diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index f43a1feb77..00b13da72b 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -5,7 +5,7 @@ on:
     - cron: '5 9 * * *'
 jobs:
   cargo-deny:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout repository code
         uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
           path: .github/workflows/support-files/notifications/deny.message
   notification:
     needs: cargo-deny
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
diff --git a/.github/workflows/build_matrix_includes.json b/.github/workflows/build_matrix_includes.json
index a75ca76530..8d8f8297bc 100644
--- a/.github/workflows/build_matrix_includes.json
+++ b/.github/workflows/build_matrix_includes.json
@@ -1,6 +1,6 @@
 [
   {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
     "rust":"stable",
     "runOnEvent":"always"
   },
diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml
index 3921bd3a6d..9ecc6b49d9 100644
--- a/.github/workflows/contracts-build.yml
+++ b/.github/workflows/contracts-build.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       
diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml
index 2c1eaf40b2..6d51356a80 100644
--- a/.github/workflows/contracts.yml
+++ b/.github/workflows/contracts.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -24,7 +24,7 @@ jobs:
   contracts:
     # since it's going to be compiled into wasm, there's absolutely
     # no point in running CI on different OS-es
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     needs: matrix_prep
     strategy:
diff --git a/.github/workflows/network-explorer-api.yml b/.github/workflows/network-explorer-api.yml
index 2ad184be72..5c60038347 100644
--- a/.github/workflows/network-explorer-api.yml
+++ b/.github/workflows/network-explorer-api.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
 
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml
index 8475b83b8b..d103b66278 100644
--- a/.github/workflows/nightly_build.yml
+++ b/.github/workflows/nightly_build.yml
@@ -5,7 +5,7 @@ on:
     - cron: '14 1 * * *'
 jobs:
   matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Install Dependencies (Linux)
         run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
 
       - name: Check out repository code
         uses: actions/checkout@v2
@@ -96,7 +96,7 @@ jobs:
 
       - name: Reclaim some disk space
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
         with:
           command: clean
 
@@ -160,7 +160,7 @@ jobs:
 
   notification:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Collect jobs status
         uses: technote-space/workflow-conclusion-action@v2
diff --git a/.github/workflows/nightly_build_matrix_includes.json b/.github/workflows/nightly_build_matrix_includes.json
index a979c90a62..172944df28 100644
--- a/.github/workflows/nightly_build_matrix_includes.json
+++ b/.github/workflows/nightly_build_matrix_includes.json
@@ -1,6 +1,6 @@
 [
   {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
     "rust":"stable",
     "runOnEvent":"schedule"
   },
@@ -17,7 +17,7 @@
   },
 
   {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
     "rust":"beta",
     "runOnEvent":"schedule"
   },
@@ -33,7 +33,7 @@
   },
 
   {
-    "os":"ubuntu-latest",
+    "os":"ubuntu-20.04",
     "rust":"nightly",
     "runOnEvent":"schedule"
   },
diff --git a/.github/workflows/nightly_build_release.yml b/.github/workflows/nightly_build_release.yml
index 4474b399b6..30e43d7f90 100644
--- a/.github/workflows/nightly_build_release.yml
+++ b/.github/workflows/nightly_build_release.yml
@@ -5,7 +5,7 @@ on:
     - cron: '14 2 * * *'
 jobs:
   matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -17,7 +17,7 @@ jobs:
           inputFile: '.github/workflows/nightly_build_matrix_includes.json'
           filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
   get_release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: matrix_prep
     outputs:
       output1: ${{ steps.step2.outputs.latest_release }}
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Install Dependencies (Linux)
         run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
 
       - name: Check out latest release branch
         uses: actions/checkout@v3
@@ -111,7 +111,7 @@ jobs:
 
       - name: Reclaim some disk space
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
         with:
           command: clean
 
@@ -175,7 +175,7 @@ jobs:
 
   notification:
     needs: [build,get_release]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Collect jobs status
         uses: technote-space/workflow-conclusion-action@v2
@@ -192,7 +192,7 @@ jobs:
           NYM_PROJECT_NAME: "Nym nightly build on latest release"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "https://github.com/nymtech/nym/tree/${{needs.get_release.outputs.output1}}"
+          GIT_BRANCH_NAME: "${{needs.get_release.outputs.output1}}"
           KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
           KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
           KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
diff --git a/.github/workflows/nightly_build_release2.yml b/.github/workflows/nightly_build_release2.yml
index 71f89948c9..6ff5368c56 100644
--- a/.github/workflows/nightly_build_release2.yml
+++ b/.github/workflows/nightly_build_release2.yml
@@ -5,7 +5,7 @@ on:
     - cron: '24 2 * * *'
 jobs:
   matrix_prep:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -17,7 +17,7 @@ jobs:
           inputFile: '.github/workflows/nightly_build_matrix_includes.json'
           filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]'
   get_release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: matrix_prep
     outputs:
       output1: ${{ steps.step2.outputs.latest_release }}
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Install Dependencies (Linux)
         run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-20.04'
 
       - name: Check out latest release branch
         uses: actions/checkout@v3
@@ -111,7 +111,7 @@ jobs:
 
       - name: Reclaim some disk space
         uses: actions-rs/cargo@v1
-        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }}
+        if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }}
         with:
           command: clean
 
@@ -175,7 +175,7 @@ jobs:
 
   notification:
     needs: [build,get_release]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Collect jobs status
         uses: technote-space/workflow-conclusion-action@v2
@@ -192,7 +192,7 @@ jobs:
           NYM_PROJECT_NAME: "Nym nightly build on latest release"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GIT_COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
-          GIT_BRANCH: "https://github.com/nymtech/nym/tree/${{needs.get_release.outputs.output1}}"
+          GIT_BRANCH_NAME: "${{needs.get_release.outputs.output1}}"
           KEYBASE_NYMBOT_USERNAME: "${{ secrets.KEYBASE_NYMBOT_USERNAME }}"
           KEYBASE_NYMBOT_PAPERKEY: "${{ secrets.KEYBASE_NYMBOT_PAPERKEY }}"
           KEYBASE_NYMBOT_TEAM: "${{ secrets.KEYBASE_NYMBOT_TEAM }}"
diff --git a/.github/workflows/nym-cli-publish.yml b/.github/workflows/nym-cli-publish.yml
index 065e9f1658..5fd532c68b 100644
--- a/.github/workflows/nym-cli-publish.yml
+++ b/.github/workflows/nym-cli-publish.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        platform: [ubuntu-20.04, windows-latest, macos-latest]
 
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml
index 52c6ed9c5e..a4eb77cae1 100644
--- a/.github/workflows/nym-connect-publish-ubuntu.yml
+++ b/.github/workflows/nym-connect-publish-ubuntu.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
 
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/nym-release-publish.yml b/.github/workflows/nym-release-publish.yml
index 700f1d697f..979781652f 100644
--- a/.github/workflows/nym-release-publish.yml
+++ b/.github/workflows/nym-release-publish.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
 
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml
index 46ed4be076..04ff746851 100644
--- a/.github/workflows/nym-wallet-publish-ubuntu.yml
+++ b/.github/workflows/nym-wallet-publish-ubuntu.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
 
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/nym-wallet-release.yml b/.github/workflows/nym-wallet-release.yml
index 4e157903e6..34883144f3 100644
--- a/.github/workflows/nym-wallet-release.yml
+++ b/.github/workflows/nym-wallet-release.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-20.04]
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/nym_wallet.yml b/.github/workflows/nym_wallet.yml
index bbc981d0f4..49b2381ed0 100644
--- a/.github/workflows/nym_wallet.yml
+++ b/.github/workflows/nym_wallet.yml
@@ -12,7 +12,7 @@ defaults:
 jobs:
   test:
     name: wallet tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/support-files/nightly/index.js b/.github/workflows/support-files/nightly/index.js
index f913539235..3bf2516092 100644
--- a/.github/workflows/support-files/nightly/index.js
+++ b/.github/workflows/support-files/nightly/index.js
@@ -85,7 +85,7 @@ async function getMessageBody(context) {
             ...
           ],
           check_run_url: 'https://api.github.com/repos/nymtech/nym/check-runs/5182940024',
-          labels: [ 'ubuntu-latest' ],
+          labels: [ 'ubuntu-20.04' ],
           runner_id: 1,
           runner_name: 'Hosted Agent',
           runner_group_id: 2,
diff --git a/.github/workflows/wasm_client_build.yml b/.github/workflows/wasm_client_build.yml
index 2761aabcd2..e1da3b04b0 100644
--- a/.github/workflows/wasm_client_build.yml
+++ b/.github/workflows/wasm_client_build.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   wasm:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.gitignore b/.gitignore
index f102743734..6d81c53530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,7 @@ validator-config
 *.patch
 validator-api-config.toml
 dist
-storybook-static
\ No newline at end of file
+storybook-static
+envs/qwerty.env
+Cargo.lock
+nym-connect/Cargo.lock
diff --git a/.wellknown/wallet/validators.json b/.wellknown/wallet/validators.json
index f4987aa3dc..ff849e16d1 100644
--- a/.wellknown/wallet/validators.json
+++ b/.wellknown/wallet/validators.json
@@ -1,6 +1,8 @@
 {
-  "mainnet":[{
-    "nymd_url":"https://rpc.nyx.nodes.guru/",
-    "api_url":"https://api.nyx.nodes.guru/"
-  }]
-}
+  "mainnet": [
+    {
+      "nyxd_url": "https://rpc.nyx.nodes.guru/",
+      "api_url": "https://api.nyx.nodes.guru/"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f3274b4e1..9a372b8376 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,81 @@
 
 Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Added
+
+- socks5: send status message for service ready, and network-requester error response
+
+### Changed
+
+- renamed all references to validator_api to nym_api
+- renamed all references to nymd to nyxd
+- all-binaries: improved error logging ([#2686])
+- native client: bring shutdown logic up to the same level as socks5-client
+- nym-api, coconut-dkg contract: automatic, time-based dkg epoch state advancement ([#2670])
+- all-binaries: standarised argument names (note: old names should still be accepted) ([#2762]
+
+### Fixed
+
+- nym-api: should now correctly use `rewarding.enabled` config flag ([#2753])
+
+[#2686]: https://github.com/nymtech/nym/pull/2686
+[#2670]: https://github.com/nymtech/nym/pull/2670
+[#2753]: https://github.com/nymtech/nym/pull/2753
+[#2762]: https://github.com/nymtech/nym/pull/2762
+
+## [v1.1.4] (2022-12-20)
+
+This release adds multiple Single Use Reply Blocks (SURBs) to allow arbitrarily-sized anonymized replies.
+At the moment this is turned off by default, but available for use by application developers.
+We will need to wait for network-requesters to upgrade to this new release, after which multi-SURB anonymization will become the default setting for the SOCKS proxy clients.
+
+The release also include some additional work for distributed key generation in the Coconut signing authority nodes.
+
+### Changed
+
+- Feature/dkg contract threshold by @neacsu in https://github.com/nymtech/nym/pull/1885
+- Multi-surbs by @jstuczyn in https://github.com/nymtech/nym/pull/2667
+- Fix multi-surb backwards compatibility in pre 1.1.4 client config files by @jstuczyn in https://github.com/nymtech/nym/pull/2703
+- fix: ignore corrupted surb storage and instead create fresh one by @jstuczyn in https://github.com/nymtech/nym/pull/2711
+- socks5: rework waiting in inbound.rs by @octol in https://github.com/nymtech/nym/pull/1880
+
+## [v1.1.3] (2022-12-13)
+
+### Changed
+
+- validator-api: can recover from shutdown during DKG process ([#1872])
+- clients: deduplicate gateway initialization, part of work towards a rust-sdk
+- clients: keep all transmission lanes going at all times by making priority probabilistic
+- clients: ability to use multi-reply SURBs to send arbitrarily long messages fully anonymously whilst requesting additional reply blocks whenever they're about to run out ([#1796], [#1801], [#1804], [#1835], [#1858], [#1883]))
+
+### Fixed
+
+- network-requester: fix bug where websocket connection disconnect resulted in success error code
+- clients: fix a few panics handling the gateway-client
+- mixnode, gateway, validator-api: Use mainnet values as defaults for URLs and mixnet contract ([#1884])
+- socks5: fixed bug where connections sometimes where closed too early
+- clients: improve message logging when received message fails to get reconstructed ([#1803])
+
+[#1796]: https://github.com/nymtech/nym/pull/1796
+[#1801]: https://github.com/nymtech/nym/pull/1801
+[#1803]: https://github.com/nymtech/nym/pull/1803
+[#1804]: https://github.com/nymtech/nym/pull/1804
+[#1835]: https://github.com/nymtech/nym/pull/1835
+[#1858]: https://github.com/nymtech/nym/pull/1858
+[#1872]: https://github.com/nymtech/nym/pull/1872
+[#1883]: https://github.com/nymtech/nym/pull/1883
+[#1884]: https://github.com/nymtech/nym/pull/1884
+
+## [v1.1.2]
+
+### Changed
+
+- gateway: Renamed flag from `enabled/disabled_credentials_mode` to `only-coconut-credentials`
+- "Family" feature for node families + layers
+- Initial coconut functionality including credentials and distributed key generation
+
 ## [v1.1.1](https://github.com/nymtech/nym/tree/v1.1.1) (2022-11-29)
 
 ### Added
@@ -36,7 +111,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1786]: https://github.com/nymtech/nym/pull/1786
 [#1805]: https://github.com/nymtech/nym/pull/1805
 
-
 ## [v1.1.0](https://github.com/nymtech/nym/tree/v1.1.0) (2022-11-09)
 
 ### Added
@@ -48,7 +122,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - native-client/socks5-client/wasm-client: `use_extended_packet_size` Debug config option to make the client use 'ExtendedPacketSize' for its traffic (32kB as opposed to 2kB in 1.0.2) ([#1671])
 - network-requester: added additional Blockstream Green wallet endpoint to `example.allowed.list` ([#1611])
 - validator-api: add `interval_operating_cost` and `profit_margin_percent` to compute reward estimation endpoint
-- validator-client: added `query_contract_smart` and `query_contract_raw` on `NymdClient` ([#1558])
+- validator-client: added `query_contract_smart` and `query_contract_raw` on `NyxdClient` ([#1558])
 - wasm-client: uses updated wasm-compatible `client-core` so that it's now capable of packet retransmission, cover traffic and poisson delay (among other things!) ([#1673])
 
 ### Fixed
@@ -63,7 +137,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - gateway-client: will attempt to read now as many as 8 websocket messages at once, assuming they're already available on the socket ([#1669])
 - moved `Percent` struct to `contracts-common`, change affects explorer-api
 - socks5 client: graceful shutdown should fix error on disconnect in nym-connect ([#1591])
-- validator-api: changed error serialization on `inclusion_probability`, `stake-saturation` and `reward-estimation` endpoints to provide more accurate information ([#1681]) 
+- validator-api: changed error serialization on `inclusion_probability`, `stake-saturation` and `reward-estimation` endpoints to provide more accurate information ([#1681])
 - validator-client: made `fee` argument optional for `execute` and `execute_multiple` ([#1541])
 - wasm-client: fixed build errors on MacOS and changed example JS code to use mainnet ([#1585])
 - validator-api: changes to internal SQL schema due to the mixnet contract revamp ([#1472])
@@ -91,7 +165,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 [#1724]: https://github.com/nymtech/nym/pull/1724
 [#1725]: https://github.com/nymtech/nym/pull/1725
 
-
 ## [nym-binaries-1.0.2](https://github.com/nymtech/nym/tree/nym-binaries-1.0.2)
 
 ### Added
@@ -144,9 +217,8 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - All binaries and cosmwasm blobs are configured at runtime now; binaries are configured using environment variables or .env files and contracts keep the configuration parameters in storage ([#1463])
 - gateway, network-statistics: include gateway id in the sent statistical data ([#1478])
 - network explorer: tweak how active set probability is shown ([#1503])
-- validator-api: rewarder set update fails without panicking on possible nymd queries ([#1520])
-- network-requester, socks5 client (nym-connect): send and receive respectively a message error to be displayed about filter check failure ([#1576]) 
-
+- validator-api: rewarder set update fails without panicking on possible nyxd queries ([#1520])
+- network-requester, socks5 client (nym-connect): send and receive respectively a message error to be displayed about filter check failure ([#1576])
 
 [#1249]: https://github.com/nymtech/nym/pull/1249
 [#1256]: https://github.com/nymtech/nym/pull/1256
@@ -240,9 +312,9 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Bump minimist from 1.2.5 to 1.2.6 in /clients/tauri-client [\#1163](https://github.com/nymtech/nym/pull/1163) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump minimist from 1.2.5 to 1.2.6 in /clients/webassembly/js-example [\#1162](https://github.com/nymtech/nym/pull/1162) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump minimist from 1.2.5 to 1.2.6 in /clients/native/examples/js-examples/websocket [\#1160](https://github.com/nymtech/nym/pull/1160) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump minimist from 1.2.5 to 1.2.6 in /docker/typescript\_client/upload\_contract [\#1159](https://github.com/nymtech/nym/pull/1159) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump minimist from 1.2.5 to 1.2.6 in /docker/typescript_client/upload_contract [\#1159](https://github.com/nymtech/nym/pull/1159) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Feature/vesting full [\#1158](https://github.com/nymtech/nym/pull/1158) ([fmtabbara](https://github.com/fmtabbara))
-- get\_current\_epoch tauri [\#1156](https://github.com/nymtech/nym/pull/1156) ([durch](https://github.com/durch))
+- get_current_epoch tauri [\#1156](https://github.com/nymtech/nym/pull/1156) ([durch](https://github.com/durch))
 - Cleanup [\#1155](https://github.com/nymtech/nym/pull/1155) ([durch](https://github.com/durch))
 - Feature flag reward payments [\#1154](https://github.com/nymtech/nym/pull/1154) ([durch](https://github.com/durch))
 - Add Query endpoints for calculating rewards [\#1152](https://github.com/nymtech/nym/pull/1152) ([durch](https://github.com/durch))
@@ -251,7 +323,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - wallet: use Urls rather than Strings for validator urls [\#1148](https://github.com/nymtech/nym/pull/1148) ([octol](https://github.com/octol))
 - Change accumulated reward to Option, migrate delegations [\#1147](https://github.com/nymtech/nym/pull/1147) ([durch](https://github.com/durch))
 - wallet: fetch validators url remotely if available [\#1146](https://github.com/nymtech/nym/pull/1146) ([octol](https://github.com/octol))
-- Fix delegated\_free calculation [\#1145](https://github.com/nymtech/nym/pull/1145) ([durch](https://github.com/durch))
+- Fix delegated_free calculation [\#1145](https://github.com/nymtech/nym/pull/1145) ([durch](https://github.com/durch))
 - Update Nym wallet dependencies to use `ts-packages` [\#1144](https://github.com/nymtech/nym/pull/1144) ([mmsinclair](https://github.com/mmsinclair))
 - wallet: try validators one by one if available [\#1143](https://github.com/nymtech/nym/pull/1143) ([octol](https://github.com/octol))
 - Update Network Explorer Packages and add mix node identity key copy [\#1142](https://github.com/nymtech/nym/pull/1142) ([mmsinclair](https://github.com/mmsinclair))
@@ -291,14 +363,13 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - feature/pedersen-commitments [\#1048](https://github.com/nymtech/nym/pull/1048) ([danielementary](https://github.com/danielementary))
 - Feature/reuse init owner [\#970](https://github.com/nymtech/nym/pull/970) ([neacsu](https://github.com/neacsu))
 
-
 ## [v0.12.1](https://github.com/nymtech/nym/tree/v0.12.1) (2021-12-23)
 
 [Full Changelog](https://github.com/nymtech/nym/compare/v0.12.0...v0.12.1)
 
 **Implemented enhancements:**
 
-- Add version check to  binaries [\#967](https://github.com/nymtech/nym/issues/967)
+- Add version check to binaries [\#967](https://github.com/nymtech/nym/issues/967)
 
 **Fixed bugs:**
 
@@ -328,7 +399,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Bugfix/remove mixnode bonding overwrite [\#917](https://github.com/nymtech/nym/pull/917) ([jstuczyn](https://github.com/jstuczyn))
 - Fixes crash condition in validator API when calculating last day uptime [\#909](https://github.com/nymtech/nym/pull/909) ([jstuczyn](https://github.com/jstuczyn))
 - Bugfix/monitor initial values wait [\#907](https://github.com/nymtech/nym/pull/907) ([jstuczyn](https://github.com/jstuczyn))
-- Bug fix: Network Explorer: Add freegeoip API key and split out tasks for country distributions  [\#806](https://github.com/nymtech/nym/pull/806) ([mmsinclair](https://github.com/mmsinclair))
+- Bug fix: Network Explorer: Add freegeoip API key and split out tasks for country distributions [\#806](https://github.com/nymtech/nym/pull/806) ([mmsinclair](https://github.com/mmsinclair))
 - Explorer API: port test now split out address resolution and add units tests [\#755](https://github.com/nymtech/nym/pull/755) ([mmsinclair](https://github.com/mmsinclair))
 
 **Closed issues:**
@@ -343,7 +414,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - help!!! [\#712](https://github.com/nymtech/nym/issues/712)
 - UX feature request: show all delegated nodes in wallet [\#711](https://github.com/nymtech/nym/issues/711)
 - UX feature request: add current balance on wallet pages [\#710](https://github.com/nymtech/nym/issues/710)
-- got sign issue from bot  [\#709](https://github.com/nymtech/nym/issues/709)
+- got sign issue from bot [\#709](https://github.com/nymtech/nym/issues/709)
 - As a wallet user, I would like to be able to log out of the wallet [\#706](https://github.com/nymtech/nym/issues/706)
 - As a wallet user, I would like to have a "receive" page where I can see my own wallet address [\#705](https://github.com/nymtech/nym/issues/705)
 - Update native client/socks client/mixnode/gateway `upgrade` command [\#689](https://github.com/nymtech/nym/issues/689)
@@ -353,7 +424,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - nym-socks5-client crash after opening Keybase team "Browse all channels" [\#494](https://github.com/nymtech/nym/issues/494)
 - Mixed Content problem [\#400](https://github.com/nymtech/nym/issues/400)
 - Gateway disk quota [\#137](https://github.com/nymtech/nym/issues/137)
-- Simplify message encapsulation with regards to topology  [\#127](https://github.com/nymtech/nym/issues/127)
+- Simplify message encapsulation with regards to topology [\#127](https://github.com/nymtech/nym/issues/127)
 - Create constants for cli argument names [\#115](https://github.com/nymtech/nym/issues/115)
 - Using Blake3 as a hash function [\#103](https://github.com/nymtech/nym/issues/103)
 - Validator should decide which layer a node is in [\#86](https://github.com/nymtech/nym/issues/86)
@@ -409,10 +480,10 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Feature/pre cosmrs updates [\#935](https://github.com/nymtech/nym/pull/935) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/client on behalf [\#934](https://github.com/nymtech/nym/pull/934) ([neacsu](https://github.com/neacsu))
 - Webpack wallet prod configuration [\#933](https://github.com/nymtech/nym/pull/933) ([tommyv1987](https://github.com/tommyv1987))
-- Adding tx\_hash to wallet response [\#932](https://github.com/nymtech/nym/pull/932) ([futurechimp](https://github.com/futurechimp))
+- Adding tx_hash to wallet response [\#932](https://github.com/nymtech/nym/pull/932) ([futurechimp](https://github.com/futurechimp))
 - Release/1.0.0 pre1 [\#931](https://github.com/nymtech/nym/pull/931) ([durch](https://github.com/durch))
 - Feature/identity verification [\#930](https://github.com/nymtech/nym/pull/930) ([jstuczyn](https://github.com/jstuczyn))
-- Move cleaned up smart contracts to main code repo  [\#929](https://github.com/nymtech/nym/pull/929) ([mfahampshire](https://github.com/mfahampshire))
+- Move cleaned up smart contracts to main code repo [\#929](https://github.com/nymtech/nym/pull/929) ([mfahampshire](https://github.com/mfahampshire))
 - Feature/mixnet contract further adjustments [\#928](https://github.com/nymtech/nym/pull/928) ([jstuczyn](https://github.com/jstuczyn))
 - typo copy change for nodemap [\#926](https://github.com/nymtech/nym/pull/926) ([Aid19801](https://github.com/Aid19801))
 - Feature/UI enhancements for Desktop Wallet [\#925](https://github.com/nymtech/nym/pull/925) ([fmtabbara](https://github.com/fmtabbara))
@@ -425,7 +496,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Feature/faucet page react [\#911](https://github.com/nymtech/nym/pull/911) ([fmtabbara](https://github.com/fmtabbara))
 - Feature/mixnet contract refactor [\#910](https://github.com/nymtech/nym/pull/910) ([futurechimp](https://github.com/futurechimp))
 - Update README.md [\#905](https://github.com/nymtech/nym/pull/905) ([tommyv1987](https://github.com/tommyv1987))
-- BUG: Bond cell denom  [\#904](https://github.com/nymtech/nym/pull/904) ([Aid19801](https://github.com/Aid19801))
+- BUG: Bond cell denom [\#904](https://github.com/nymtech/nym/pull/904) ([Aid19801](https://github.com/Aid19801))
 - Explorer UI tests missing data-testid [\#903](https://github.com/nymtech/nym/pull/903) ([tommyv1987](https://github.com/tommyv1987))
 - Fix up Nym-Wallet README.md [\#899](https://github.com/nymtech/nym/pull/899) ([tommyv1987](https://github.com/tommyv1987))
 - Feature/batch delegator rewarding [\#898](https://github.com/nymtech/nym/pull/898) ([jstuczyn](https://github.com/jstuczyn))
@@ -443,7 +514,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Reverted gateway registration handshake to its 0.11.0 version [\#882](https://github.com/nymtech/nym/pull/882) ([jstuczyn](https://github.com/jstuczyn))
 - Network Explorer [\#881](https://github.com/nymtech/nym/pull/881) ([mmsinclair](https://github.com/mmsinclair))
 - Feature/rewarding interval updates [\#880](https://github.com/nymtech/nym/pull/880) ([jstuczyn](https://github.com/jstuczyn))
-- Put client\_address and id in the correct order [\#875](https://github.com/nymtech/nym/pull/875) ([neacsu](https://github.com/neacsu))
+- Put client_address and id in the correct order [\#875](https://github.com/nymtech/nym/pull/875) ([neacsu](https://github.com/neacsu))
 - remove gateway selection on delegation and undelegation pages [\#873](https://github.com/nymtech/nym/pull/873) ([fmtabbara](https://github.com/fmtabbara))
 - Set MSRV on all binaries to 1.56 [\#872](https://github.com/nymtech/nym/pull/872) ([jstuczyn](https://github.com/jstuczyn))
 - add native window items \(copy/paste\) via tauri [\#871](https://github.com/nymtech/nym/pull/871) ([fmtabbara](https://github.com/fmtabbara))
@@ -459,7 +530,7 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Overflow checks in release [\#846](https://github.com/nymtech/nym/pull/846) ([jstuczyn](https://github.com/jstuczyn))
 - fix delegate success overflow [\#842](https://github.com/nymtech/nym/pull/842) ([fmtabbara](https://github.com/fmtabbara))
 - Feature NYM wallet webdriverio test [\#841](https://github.com/nymtech/nym/pull/841) ([tommyv1987](https://github.com/tommyv1987))
-- Update nym\_wallet.yml [\#840](https://github.com/nymtech/nym/pull/840) ([tommyv1987](https://github.com/tommyv1987))
+- Update nym_wallet.yml [\#840](https://github.com/nymtech/nym/pull/840) ([tommyv1987](https://github.com/tommyv1987))
 - Feature/vouchers [\#837](https://github.com/nymtech/nym/pull/837) ([aniampio](https://github.com/aniampio))
 - Apply readable ids to elements on Nym Wallet [\#836](https://github.com/nymtech/nym/pull/836) ([tommyv1987](https://github.com/tommyv1987))
 - Feature/removal of monitor good nodes [\#833](https://github.com/nymtech/nym/pull/833) ([jstuczyn](https://github.com/jstuczyn))
@@ -483,8 +554,8 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Created getters for AccountData [\#787](https://github.com/nymtech/nym/pull/787) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/migrate hidden delegations [\#786](https://github.com/nymtech/nym/pull/786) ([neacsu](https://github.com/neacsu))
 - Feature/persistent gateway storage [\#784](https://github.com/nymtech/nym/pull/784) ([jstuczyn](https://github.com/jstuczyn))
-- Replaced unwrap\_or\_else with unwrap\_or\_default [\#780](https://github.com/nymtech/nym/pull/780) ([jstuczyn](https://github.com/jstuczyn))
-- Add block\_height method to Delegation [\#778](https://github.com/nymtech/nym/pull/778) ([durch](https://github.com/durch))
+- Replaced unwrap_or_else with unwrap_or_default [\#780](https://github.com/nymtech/nym/pull/780) ([jstuczyn](https://github.com/jstuczyn))
+- Add block_height method to Delegation [\#778](https://github.com/nymtech/nym/pull/778) ([durch](https://github.com/durch))
 - Make fee helpers public [\#777](https://github.com/nymtech/nym/pull/777) ([durch](https://github.com/durch))
 - re-enable bonding [\#776](https://github.com/nymtech/nym/pull/776) ([fmtabbara](https://github.com/fmtabbara))
 - Explorer-api: add API resource to show the delegations for each mix node [\#774](https://github.com/nymtech/nym/pull/774) ([mmsinclair](https://github.com/mmsinclair))
@@ -493,14 +564,14 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Adding deps for building the Tauri wallet under Ubuntu [\#770](https://github.com/nymtech/nym/pull/770) ([futurechimp](https://github.com/futurechimp))
 - remove alert [\#767](https://github.com/nymtech/nym/pull/767) ([fmtabbara](https://github.com/fmtabbara))
 - Feature/consumable bandwidth [\#766](https://github.com/nymtech/nym/pull/766) ([neacsu](https://github.com/neacsu))
-- Update coconut-rs and use hash\_to\_scalar from there [\#765](https://github.com/nymtech/nym/pull/765) ([neacsu](https://github.com/neacsu))
+- Update coconut-rs and use hash_to_scalar from there [\#765](https://github.com/nymtech/nym/pull/765) ([neacsu](https://github.com/neacsu))
 - Feature/active sets [\#764](https://github.com/nymtech/nym/pull/764) ([jstuczyn](https://github.com/jstuczyn))
 - add app alert banner [\#762](https://github.com/nymtech/nym/pull/762) ([fmtabbara](https://github.com/fmtabbara))
 - Updated cosmos-sdk [\#761](https://github.com/nymtech/nym/pull/761) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/bond blockstamp [\#760](https://github.com/nymtech/nym/pull/760) ([neacsu](https://github.com/neacsu))
 - Feature/revert migration code [\#759](https://github.com/nymtech/nym/pull/759) ([neacsu](https://github.com/neacsu))
 - Bump next from 11.1.0 to 11.1.1 in /wallet-web [\#758](https://github.com/nymtech/nym/pull/758) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Add block\_height in the Delegation structure as well [\#757](https://github.com/nymtech/nym/pull/757) ([neacsu](https://github.com/neacsu))
+- Add block_height in the Delegation structure as well [\#757](https://github.com/nymtech/nym/pull/757) ([neacsu](https://github.com/neacsu))
 - Feature/add blockstamp [\#756](https://github.com/nymtech/nym/pull/756) ([neacsu](https://github.com/neacsu))
 - NetworkMonitorBuilder - starting the monitor after rocket has launched [\#754](https://github.com/nymtech/nym/pull/754) ([jstuczyn](https://github.com/jstuczyn))
 - Enabled validators api argument [\#753](https://github.com/nymtech/nym/pull/753) ([jstuczyn](https://github.com/jstuczyn))
@@ -512,21 +583,21 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Feature/more reliable uptime calculation [\#747](https://github.com/nymtech/nym/pull/747) ([jstuczyn](https://github.com/jstuczyn))
 - Update template toml key [\#746](https://github.com/nymtech/nym/pull/746) ([neacsu](https://github.com/neacsu))
 - Feature/cred after handshake [\#745](https://github.com/nymtech/nym/pull/745) ([neacsu](https://github.com/neacsu))
-- Reinstate the POST method blind\_sign [\#744](https://github.com/nymtech/nym/pull/744) ([neacsu](https://github.com/neacsu))
+- Reinstate the POST method blind_sign [\#744](https://github.com/nymtech/nym/pull/744) ([neacsu](https://github.com/neacsu))
 - explorer-api: add pending field to port check response [\#742](https://github.com/nymtech/nym/pull/742) ([mmsinclair](https://github.com/mmsinclair))
 - Feature/use delegation rates [\#741](https://github.com/nymtech/nym/pull/741) ([neacsu](https://github.com/neacsu))
 - Feature/copy to clipboard [\#740](https://github.com/nymtech/nym/pull/740) ([fmtabbara](https://github.com/fmtabbara))
 - Feature/update wallet with stake rates [\#739](https://github.com/nymtech/nym/pull/739) ([neacsu](https://github.com/neacsu))
 - Add stake reward rates and bump version of client [\#738](https://github.com/nymtech/nym/pull/738) ([neacsu](https://github.com/neacsu))
 - Bump next from 10.1.3 to 11.1.0 in /wallet-web [\#737](https://github.com/nymtech/nym/pull/737) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Feature/nymd client integration [\#736](https://github.com/nymtech/nym/pull/736) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/nyxd client integration [\#736](https://github.com/nymtech/nym/pull/736) ([jstuczyn](https://github.com/jstuczyn))
 - Bug/fix parking lot on wasm [\#735](https://github.com/nymtech/nym/pull/735) ([neacsu](https://github.com/neacsu))
 - Explorer API: add new HTTP resource to decorate mix nodes with geoip locations [\#734](https://github.com/nymtech/nym/pull/734) ([mmsinclair](https://github.com/mmsinclair))
-- Feature/completing nymd client api [\#732](https://github.com/nymtech/nym/pull/732) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/completing nyxd client api [\#732](https://github.com/nymtech/nym/pull/732) ([jstuczyn](https://github.com/jstuczyn))
 - Explorer API - add port check and node description/stats proxy [\#731](https://github.com/nymtech/nym/pull/731) ([mmsinclair](https://github.com/mmsinclair))
-- Feature/nymd client fee handling [\#730](https://github.com/nymtech/nym/pull/730) ([jstuczyn](https://github.com/jstuczyn))
+- Feature/nyxd client fee handling [\#730](https://github.com/nymtech/nym/pull/730) ([jstuczyn](https://github.com/jstuczyn))
 - Update DelegationCheck.tsx [\#725](https://github.com/nymtech/nym/pull/725) ([jessgess](https://github.com/jessgess))
-- Rust nymd/cosmwasm client [\#724](https://github.com/nymtech/nym/pull/724) ([jstuczyn](https://github.com/jstuczyn))
+- Rust nyxd/cosmwasm client [\#724](https://github.com/nymtech/nym/pull/724) ([jstuczyn](https://github.com/jstuczyn))
 - Removed wasm feature bypassing cyclic dependencies [\#723](https://github.com/nymtech/nym/pull/723) ([jstuczyn](https://github.com/jstuczyn))
 - Updated used sphinx dependency to the most recent revision [\#722](https://github.com/nymtech/nym/pull/722) ([jstuczyn](https://github.com/jstuczyn))
 - update state management and validation [\#721](https://github.com/nymtech/nym/pull/721) ([fmtabbara](https://github.com/fmtabbara))
@@ -545,10 +616,8 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 - Bond and delegation alerts [\#698](https://github.com/nymtech/nym/pull/698) ([fmtabbara](https://github.com/fmtabbara))
 - Bugfix/network monitor version check [\#697](https://github.com/nymtech/nym/pull/697) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/other containers [\#692](https://github.com/nymtech/nym/pull/692) ([neacsu](https://github.com/neacsu))
-- Using validator API instead of nymd [\#690](https://github.com/nymtech/nym/pull/690) ([futurechimp](https://github.com/futurechimp))
+- Using validator API instead of nyxd [\#690](https://github.com/nymtech/nym/pull/690) ([futurechimp](https://github.com/futurechimp))
 - Hang coconut issuance off the validator-api [\#679](https://github.com/nymtech/nym/pull/679) ([durch](https://github.com/durch))
 - Update hmac and blake3 [\#673](https://github.com/nymtech/nym/pull/673) ([durch](https://github.com/durch))
 
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+\* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_
diff --git a/Cargo.lock b/Cargo.lock
deleted file mode 100644
index b86923d884..0000000000
--- a/Cargo.lock
+++ /dev/null
@@ -1,6980 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures",
- "ctr 0.8.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.4.3",
- "cpufeatures",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
-dependencies = [
- "aead",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.8.0",
- "ghash",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.6",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "async-stream"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
-dependencies = [
- "async-stream-impl",
- "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atoi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "atoi"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "atomic"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bandwidth-claim-contract"
-version = "0.1.0"
-dependencies = [
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64ct"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b"
-
-[[package]]
-name = "binascii"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bip32"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f"
-dependencies = [
- "bs58",
- "hmac 0.11.0",
- "k256",
- "once_cell",
- "pbkdf2",
- "rand_core 0.6.3",
- "ripemd160",
- "sha2 0.9.9",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "bip39"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e89470017230c38e52b82b3ee3f530db1856ba1d434e3a67a3456a8a8dec5f"
-dependencies = [
- "bitcoin_hashes",
- "rand 0.6.5",
- "rand_core 0.4.2",
- "serde",
- "unicode-normalization",
-]
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitvec"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "blake2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
-dependencies = [
- "byte-tools",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "blake3"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if 1.0.0",
- "constant_time_eq",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding 0.1.5",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "block-padding 0.2.1",
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
-[[package]]
-name = "bls12_381"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397"
-dependencies = [
- "digest 0.9.0",
- "ff 0.10.1",
- "group 0.10.0",
- "pairing 0.20.0",
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "bls12_381"
-version = "0.6.0"
-source = "git+https://github.com/jstuczyn/bls12_381?branch=gt-serialisation#10fb6f700bfda17c8475af3bfd31e3fec15f2278"
-dependencies = [
- "digest 0.9.0",
- "ff 0.11.0",
- "group 0.11.0",
- "pairing 0.21.0",
- "rand_core 0.6.3",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-dependencies = [
- "sha2 0.9.9",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cast"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
-dependencies = [
- "rustc_version 0.4.0",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
-dependencies = [
- "byteorder",
- "keystream",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "serde",
- "time 0.1.44",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "bitflags",
- "textwrap 0.11.0",
- "unicode-width",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190814073e85d238f31ff738fcb0bf6910cedeb73376c87cd69291028966fd83"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "clap_lex",
- "indexmap",
- "once_cell",
- "strsim",
- "termcolor",
- "textwrap 0.15.0",
-]
-
-[[package]]
-name = "clap_complete"
-version = "3.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4179da71abd56c26b54dd0c248cc081c1f43b0a1a7e8448e28e57a29baa993d"
-dependencies = [
- "clap 3.2.8",
-]
-
-[[package]]
-name = "clap_complete_fig"
-version = "3.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed37b4c0c1214673eba6ad8ea31666626bf72be98ffb323067d973c48b4964b9"
-dependencies = [
- "clap 3.2.8",
- "clap_complete",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
-dependencies = [
- "heck 0.4.0",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "client-connections"
-version = "0.1.0"
-dependencies = [
- "futures",
- "log",
-]
-
-[[package]]
-name = "client-core"
-version = "1.1.1"
-dependencies = [
- "client-connections",
- "config",
- "crypto",
- "dirs",
- "futures",
- "gateway-client",
- "gateway-requests",
- "gloo-timers",
- "humantime-serde",
- "log",
- "nonexhaustive-delayqueue",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "serde",
- "sled",
- "tap",
- "task",
- "tempfile",
- "thiserror",
- "tokio",
- "tokio-stream",
- "topology",
- "url",
- "validator-client",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "coconut-bandwidth-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-dkg-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-utils",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-interface"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "getset",
- "nymcoconut",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "comfy-table"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121d8a5b0346092c18a4b2fd6f620d7a06f0eb7ac0a45860939a0884bc579c56"
-dependencies = [
- "crossterm",
- "strum 0.24.1",
- "strum_macros 0.24.3",
- "unicode-width",
-]
-
-[[package]]
-name = "completions"
-version = "0.1.0"
-dependencies = [
- "clap 3.2.8",
- "clap_complete",
- "clap_complete_fig",
-]
-
-[[package]]
-name = "config"
-version = "0.1.0"
-dependencies = [
- "cfg-if 1.0.0",
- "handlebars",
- "log",
- "network-defaults",
- "serde",
- "toml",
- "url",
-]
-
-[[package]]
-name = "console-api"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc347c19eb5b940f396ac155822caee6662f850d97306890ac3773ed76c90c5a"
-dependencies = [
- "prost 0.9.0",
- "prost-types 0.9.0",
- "tonic",
- "tonic-build",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565a7dfea2d10dd0e5c57cc394d5d441b1910960d8c9211ed14135e0e6ec3a20"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures",
- "hdrhistogram",
- "humantime 2.1.0",
- "prost-types 0.9.0",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "contracts-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "dkg",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "cookie"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
-dependencies = [
- "aes-gcm",
- "base64",
- "hkdf 0.12.3",
- "hmac 0.12.1",
- "percent-encoding",
- "rand 0.8.5",
- "sha2 0.10.2",
- "subtle 2.4.1",
- "time 0.3.14",
- "version_check",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cosmos-sdk-proto"
-version = "0.12.3"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
-dependencies = [
- "prost 0.10.3",
- "prost-types 0.10.1",
- "tendermint-proto",
-]
-
-[[package]]
-name = "cosmrs"
-version = "0.7.1"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
-dependencies = [
- "bip32",
- "cosmos-sdk-proto",
- "ecdsa",
- "eyre",
- "getrandom 0.2.6",
- "k256",
- "prost 0.10.3",
- "prost-types 0.10.1",
- "rand_core 0.6.3",
- "serde",
- "serde_json",
- "subtle-encoding",
- "tendermint",
- "tendermint-rpc",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-crypto"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
-dependencies = [
- "digest 0.9.0",
- "ed25519-zebra",
- "k256",
- "rand_core 0.6.3",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
-dependencies = [
- "syn",
-]
-
-[[package]]
-name = "cosmwasm-std"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
-dependencies = [
- "base64",
- "cosmwasm-crypto",
- "cosmwasm-derive",
- "forward_ref",
- "schemars",
- "serde",
- "serde-json-wasm",
- "thiserror",
- "uint",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
-dependencies = [
- "crc-catalog 1.1.1",
-]
-
-[[package]]
-name = "crc"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
-dependencies = [
- "crc-catalog 2.1.0",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
-
-[[package]]
-name = "crc-catalog"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "credential"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "bip39",
- "cfg-if 0.1.10",
- "clap 3.2.8",
- "coconut-interface",
- "completions",
- "config",
- "credential-storage",
- "credentials",
- "crypto",
- "network-defaults",
- "pemstore",
- "pickledb",
- "rand 0.7.3",
- "serde",
- "thiserror",
- "tokio",
- "url",
- "validator-client",
-]
-
-[[package]]
-name = "credential-storage"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "log",
- "sqlx 0.5.11",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "credentials"
-version = "0.1.0"
-dependencies = [
- "bls12_381 0.5.0",
- "coconut-interface",
- "cosmrs",
- "crypto",
- "rand 0.7.3",
- "thiserror",
- "validator-api-requests",
- "validator-client",
-]
-
-[[package]]
-name = "criterion"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10"
-dependencies = [
- "atty",
- "cast",
- "clap 2.34.0",
- "criterion-plot",
- "csv",
- "itertools",
- "lazy_static",
- "num-traits",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_cbor",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57"
-dependencies = [
- "cast",
- "itertools",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
-dependencies = [
- "autocfg 1.1.0",
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "lazy_static",
- "memoffset",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
-dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
-dependencies = [
- "bitflags",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot 0.12.0",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto"
-version = "0.1.0"
-dependencies = [
- "aes 0.8.1",
- "blake3",
- "bs58",
- "cipher 0.4.3",
- "ctr 0.9.1",
- "digest 0.10.3",
- "ed25519-dalek",
- "generic-array 0.14.5",
- "hkdf 0.12.3",
- "hmac 0.12.1",
- "nymsphinx-types",
- "pemstore",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
- "serde",
- "serde_bytes",
- "subtle-encoding",
- "x25519-dalek",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
-dependencies = [
- "generic-array 0.14.5",
- "rand_core 0.6.3",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
-dependencies = [
- "generic-array 0.14.5",
- "typenum",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.5",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ct-logs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
-dependencies = [
- "sct 0.6.1",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher 0.3.0",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0"
-dependencies = [
- "cipher 0.4.3",
-]
-
-[[package]]
-name = "cupid"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bad352a84b567cc38a5854e3aa8ee903cb8519a25d0b799b739bafffd1f91a1"
-dependencies = [
- "gcc",
- "rustc_version 0.2.3",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "serde",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-utils"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw2"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3-fixed-multisig"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw3",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw4"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if 1.0.0",
- "num_cpus",
-]
-
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "devise"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595"
-dependencies = [
- "devise_codegen",
- "devise_core",
-]
-
-[[package]]
-name = "devise_codegen"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
-dependencies = [
- "devise_core",
- "quote",
-]
-
-[[package]]
-name = "devise_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0"
-dependencies = [
- "bitflags",
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
-dependencies = [
- "block-buffer 0.10.2",
- "crypto-common",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dkg"
-version = "0.1.0"
-dependencies = [
- "bitvec",
- "bls12_381 0.6.0",
- "bs58",
- "criterion",
- "ff 0.11.0",
- "group 0.11.0",
- "lazy_static",
- "pemstore",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
-[[package]]
-name = "dotenvy"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9155c8f4dc55c7470ae9da3f63c6785245093b3f6aeb0f5bf2e968efbba314"
-dependencies = [
- "dirs",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e50f3adc76d6a43f5ed73b698a87d0760ca74617f60f7c3b879003536fdd28"
-
-[[package]]
-name = "ecdsa"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
-dependencies = [
- "serde",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand 0.7.3",
- "serde",
- "serde_bytes",
- "sha2 0.9.9",
- "zeroize",
-]
-
-[[package]]
-name = "ed25519-zebra"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
-dependencies = [
- "curve25519-dalek",
- "hex",
- "rand_core 0.6.3",
- "serde",
- "sha2 0.9.9",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "ff 0.11.0",
- "generic-array 0.14.5",
- "group 0.11.0",
- "rand_core 0.6.3",
- "sec1",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "execute"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "explorer-api"
-version = "1.1.1"
-dependencies = [
- "chrono",
- "clap 3.2.8",
- "contracts-common",
- "dotenv",
- "humantime-serde",
- "isocountry",
- "itertools",
- "log",
- "logging",
- "maxminddb",
- "mixnet-contract-common",
- "network-defaults",
- "okapi",
- "pretty_env_logger",
- "reqwest",
- "rocket",
- "rocket_cors",
- "rocket_okapi",
- "schemars",
- "serde",
- "serde_json",
- "task",
- "thiserror",
- "tokio",
- "validator-client",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "fastrand"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "ff"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f"
-dependencies = [
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "ff"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e"
-dependencies = [
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "figment"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "790b4292c72618abbab50f787a477014fe15634f96291de45672ce46afe122df"
-dependencies = [
- "atomic",
- "pear",
- "serde",
- "toml",
- "uncased",
- "version_check",
-]
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e"
-
-[[package]]
-name = "flate2"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
-dependencies = [
- "cfg-if 1.0.0",
- "crc32fast",
- "libc",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flex-error"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
-dependencies = [
- "eyre",
- "paste",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843c03199d0c0ca54bc1ea90ac0d507274c28abcc4f691ae8b4eaa375087c76a"
-dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project",
- "spin 0.9.2",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "forward_ref"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futures"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-intrusive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e"
-dependencies = [
- "futures-core",
- "lock_api",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
-
-[[package]]
-name = "futures-task"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
-
-[[package]]
-name = "futures-util"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gateway-client"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "coconut-interface",
- "credential-storage",
- "credentials",
- "crypto",
- "futures",
- "gateway-requests",
- "getrandom 0.2.6",
- "log",
- "network-defaults",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "task",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite 0.14.0",
- "tungstenite 0.13.0",
- "url",
- "validator-client",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-timer",
- "wasm-utils",
-]
-
-[[package]]
-name = "gateway-requests"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "coconut-interface",
- "credentials",
- "crypto",
- "futures",
- "log",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "thiserror",
- "tungstenite 0.13.0",
-]
-
-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
-[[package]]
-name = "generator"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "winapi",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug 0.3.0",
- "polyval",
-]
-
-[[package]]
-name = "git2"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "group"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912"
-dependencies = [
- "byteorder",
- "ff 0.10.1",
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "group"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
-dependencies = [
- "byteorder",
- "ff 0.11.0",
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util 0.7.3",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
-[[package]]
-name = "handlebars"
-version = "3.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "quick-error 2.0.1",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown 0.11.2",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
-dependencies = [
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "hdrhistogram"
-version = "7.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0"
-dependencies = [
- "base64",
- "byteorder",
- "flate2",
- "nom",
- "num-traits",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
-dependencies = [
- "base64",
- "bitflags",
- "bytes",
- "headers-core",
- "http",
- "httpdate",
- "mime",
- "sha-1 0.10.0",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hex-literal"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-
-[[package]]
-name = "hidapi"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d26e1151deaab68f34fbfd16d491a2a0170cf98d69d3efa23873b567a4199e1"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "hkdf"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
-dependencies = [
- "digest 0.9.0",
- "hmac 0.11.0",
-]
-
-[[package]]
-name = "hkdf"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
-dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.3",
-]
-
-[[package]]
-name = "http"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.1",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "humantime-serde"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
-dependencies = [
- "humantime 2.1.0",
- "serde",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa 1.0.1",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-proxy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
-dependencies = [
- "bytes",
- "futures",
- "headers",
- "http",
- "hyper",
- "hyper-rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.22.0",
- "tower-service",
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
-dependencies = [
- "ct-logs",
- "futures-util",
- "hyper",
- "log",
- "rustls 0.19.1",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.22.0",
- "webpki 0.21.4",
- "webpki-roots 0.21.1",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "inclusion-probability"
-version = "0.1.0"
-dependencies = [
- "log",
- "rand 0.8.5",
- "thiserror",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
-dependencies = [
- "autocfg 1.1.0",
- "hashbrown 0.11.2",
- "serde",
-]
-
-[[package]]
-name = "inlinable_string"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "input_buffer"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c"
-
-[[package]]
-name = "ipnetwork"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "ipnetwork"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "isocountry"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea1dc4bf0fb4904ba83ffdb98af3d9c325274e92e6e295e4151e86c96363e04"
-dependencies = [
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "k256"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
-dependencies = [
- "cfg-if 1.0.0",
- "ecdsa",
- "elliptic-curve",
- "sec1",
- "sha2 0.9.9",
- "sha3",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
-
-[[package]]
-name = "keystream"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "ledger"
-version = "0.1.0"
-dependencies = [
- "bip32",
- "k256",
- "ledger-transport",
- "ledger-transport-hid",
- "thiserror",
-]
-
-[[package]]
-name = "ledger-apdu"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe435806c197dfeaa5efcded5e623c4b8230fd28fdf1e91e7a86e40ef2acbf90"
-dependencies = [
- "arrayref",
- "no-std-compat",
- "snafu 0.7.1",
-]
-
-[[package]]
-name = "ledger-transport"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1117f2143d92c157197785bf57711d7b02f2cfa101e162f8ca7900fb7f976321"
-dependencies = [
- "async-trait",
- "ledger-apdu",
-]
-
-[[package]]
-name = "ledger-transport-hid"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ba81a1f5f24396b37211478aff7fbcd605dd4544df8dbed07b9da3c2057aee"
-dependencies = [
- "byteorder",
- "cfg-if 1.0.0",
- "hex",
- "hidapi",
- "ledger-transport",
- "libc",
- "log",
- "thiserror",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.122"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.13.2+1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
-
-[[package]]
-name = "lioness"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
-dependencies = [
- "arrayref",
- "blake2",
- "chacha",
- "keystream",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg 1.1.0",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "logging"
-version = "0.1.0"
-dependencies = [
- "log",
- "pretty_env_logger",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc5c7d328e32cc4954e8e01193d7f0ef5ab257b5090b70a964e099a36034309"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "maxminddb"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe2ba61113f9f7a9f0e87c519682d39c43a6f3f79c2cc42c3ba3dda83b1fa334"
-dependencies = [
- "ipnetwork 0.18.0",
- "log",
- "memchr",
- "serde",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.36.1",
-]
-
-[[package]]
-name = "mixnet-client"
-version = "0.1.0"
-dependencies = [
- "futures",
- "log",
- "nymsphinx",
- "tokio",
- "tokio-util 0.7.3",
-]
-
-[[package]]
-name = "mixnet-contract-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "contracts-common",
- "cosmwasm-std",
- "humantime-serde",
- "log",
- "rand_chacha 0.3.1",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time 0.3.14",
- "ts-rs",
-]
-
-[[package]]
-name = "mixnode-common"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "crypto",
- "futures",
- "humantime-serde",
- "log",
- "nymsphinx-acknowledgements",
- "nymsphinx-addressing",
- "nymsphinx-forwarding",
- "nymsphinx-framing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.8.5",
- "serde",
- "task",
- "tokio",
- "tokio-util 0.7.3",
- "url",
- "validator-client",
- "version-checker",
-]
-
-[[package]]
-name = "multer"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin 0.9.2",
- "tokio",
- "tokio-util 0.6.9",
- "version_check",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "multisig-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "cw3",
- "cw3-fixed-multisig",
- "cw4",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "network-defaults"
-version = "0.1.0"
-dependencies = [
- "cfg-if 1.0.0",
- "dotenv",
- "hex-literal",
- "once_cell",
- "serde",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "nonexhaustive-delayqueue"
-version = "0.1.0"
-dependencies = [
- "futures-core",
- "slab",
- "tokio",
- "tokio-stream",
- "tokio-util 0.7.3",
- "wasm-timer",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg 1.1.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg 1.1.0",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "nym-bity-integration"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "cosmrs",
- "eyre",
- "k256",
- "nym-cli-commands",
- "serde",
- "serde_json",
- "thiserror",
- "validator-client",
-]
-
-[[package]]
-name = "nym-cli"
-version = "1.1.1"
-dependencies = [
- "anyhow",
- "base64",
- "bip39",
- "bs58",
- "clap 3.2.8",
- "clap_complete",
- "clap_complete_fig",
- "dotenv",
- "log",
- "logging",
- "network-defaults",
- "nym-cli-commands",
- "pretty_env_logger",
- "serde",
- "serde_json",
- "tap",
- "tokio",
- "validator-client",
-]
-
-[[package]]
-name = "nym-cli-commands"
-version = "1.0.0"
-dependencies = [
- "base64",
- "bip39",
- "bs58",
- "cfg-if 1.0.0",
- "clap 3.2.8",
- "coconut-bandwidth-contract-common",
- "coconut-dkg-common",
- "comfy-table",
- "cosmrs",
- "cosmwasm-std",
- "cw-utils",
- "handlebars",
- "humantime-serde",
- "k256",
- "log",
- "mixnet-contract-common",
- "multisig-contract-common",
- "network-defaults",
- "rand 0.6.5",
- "serde",
- "serde_json",
- "tap",
- "thiserror",
- "time 0.3.14",
- "toml",
- "url",
- "validator-client",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "nym-client"
-version = "1.1.1"
-dependencies = [
- "clap 3.2.8",
- "client-connections",
- "client-core",
- "coconut-interface",
- "completions",
- "config",
- "credential-storage",
- "credentials",
- "crypto",
- "dirs",
- "futures",
- "gateway-client",
- "gateway-requests",
- "log",
- "logging",
- "network-defaults",
- "nymsphinx",
- "pemstore",
- "pretty_env_logger",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "sled",
- "tap",
- "task",
- "thiserror",
- "tokio",
- "tokio-tungstenite 0.14.0",
- "topology",
- "url",
- "validator-client",
- "vergen 5.1.17",
- "version-checker",
- "websocket-requests",
-]
-
-[[package]]
-name = "nym-gateway"
-version = "1.1.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "bip39",
- "bs58",
- "clap 3.2.8",
- "coconut-interface",
- "colored",
- "completions",
- "config",
- "credentials",
- "crypto",
- "dashmap",
- "dirs",
- "dotenv",
- "futures",
- "gateway-requests",
- "humantime-serde",
- "log",
- "logging",
- "mixnet-client",
- "mixnode-common",
- "network-defaults",
- "nymsphinx",
- "once_cell",
- "pemstore",
- "pretty_env_logger",
- "rand 0.7.3",
- "serde",
- "sqlx 0.5.11",
- "statistics-common",
- "subtle-encoding",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite 0.14.0",
- "tokio-util 0.7.3",
- "url",
- "validator-api-requests",
- "validator-client",
- "vergen 5.1.17",
- "version-checker",
-]
-
-[[package]]
-name = "nym-mixnode"
-version = "1.1.1"
-dependencies = [
- "anyhow",
- "bs58",
- "clap 3.2.8",
- "colored",
- "completions",
- "config",
- "crypto",
- "cupid",
- "dirs",
- "dotenv",
- "futures",
- "humantime-serde",
- "lazy_static",
- "log",
- "logging",
- "mixnet-client",
- "mixnode-common",
- "nonexhaustive-delayqueue",
- "nymsphinx",
- "nymsphinx-params",
- "nymsphinx-types",
- "pemstore",
- "pretty_env_logger",
- "rand 0.7.3",
- "rocket",
- "serde",
- "sysinfo",
- "task",
- "tokio",
- "tokio-util 0.7.3",
- "toml",
- "topology",
- "url",
- "validator-client",
- "vergen 5.1.17",
- "version-checker",
-]
-
-[[package]]
-name = "nym-network-requester"
-version = "1.1.1"
-dependencies = [
- "async-trait",
- "clap 3.2.8",
- "client-connections",
- "completions",
- "dirs",
- "futures",
- "ipnetwork 0.20.0",
- "log",
- "logging",
- "network-defaults",
- "nymsphinx",
- "ordered-buffer",
- "pretty_env_logger",
- "proxy-helpers",
- "publicsuffix",
- "rand 0.7.3",
- "reqwest",
- "serde",
- "socks5-requests",
- "sqlx 0.6.2",
- "statistics-common",
- "task",
- "thiserror",
- "tokio",
- "tokio-tungstenite 0.17.2",
- "websocket-requests",
-]
-
-[[package]]
-name = "nym-network-statistics"
-version = "1.0.2"
-dependencies = [
- "dirs",
- "log",
- "logging",
- "pretty_env_logger",
- "rocket",
- "serde",
- "sqlx 0.5.11",
- "statistics-common",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "nym-socks5-client"
-version = "1.1.1"
-dependencies = [
- "clap 3.2.8",
- "client-connections",
- "client-core",
- "coconut-interface",
- "completions",
- "config",
- "credential-storage",
- "credentials",
- "crypto",
- "dirs",
- "futures",
- "gateway-client",
- "gateway-requests",
- "log",
- "logging",
- "network-defaults",
- "nymsphinx",
- "ordered-buffer",
- "pemstore",
- "pin-project",
- "pretty_env_logger",
- "proxy-helpers",
- "rand 0.7.3",
- "serde",
- "snafu 0.6.10",
- "socks5-requests",
- "tap",
- "task",
- "thiserror",
- "tokio",
- "topology",
- "url",
- "validator-client",
- "vergen 5.1.17",
- "version-checker",
-]
-
-[[package]]
-name = "nym-types"
-version = "1.0.0"
-dependencies = [
- "coconut-interface",
- "config",
- "cosmrs",
- "cosmwasm-std",
- "eyre",
- "itertools",
- "log",
- "mixnet-contract-common",
- "reqwest",
- "schemars",
- "serde",
- "serde_json",
- "strum 0.23.0",
- "tempfile",
- "thiserror",
- "ts-rs",
- "url",
- "validator-client",
- "vesting-contract",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "nym-validator-api"
-version = "1.1.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "bs58",
- "cfg-if 1.0.0",
- "clap 3.2.8",
- "coconut-bandwidth-contract-common",
- "coconut-dkg-common",
- "coconut-interface",
- "config",
- "console-subscriber",
- "contracts-common",
- "cosmwasm-std",
- "credential-storage",
- "credentials",
- "crypto",
- "cw-utils",
- "cw3",
- "dirs",
- "dkg",
- "dotenv",
- "futures",
- "gateway-client",
- "getset",
- "humantime-serde",
- "inclusion-probability",
- "log",
- "logging",
- "mixnet-contract-common",
- "multisig-contract-common",
- "nymcoconut",
- "nymsphinx",
- "okapi",
- "pemstore",
- "pin-project",
- "pretty_env_logger",
- "rand 0.7.3",
- "rand 0.8.5",
- "reqwest",
- "rocket",
- "rocket_cors",
- "rocket_okapi",
- "schemars",
- "serde",
- "serde_json",
- "sqlx 0.6.2",
- "tap",
- "task",
- "thiserror",
- "time 0.3.14",
- "tokio",
- "tokio-stream",
- "topology",
- "ts-rs",
- "url",
- "validator-api-requests",
- "validator-client",
- "vergen 7.2.1",
- "version-checker",
-]
-
-[[package]]
-name = "nym-wallet-types"
-version = "1.0.0"
-dependencies = [
- "config",
- "cosmrs",
- "cosmwasm-std",
- "hex-literal",
- "mixnet-contract-common",
- "network-defaults",
- "nym-types",
- "serde",
- "serde_json",
- "strum 0.23.0",
- "ts-rs",
- "validator-client",
- "vesting-contract",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "nymcoconut"
-version = "0.5.0"
-dependencies = [
- "bincode",
- "bls12_381 0.6.0",
- "bs58",
- "criterion",
- "digest 0.9.0",
- "dkg",
- "doc-comment",
- "ff 0.11.0",
- "getrandom 0.2.6",
- "group 0.11.0",
- "itertools",
- "pemstore",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "thiserror",
-]
-
-[[package]]
-name = "nymsphinx"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "mixnet-contract-common",
- "nymsphinx-acknowledgements",
- "nymsphinx-addressing",
- "nymsphinx-anonymous-replies",
- "nymsphinx-chunking",
- "nymsphinx-cover",
- "nymsphinx-forwarding",
- "nymsphinx-framing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "rand_distr",
- "tokio",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-acknowledgements"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "pemstore",
- "rand 0.7.3",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-addressing"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-types",
- "rand 0.7.3",
- "serde",
-]
-
-[[package]]
-name = "nymsphinx-anonymous-replies"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "crypto",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "serde",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-chunking"
-version = "0.1.0"
-dependencies = [
- "log",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "nymsphinx-cover"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-acknowledgements",
- "nymsphinx-addressing",
- "nymsphinx-chunking",
- "nymsphinx-forwarding",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-forwarding"
-version = "0.1.0"
-dependencies = [
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
-]
-
-[[package]]
-name = "nymsphinx-framing"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "nymsphinx-params",
- "nymsphinx-types",
- "tokio-util 0.7.3",
-]
-
-[[package]]
-name = "nymsphinx-params"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-types",
-]
-
-[[package]]
-name = "nymsphinx-types"
-version = "0.1.0"
-dependencies = [
- "sphinx",
-]
-
-[[package]]
-name = "okapi"
-version = "0.7.0-rc.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce66b6366e049880a35c378123fddb630b1a1a3c37fa1ca70caaf4a09f6e2893"
-dependencies = [
- "log",
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
-
-[[package]]
-name = "oorandom"
-version = "11.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
-dependencies = [
- "autocfg 1.1.0",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-buffer"
-version = "0.1.0"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-
-[[package]]
-name = "pairing"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3"
-dependencies = [
- "group 0.10.0",
-]
-
-[[package]]
-name = "pairing"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42"
-dependencies = [
- "group 0.11.0",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.2",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec 1.8.0",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec 1.8.0",
- "windows-sys 0.34.0",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
-
-[[package]]
-name = "pbkdf2"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
-dependencies = [
- "crypto-mac 0.11.1",
-]
-
-[[package]]
-name = "pear"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702"
-dependencies = [
- "inlinable_string",
- "pear_codegen",
- "yansi",
-]
-
-[[package]]
-name = "pear_codegen"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
-dependencies = [
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "peg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
-dependencies = [
- "peg-macros",
- "peg-runtime",
-]
-
-[[package]]
-name = "peg-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
-dependencies = [
- "peg-runtime",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "peg-runtime"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
-
-[[package]]
-name = "pem"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
-dependencies = [
- "base64",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "pemstore"
-version = "0.1.0"
-dependencies = [
- "pem",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1 0.8.2",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "pickledb"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9161694d67f6c5163519d42be942ae36bbdb55f439460144f105bc4f9f7d1d61"
-dependencies = [
- "bincode",
- "serde",
- "serde_cbor",
- "serde_json",
- "serde_yaml",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs8"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
-dependencies = [
- "der",
- "spki",
- "zeroize",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "plotters"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "plotters-backend"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
-dependencies = [
- "plotters-backend",
-]
-
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
-dependencies = [
- "env_logger",
- "log",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "prost"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
-dependencies = [
- "bytes",
- "prost-derive 0.9.0",
-]
-
-[[package]]
-name = "prost"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc03e116981ff7d8da8e5c220e374587b98d294af7ba7dd7fda761158f00086f"
-dependencies = [
- "bytes",
- "prost-derive 0.10.1",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
-dependencies = [
- "bytes",
- "heck 0.3.3",
- "itertools",
- "lazy_static",
- "log",
- "multimap",
- "petgraph",
- "prost 0.9.0",
- "prost-types 0.9.0",
- "regex",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
-dependencies = [
- "bytes",
- "prost 0.9.0",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
-dependencies = [
- "bytes",
- "prost 0.10.3",
-]
-
-[[package]]
-name = "proxy-helpers"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "client-connections",
- "futures",
- "log",
- "ordered-buffer",
- "socks5-requests",
- "task",
- "tokio",
- "tokio-test",
- "tokio-util 0.7.3",
-]
-
-[[package]]
-name = "publicsuffix"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b"
-dependencies = [
- "error-chain",
- "idna",
- "lazy_static",
- "native-tls",
- "regex",
- "url",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
-[[package]]
-name = "quote"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg",
- "rand_xorshift",
- "winapi",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom 0.2.6",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rayon"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
-dependencies = [
- "autocfg 1.1.0",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "lazy_static",
- "num_cpus",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom 0.2.6",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log",
- "mime",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
-dependencies = [
- "crypto-bigint",
- "hmac 0.11.0",
- "zeroize",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "rocket"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317"
-dependencies = [
- "async-stream",
- "async-trait",
- "atomic",
- "atty",
- "binascii",
- "bytes",
- "either",
- "figment",
- "futures",
- "indexmap",
- "log",
- "memchr",
- "multer",
- "num_cpus",
- "parking_lot 0.12.0",
- "pin-project-lite",
- "rand 0.8.5",
- "ref-cast",
- "rocket_codegen",
- "rocket_http",
- "serde",
- "serde_json",
- "state",
- "tempfile",
- "time 0.3.14",
- "tokio",
- "tokio-stream",
- "tokio-util 0.7.3",
- "ubyte",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "rocket_codegen"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47"
-dependencies = [
- "devise",
- "glob",
- "indexmap",
- "proc-macro2",
- "quote",
- "rocket_http",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "rocket_cors"
-version = "0.5.2"
-source = "git+https://github.com/lawliet89/rocket_cors?rev=dfd3662c49e2f6fc37df35091cb94d82f7fb5915#dfd3662c49e2f6fc37df35091cb94d82f7fb5915"
-dependencies = [
- "log",
- "regex",
- "rocket",
- "serde",
- "serde_derive",
- "unicase",
- "unicase_serde",
- "url",
-]
-
-[[package]]
-name = "rocket_http"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2"
-dependencies = [
- "cookie",
- "either",
- "futures",
- "http",
- "hyper",
- "indexmap",
- "log",
- "memchr",
- "pear",
- "percent-encoding",
- "pin-project-lite",
- "ref-cast",
- "serde",
- "smallvec 1.8.0",
- "stable-pattern",
- "state",
- "time 0.3.14",
- "tokio",
- "uncased",
-]
-
-[[package]]
-name = "rocket_okapi"
-version = "0.8.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489f4f5b120762f7974e65b919fc462d0660fd8b839026d8985b850fe5acccb0"
-dependencies = [
- "either",
- "log",
- "okapi",
- "rocket",
- "rocket_okapi_codegen",
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "rocket_okapi_codegen"
-version = "0.8.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54f94d1ffe41472e08463d7a2674f1db04dc4df745285e8369b33d3cfd6b0308"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "rocket_http",
- "syn",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.7",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
-dependencies = [
- "log",
- "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls 0.19.1",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-
-[[package]]
-name = "ryu"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
-dependencies = [
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
-dependencies = [
- "dyn-clone",
- "indexmap",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sec1"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
-dependencies = [
- "der",
- "generic-array 0.14.5",
- "pkcs8",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4"
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-json-wasm"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.136"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
-dependencies = [
- "itoa 1.0.1",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa 1.0.1",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
-dependencies = [
- "indexmap",
- "ryu",
- "serde",
- "yaml-rust",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4"
-dependencies = [
- "digest 0.9.0",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "sled"
-version = "0.34.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
-dependencies = [
- "crc32fast",
- "crossbeam-epoch",
- "crossbeam-utils",
- "fs2",
- "fxhash",
- "libc",
- "log",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
-
-[[package]]
-name = "snafu"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7"
-dependencies = [
- "doc-comment",
- "snafu-derive 0.6.10",
-]
-
-[[package]]
-name = "snafu"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2"
-dependencies = [
- "doc-comment",
- "snafu-derive 0.7.1",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5"
-dependencies = [
- "heck 0.4.0",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socks5-requests"
-version = "0.1.0"
-dependencies = [
- "nymsphinx-addressing",
- "thiserror",
-]
-
-[[package]]
-name = "sphinx"
-version = "0.1.0"
-source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859"
-dependencies = [
- "aes 0.7.5",
- "arrayref",
- "blake2",
- "bs58",
- "byteorder",
- "chacha",
- "curve25519-dalek",
- "digest 0.9.0",
- "hkdf 0.11.0",
- "hmac 0.11.0",
- "lioness",
- "log",
- "rand 0.7.3",
- "rand_distr",
- "sha2 0.9.9",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spki"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "sqlformat"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4"
-dependencies = [
- "itertools",
- "nom",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlformat"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a"
-dependencies = [
- "itertools",
- "nom",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc15591eb44ffb5816a4a70a7efd5dd87bfd3aa84c4c200401c4396140525826"
-dependencies = [
- "sqlx-core 0.5.13",
- "sqlx-macros 0.5.11",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428"
-dependencies = [
- "sqlx-core 0.6.2",
- "sqlx-macros 0.6.2",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5"
-dependencies = [
- "ahash",
- "atoi 0.4.0",
- "bitflags",
- "byteorder",
- "bytes",
- "chrono",
- "crc 2.1.0",
- "crossbeam-queue",
- "either",
- "event-listener",
- "flume",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-intrusive",
- "futures-util",
- "hashlink 0.7.0",
- "hex",
- "indexmap",
- "itoa 1.0.1",
- "libc",
- "libsqlite3-sys",
- "log",
- "memchr",
- "once_cell",
- "paste",
- "percent-encoding",
- "rustls 0.19.1",
- "sha2 0.10.2",
- "smallvec 1.8.0",
- "sqlformat 0.1.8",
- "sqlx-rt 0.5.13",
- "stringprep",
- "thiserror",
- "tokio-stream",
- "url",
- "webpki 0.21.4",
- "webpki-roots 0.21.1",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105"
-dependencies = [
- "ahash",
- "atoi 1.0.0",
- "bitflags",
- "byteorder",
- "bytes",
- "chrono",
- "crc 3.0.0",
- "crossbeam-queue",
- "dotenvy",
- "either",
- "event-listener",
- "flume",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-intrusive",
- "futures-util",
- "hashlink 0.8.1",
- "hex",
- "indexmap",
- "itoa 1.0.1",
- "libc",
- "libsqlite3-sys",
- "log",
- "memchr",
- "once_cell",
- "paste",
- "percent-encoding",
- "rustls 0.20.6",
- "rustls-pemfile",
- "sha2 0.10.2",
- "smallvec 1.8.0",
- "sqlformat 0.2.0",
- "sqlx-rt 0.6.2",
- "stringprep",
- "thiserror",
- "tokio-stream",
- "url",
- "webpki-roots 0.22.4",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee35713129561f5e55c554bba1c378e2a7e67f81257b7311183de98c50e6f94"
-dependencies = [
- "dotenv",
- "either",
- "heck 0.3.3",
- "once_cell",
- "proc-macro2",
- "quote",
- "sha2 0.9.9",
- "sqlx-core 0.5.13",
- "sqlx-rt 0.5.13",
- "syn",
- "url",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9"
-dependencies = [
- "dotenvy",
- "either",
- "heck 0.4.0",
- "once_cell",
- "proc-macro2",
- "quote",
- "sha2 0.10.2",
- "sqlx-core 0.6.2",
- "sqlx-rt 0.6.2",
- "syn",
- "url",
-]
-
-[[package]]
-name = "sqlx-rt"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae"
-dependencies = [
- "once_cell",
- "tokio",
- "tokio-rustls 0.22.0",
-]
-
-[[package]]
-name = "sqlx-rt"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396"
-dependencies = [
- "once_cell",
- "tokio",
- "tokio-rustls 0.23.4",
-]
-
-[[package]]
-name = "stable-pattern"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "state"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "statistics-common"
-version = "1.0.1"
-dependencies = [
- "async-trait",
- "log",
- "reqwest",
- "serde",
- "serde_json",
- "sqlx 0.5.11",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "stringprep"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb"
-dependencies = [
- "strum_macros 0.23.1",
-]
-
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-
-[[package]]
-name = "strum_macros"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "subtle-encoding"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a8e71535da31837213ac114531d31def75d7aebd133264e420a3451fa7f703"
-dependencies = [
- "cfg-if 1.0.0",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "task"
-version = "0.1.0"
-dependencies = [
- "futures",
- "log",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "tendermint"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
-dependencies = [
- "async-trait",
- "bytes",
- "ed25519",
- "ed25519-dalek",
- "flex-error",
- "futures",
- "k256",
- "num-traits",
- "once_cell",
- "prost 0.10.3",
- "prost-types 0.10.1",
- "ripemd160",
- "serde",
- "serde_bytes",
- "serde_json",
- "serde_repr",
- "sha2 0.9.9",
- "signature",
- "subtle 2.4.1",
- "subtle-encoding",
- "tendermint-proto",
- "time 0.3.14",
- "zeroize",
-]
-
-[[package]]
-name = "tendermint-config"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
-dependencies = [
- "flex-error",
- "serde",
- "serde_json",
- "tendermint",
- "toml",
- "url",
-]
-
-[[package]]
-name = "tendermint-proto"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
-dependencies = [
- "bytes",
- "flex-error",
- "num-derive",
- "num-traits",
- "prost 0.10.3",
- "prost-types 0.10.1",
- "serde",
- "serde_bytes",
- "subtle-encoding",
- "time 0.3.14",
-]
-
-[[package]]
-name = "tendermint-rpc"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
-dependencies = [
- "async-trait",
- "bytes",
- "flex-error",
- "futures",
- "getrandom 0.2.6",
- "http",
- "hyper",
- "hyper-proxy",
- "hyper-rustls",
- "peg",
- "pin-project",
- "serde",
- "serde_bytes",
- "serde_json",
- "subtle-encoding",
- "tendermint",
- "tendermint-config",
- "tendermint-proto",
- "thiserror",
- "time 0.3.14",
- "tokio",
- "tracing",
- "url",
- "uuid",
- "walkdir",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
-[[package]]
-name = "thiserror"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
-dependencies = [
- "itoa 1.0.1",
- "libc",
- "num_threads",
- "serde",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
-
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "tokio"
-version = "1.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
-dependencies = [
- "autocfg 1.1.0",
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "parking_lot 0.12.0",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "tracing",
- "winapi",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
-dependencies = [
- "rustls 0.19.1",
- "tokio",
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls 0.20.6",
- "tokio",
- "webpki 0.22.0",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util 0.7.3",
-]
-
-[[package]]
-name = "tokio-test"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
-dependencies = [
- "async-stream",
- "bytes",
- "futures-core",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e96bb520beab540ab664bd5a9cfeaa1fcd846fa68c830b42e2c8963071251d2"
-dependencies = [
- "futures-util",
- "log",
- "pin-project",
- "tokio",
- "tungstenite 0.13.0",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.17.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.17.3",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "slab",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tonic"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64",
- "bytes",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost 0.9.0",
- "prost-derive 0.9.0",
- "tokio",
- "tokio-stream",
- "tokio-util 0.6.9",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
-dependencies = [
- "proc-macro2",
- "prost-build",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "topology"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "crypto",
- "log",
- "mixnet-contract-common",
- "nymsphinx-addressing",
- "nymsphinx-types",
- "rand 0.7.3",
- "version-checker",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap",
- "pin-project",
- "pin-project-lite",
- "rand 0.8.5",
- "slab",
- "tokio",
- "tokio-util 0.7.3",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62"
-
-[[package]]
-name = "tower-service"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
-
-[[package]]
-name = "tracing"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3"
-dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee"
-dependencies = [
- "lazy_static",
- "valuable",
-]
-
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "pin-project",
- "tracing",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
-dependencies = [
- "ansi_term",
- "lazy_static",
- "matchers",
- "regex",
- "sharded-slab",
- "smallvec 1.8.0",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "ts-rs"
-version = "6.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d26cba30c9b3a2f537f765cf754126f11c983b7426d280ae0b4cef2374cab98"
-dependencies = [
- "thiserror",
- "ts-rs-macros",
-]
-
-[[package]]
-name = "ts-rs-cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "mixnet-contract-common",
- "nym-types",
- "nym-wallet-types",
- "ts-rs",
- "validator-api-requests",
- "validator-client",
- "vesting-contract-common",
- "walkdir",
-]
-
-[[package]]
-name = "ts-rs-macros"
-version = "6.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd8e302fbcf5b60dfa1df443535967511442c5ce4eac8b4c9fa811f2274280a4"
-dependencies = [
- "Inflector",
- "proc-macro2",
- "quote",
- "syn",
- "termcolor",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "input_buffer",
- "log",
- "rand 0.8.5",
- "sha-1 0.9.8",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.17.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha-1 0.10.0",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ubyte"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42756bb9e708855de2f8a98195643dff31a97f0485d90d8467b39dc24be9e8fe"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "uint"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "uncased"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5baeed7327e25054889b9bd4f975f32e5f4c5d434042d59ab6cd4142c0a76ed0"
-dependencies = [
- "serde",
- "version_check",
-]
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicase_serde"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1"
-dependencies = [
- "serde",
- "unicase",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
-dependencies = [
- "smallvec 0.6.14",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "universal-hash"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array 0.14.5",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-
-[[package]]
-name = "validator-api-requests"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "coconut-interface",
- "cosmrs",
- "cosmwasm-std",
- "getset",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "ts-rs",
-]
-
-[[package]]
-name = "validator-client"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "base64",
- "bip39",
- "coconut-bandwidth-contract-common",
- "coconut-dkg-common",
- "coconut-interface",
- "colored",
- "config",
- "contracts-common",
- "cosmrs",
- "cosmwasm-std",
- "cw3",
- "execute",
- "flate2",
- "futures",
- "itertools",
- "log",
- "mixnet-contract-common",
- "multisig-contract-common",
- "network-defaults",
- "prost 0.10.3",
- "reqwest",
- "serde",
- "serde_json",
- "sha2 0.9.9",
- "thiserror",
- "tokio",
- "ts-rs",
- "url",
- "validator-api-requests",
- "vesting-contract",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vergen"
-version = "5.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e"
-dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
- "chrono",
- "enum-iterator",
- "getset",
- "git2",
- "rustc_version 0.4.0",
- "rustversion",
- "thiserror",
-]
-
-[[package]]
-name = "vergen"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f44ef1afcf5979e34748c12595f9589f3dc4e34abf156fb6d95f9b835568dc"
-dependencies = [
- "anyhow",
- "cfg-if 1.0.0",
- "enum-iterator",
- "getset",
- "git2",
- "rustc_version 0.4.0",
- "rustversion",
- "thiserror",
- "time 0.3.14",
-]
-
-[[package]]
-name = "version-checker"
-version = "0.1.0"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vesting-contract"
-version = "1.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-storage-plus",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "thiserror",
- "vergen 5.1.17",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "vesting-contract-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "ts-rs",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "git+https://github.com/mmsinclair/wasm-timer?rev=b9d1a54ad514c2f230a026afe0dde341e98cd7b6#b9d1a54ad514c2f230a026afe0dde341e98cd7b6"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-utils"
-version = "0.1.0"
-dependencies = [
- "futures",
- "js-sys",
- "tungstenite 0.13.0",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki 0.21.4",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
-dependencies = [
- "webpki 0.22.0",
-]
-
-[[package]]
-name = "websocket-requests"
-version = "0.1.0"
-dependencies = [
- "nymsphinx",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "which"
-version = "4.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae"
-dependencies = [
- "either",
- "lazy_static",
- "libc",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825"
-dependencies = [
- "windows_aarch64_msvc 0.34.0",
- "windows_i686_gnu 0.34.0",
- "windows_i686_msvc 0.34.0",
- "windows_x86_64_gnu 0.34.0",
- "windows_x86_64_msvc 0.34.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "x25519-dalek"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "serde",
- "zeroize",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zeroize"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
diff --git a/Cargo.toml b/Cargo.toml
index e03bd46aeb..e756fc7bf8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,7 @@ members = [
     "common/coconut-interface",
     "common/commands",
     "common/config",
+    "common/build-information",
     "common/cosmwasm-smart-contracts/coconut-bandwidth-contract",
     "common/cosmwasm-smart-contracts/coconut-dkg",
     "common/cosmwasm-smart-contracts/contracts-common",
@@ -74,8 +75,9 @@ members = [
     "mixnode",
     "service-providers/network-requester",
     "service-providers/network-statistics",
-    "validator-api",
-    "validator-api/validator-api-requests",
+    "nym-api",
+    "nym-api/nym-api-requests",
+    "nym-outfox",
     "tools/nym-cli",
     "tools/ts-rs-cli"
 ]
@@ -87,7 +89,7 @@ default-members = [
     "service-providers/network-requester",
     "service-providers/network-statistics",
     "mixnode",
-    "validator-api",
+    "nym-api",
     "explorer-api",
 ]
 
diff --git a/Makefile b/Makefile
index 8f5aba2678..883be67453 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ clippy-coconut:
 	cargo clippy --workspace --features coconut -- -D warnings
 
 clippy-wasm:
-	cargo clippy --workspace --features wasm -- -D warnings
+	cargo clippy --manifest-path clients/webassembly/Cargo.toml --target wasm32-unknown-unknown --workspace -- -D warnings
 
 
 clippy-all-contracts:
@@ -49,9 +49,6 @@ test-main:
 test-coconut:
 	cargo test --workspace --features coconut
 
-test-wasm:
-	cargo test --workspace --features wasm
-
 
 test-main-expensive:
 	cargo test --workspace -- --ignored
diff --git a/clients/client-core/Cargo.toml b/clients/client-core/Cargo.toml
index 3d84983358..2c36fb892b 100644
--- a/clients/client-core/Cargo.toml
+++ b/clients/client-core/Cargo.toml
@@ -1,23 +1,27 @@
 [package]
 name = "client-core"
-version = "1.1.1"
+version = "1.1.4"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
+rust-version = "1.66"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+async-trait = { version = "0.1.58" }
 dirs = "4.0"
+dashmap = "5.4.0"
 futures = "0.3"
 humantime-serde = "1.0"
 log = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] }
-sled = { version = "0.34", optional = true }
+serde_json = "1.0.89"
 tap = "1.0.1"
 thiserror = "1.0.34"
 url = { version ="2.2", features = ["serde"] }
-tokio = { version = "1.21.2", features = ["time", "macros"]}
+tokio = { version = "1.21.2", features = ["macros"]}
+time = "0.3.17"
 
 # internal
 config = { path = "../../common/config" }
@@ -37,6 +41,15 @@ task = { path = "../../common/task" }
 version = "0.1.9"
 features = ["time"]
 
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
+version = "1.21.2"
+features = ["time"]
+
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies.sqlx]
+version = "0.6.2"
+features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"]
+optional = true
+
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures]
 version = "0.4"
 
@@ -51,15 +64,23 @@ rev = "b9d1a54ad514c2f230a026afe0dde341e98cd7b6"
 version = "0.2.4"
 features = ["futures"]
 
-#[target."cfg(not(target_arch = \"wasm32\"))".dependencies.task]
-#path = "../../common/task"
+[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils]
+path = "../../common/wasm-utils"
+
+[target."cfg(target_arch = \"wasm32\")".dependencies.time]
+version = "0.3.17"
+features = ["wasm-bindgen"]
 
 [dev-dependencies]
 tempfile = "3.1.0"
 
+[build-dependencies]
+tokio = { version = "1.21.2", features = ["rt-multi-thread", "macros"] }
+sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "sqlite", "macros", "migrate"] }
+
 [features]
-default = ["reply-surb"]
+default = []
+fs-surb-storage = ["sqlx"]
 wasm = ["gateway-client/wasm"]
 coconut = ["gateway-client/coconut", "gateway-requests/coconut"]
-reply-surb = ["sled"]
 
diff --git a/clients/client-core/build.rs b/clients/client-core/build.rs
new file mode 100644
index 0000000000..bac1b20c53
--- /dev/null
+++ b/clients/client-core/build.rs
@@ -0,0 +1,31 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[tokio::main]
+async fn main() {
+    #[cfg(feature = "fs-surb-storage")]
+    {
+        use sqlx::{Connection, SqliteConnection};
+        use std::env;
+
+        let out_dir = env::var("OUT_DIR").unwrap();
+        let database_path = format!("{}/fs-surbs-example.sqlite", out_dir);
+
+        let mut conn = SqliteConnection::connect(&format!("sqlite://{}?mode=rwc", database_path))
+            .await
+            .expect("Failed to create SQLx database connection");
+
+        sqlx::migrate!("./fs_surbs_migrations")
+            .run(&mut conn)
+            .await
+            .expect("Failed to perform SQLx migrations");
+
+        #[cfg(target_family = "unix")]
+        println!("cargo:rustc-env=DATABASE_URL=sqlite://{}", &database_path);
+
+        #[cfg(target_family = "windows")]
+        // for some strange reason we need to add a leading `/` to the windows path even though it's
+        // not a valid windows path... but hey, it works...
+        println!("cargo:rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
+    }
+}
diff --git a/clients/client-core/fs_surbs_migrations/20221130120000_create_initial_tables.sql b/clients/client-core/fs_surbs_migrations/20221130120000_create_initial_tables.sql
new file mode 100644
index 0000000000..0143475a37
--- /dev/null
+++ b/clients/client-core/fs_surbs_migrations/20221130120000_create_initial_tables.sql
@@ -0,0 +1,40 @@
+CREATE TABLE status
+(
+    flush_in_progress        INTEGER NOT NULL,
+    previous_flush_timestamp INTEGER NOT NULL,
+    client_in_use            INTEGER NOT NULL
+);
+
+CREATE TABLE reply_surb_storage_metadata
+(
+    min_reply_surb_threshold INTEGER NOT NULL,
+    max_reply_surb_threshold INTEGER NOT NULL
+);
+
+CREATE TABLE sender_tag
+(
+    recipient BLOB NOT NULL UNIQUE,
+    tag       BLOB NOT NULL UNIQUE
+);
+
+CREATE TABLE reply_key
+(
+    key_digest        BLOB    NOT NULL UNIQUE,
+    reply_key         BLOB    NOT NULL UNIQUE,
+    sent_at_timestamp INTEGER NOT NULL
+);
+
+CREATE TABLE reply_surb_sender
+(
+    id                  INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    last_sent_timestamp INTEGER NOT NULL,
+    tag                 BLOB    NOT NULL UNIQUE
+);
+
+CREATE TABLE reply_surb
+(
+    reply_surb_sender_id INTEGER NOT NULL,
+    reply_surb           BLOB    NOT NULL,
+
+    FOREIGN KEY (reply_surb_sender_id) REFERENCES reply_surb_sender (id)
+);
\ No newline at end of file
diff --git a/clients/client-core/src/client/base_client/mod.rs b/clients/client-core/src/client/base_client/mod.rs
index 9788cb26f8..4757c3bf2c 100644
--- a/clients/client-core/src/client/base_client/mod.rs
+++ b/clients/client-core/src/client/base_client/mod.rs
@@ -10,41 +10,45 @@ use crate::client::real_messages_control::RealMessagesController;
 use crate::client::received_buffer::{
     ReceivedBufferRequestReceiver, ReceivedBufferRequestSender, ReceivedMessagesBufferController,
 };
+use crate::client::replies::reply_controller;
+use crate::client::replies::reply_controller::{ReplyControllerReceiver, ReplyControllerSender};
+use crate::client::replies::reply_storage::{
+    CombinedReplyStorage, PersistentReplyStorage, ReplyStorageBackend, SentReplyKeys,
+};
 use crate::client::topology_control::{
     TopologyAccessor, TopologyRefresher, TopologyRefresherConfig,
 };
 use crate::config::{Config, DebugConfig, GatewayEndpointConfig};
 use crate::error::ClientCoreError;
+use crate::spawn_future;
 use client_connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
-use crypto::asymmetric::identity;
+use crypto::asymmetric::{encryption, identity};
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 use gateway_client::{
     AcknowledgementReceiver, AcknowledgementSender, GatewayClient, MixnetMessageReceiver,
     MixnetMessageSender,
 };
-use log::info;
+use log::{debug, info};
+use nymsphinx::acknowledgements::AckKey;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;
-#[cfg(feature = "reply-surb")]
-use std::path::PathBuf;
-#[cfg(feature = "reply-surb")]
+use std::sync::Arc;
+use std::time::Duration;
 use tap::TapFallible;
-use task::{ShutdownListener, ShutdownNotifier};
+use task::{TaskClient, TaskManager};
 use url::Url;
 
-// it's fine to do this disgusting compilation flag business here as this problem
-// is going to go away in 1.2.0
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorage;
+#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+pub mod non_wasm_helpers;
 
 pub struct ClientInput {
-    pub shared_lane_queue_lengths: LaneQueueLengths,
     pub connection_command_sender: ConnectionCommandSender,
     pub input_sender: InputMessageSender,
 }
 
 pub struct ClientOutput {
+    pub shared_lane_queue_lengths: LaneQueueLengths,
     pub received_buffer_request_sender: ReceivedBufferRequestSender,
 }
 
@@ -76,35 +80,36 @@ impl ClientOutputStatus {
     }
 }
 
-pub struct BaseClientBuilder<'a> {
+pub struct BaseClientBuilder<'a, B> {
     // due to wasm limitations I had to split it like this : (
     gateway_config: &'a GatewayEndpointConfig,
     debug_config: &'a DebugConfig,
     disabled_credentials: bool,
-    validator_api_endpoints: Vec<Url>,
-
-    #[cfg(feature = "reply-surb")]
-    reply_surb_keys_store_path: PathBuf,
+    nym_api_endpoints: Vec<Url>,
+    reply_storage_backend: B,
 
     bandwidth_controller: Option<BandwidthController>,
     key_manager: KeyManager,
 }
 
-impl<'a> BaseClientBuilder<'a> {
+impl<'a, B> BaseClientBuilder<'a, B>
+where
+    B: ReplyStorageBackend + Send + Sync + 'static,
+{
     pub fn new_from_base_config<T>(
         base_config: &'a Config<T>,
         key_manager: KeyManager,
         bandwidth_controller: Option<BandwidthController>,
-    ) -> BaseClientBuilder<'a> {
+        reply_storage_backend: B,
+    ) -> BaseClientBuilder<'a, B> {
         BaseClientBuilder {
             gateway_config: base_config.get_gateway_endpoint_config(),
             debug_config: base_config.get_debug_config(),
             disabled_credentials: base_config.get_disabled_credentials_mode(),
-            validator_api_endpoints: base_config.get_validator_api_endpoints(),
+            nym_api_endpoints: base_config.get_nym_api_endpoints(),
             bandwidth_controller,
+            reply_storage_backend,
             key_manager,
-            #[cfg(feature = "reply-surb")]
-            reply_surb_keys_store_path: base_config.get_reply_encryption_key_store_path(),
         }
     }
 
@@ -113,19 +118,18 @@ impl<'a> BaseClientBuilder<'a> {
         debug_config: &'a DebugConfig,
         key_manager: KeyManager,
         bandwidth_controller: Option<BandwidthController>,
+        reply_storage_backend: B,
         disabled_credentials: bool,
-        validator_api_endpoints: Vec<Url>,
-        #[cfg(feature = "reply-surb")] reply_surb_keys_store_path: PathBuf,
-    ) -> BaseClientBuilder<'a> {
+        nym_api_endpoints: Vec<Url>,
+    ) -> BaseClientBuilder<'a, B> {
         BaseClientBuilder {
             gateway_config,
             debug_config,
             disabled_credentials,
-            validator_api_endpoints,
+            nym_api_endpoints,
+            reply_storage_backend,
             bandwidth_controller,
             key_manager,
-            #[cfg(feature = "reply-surb")]
-            reply_surb_keys_store_path,
         }
     }
 
@@ -142,24 +146,26 @@ impl<'a> BaseClientBuilder<'a> {
     // future constantly pumping loop cover traffic at some specified average rate
     // the pumped traffic goes to the MixTrafficController
     fn start_cover_traffic_stream(
-        &self,
+        debug_config: &DebugConfig,
+        ack_key: Arc<AckKey>,
+        self_address: Recipient,
         topology_accessor: TopologyAccessor,
         mix_tx: BatchMixMessageSender,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
         info!("Starting loop cover traffic stream...");
 
         let mut stream = LoopCoverTrafficStream::new(
-            self.key_manager.ack_key(),
-            self.debug_config.average_ack_delay,
-            self.debug_config.average_packet_delay,
-            self.debug_config.loop_cover_traffic_average_delay,
+            ack_key,
+            debug_config.average_ack_delay,
+            debug_config.average_packet_delay,
+            debug_config.loop_cover_traffic_average_delay,
             mix_tx,
-            self.as_mix_recipient(),
+            self_address,
             topology_accessor,
         );
 
-        if let Some(size) = self.debug_config.use_extended_packet_size {
+        if let Some(size) = debug_config.use_extended_packet_size {
             log::debug!("Setting extended packet size: {:?}", size);
             stream.set_custom_packet_size(size.into());
         }
@@ -169,32 +175,18 @@ impl<'a> BaseClientBuilder<'a> {
 
     #[allow(clippy::too_many_arguments)]
     fn start_real_traffic_controller(
-        &self,
+        controller_config: real_messages_control::Config,
         topology_accessor: TopologyAccessor,
         ack_receiver: AcknowledgementReceiver,
         input_receiver: InputMessageReceiver,
         mix_sender: BatchMixMessageSender,
+        reply_storage: CombinedReplyStorage,
+        reply_controller_sender: ReplyControllerSender,
+        reply_controller_receiver: ReplyControllerReceiver,
         lane_queue_lengths: LaneQueueLengths,
         client_connection_rx: ConnectionCommandReceiver,
-        shutdown: ShutdownListener,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        shutdown: TaskClient,
     ) {
-        let mut controller_config = real_messages_control::Config::new(
-            self.key_manager.ack_key(),
-            self.debug_config.ack_wait_multiplier,
-            self.debug_config.ack_wait_addition,
-            self.debug_config.average_ack_delay,
-            self.debug_config.message_sending_average_delay,
-            self.debug_config.average_packet_delay,
-            self.debug_config.disable_main_poisson_packet_distribution,
-            self.as_mix_recipient(),
-        );
-
-        if let Some(size) = self.debug_config.use_extended_packet_size {
-            log::debug!("Setting extended packet size: {:?}", size);
-            controller_config.set_custom_packet_size(size.into());
-        }
-
         info!("Starting real traffic stream...");
 
         RealMessagesController::new(
@@ -203,10 +195,11 @@ impl<'a> BaseClientBuilder<'a> {
             input_receiver,
             mix_sender,
             topology_accessor,
+            reply_storage,
+            reply_controller_sender,
+            reply_controller_receiver,
             lane_queue_lengths,
             client_connection_rx,
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage,
         )
         .start_with_shutdown(shutdown);
     }
@@ -214,19 +207,20 @@ impl<'a> BaseClientBuilder<'a> {
     // buffer controlling all messages fetched from provider
     // required so that other components would be able to use them (say the websocket)
     fn start_received_messages_buffer_controller(
-        &self,
+        local_encryption_keypair: Arc<encryption::KeyPair>,
         query_receiver: ReceivedBufferRequestReceiver,
         mixnet_receiver: MixnetMessageReceiver,
-        shutdown: ShutdownListener,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        reply_key_storage: SentReplyKeys,
+        reply_controller_sender: ReplyControllerSender,
+        shutdown: TaskClient,
     ) {
         info!("Starting received messages buffer controller...");
         ReceivedMessagesBufferController::new(
-            self.key_manager.encryption_keypair(),
+            local_encryption_keypair,
             query_receiver,
             mixnet_receiver,
-            #[cfg(feature = "reply-surb")]
             reply_key_storage,
+            reply_controller_sender,
         )
         .start_with_shutdown(shutdown)
     }
@@ -235,23 +229,23 @@ impl<'a> BaseClientBuilder<'a> {
         &mut self,
         mixnet_message_sender: MixnetMessageSender,
         ack_sender: AcknowledgementSender,
-        shutdown: ShutdownListener,
-    ) -> GatewayClient {
+        shutdown: TaskClient,
+    ) -> Result<GatewayClient, ClientCoreError> {
         let gateway_id = self.gateway_config.gateway_id.clone();
         if gateway_id.is_empty() {
-            panic!("The identity of the gateway is unknown - did you run `nym-client` init?")
+            return Err(ClientCoreError::GatewayIdUnknown);
         }
         let gateway_owner = self.gateway_config.gateway_owner.clone();
         if gateway_owner.is_empty() {
-            panic!("The owner of the gateway is unknown - did you run `nym-client` init?")
+            return Err(ClientCoreError::GatewayOwnerUnknown);
         }
         let gateway_address = self.gateway_config.gateway_listener.clone();
         if gateway_address.is_empty() {
-            panic!("The address of the gateway is unknown - did you run `nym-client` init?")
+            return Err(ClientCoreError::GatwayAddressUnknown);
         }
 
         let gateway_identity = identity::PublicKey::from_base58_string(gateway_id)
-            .expect("provided gateway id is invalid!");
+            .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;
 
         // disgusting wasm workaround since there's no key persistence there (nor `client init`)
         let shared_key = if self.key_manager.gateway_key_set() {
@@ -270,7 +264,7 @@ impl<'a> BaseClientBuilder<'a> {
             ack_sender,
             self.debug_config.gateway_response_timeout,
             self.bandwidth_controller.take(),
-            Some(shutdown),
+            shutdown,
         );
 
         gateway_client.set_disabled_credentials_mode(self.disabled_credentials);
@@ -278,21 +272,23 @@ impl<'a> BaseClientBuilder<'a> {
         gateway_client
             .authenticate_and_start()
             .await
-            .expect("could not authenticate and start up the gateway connection");
-
-        gateway_client
+            .tap_err(|err| {
+                log::error!("Could not authenticate and start up the gateway connection - {err}")
+            })?;
+        Ok(gateway_client)
     }
 
     // future responsible for periodically polling directory server and updating
     // the current global view of topology
     async fn start_topology_refresher(
-        &mut self,
+        nym_api_urls: Vec<Url>,
+        refresh_rate: Duration,
         topology_accessor: TopologyAccessor,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Result<(), ClientCoreError> {
         let topology_refresher_config = TopologyRefresherConfig::new(
-            self.validator_api_endpoints.clone(),
-            self.debug_config.topology_refresh_rate,
+            nym_api_urls,
+            refresh_rate,
             env!("CARGO_PKG_VERSION").to_string(),
         );
         let mut topology_refresher =
@@ -302,13 +298,12 @@ impl<'a> BaseClientBuilder<'a> {
         info!("Obtaining initial network topology");
         topology_refresher.refresh().await;
 
-        // TODO: a slightly more graceful termination here
-        if !topology_refresher.is_topology_routable().await {
+        if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
             log::error!(
                 "The current network topology seem to be insufficient to route any packets through \
-                - check if enough nodes and a gateway are online"
+                - check if enough nodes and a gateway are online - source: {err}"
             );
-            return Err(ClientCoreError::InsufficientNetworkTopology);
+            return Err(ClientCoreError::InsufficientNetworkTopology(err));
         }
 
         info!("Starting topology refresher...");
@@ -322,7 +317,7 @@ impl<'a> BaseClientBuilder<'a> {
     // requests?
     fn start_mix_traffic_controller(
         gateway_client: GatewayClient,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> BatchMixMessageSender {
         info!("Starting mix traffic controller...");
         let (mix_traffic_controller, mix_tx) = MixTrafficController::new(gateway_client);
@@ -330,7 +325,35 @@ impl<'a> BaseClientBuilder<'a> {
         mix_tx
     }
 
-    pub async fn start_base(mut self) -> Result<BaseClient, ClientCoreError> {
+    async fn setup_persistent_reply_storage(
+        backend: B,
+        shutdown: TaskClient,
+    ) -> Result<CombinedReplyStorage, ClientCoreError>
+    where
+        <B as ReplyStorageBackend>::StorageError: Sync + Send,
+    {
+        let persistent_storage = PersistentReplyStorage::new(backend);
+        let mem_store = persistent_storage
+            .load_state_from_backend()
+            .await
+            .map_err(|err| ClientCoreError::SurbStorageError {
+                source: Box::new(err),
+            })?;
+
+        let store_clone = mem_store.clone();
+        spawn_future(async move {
+            persistent_storage
+                .flush_on_shutdown(store_clone, shutdown)
+                .await
+        });
+
+        Ok(mem_store)
+    }
+
+    pub async fn start_base(mut self) -> Result<BaseClient, ClientCoreError>
+    where
+        <B as ReplyStorageBackend>::StorageError: Sync + Send,
+    {
         info!("Starting nym client");
         // channels for inter-component communication
         // TODO: make the channels be internally created by the relevant components
@@ -351,38 +374,50 @@ impl<'a> BaseClientBuilder<'a> {
         let (ack_sender, ack_receiver) = mpsc::unbounded();
         let shared_topology_accessor = TopologyAccessor::new();
 
-        #[cfg(feature = "reply-surb")]
-        let reply_key_storage =
-            ReplyKeyStorage::load(&self.reply_surb_keys_store_path).tap_err(|err| {
-                log::error!("Failed to load reply key storage - is it perhaps already in use?");
-                log::error!("{:?}", err);
-            })?;
-
         // Shutdown notifier for signalling tasks to stop
-        let shutdown = ShutdownNotifier::default();
+        let task_manager = TaskManager::default();
+
+        // channels responsible for dealing with reply-related fun
+        let (reply_controller_sender, reply_controller_receiver) =
+            reply_controller::requests::new_control_channels();
+
+        let self_address = self.as_mix_recipient();
 
         // the components are started in very specific order. Unless you know what you are doing,
         // do not change that.
-        self.start_topology_refresher(shared_topology_accessor.clone(), shutdown.subscribe())
+        let gateway_client = self
+            .start_gateway_client(mixnet_messages_sender, ack_sender, task_manager.subscribe())
             .await?;
-        self.start_received_messages_buffer_controller(
+
+        let reply_storage = Self::setup_persistent_reply_storage(
+            self.reply_storage_backend,
+            task_manager.subscribe(),
+        )
+        .await?;
+
+        Self::start_topology_refresher(
+            self.nym_api_endpoints.clone(),
+            self.debug_config.topology_refresh_rate,
+            shared_topology_accessor.clone(),
+            task_manager.subscribe(),
+        )
+        .await?;
+
+        Self::start_received_messages_buffer_controller(
+            self.key_manager.encryption_keypair(),
             received_buffer_request_receiver,
             mixnet_messages_receiver,
-            shutdown.subscribe(),
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage.clone(),
+            reply_storage.key_storage(),
+            reply_controller_sender.clone(),
+            task_manager.subscribe(),
         );
 
-        let gateway_client = self
-            .start_gateway_client(mixnet_messages_sender, ack_sender, shutdown.subscribe())
-            .await;
-
         // The sphinx_message_sender is the transmitter for any component generating sphinx packets
         // that are to be sent to the mixnet. They are used by cover traffic stream and real
         // traffic stream.
         // The MixTrafficController then sends the actual traffic
         let sphinx_message_sender =
-            Self::start_mix_traffic_controller(gateway_client, shutdown.subscribe());
+            Self::start_mix_traffic_controller(gateway_client, task_manager.subscribe());
 
         // Channels that the websocket listener can use to signal downstream to the real traffic
         // controller that connections are closed.
@@ -392,43 +427,60 @@ impl<'a> BaseClientBuilder<'a> {
         // primarily to throttle incoming connections (e.g socks5 for attached network-requesters)
         let shared_lane_queue_lengths = LaneQueueLengths::new();
 
-        self.start_real_traffic_controller(
+        let mut controller_config = real_messages_control::Config::new(
+            self.debug_config,
+            self.key_manager.ack_key(),
+            self_address,
+        );
+
+        if let Some(size) = self.debug_config.use_extended_packet_size {
+            log::debug!("Setting extended packet size: {:?}", size);
+            controller_config.set_custom_packet_size(size.into());
+        }
+
+        Self::start_real_traffic_controller(
+            controller_config,
             shared_topology_accessor.clone(),
             ack_receiver,
             input_receiver,
             sphinx_message_sender.clone(),
+            reply_storage,
+            reply_controller_sender.clone(),
+            reply_controller_receiver,
             shared_lane_queue_lengths.clone(),
             client_connection_rx,
-            shutdown.subscribe(),
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage,
+            task_manager.subscribe(),
         );
 
         if !self.debug_config.disable_loop_cover_traffic_stream {
-            self.start_cover_traffic_stream(
+            Self::start_cover_traffic_stream(
+                self.debug_config,
+                self.key_manager.ack_key(),
+                self_address,
                 shared_topology_accessor,
                 sphinx_message_sender,
-                shutdown.subscribe(),
+                task_manager.subscribe(),
             );
         }
 
-        info!("Client startup finished!");
-        info!("The address of this client is: {}", self.as_mix_recipient());
+        debug!("Core client startup finished!");
+        debug!("The address of this client is: {self_address}");
 
         Ok(BaseClient {
             client_input: ClientInputStatus::AwaitingProducer {
                 client_input: ClientInput {
-                    shared_lane_queue_lengths,
                     connection_command_sender: client_connection_tx,
                     input_sender,
                 },
             },
             client_output: ClientOutputStatus::AwaitingConsumer {
                 client_output: ClientOutput {
+                    shared_lane_queue_lengths,
                     received_buffer_request_sender,
                 },
             },
-            shutdown_notifier: shutdown,
+            reply_controller_sender,
+            task_manager,
         })
     }
 }
@@ -437,5 +489,8 @@ pub struct BaseClient {
     pub client_input: ClientInputStatus,
     pub client_output: ClientOutputStatus,
 
-    pub shutdown_notifier: ShutdownNotifier,
+    // it feels very wrong to put this channel here, but I can't think of any other way of passing it to the native client
+    pub reply_controller_sender: ReplyControllerSender,
+
+    pub task_manager: TaskManager,
 }
diff --git a/clients/client-core/src/client/base_client/non_wasm_helpers.rs b/clients/client-core/src/client/base_client/non_wasm_helpers.rs
new file mode 100644
index 0000000000..996dcc8fc3
--- /dev/null
+++ b/clients/client-core/src/client/base_client/non_wasm_helpers.rs
@@ -0,0 +1,87 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::{
+    fs_backend, CombinedReplyStorage, ReplyStorageBackend,
+};
+use crate::config::DebugConfig;
+use crate::error::ClientCoreError;
+use log::{error, info};
+use std::path::Path;
+use std::{fs, io};
+use time::OffsetDateTime;
+
+async fn setup_fresh_backend<P: AsRef<Path>>(
+    db_path: P,
+    debug_config: &DebugConfig,
+) -> Result<fs_backend::Backend, ClientCoreError> {
+    info!("creating fresh surb database");
+    let mut storage_backend = match fs_backend::Backend::init(db_path).await {
+        Ok(backend) => backend,
+        Err(err) => {
+            error!("failed to setup persistent storage backend for our reply needs: {err}");
+            return Err(ClientCoreError::SurbStorageError {
+                source: Box::new(err),
+            });
+        }
+    };
+
+    // while I kinda hate that we're going to be creating `CombinedReplyStorage` twice,
+    // it will only be happening on the very first run and in practice won't incur huge
+    // costs since the storage is going to be empty
+    let mem_store = CombinedReplyStorage::new(
+        debug_config.minimum_reply_surb_storage_threshold,
+        debug_config.maximum_reply_surb_storage_threshold,
+    );
+    storage_backend
+        .init_fresh(&mem_store)
+        .await
+        .map_err(|err| ClientCoreError::SurbStorageError {
+            source: Box::new(err),
+        })?;
+
+    Ok(storage_backend)
+}
+
+fn archive_corrupted_database<P: AsRef<Path>>(db_path: P) -> io::Result<()> {
+    let db_path = db_path.as_ref();
+    debug_assert!(db_path.exists());
+
+    let now = OffsetDateTime::now_utc().unix_timestamp();
+
+    let suffix = format!("_{now}.corrupted");
+
+    let new_extension =
+        if let Some(existing_extension) = db_path.extension().and_then(|ext| ext.to_str()) {
+            format!("{existing_extension}.{}", suffix)
+        } else {
+            suffix
+        };
+
+    let mut renamed = db_path.to_owned();
+    renamed.set_extension(new_extension);
+
+    fs::rename(db_path, renamed)
+}
+
+pub async fn setup_fs_reply_surb_backend<P: AsRef<Path>>(
+    db_path: P,
+    debug_config: &DebugConfig,
+) -> Result<fs_backend::Backend, ClientCoreError> {
+    // if the database file doesnt exist, initialise fresh storage, otherwise attempt to load the existing one
+    let db_path = db_path.as_ref();
+    if db_path.exists() {
+        info!("loading existing surb database");
+        match fs_backend::Backend::try_load(db_path).await {
+            Ok(backend) => Ok(backend),
+            Err(err) => {
+                error!("failed to setup persistent storage backend for our reply needs: {err}. We're going to create a fresh database instead. This behaviour might change in the future");
+
+                archive_corrupted_database(db_path)?;
+                setup_fresh_backend(db_path, debug_config).await
+            }
+        }
+    } else {
+        setup_fresh_backend(db_path, debug_config).await
+    }
+}
diff --git a/clients/client-core/src/client/cover_traffic_stream.rs b/clients/client-core/src/client/cover_traffic_stream.rs
index 061e5f0b98..a8ecad86b2 100644
--- a/clients/client-core/src/client/cover_traffic_stream.rs
+++ b/clients/client-core/src/client/cover_traffic_stream.rs
@@ -161,15 +161,16 @@ impl LoopCoverTrafficStream<OsRng> {
         // poisson delay, but is it really a problem?
         let topology_permit = self.topology_access.get_read_permit().await;
         // the ack is sent back to ourselves (and then ignored)
-        let topology_ref_option = topology_permit.try_get_valid_topology_ref(
+        let topology_ref = match topology_permit.try_get_valid_topology_ref(
             &self.our_full_destination,
             Some(&self.our_full_destination),
-        );
-        if topology_ref_option.is_none() {
-            warn!("No valid topology detected - won't send any loop cover message this time");
-            return;
-        }
-        let topology_ref = topology_ref_option.unwrap();
+        ) {
+            Ok(topology) => topology,
+            Err(err) => {
+                warn!("We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}");
+                return;
+            }
+        };
 
         let cover_message = generate_loop_cover_packet(
             &mut self.rng,
@@ -191,7 +192,7 @@ impl LoopCoverTrafficStream<OsRng> {
                     // However it's still useful to alert the user that the gateway or the link to
                     // the gateway can't keep up. Either due to insufficient bandwidth on the
                     // client side, or that the gateway is overloaded.
-                    log::warn!("Failed to send: gateway appears to not keep up");
+                    log::warn!("Failed to send sphinx packet - gateway or connection to gatway can't keep up");
                 }
                 TrySendError::Closed(_) => {
                     log::warn!("Failed to send cover message - channel closed");
@@ -212,7 +213,7 @@ impl LoopCoverTrafficStream<OsRng> {
         tokio::task::yield_now().await;
     }
 
-    pub fn start_with_shutdown(mut self, mut shutdown: task::ShutdownListener) {
+    pub fn start_with_shutdown(mut self, mut shutdown: task::TaskClient) {
         // we should set initial delay only when we actually start the stream
         let sampled =
             sample_poisson_duration(&mut self.rng, self.average_cover_message_sending_delay);
@@ -241,19 +242,4 @@ impl LoopCoverTrafficStream<OsRng> {
             log::debug!("LoopCoverTrafficStream: Exiting");
         })
     }
-
-    pub fn start(mut self) {
-        // we should set initial delay only when we actually start the stream
-        let sampled =
-            sample_poisson_duration(&mut self.rng, self.average_cover_message_sending_delay);
-        self.set_next_delay(sampled);
-
-        spawn_future(async move {
-            debug!("Started LoopCoverTrafficStream without graceful shutdown support");
-
-            while self.next().await.is_some() {
-                self.on_new_message().await;
-            }
-        })
-    }
 }
diff --git a/clients/client-core/src/client/helpers/mod.rs b/clients/client-core/src/client/helpers/mod.rs
new file mode 100644
index 0000000000..ffffea0313
--- /dev/null
+++ b/clients/client-core/src/client/helpers/mod.rs
@@ -0,0 +1,14 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(not(target_arch = "wasm32"))]
+mod non_wasm;
+
+#[cfg(target_arch = "wasm32")]
+mod wasm;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use non_wasm::*;
+
+#[cfg(target_arch = "wasm32")]
+pub use wasm::*;
diff --git a/clients/client-core/src/client/helpers/non_wasm.rs b/clients/client-core/src/client/helpers/non_wasm.rs
new file mode 100644
index 0000000000..ff5c9c0047
--- /dev/null
+++ b/clients/client-core/src/client/helpers/non_wasm.rs
@@ -0,0 +1,13 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub use tokio::time::*;
+pub type IntervalStream = tokio_stream::wrappers::IntervalStream;
+
+pub(crate) fn get_time_now() -> Instant {
+    Instant::now()
+}
+
+pub(crate) fn new_interval_stream(polling_rate: Duration) -> IntervalStream {
+    tokio_stream::wrappers::IntervalStream::new(tokio::time::interval(polling_rate))
+}
diff --git a/clients/client-core/src/client/helpers/wasm.rs b/clients/client-core/src/client/helpers/wasm.rs
new file mode 100644
index 0000000000..f04dd64028
--- /dev/null
+++ b/clients/client-core/src/client/helpers/wasm.rs
@@ -0,0 +1,16 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use std::time::Duration;
+use wasm_timer;
+
+pub use wasm_timer::*;
+pub type IntervalStream = gloo_timers::future::IntervalStream;
+
+pub(crate) fn get_time_now() -> Instant {
+    wasm_timer::Instant::now()
+}
+
+pub(crate) fn new_interval_stream(polling_rate: Duration) -> IntervalStream {
+    gloo_timers::future::IntervalStream::new(polling_rate.as_millis() as u32)
+}
diff --git a/clients/client-core/src/client/inbound_messages.rs b/clients/client-core/src/client/inbound_messages.rs
index 909e3720f9..890787aa60 100644
--- a/clients/client-core/src/client/inbound_messages.rs
+++ b/clients/client-core/src/client/inbound_messages.rs
@@ -1,40 +1,80 @@
 use client_connections::TransmissionLane;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 
 pub type InputMessageSender = tokio::sync::mpsc::Sender<InputMessage>;
 pub type InputMessageReceiver = tokio::sync::mpsc::Receiver<InputMessage>;
 
 #[derive(Debug)]
 pub enum InputMessage {
-    Fresh {
+    /// The simplest message variant where no additional information is attached.
+    /// You're simply sending your `data` to specified `recipient` without any tagging.
+    ///
+    /// Ends up with `NymMessage::Plain` variant
+    Regular {
         recipient: Recipient,
         data: Vec<u8>,
-        with_reply_surb: bool,
         lane: TransmissionLane,
     },
-    Reply {
-        reply_surb: ReplySurb,
+
+    /// Creates a message used for a duplex anonymous communication where the recipient
+    /// will never learn of our true identity. This is achieved by carefully sending `reply_surbs`.
+    ///
+    /// Note that if reply_surbs is set to zero then
+    /// this variant requires the client having sent some reply_surbs in the past
+    /// (and thus the recipient also knowing our sender tag).
+    ///
+    /// Ends up with `NymMessage::Repliable` variant
+    Anonymous {
+        recipient: Recipient,
         data: Vec<u8>,
+        reply_surbs: u32,
+        lane: TransmissionLane,
+    },
+
+    /// Attempt to use our internally received and stored `ReplySurb` to send the message back
+    /// to specified recipient whilst not knowing its full identity (or even gateway).
+    ///
+    /// Ends up with `NymMessage::Reply` variant
+    Reply {
+        recipient_tag: AnonymousSenderTag,
+        data: Vec<u8>,
+        lane: TransmissionLane,
     },
 }
 
 impl InputMessage {
-    pub fn new_fresh(
-        recipient: Recipient,
-        data: Vec<u8>,
-        with_reply_surb: bool,
-        lane: TransmissionLane,
-    ) -> Self {
-        InputMessage::Fresh {
+    pub fn new_regular(recipient: Recipient, data: Vec<u8>, lane: TransmissionLane) -> Self {
+        InputMessage::Regular {
             recipient,
             data,
-            with_reply_surb,
             lane,
         }
     }
 
-    pub fn new_reply(reply_surb: ReplySurb, data: Vec<u8>) -> Self {
-        InputMessage::Reply { reply_surb, data }
+    pub fn new_anonymous(
+        recipient: Recipient,
+        data: Vec<u8>,
+        reply_surbs: u32,
+        lane: TransmissionLane,
+    ) -> Self {
+        InputMessage::Anonymous {
+            recipient,
+            data,
+            reply_surbs,
+            lane,
+        }
+    }
+
+    pub fn new_reply(
+        recipient_tag: AnonymousSenderTag,
+        data: Vec<u8>,
+        lane: TransmissionLane,
+    ) -> Self {
+        InputMessage::Reply {
+            recipient_tag,
+            data,
+            lane,
+        }
     }
 }
diff --git a/clients/client-core/src/client/mix_traffic.rs b/clients/client-core/src/client/mix_traffic.rs
index 0d3aab9513..94944cb481 100644
--- a/clients/client-core/src/client/mix_traffic.rs
+++ b/clients/client-core/src/client/mix_traffic.rs
@@ -51,8 +51,8 @@ impl MixTrafficController {
         };
 
         match result {
-            Err(e) => {
-                error!("Failed to send sphinx packet(s) to the gateway! - {:?}", e);
+            Err(err) => {
+                error!("Failed to send sphinx packet(s) to the gateway! - {err}");
                 self.consecutive_gateway_failure_count += 1;
                 if self.consecutive_gateway_failure_count == MAX_FAILURE_COUNT {
                     // todo: in the future this should initiate a 'graceful' shutdown or try
@@ -67,11 +67,11 @@ impl MixTrafficController {
         }
     }
 
-    pub fn start_with_shutdown(mut self, mut shutdown: task::ShutdownListener) {
+    pub fn start_with_shutdown(mut self, mut shutdown: task::TaskClient) {
         spawn_future(async move {
             debug!("Started MixTrafficController with graceful shutdown support");
 
-            while !shutdown.is_shutdown() {
+            loop {
                 tokio::select! {
                     mix_packets = self.mix_rx.recv() => match mix_packets {
                         Some(mix_packets) => {
@@ -82,8 +82,9 @@ impl MixTrafficController {
                             break;
                         }
                     },
-                    _ = shutdown.recv() => {
+                    _ = shutdown.recv_with_delay() => {
                         log::trace!("MixTrafficController: Received shutdown");
+                        break;
                     }
                 }
             }
@@ -91,14 +92,4 @@ impl MixTrafficController {
             log::debug!("MixTrafficController: Exiting");
         })
     }
-
-    pub fn start(mut self) {
-        spawn_future(async move {
-            debug!("Started MixTrafficController without graceful shutdown support");
-
-            while let Some(mix_packets) = self.mix_rx.recv().await {
-                self.on_messages(mix_packets).await;
-            }
-        })
-    }
 }
diff --git a/clients/client-core/src/client/mod.rs b/clients/client-core/src/client/mod.rs
index 8c09544ce6..789dd300de 100644
--- a/clients/client-core/src/client/mod.rs
+++ b/clients/client-core/src/client/mod.rs
@@ -3,11 +3,12 @@
 
 pub mod base_client;
 pub mod cover_traffic_stream;
+pub(crate) mod helpers;
 pub mod inbound_messages;
 pub mod key_manager;
 pub mod mix_traffic;
 pub mod real_messages_control;
 pub mod received_buffer;
-#[cfg(feature = "reply-surb")]
-pub mod reply_key_storage;
+pub mod replies;
 pub mod topology_control;
+pub(crate) mod transmission_buffer;
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs
index bd7b34e93d..8febbfa85d 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::action_controller::{Action, ActionSender};
+use super::action_controller::{AckActionSender, Action};
 use futures::StreamExt;
 use gateway_client::AcknowledgementReceiver;
 use log::*;
@@ -16,14 +16,14 @@ use std::sync::Arc;
 pub(super) struct AcknowledgementListener {
     ack_key: Arc<AckKey>,
     ack_receiver: AcknowledgementReceiver,
-    action_sender: ActionSender,
+    action_sender: AckActionSender,
 }
 
 impl AcknowledgementListener {
     pub(super) fn new(
         ack_key: Arc<AckKey>,
         ack_receiver: AcknowledgementReceiver,
-        action_sender: ActionSender,
+        action_sender: AckActionSender,
     ) -> Self {
         AcknowledgementListener {
             ack_key,
@@ -49,11 +49,6 @@ impl AcknowledgementListener {
         if frag_id == COVER_FRAG_ID {
             trace!("Received an ack for a cover message - no need to do anything");
             return;
-        } else if frag_id.is_reply() {
-            info!("Received an ack for a reply message - no need to do anything! (don't know what to do!)");
-            // TODO: probably there will need to be some extra procedure here, something to notify
-            // user that his reply reached the recipient (since we got an ack)
-            return;
         }
 
         trace!("Received {} from the mix network", frag_id);
@@ -70,7 +65,7 @@ impl AcknowledgementListener {
         }
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started AcknowledgementListener with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
@@ -82,7 +77,7 @@ impl AcknowledgementListener {
                         break;
                     }
                 },
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("AcknowledgementListener: Received shutdown");
                 }
             }
@@ -90,14 +85,4 @@ impl AcknowledgementListener {
         shutdown.recv_timeout().await;
         log::debug!("AcknowledgementListener: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started AcknowledgementListener without graceful shutdown support");
-
-        while let Some(acks) = self.ack_receiver.next().await {
-            self.handle_ack_receiver_item(acks).await
-        }
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/action_controller.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/action_controller.rs
index 09cf48185a..c65592b2f6 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/action_controller.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/action_controller.rs
@@ -3,7 +3,7 @@
 
 use super::PendingAcknowledgement;
 use crate::client::real_messages_control::acknowledgement_control::RetransmissionRequestSender;
-use futures::channel::mpsc::{self, UnboundedReceiver, UnboundedSender};
+use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
 use nonexhaustive_delayqueue::{Expired, NonExhaustiveDelayQueue, QueueKey};
@@ -13,7 +13,8 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
 
-pub(crate) type ActionSender = UnboundedSender<Action>;
+pub(crate) type AckActionSender = mpsc::UnboundedSender<Action>;
+pub(crate) type AckActionReceiver = mpsc::UnboundedReceiver<Action>;
 
 // The actual data being sent off as well as potential key to the delay queue
 type PendingAckEntry = (Arc<PendingAcknowledgement>, Option<QueueKey>);
@@ -95,7 +96,7 @@ pub(super) struct ActionController {
     pending_acks_timers: NonExhaustiveDelayQueue<FragmentIdentifier>,
 
     /// Channel for receiving `Action`s from other modules.
-    incoming_actions: UnboundedReceiver<Action>,
+    incoming_actions: AckActionReceiver,
 
     /// Channel for notifying `RetransmissionRequestListener` about expired acknowledgements.
     retransmission_sender: RetransmissionRequestSender,
@@ -105,18 +106,15 @@ impl ActionController {
     pub(super) fn new(
         config: Config,
         retransmission_sender: RetransmissionRequestSender,
-    ) -> (Self, ActionSender) {
-        let (sender, receiver) = mpsc::unbounded();
-        (
-            ActionController {
-                config,
-                pending_acks_data: HashMap::new(),
-                pending_acks_timers: NonExhaustiveDelayQueue::new(),
-                incoming_actions: receiver,
-                retransmission_sender,
-            },
-            sender,
-        )
+        incoming_actions: AckActionReceiver,
+    ) -> Self {
+        ActionController {
+            config,
+            pending_acks_data: HashMap::new(),
+            pending_acks_timers: NonExhaustiveDelayQueue::new(),
+            incoming_actions,
+            retransmission_sender,
+        }
     }
 
     fn handle_insert(&mut self, pending_acks: Vec<PendingAcknowledgement>) {
@@ -138,13 +136,18 @@ impl ActionController {
         trace!("{} is starting its timer", frag_id);
 
         if let Some((pending_ack_data, queue_key)) = self.pending_acks_data.get_mut(&frag_id) {
-            if queue_key.is_some() {
-                // this branch should be IMPOSSIBLE under ANY condition. It would imply starting
-                // timer TWICE for the SAME PendingAcknowledgement
-                panic!("Tried to start an already started ack timer!")
-            }
-            let timeout = (pending_ack_data.delay.clone() * self.config.ack_wait_multiplier)
-                .to_duration()
+            // the fact that this branch is now POSSIBLE is a sign of a need to refactor this whole
+            // retransmission procedure
+            //
+            // (it can happen as timer is started when ack expires to make sure it's not stuck in memory
+            // and the second instance can be fired when we finally get reply surbs for data we failed to retransmit)
+
+            // if queue_key.is_some() {
+            //     // this branch should be IMPOSSIBLE under ANY condition. It would imply starting
+            //     // timer TWICE for the SAME PendingAcknowledgement
+            //     panic!("Tried to start an already started ack timer!")
+            // }
+            let timeout = (pending_ack_data.delay * self.config.ack_wait_multiplier).to_duration()
                 + self.config.ack_wait_addition;
 
             let new_queue_key = self.pending_acks_timers.insert(frag_id, timeout);
@@ -192,7 +195,8 @@ impl ActionController {
         trace!("{} is updating its delay", frag_id);
         // TODO: is it possible to solve this without either locking or temporarily removing the value?
         if let Some((pending_ack_data, queue_key)) = self.pending_acks_data.remove(&frag_id) {
-            // this Action is triggered by `RetransmissionRequestListener` which held the other potential
+            // this Action is triggered by `RetransmissionRequestListener` (for 'normal' packets)
+            // or `ReplyController` (for 'reply' packets) which held the other potential
             // reference to this Arc. HOWEVER, before the Action was pushed onto the queue, the reference
             // was dropped hence this unwrap is safe.
             let mut inner_data = Arc::try_unwrap(pending_ack_data).unwrap();
@@ -245,7 +249,7 @@ impl ActionController {
         }
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started ActionController with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
@@ -266,7 +270,7 @@ impl ActionController {
                         break;
                     }
                 },
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("ActionController: Received shutdown");
                 }
             }
@@ -277,17 +281,4 @@ impl ActionController {
             .expect("Task stopped without shutdown called");
         log::debug!("ActionController: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started ActionController without graceful shutdown support");
-
-        loop {
-            tokio::select! {
-                action = self.incoming_actions.next() => self.process_action(action.unwrap()),
-                expired_ack = self.pending_acks_timers.next() => self.handle_expired_ack_timer(expired_ack.unwrap())
-            }
-        }
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs
index dec2d153d6..f492de1aae 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs
@@ -1,23 +1,14 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::action_controller::{Action, ActionSender};
-use super::PendingAcknowledgement;
-use crate::client::{
-    inbound_messages::{InputMessage, InputMessageReceiver},
-    real_messages_control::real_traffic_stream::{BatchRealMessageSender, RealMessage},
-    topology_control::TopologyAccessor,
-};
+use crate::client::inbound_messages::{InputMessage, InputMessageReceiver};
+use crate::client::real_messages_control::message_handler::MessageHandler;
+use crate::client::replies::reply_controller::ReplyControllerSender;
 use client_connections::TransmissionLane;
 use log::*;
-use nymsphinx::anonymous_replies::ReplySurb;
-use nymsphinx::preparer::MessagePreparer;
-use nymsphinx::{acknowledgements::AckKey, addressing::clients::Recipient};
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use rand::{CryptoRng, Rng};
-use std::sync::Arc;
-
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorage;
 
 /// Module responsible for dealing with the received messages: splitting them, creating acknowledgements,
 /// putting everything into sphinx packets, etc.
@@ -26,15 +17,9 @@ pub(super) struct InputMessageListener<R>
 where
     R: CryptoRng + Rng,
 {
-    ack_key: Arc<AckKey>,
-    ack_recipient: Recipient,
     input_receiver: InputMessageReceiver,
-    message_preparer: MessagePreparer<R>,
-    action_sender: ActionSender,
-    real_message_sender: BatchRealMessageSender,
-    topology_access: TopologyAccessor,
-    #[cfg(feature = "reply-surb")]
-    reply_key_storage: ReplyKeyStorage,
+    message_handler: MessageHandler<R>,
+    reply_controller_sender: ReplyControllerSender,
 }
 
 impl<R> InputMessageListener<R>
@@ -45,156 +30,86 @@ where
     // some considerable refactoring
     #[allow(clippy::too_many_arguments)]
     pub(super) fn new(
-        ack_key: Arc<AckKey>,
-        ack_recipient: Recipient,
         input_receiver: InputMessageReceiver,
-        message_preparer: MessagePreparer<R>,
-        action_sender: ActionSender,
-        real_message_sender: BatchRealMessageSender,
-        topology_access: TopologyAccessor,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        message_handler: MessageHandler<R>,
+        reply_controller_sender: ReplyControllerSender,
     ) -> Self {
         InputMessageListener {
-            ack_key,
-            ack_recipient,
             input_receiver,
-            message_preparer,
-            action_sender,
-            real_message_sender,
-            topology_access,
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage,
+            message_handler,
+            reply_controller_sender,
         }
     }
 
-    // we require topology for replies to generate surb_acks
-    async fn handle_reply(&mut self, reply_surb: ReplySurb, data: Vec<u8>) -> Option<RealMessage> {
-        let topology_permit = self.topology_access.get_read_permit().await;
-        let topology = match topology_permit.try_get_valid_topology_ref(&self.ack_recipient, None) {
-            Some(topology_ref) => topology_ref,
-            None => {
-                warn!("Could not process the message - the network topology is invalid");
-                return None;
-            }
-        };
-
-        match self
-            .message_preparer
-            .prepare_reply_for_use(data, reply_surb, topology, &self.ack_key)
-            .await
-        {
-            Ok((mix_packet, reply_id)) => {
-                // TODO: later probably write pending ack here
-                // and deal with them....
-                // ... somehow
-                Some(RealMessage::new(mix_packet, reply_id))
-            }
-            Err(err) => {
-                // TODO: should we have some mechanism to indicate to the user that the `reply_surb`
-                // could be reused since technically it wasn't used up here?
-                warn!("failed to deal with received reply surb - {:?}", err);
-                None
-            }
-        }
+    async fn handle_reply(
+        &mut self,
+        recipient_tag: AnonymousSenderTag,
+        data: Vec<u8>,
+        lane: TransmissionLane,
+    ) {
+        // offload reply handling to the dedicated task
+        self.reply_controller_sender
+            .send_reply(recipient_tag, data, lane)
     }
 
-    async fn handle_fresh_message(
+    async fn handle_plain_message(
         &mut self,
         recipient: Recipient,
         content: Vec<u8>,
-        with_reply_surb: bool,
-    ) -> Option<Vec<RealMessage>> {
-        log::trace!("handling msg size: {}", content.len());
-        let topology_permit = self.topology_access.get_read_permit().await;
-        let topology = match topology_permit
-            .try_get_valid_topology_ref(&self.ack_recipient, Some(&recipient))
+        lane: TransmissionLane,
+    ) {
+        if let Err(err) = self
+            .message_handler
+            .try_send_plain_message(recipient, content, lane)
+            .await
         {
-            Some(topology_ref) => topology_ref,
-            None => {
-                warn!("Could not process the message - the network topology is invalid");
-                return None;
-            }
-        };
-
-        // split the message, attach optional reply surb
-        let (split_message, reply_key) = self
-            .message_preparer
-            .prepare_and_split_message(content, with_reply_surb, topology)
-            .expect("somehow the topology was invalid after all!");
-
-        #[cfg(feature = "reply-surb")]
-        if let Some(reply_key) = reply_key {
-            self.reply_key_storage
-                .insert_encryption_key(reply_key)
-                .expect("Failed to insert surb reply key to the store!")
+            warn!("failed to send a plain message - {err}")
         }
+    }
 
-        #[cfg(not(feature = "reply-surb"))]
-        let _reply_key = reply_key;
-
-        // encrypt chunks, put them inside sphinx packets and generate acks
-        let mut pending_acks = Vec::with_capacity(split_message.len());
-        let mut real_messages = Vec::with_capacity(split_message.len());
-        for message_chunk in split_message {
-            // we need to clone it because we need to keep it in memory in case we had to retransmit
-            // it. And then we'd need to recreate entire ACK again.
-            let chunk_clone = message_chunk.clone();
-            let prepared_fragment = self
-                .message_preparer
-                .prepare_chunk_for_sending(chunk_clone, topology, &self.ack_key, &recipient)
-                .unwrap();
-
-            real_messages.push(RealMessage::new(
-                prepared_fragment.mix_packet,
-                message_chunk.fragment_identifier(),
-            ));
-
-            pending_acks.push(PendingAcknowledgement::new(
-                message_chunk,
-                prepared_fragment.total_delay,
-                recipient,
-            ));
+    async fn handle_repliable_message(
+        &mut self,
+        recipient: Recipient,
+        content: Vec<u8>,
+        reply_surbs: u32,
+        lane: TransmissionLane,
+    ) {
+        if let Err(err) = self
+            .message_handler
+            .try_send_message_with_reply_surbs(recipient, content, reply_surbs, lane)
+            .await
+        {
+            warn!("failed to send a repliable message - {err}")
         }
-
-        // tells the controller to put this into the hashmap
-        self.action_sender
-            .unbounded_send(Action::new_insert(pending_acks))
-            .unwrap();
-
-        Some(real_messages)
     }
 
     async fn on_input_message(&mut self, msg: InputMessage) {
-        let (real_messages, lane) = match msg {
-            InputMessage::Fresh {
+        match msg {
+            InputMessage::Regular {
                 recipient,
                 data,
-                with_reply_surb,
                 lane,
-            } => (
-                self.handle_fresh_message(recipient, data, with_reply_surb)
-                    .await,
+            } => self.handle_plain_message(recipient, data, lane).await,
+            InputMessage::Anonymous {
+                recipient,
+                data,
+                reply_surbs,
                 lane,
-            ),
-            InputMessage::Reply { reply_surb, data } => (
-                self.handle_reply(reply_surb, data)
+            } => {
+                self.handle_repliable_message(recipient, data, reply_surbs, lane)
                     .await
-                    .map(|message| vec![message]),
-                TransmissionLane::Reply,
-            ),
+            }
+            InputMessage::Reply {
+                recipient_tag,
+                data,
+                lane,
+            } => {
+                self.handle_reply(recipient_tag, data, lane).await;
+            }
         };
-
-        // there's no point in trying to send nothing
-        if let Some(real_messages) = real_messages {
-            // tells real message sender (with the poisson timer) to send this to the mix network
-            self.real_message_sender
-                .send((real_messages, lane))
-                .await
-                .expect("BatchRealMessageReceiver has stopped receiving!");
-        }
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started InputMessageListener with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
@@ -208,7 +123,7 @@ where
                         break;
                     }
                 },
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("InputMessageListener: Received shutdown");
                 }
             }
@@ -216,13 +131,4 @@ where
         shutdown.recv_timeout().await;
         log::debug!("InputMessageListener: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started InputMessageListener without graceful shutdown support");
-        while let Some(input_msg) = self.input_receiver.recv().await {
-            self.on_input_message(input_msg).await;
-        }
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs
index 5bf2331555..befc24b86a 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/mod.rs
@@ -7,18 +7,20 @@ use self::{
     retransmission_request_listener::RetransmissionRequestListener,
     sent_notification_listener::SentNotificationListener,
 };
-use super::real_traffic_stream::BatchRealMessageSender;
-use crate::client::{inbound_messages::InputMessageReceiver, topology_control::TopologyAccessor};
+use crate::client::inbound_messages::InputMessageReceiver;
+use crate::client::real_messages_control::message_handler::MessageHandler;
+use crate::client::replies::reply_controller::ReplyControllerSender;
 use crate::spawn_future;
+use action_controller::AckActionReceiver;
 use futures::channel::mpsc;
 use gateway_client::AcknowledgementReceiver;
 use log::*;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nymsphinx::params::PacketSize;
 use nymsphinx::{
     acknowledgements::AckKey,
     addressing::clients::Recipient,
     chunking::fragment::{Fragment, FragmentIdentifier},
-    preparer::MessagePreparer,
     Delay as SphinxDelay,
 };
 use rand::{CryptoRng, Rng};
@@ -27,8 +29,7 @@ use std::{
     time::Duration,
 };
 
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorage;
+pub(crate) use action_controller::{AckActionSender, Action};
 
 mod acknowledgement_listener;
 mod action_controller;
@@ -50,24 +51,64 @@ pub(super) type SentPacketNotificationSender = mpsc::UnboundedSender<FragmentIde
 /// that it is about to be sent to the mix network and its timeout timer should be started.
 type SentPacketNotificationReceiver = mpsc::UnboundedReceiver<FragmentIdentifier>;
 
+#[derive(Debug)]
+pub(crate) enum PacketDestination {
+    Anonymous {
+        recipient_tag: AnonymousSenderTag,
+        // special flag to indicate whether this was an ack for requesting additional surbs,
+        // in that case we have to do everything we can to get it through, even if it means going
+        // below our stored reply surb threshold
+        extra_surb_request: bool,
+    },
+    KnownRecipient(Box<Recipient>),
+}
+
 /// Structure representing a data `Fragment` that is on-route to the specified `Recipient`
 #[derive(Debug)]
 pub(crate) struct PendingAcknowledgement {
     message_chunk: Fragment,
     delay: SphinxDelay,
-    recipient: Recipient,
+    destination: PacketDestination,
 }
 
 impl PendingAcknowledgement {
     /// Creates new instance of `PendingAcknowledgement` using the provided data.
-    fn new(message_chunk: Fragment, delay: SphinxDelay, recipient: Recipient) -> Self {
+    pub(crate) fn new_known(
+        message_chunk: Fragment,
+        delay: SphinxDelay,
+        recipient: Recipient,
+    ) -> Self {
         PendingAcknowledgement {
             message_chunk,
             delay,
-            recipient,
+            destination: PacketDestination::KnownRecipient(recipient.into()),
         }
     }
 
+    pub(crate) fn new_anonymous(
+        message_chunk: Fragment,
+        delay: SphinxDelay,
+        recipient_tag: AnonymousSenderTag,
+        extra_surb_request: bool,
+    ) -> Self {
+        PendingAcknowledgement {
+            message_chunk,
+            delay,
+            destination: PacketDestination::Anonymous {
+                recipient_tag,
+                extra_surb_request,
+            },
+        }
+    }
+
+    pub(crate) fn inner_fragment_identifier(&self) -> FragmentIdentifier {
+        self.message_chunk.fragment_identifier()
+    }
+
+    pub(crate) fn fragment_data(&self) -> Fragment {
+        self.message_chunk.clone()
+    }
+
     fn update_delay(&mut self, new_delay: SphinxDelay) {
         self.delay = new_delay;
     }
@@ -76,10 +117,6 @@ impl PendingAcknowledgement {
 /// AcknowledgementControllerConnectors represents set of channels for communication with
 /// other parts of the system in order to support acknowledgements and retransmission.
 pub(super) struct AcknowledgementControllerConnectors {
-    /// Channel used for forwarding prepared sphinx messages into the poisson sender
-    /// to be sent to the mix network.
-    real_message_sender: BatchRealMessageSender,
-
     /// Channel used for receiving raw messages from a client. The messages need to be put
     /// into sphinx packets first.
     input_receiver: InputMessageReceiver,
@@ -91,20 +128,28 @@ pub(super) struct AcknowledgementControllerConnectors {
 
     /// Channel used for receiving acknowledgements from the mix network.
     ack_receiver: AcknowledgementReceiver,
+
+    /// Channel used for sending request to `ActionController` to deal with anything ack-related,
+    ack_action_sender: AckActionSender,
+
+    /// Channel used for receiving request by `ActionController` to deal with anything ack-related,
+    ack_action_receiver: AckActionReceiver,
 }
 
 impl AcknowledgementControllerConnectors {
     pub(super) fn new(
-        real_message_sender: BatchRealMessageSender,
         input_receiver: InputMessageReceiver,
         sent_notifier: SentPacketNotificationReceiver,
         ack_receiver: AcknowledgementReceiver,
+        ack_action_sender: AckActionSender,
+        ack_action_receiver: AckActionReceiver,
     ) -> Self {
         AcknowledgementControllerConnectors {
-            real_message_sender,
             input_receiver,
             sent_notifier,
             ack_receiver,
+            ack_action_sender,
+            ack_action_receiver,
         }
     }
 }
@@ -117,28 +162,15 @@ pub(super) struct Config {
     /// Given ack timeout in the form a * BASE_DELAY + b, it specifies the multiplier `a`
     ack_wait_multiplier: f64,
 
-    /// Average delay an acknowledgement packet is going to get delayed at a single mixnode.
-    average_ack_delay: Duration,
-
-    /// Average delay a data packet is going to get delayed at a single mixnode.
-    average_packet_delay: Duration,
-
     /// Predefined packet size used for the encapsulated messages.
     packet_size: PacketSize,
 }
 
 impl Config {
-    pub(super) fn new(
-        ack_wait_addition: Duration,
-        ack_wait_multiplier: f64,
-        average_ack_delay: Duration,
-        average_packet_delay: Duration,
-    ) -> Self {
+    pub(super) fn new(ack_wait_addition: Duration, ack_wait_multiplier: f64) -> Self {
         Config {
             ack_wait_addition,
             ack_wait_multiplier,
-            average_ack_delay,
-            average_packet_delay,
             packet_size: Default::default(),
         }
     }
@@ -162,68 +194,51 @@ where
 
 impl<R> AcknowledgementController<R>
 where
-    R: 'static + CryptoRng + Rng + Clone + Send,
+    R: 'static + CryptoRng + Rng + Clone + Send + Sync,
 {
-    #[allow(clippy::too_many_arguments)]
     pub(super) fn new(
         config: Config,
-        rng: R,
-        topology_access: TopologyAccessor,
         ack_key: Arc<AckKey>,
-        ack_recipient: Recipient,
         connectors: AcknowledgementControllerConnectors,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        message_handler: MessageHandler<R>,
+        reply_controller_sender: ReplyControllerSender,
     ) -> Self {
         let (retransmission_tx, retransmission_rx) = mpsc::unbounded();
 
         let action_config =
             action_controller::Config::new(config.ack_wait_addition, config.ack_wait_multiplier);
-        let (action_controller, action_sender) =
-            ActionController::new(action_config, retransmission_tx);
-
-        let message_preparer = MessagePreparer::new(
-            rng,
-            ack_recipient,
-            config.average_packet_delay,
-            config.average_ack_delay,
-        )
-        .with_custom_real_message_packet_size(config.packet_size);
+        let action_controller = ActionController::new(
+            action_config,
+            retransmission_tx,
+            connectors.ack_action_receiver,
+        );
 
         // will listen for any acks coming from the network
         let acknowledgement_listener = AcknowledgementListener::new(
             Arc::clone(&ack_key),
             connectors.ack_receiver,
-            action_sender.clone(),
+            connectors.ack_action_sender.clone(),
         );
 
         // will listen for any new messages from the client
         let input_message_listener = InputMessageListener::new(
-            Arc::clone(&ack_key),
-            ack_recipient,
             connectors.input_receiver,
-            message_preparer.clone(),
-            action_sender.clone(),
-            connectors.real_message_sender.clone(),
-            topology_access.clone(),
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage,
+            message_handler.clone(),
+            reply_controller_sender.clone(),
         );
 
         // will listen for any ack timeouts and trigger retransmission
         let retransmission_request_listener = RetransmissionRequestListener::new(
-            Arc::clone(&ack_key),
-            ack_recipient,
-            message_preparer,
-            action_sender.clone(),
-            connectors.real_message_sender,
+            connectors.ack_action_sender.clone(),
+            message_handler,
             retransmission_rx,
-            topology_access,
+            reply_controller_sender,
         );
 
         // will listen for events indicating the packet was sent through the network so that
         // the retransmission timer should be started.
         let sent_notification_listener =
-            SentNotificationListener::new(connectors.sent_notifier, action_sender);
+            SentNotificationListener::new(connectors.sent_notifier, connectors.ack_action_sender);
 
         AcknowledgementController {
             acknowledgement_listener,
@@ -234,7 +249,7 @@ where
         }
     }
 
-    pub(super) fn start_with_shutdown(self, shutdown: task::ShutdownListener) {
+    pub(super) fn start_with_shutdown(self, shutdown: task::TaskClient) {
         let mut acknowledgement_listener = self.acknowledgement_listener;
         let mut input_message_listener = self.input_message_listener;
         let mut retransmission_request_listener = self.retransmission_request_listener;
@@ -278,35 +293,4 @@ where
             debug!("The controller has finished execution!");
         });
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) fn start(self) {
-        let mut acknowledgement_listener = self.acknowledgement_listener;
-        let mut input_message_listener = self.input_message_listener;
-        let mut retransmission_request_listener = self.retransmission_request_listener;
-        let mut sent_notification_listener = self.sent_notification_listener;
-        let mut action_controller = self.action_controller;
-
-        spawn_future(async move {
-            acknowledgement_listener.run().await;
-            error!("The acknowledgement listener has finished execution!");
-        });
-        spawn_future(async move {
-            input_message_listener.run().await;
-            error!("The input listener has finished execution!");
-        });
-        spawn_future(async move {
-            retransmission_request_listener.run().await;
-            error!("The retransmission request listener has finished execution!");
-        });
-        spawn_future(async move {
-            sent_notification_listener.run().await;
-            error!("The sent notification listener has finished execution!");
-        });
-        spawn_future(async move {
-            action_controller.run().await;
-            error!("The controller has finished execution!");
-        });
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs
index 190f23e50c..d8fb2b0a8d 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs
@@ -1,82 +1,101 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use super::{
-    action_controller::{Action, ActionSender},
+    action_controller::{AckActionSender, Action},
     PendingAcknowledgement, RetransmissionRequestReceiver,
 };
-use crate::client::{
-    real_messages_control::real_traffic_stream::{BatchRealMessageSender, RealMessage},
-    topology_control::TopologyAccessor,
-};
-
+use crate::client::real_messages_control::acknowledgement_control::PacketDestination;
+use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError};
+use crate::client::real_messages_control::real_traffic_stream::RealMessage;
+use crate::client::replies::reply_controller::ReplyControllerSender;
 use client_connections::TransmissionLane;
 use futures::StreamExt;
 use log::*;
-use nymsphinx::{
-    acknowledgements::AckKey, addressing::clients::Recipient, preparer::MessagePreparer,
-};
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::chunking::fragment::Fragment;
+use nymsphinx::preparer::PreparedFragment;
 use rand::{CryptoRng, Rng};
 use std::sync::{Arc, Weak};
 
 // responsible for packet retransmission upon fired timer
-pub(super) struct RetransmissionRequestListener<R>
-where
-    R: CryptoRng + Rng,
-{
-    ack_key: Arc<AckKey>,
-    ack_recipient: Recipient,
-    message_preparer: MessagePreparer<R>,
-    action_sender: ActionSender,
-    real_message_sender: BatchRealMessageSender,
+pub(super) struct RetransmissionRequestListener<R> {
+    action_sender: AckActionSender,
+    message_handler: MessageHandler<R>,
     request_receiver: RetransmissionRequestReceiver,
-    topology_access: TopologyAccessor,
+    reply_controller_sender: ReplyControllerSender,
 }
 
 impl<R> RetransmissionRequestListener<R>
 where
     R: CryptoRng + Rng,
 {
-    #[allow(clippy::too_many_arguments)]
     pub(super) fn new(
-        ack_key: Arc<AckKey>,
-        ack_recipient: Recipient,
-        message_preparer: MessagePreparer<R>,
-        action_sender: ActionSender,
-        real_message_sender: BatchRealMessageSender,
+        action_sender: AckActionSender,
+        message_handler: MessageHandler<R>,
         request_receiver: RetransmissionRequestReceiver,
-        topology_access: TopologyAccessor,
+        reply_controller_sender: ReplyControllerSender,
     ) -> Self {
         RetransmissionRequestListener {
-            ack_key,
-            ack_recipient,
-            message_preparer,
             action_sender,
-            real_message_sender,
+            message_handler,
             request_receiver,
-            topology_access,
+            reply_controller_sender,
         }
     }
 
-    async fn on_retransmission_request(&mut self, timed_out_ack: Weak<PendingAcknowledgement>) {
-        let timed_out_ack = match timed_out_ack.upgrade() {
+    async fn prepare_normal_retransmission_chunk(
+        &mut self,
+        packet_recipient: Recipient,
+        chunk_data: Fragment,
+    ) -> Result<PreparedFragment, PreparationError> {
+        debug!("retransmitting normal packet...");
+
+        self.message_handler
+            .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data)
+            .await
+    }
+
+    async fn on_retransmission_request(
+        &mut self,
+        weak_timed_out_ack: Weak<PendingAcknowledgement>,
+    ) {
+        let timed_out_ack = match weak_timed_out_ack.upgrade() {
             Some(timed_out_ack) => timed_out_ack,
             None => {
                 debug!("We received an ack JUST as we were about to retransmit [1]");
                 return;
             }
         };
-        let packet_recipient = &timed_out_ack.recipient;
-        let chunk_clone = timed_out_ack.message_chunk.clone();
-        let frag_id = chunk_clone.fragment_identifier();
 
-        let topology_permit = self.topology_access.get_read_permit().await;
-        let topology_ref = match topology_permit
-            .try_get_valid_topology_ref(&self.ack_recipient, Some(packet_recipient))
-        {
-            Some(topology_ref) => topology_ref,
-            None => {
-                warn!("Could not retransmit the packet - the network topology is invalid");
+        let maybe_prepared_fragment = match &timed_out_ack.destination {
+            PacketDestination::Anonymous {
+                recipient_tag,
+                extra_surb_request,
+            } => {
+                // if this is retransmission for reply, offload it to the dedicated task
+                // that deals with all the surbs
+                return self.reply_controller_sender.send_retransmission_data(
+                    *recipient_tag,
+                    weak_timed_out_ack,
+                    *extra_surb_request,
+                );
+            }
+            PacketDestination::KnownRecipient(recipient) => {
+                self.prepare_normal_retransmission_chunk(
+                    **recipient,
+                    timed_out_ack.message_chunk.clone(),
+                )
+                .await
+            }
+        };
+
+        let frag_id = timed_out_ack.message_chunk.fragment_identifier();
+
+        let prepared_fragment = match maybe_prepared_fragment {
+            Ok(prepared_fragment) => prepared_fragment,
+            Err(err) => {
+                warn!("Could not retransmit the packet - {err}");
                 // we NEED to start timer here otherwise we will have this guy permanently stuck in memory
                 self.action_sender
                     .unbounded_send(Action::new_start_timer(frag_id))
@@ -85,11 +104,6 @@ where
             }
         };
 
-        let prepared_fragment = self
-            .message_preparer
-            .prepare_chunk_for_sending(chunk_clone, topology_ref, &self.ack_key, packet_recipient)
-            .unwrap();
-
         // if we have the ONLY strong reference to the ack data, it means it was removed from the
         // pending acks
         if Arc::strong_count(&timed_out_ack) == 1 {
@@ -101,7 +115,6 @@ where
         // we no longer need the reference - let's drop it so that if somehow `UpdateTimer` action
         // reached the controller before this function terminated, the controller would not panic.
         drop(timed_out_ack);
-
         let new_delay = prepared_fragment.total_delay;
 
         // We know this update will be reflected by the `StartTimer` Action performed when this
@@ -116,16 +129,15 @@ where
             .unwrap();
 
         // send to `OutQueueControl` to eventually send to the mix network
-        self.real_message_sender
-            .send((
+        self.message_handler
+            .forward_messages(
                 vec![RealMessage::new(prepared_fragment.mix_packet, frag_id)],
                 TransmissionLane::Retransmission,
-            ))
+            )
             .await
-            .expect("BatchRealMessageReceiver has stopped receiving!");
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started RetransmissionRequestListener with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
@@ -145,14 +157,4 @@ where
         shutdown.recv_timeout().await;
         log::debug!("RetransmissionRequestListener: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started RetransmissionRequestListener without graceful shutdown support");
-
-        while let Some(timed_out_ack) = self.request_receiver.next().await {
-            self.on_retransmission_request(timed_out_ack).await;
-        }
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/sent_notification_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/sent_notification_listener.rs
index 958c696aa7..a931ce4962 100644
--- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/sent_notification_listener.rs
+++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/sent_notification_listener.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::action_controller::{Action, ActionSender};
+use super::action_controller::{AckActionSender, Action};
 use super::SentPacketNotificationReceiver;
 use futures::StreamExt;
 use log::*;
@@ -13,13 +13,13 @@ use nymsphinx::chunking::fragment::{FragmentIdentifier, COVER_FRAG_ID};
 /// accidentally fire retransmission way quicker than we should have.
 pub(super) struct SentNotificationListener {
     sent_notifier: SentPacketNotificationReceiver,
-    action_sender: ActionSender,
+    action_sender: AckActionSender,
 }
 
 impl SentNotificationListener {
     pub(super) fn new(
         sent_notifier: SentPacketNotificationReceiver,
-        action_sender: ActionSender,
+        action_sender: AckActionSender,
     ) -> Self {
         SentNotificationListener {
             sent_notifier,
@@ -31,18 +31,13 @@ impl SentNotificationListener {
         if frag_id == COVER_FRAG_ID {
             trace!("sent off a cover message - no need to start retransmission timer!");
             return;
-        } else if frag_id.is_reply() {
-            debug!("sent off a reply message - no need to start retransmission timer!");
-            // TODO: probably there will need to be some extra procedure here, like it would
-            // be nice to know that our reply actually reached the recipient (i.e. we got the ack)
-            return;
         }
         self.action_sender
             .unbounded_send(Action::new_start_timer(frag_id))
             .unwrap();
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started SentNotificationListener with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
@@ -56,7 +51,7 @@ impl SentNotificationListener {
                         break;
                     }
                 },
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("SentNotificationListener: Received shutdown");
                 }
             }
@@ -64,14 +59,4 @@ impl SentNotificationListener {
         assert!(shutdown.is_shutdown_poll());
         log::debug!("SentNotificationListener: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started SentNotificationListener without graceful shutdown support");
-
-        while let Some(frag_id) = self.sent_notifier.next().await {
-            self.on_sent_message(frag_id).await;
-        }
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/message_handler.rs b/clients/client-core/src/client/real_messages_control/message_handler.rs
new file mode 100644
index 0000000000..d6fcaab0c0
--- /dev/null
+++ b/clients/client-core/src/client/real_messages_control/message_handler.rs
@@ -0,0 +1,566 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
+use crate::client::real_messages_control::real_traffic_stream::{
+    BatchRealMessageSender, RealMessage,
+};
+use crate::client::real_messages_control::{AckActionSender, Action};
+use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
+use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit};
+use client_connections::TransmissionLane;
+use log::{debug, error, info, trace, warn};
+use nymsphinx::acknowledgements::AckKey;
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, RepliableMessage, ReplyMessage};
+use nymsphinx::anonymous_replies::{ReplySurb, SurbEncryptionKey};
+use nymsphinx::chunking::fragment::{Fragment, FragmentIdentifier};
+use nymsphinx::message::NymMessage;
+use nymsphinx::params::{PacketSize, DEFAULT_NUM_MIX_HOPS};
+use nymsphinx::preparer::{MessagePreparer, PreparedFragment};
+use nymsphinx::Delay;
+use rand::{CryptoRng, Rng};
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::Duration;
+use thiserror::Error;
+use topology::{NymTopology, NymTopologyError};
+
+// TODO: move that error elsewhere since it seems to be contaminating different files
+#[derive(Debug, Clone, Error)]
+pub enum PreparationError {
+    #[error(transparent)]
+    NymTopologyError(#[from] NymTopologyError),
+
+    #[error("The received message cannot be sent using a single reply surb. It ended up getting split into {fragments} fragments.")]
+    MessageTooLongForSingleSurb { fragments: usize },
+
+    #[error("Not enough reply SURBs to send the message. We have {available} available and require at least {required}.")]
+    NotEnoughSurbs { available: usize, required: usize },
+}
+
+impl PreparationError {
+    fn return_surbs(self, returned_surbs: Vec<ReplySurb>) -> SurbWrappedPreparationError {
+        SurbWrappedPreparationError {
+            source: self,
+            returned_surbs: Some(returned_surbs),
+        }
+    }
+}
+
+#[derive(Debug, Error)]
+#[error("Failed to prepare packets - {source}. {} reply surbs will be returned", .returned_surbs.as_ref().map(|s| s.len()).unwrap_or_default())]
+pub struct SurbWrappedPreparationError {
+    #[source]
+    source: PreparationError,
+
+    returned_surbs: Option<Vec<ReplySurb>>,
+}
+
+impl<T> From<T> for SurbWrappedPreparationError
+where
+    T: Into<PreparationError>,
+{
+    fn from(err: T) -> Self {
+        SurbWrappedPreparationError {
+            source: err.into(),
+            returned_surbs: None,
+        }
+    }
+}
+
+impl SurbWrappedPreparationError {
+    pub(crate) fn return_unused_surbs(
+        self,
+        surb_storage: &ReceivedReplySurbsMap,
+        target: &AnonymousSenderTag,
+    ) -> PreparationError {
+        if let Some(reply_surbs) = self.returned_surbs {
+            surb_storage.insert_surbs(target, reply_surbs)
+        }
+        self.source
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct Config {
+    /// Key used to decrypt contents of received SURBAcks
+    ack_key: Arc<AckKey>,
+
+    /// Address of this client which also represent an address to which all acknowledgements
+    /// and surb-based are going to be sent.
+    sender_address: Recipient,
+
+    /// Average delay a data packet is going to get delay at a single mixnode.
+    average_packet_delay: Duration,
+
+    /// Average delay an acknowledgement packet is going to get delay at a single mixnode.
+    average_ack_delay: Duration,
+
+    /// Number of mix hops each packet ('real' message, ack, reply) is expected to take.
+    /// Note that it does not include gateway hops.
+    num_mix_hops: u8,
+
+    /// Predefined packet size used for the encapsulated messages.
+    packet_size: PacketSize,
+}
+
+impl Config {
+    pub fn new(
+        ack_key: Arc<AckKey>,
+        sender_address: Recipient,
+        average_packet_delay: Duration,
+        average_ack_delay: Duration,
+    ) -> Self {
+        Config {
+            ack_key,
+            sender_address,
+            average_packet_delay,
+            average_ack_delay,
+            num_mix_hops: DEFAULT_NUM_MIX_HOPS,
+            packet_size: PacketSize::default(),
+        }
+    }
+
+    /// Allows setting non-default number of expected mix hops in the network.
+    #[allow(dead_code)]
+    pub fn with_mix_hops(mut self, hops: u8) -> Self {
+        self.num_mix_hops = hops;
+        self
+    }
+
+    /// Allows setting non-default size of the sphinx packets sent out.
+    pub fn with_custom_packet_size(mut self, packet_size: PacketSize) -> Self {
+        self.packet_size = packet_size;
+        self
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct MessageHandler<R> {
+    config: Config,
+    rng: R,
+    message_preparer: MessagePreparer<R>,
+    action_sender: AckActionSender,
+    real_message_sender: BatchRealMessageSender,
+    topology_access: TopologyAccessor,
+    reply_key_storage: SentReplyKeys,
+    tag_storage: UsedSenderTags,
+}
+
+impl<R> MessageHandler<R>
+where
+    R: CryptoRng + Rng,
+{
+    pub(crate) fn new(
+        config: Config,
+        rng: R,
+        action_sender: AckActionSender,
+        real_message_sender: BatchRealMessageSender,
+        topology_access: TopologyAccessor,
+        reply_key_storage: SentReplyKeys,
+        tag_storage: UsedSenderTags,
+    ) -> Self
+    where
+        R: Copy,
+    {
+        let message_preparer = MessagePreparer::new(
+            rng,
+            config.sender_address,
+            config.average_packet_delay,
+            config.average_ack_delay,
+        )
+        .with_custom_real_message_packet_size(config.packet_size)
+        .with_mix_hops(config.num_mix_hops);
+
+        MessageHandler {
+            config,
+            rng,
+            message_preparer,
+            action_sender,
+            real_message_sender,
+            topology_access,
+            reply_key_storage,
+            tag_storage,
+        }
+    }
+
+    fn get_or_create_sender_tag(&mut self, recipient: &Recipient) -> AnonymousSenderTag {
+        if let Some(existing) = self.tag_storage.try_get_existing(recipient) {
+            trace!("we already had sender tag for {recipient}");
+            existing
+        } else {
+            info!("creating new sender tag for {recipient}");
+            let new_tag = AnonymousSenderTag::new_random(&mut self.rng);
+            self.tag_storage.insert_new(recipient, new_tag);
+            info!("we'll be using {new_tag} for all anonymous messages sent to {recipient}");
+            new_tag
+        }
+    }
+
+    fn get_topology<'a>(
+        &self,
+        permit: &'a TopologyReadPermit<'a>,
+    ) -> Result<&'a NymTopology, PreparationError> {
+        match permit.try_get_valid_topology_ref(&self.config.sender_address, None) {
+            Ok(topology_ref) => Ok(topology_ref),
+            Err(err) => {
+                warn!("Could not process the packet - the network topology is invalid - {err}");
+                Err(err.into())
+            }
+        }
+    }
+
+    async fn generate_reply_surbs_with_keys(
+        &mut self,
+        amount: usize,
+    ) -> Result<(Vec<ReplySurb>, Vec<SurbEncryptionKey>), PreparationError> {
+        let topology_permit = self.topology_access.get_read_permit().await;
+        let topology = self.get_topology(&topology_permit)?;
+
+        let reply_surbs = self
+            .message_preparer
+            .generate_reply_surbs(amount, topology)?;
+
+        let reply_keys = reply_surbs
+            .iter()
+            .map(|s| *s.encryption_key())
+            .collect::<Vec<_>>();
+
+        Ok((reply_surbs, reply_keys))
+    }
+
+    pub(crate) async fn try_send_single_surb_message(
+        &mut self,
+        target: AnonymousSenderTag,
+        message: ReplyMessage,
+        reply_surb: ReplySurb,
+        is_extra_surb_request: bool,
+    ) -> Result<(), SurbWrappedPreparationError> {
+        let mut fragment = self
+            .message_preparer
+            .pad_and_split_message(NymMessage::new_reply(message));
+        if fragment.len() > 1 {
+            // well, it's not a single surb message
+            return Err(SurbWrappedPreparationError {
+                source: PreparationError::MessageTooLongForSingleSurb {
+                    fragments: fragment.len(),
+                },
+                returned_surbs: Some(vec![reply_surb]),
+            });
+        }
+
+        let chunk = fragment.pop().unwrap();
+        let chunk_clone = chunk.clone();
+        let prepared_fragment = self
+            .try_prepare_single_reply_chunk_for_sending(reply_surb, chunk_clone)
+            .await?;
+
+        let real_messages =
+            RealMessage::new(prepared_fragment.mix_packet, chunk.fragment_identifier());
+        let delay = prepared_fragment.total_delay;
+        let pending_ack =
+            PendingAcknowledgement::new_anonymous(chunk, delay, target, is_extra_surb_request);
+
+        let lane = if is_extra_surb_request {
+            TransmissionLane::ReplySurbRequest
+        } else {
+            TransmissionLane::General
+        };
+
+        self.forward_messages(vec![real_messages], lane).await;
+        self.insert_pending_acks(vec![pending_ack]);
+        Ok(())
+    }
+
+    pub(crate) async fn try_request_additional_reply_surbs(
+        &mut self,
+        from: AnonymousSenderTag,
+        reply_surb: ReplySurb,
+        amount: u32,
+    ) -> Result<(), SurbWrappedPreparationError> {
+        debug!("requesting {amount} reply SURBs from {from}");
+
+        let surbs_request =
+            ReplyMessage::new_surb_request_message(self.config.sender_address, amount);
+        self.try_send_single_surb_message(from, surbs_request, reply_surb, true)
+            .await
+    }
+
+    // // TODO: this will require additional argument to make it use different variant of `ReplyMessage`
+    pub(crate) fn split_reply_message(&mut self, message: Vec<u8>) -> Vec<Fragment> {
+        self.message_preparer
+            .pad_and_split_message(NymMessage::new_reply(ReplyMessage::new_data_message(
+                message,
+            )))
+    }
+
+    pub(crate) async fn send_retransmission_reply_chunks(
+        &mut self,
+        prepared_fragments: Vec<PreparedFragment>,
+        lane: TransmissionLane,
+    ) {
+        let mut real_messages = Vec::with_capacity(prepared_fragments.len());
+
+        for prepared in prepared_fragments {
+            self.update_ack_delay(prepared.fragment_identifier, prepared.total_delay);
+            real_messages.push(prepared.into())
+        }
+
+        self.forward_messages(real_messages, lane).await;
+    }
+
+    pub(crate) async fn try_send_reply_chunks_on_lane(
+        &mut self,
+        target: AnonymousSenderTag,
+        fragments: Vec<Fragment>,
+        reply_surbs: Vec<ReplySurb>,
+        lane: TransmissionLane,
+    ) -> Result<(), SurbWrappedPreparationError> {
+        // TODO: technically this is performing an unnecessary cloning, but in the grand scheme of things
+        // is it really that bad?
+        self.try_send_reply_chunks(
+            target,
+            fragments.into_iter().map(|f| (lane, f)).collect(),
+            reply_surbs,
+        )
+        .await
+    }
+
+    pub(crate) async fn try_send_reply_chunks(
+        &mut self,
+        target: AnonymousSenderTag,
+        fragments: Vec<(TransmissionLane, Fragment)>,
+        reply_surbs: Vec<ReplySurb>,
+    ) -> Result<(), SurbWrappedPreparationError> {
+        let prepared_fragments = self
+            .prepare_reply_chunks_for_sending(
+                fragments.iter().map(|(_, f)| f.clone()).collect(),
+                reply_surbs,
+            )
+            .await?;
+
+        let mut pending_acks = Vec::with_capacity(fragments.len());
+        let mut to_forward: HashMap<_, Vec<_>> = HashMap::new();
+
+        for (raw, prepared) in fragments.into_iter().zip(prepared_fragments.into_iter()) {
+            let lane = raw.0;
+            let fragment = raw.1;
+
+            let real_message = RealMessage::new(prepared.mix_packet, prepared.fragment_identifier);
+            let delay = prepared.total_delay;
+            let pending_ack = PendingAcknowledgement::new_anonymous(fragment, delay, target, false);
+
+            let entry = to_forward.entry(lane).or_default();
+            entry.push(real_message);
+            pending_acks.push(pending_ack);
+        }
+
+        for (lane, real_messages) in to_forward {
+            self.forward_messages(real_messages, lane).await;
+        }
+
+        self.insert_pending_acks(pending_acks);
+        Ok(())
+    }
+
+    pub(crate) async fn try_send_plain_message(
+        &mut self,
+        recipient: Recipient,
+        message: Vec<u8>,
+        lane: TransmissionLane,
+    ) -> Result<(), PreparationError> {
+        let message = NymMessage::new_plain(message);
+        self.try_split_and_send_non_reply_message(message, recipient, lane)
+            .await
+    }
+
+    pub(crate) async fn try_split_and_send_non_reply_message(
+        &mut self,
+        message: NymMessage,
+        recipient: Recipient,
+        lane: TransmissionLane,
+    ) -> Result<(), PreparationError> {
+        // TODO: I really dislike existence of this assertion, it implies code has to be re-organised
+        debug_assert!(!matches!(message, NymMessage::Reply(_)));
+
+        // TODO2: it's really annoying we have to get topology permit again here due to borrow-checker
+        let topology_permit = self.topology_access.get_read_permit().await;
+        let topology = self.get_topology(&topology_permit)?;
+
+        let fragments = self.message_preparer.pad_and_split_message(message);
+
+        let mut pending_acks = Vec::with_capacity(fragments.len());
+        let mut real_messages = Vec::with_capacity(fragments.len());
+        for fragment in fragments {
+            // we need to clone it because we need to keep it in memory in case we had to retransmit
+            // it. And then we'd need to recreate entire ACK again.
+            let chunk_clone = fragment.clone();
+            let prepared_fragment = self.message_preparer.prepare_chunk_for_sending(
+                chunk_clone,
+                topology,
+                &self.config.ack_key,
+                &recipient,
+            )?;
+
+            let real_message =
+                RealMessage::new(prepared_fragment.mix_packet, fragment.fragment_identifier());
+            let delay = prepared_fragment.total_delay;
+            let pending_ack = PendingAcknowledgement::new_known(fragment, delay, recipient);
+
+            real_messages.push(real_message);
+            pending_acks.push(pending_ack);
+        }
+
+        self.insert_pending_acks(pending_acks);
+        self.forward_messages(real_messages, lane).await;
+
+        Ok(())
+    }
+
+    pub(crate) async fn try_send_additional_reply_surbs(
+        &mut self,
+        recipient: Recipient,
+        amount: u32,
+    ) -> Result<(), PreparationError> {
+        let sender_tag = self.get_or_create_sender_tag(&recipient);
+        let (reply_surbs, reply_keys) =
+            self.generate_reply_surbs_with_keys(amount as usize).await?;
+
+        let message = NymMessage::new_repliable(RepliableMessage::new_additional_surbs(
+            sender_tag,
+            reply_surbs,
+        ));
+
+        self.try_split_and_send_non_reply_message(
+            message,
+            recipient,
+            TransmissionLane::AdditionalReplySurbs,
+        )
+        .await?;
+
+        log::trace!("storing {} reply keys", reply_keys.len());
+        self.reply_key_storage.insert_multiple(reply_keys);
+
+        Ok(())
+    }
+
+    pub(crate) async fn try_send_message_with_reply_surbs(
+        &mut self,
+        recipient: Recipient,
+        message: Vec<u8>,
+        num_reply_surbs: u32,
+        lane: TransmissionLane,
+    ) -> Result<(), SurbWrappedPreparationError> {
+        let sender_tag = self.get_or_create_sender_tag(&recipient);
+        let (reply_surbs, reply_keys) = self
+            .generate_reply_surbs_with_keys(num_reply_surbs as usize)
+            .await?;
+
+        let message =
+            NymMessage::new_repliable(RepliableMessage::new_data(message, sender_tag, reply_surbs));
+
+        self.try_split_and_send_non_reply_message(message, recipient, lane)
+            .await?;
+
+        log::trace!("storing {} reply keys", reply_keys.len());
+        self.reply_key_storage.insert_multiple(reply_keys);
+
+        Ok(())
+    }
+
+    pub(crate) async fn try_prepare_single_chunk_for_sending(
+        &mut self,
+        recipient: Recipient,
+        chunk: Fragment,
+    ) -> Result<PreparedFragment, PreparationError> {
+        let topology_permit = self.topology_access.get_read_permit().await;
+        let topology = self.get_topology(&topology_permit)?;
+
+        let prepared_fragment = self
+            .message_preparer
+            .prepare_chunk_for_sending(chunk, topology, &self.config.ack_key, &recipient)
+            .unwrap();
+
+        Ok(prepared_fragment)
+    }
+
+    pub(crate) async fn prepare_reply_chunks_for_sending(
+        &mut self,
+        fragments: Vec<Fragment>,
+        reply_surbs: Vec<ReplySurb>,
+    ) -> Result<Vec<PreparedFragment>, SurbWrappedPreparationError> {
+        debug_assert_ne!(
+            fragments.len(),
+            reply_surbs.len(),
+            "attempted to send {} fragments with {} reply surbs",
+            fragments.len(),
+            reply_surbs.len()
+        );
+
+        let topology_permit = self.topology_access.get_read_permit().await;
+        let topology = match self.get_topology(&topology_permit) {
+            Ok(topology) => topology,
+            Err(err) => return Err(err.return_surbs(reply_surbs)),
+        };
+
+        Ok(fragments
+            .into_iter()
+            .zip(reply_surbs.into_iter())
+            .map(|(fragment, reply_surb)| {
+                // unwrap here is fine as we know we have a valid topology
+                self.message_preparer
+                    .prepare_reply_chunk_for_sending(
+                        fragment,
+                        topology,
+                        &self.config.ack_key,
+                        reply_surb,
+                    )
+                    .unwrap()
+            })
+            .collect())
+    }
+
+    pub(crate) async fn try_prepare_single_reply_chunk_for_sending(
+        &mut self,
+        reply_surb: ReplySurb,
+        chunk: Fragment,
+    ) -> Result<PreparedFragment, SurbWrappedPreparationError> {
+        let topology_permit = self.topology_access.get_read_permit().await;
+        let topology = match self.get_topology(&topology_permit) {
+            Ok(topology) => topology,
+            Err(err) => return Err(err.return_surbs(vec![reply_surb])),
+        };
+
+        let prepared_fragment = self
+            .message_preparer
+            .prepare_reply_chunk_for_sending(chunk, topology, &self.config.ack_key, reply_surb)
+            .unwrap();
+
+        Ok(prepared_fragment)
+    }
+
+    pub(crate) fn update_ack_delay(&self, id: FragmentIdentifier, new_delay: Delay) {
+        self.action_sender
+            .unbounded_send(Action::UpdateDelay(id, new_delay))
+            .expect("action control task has died")
+    }
+
+    pub(crate) fn insert_pending_acks(&self, pending_acks: Vec<PendingAcknowledgement>) {
+        self.action_sender
+            .unbounded_send(Action::new_insert(pending_acks))
+            .expect("action control task has died")
+    }
+
+    // tells real message sender (with the poisson timer) to send this to the mix network
+    pub(crate) async fn forward_messages(
+        &self,
+        messages: Vec<RealMessage>,
+        transmission_lane: TransmissionLane,
+    ) {
+        self.real_message_sender
+            .send((messages, transmission_lane))
+            .await
+            .expect("real message receiver task (OutQueueControl) has died");
+    }
+}
diff --git a/clients/client-core/src/client/real_messages_control/mod.rs b/clients/client-core/src/client/real_messages_control/mod.rs
index e46c02e31e..df04365c9b 100644
--- a/clients/client-core/src/client/real_messages_control/mod.rs
+++ b/clients/client-core/src/client/real_messages_control/mod.rs
@@ -8,6 +8,11 @@
 use self::{
     acknowledgement_control::AcknowledgementController, real_traffic_stream::OutQueueControl,
 };
+use crate::client::real_messages_control::message_handler::MessageHandler;
+use crate::client::replies::reply_controller::{
+    ReplyController, ReplyControllerReceiver, ReplyControllerSender,
+};
+use crate::client::replies::reply_storage::CombinedReplyStorage;
 use crate::{
     client::{
         inbound_messages::InputMessageReceiver, mix_traffic::BatchMixMessageSender,
@@ -27,11 +32,13 @@ use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::sync::Arc;
 use std::time::Duration;
 
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorage;
+use crate::client::replies::reply_controller;
+use crate::config;
+pub(crate) use acknowledgement_control::{AckActionSender, Action};
 
-mod acknowledgement_control;
-mod real_traffic_stream;
+pub(crate) mod acknowledgement_control;
+pub(crate) mod message_handler;
+pub(crate) mod real_traffic_stream;
 
 // TODO: ack_key and self_recipient shouldn't really be part of this config
 pub struct Config {
@@ -62,31 +69,102 @@ pub struct Config {
 
     /// Predefined packet size used for the encapsulated messages.
     packet_size: PacketSize,
+
+    /// Defines the minimum number of reply surbs the client would request.
+    minimum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs the client would request.
+    maximum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs a remote party is allowed to request from this client at once.
+    maximum_allowed_reply_surb_request_size: u32,
+
+    /// Defines maximum amount of time the client is going to wait for reply surbs before explicitly asking
+    /// for more even though in theory they wouldn't need to.
+    maximum_reply_surb_waiting_period: Duration,
+
+    /// Defines maximum amount of time given reply surb is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    maximum_reply_surb_age: Duration,
+
+    /// Defines maximum amount of time given reply key is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    maximum_reply_key_age: Duration,
+}
+
+impl<'a> From<&'a Config> for acknowledgement_control::Config {
+    fn from(cfg: &'a Config) -> Self {
+        acknowledgement_control::Config::new(cfg.ack_wait_addition, cfg.ack_wait_multiplier)
+            .with_custom_packet_size(cfg.packet_size)
+    }
+}
+
+impl<'a> From<&'a Config> for real_traffic_stream::Config {
+    fn from(cfg: &'a Config) -> Self {
+        real_traffic_stream::Config::new(
+            Arc::clone(&cfg.ack_key),
+            cfg.self_recipient,
+            cfg.average_ack_delay_duration,
+            cfg.average_packet_delay_duration,
+            cfg.average_message_sending_delay,
+            cfg.disable_main_poisson_packet_distribution,
+        )
+        .with_custom_cover_packet_size(cfg.packet_size)
+    }
+}
+
+impl<'a> From<&'a Config> for reply_controller::Config {
+    fn from(cfg: &'a Config) -> Self {
+        reply_controller::Config::new(
+            cfg.minimum_reply_surb_request_size,
+            cfg.maximum_reply_surb_request_size,
+            cfg.maximum_allowed_reply_surb_request_size,
+            cfg.maximum_reply_surb_waiting_period,
+            cfg.maximum_reply_surb_age,
+            cfg.maximum_reply_key_age,
+        )
+    }
+}
+
+impl<'a> From<&'a Config> for message_handler::Config {
+    fn from(cfg: &'a Config) -> Self {
+        message_handler::Config::new(
+            Arc::clone(&cfg.ack_key),
+            cfg.self_recipient,
+            cfg.average_packet_delay_duration,
+            cfg.average_ack_delay_duration,
+        )
+        .with_custom_packet_size(cfg.packet_size)
+    }
 }
 
 impl Config {
-    // TODO: change the config into a builder
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
+        base_client_debug_config: &config::DebugConfig,
         ack_key: Arc<AckKey>,
-        ack_wait_multiplier: f64,
-        ack_wait_addition: Duration,
-        average_ack_delay_duration: Duration,
-        average_message_sending_delay: Duration,
-        average_packet_delay_duration: Duration,
-        disable_main_poisson_packet_distribution: bool,
         self_recipient: Recipient,
     ) -> Self {
         Config {
             ack_key,
-            ack_wait_addition,
-            ack_wait_multiplier,
             self_recipient,
-            average_message_sending_delay,
-            average_packet_delay_duration,
-            average_ack_delay_duration,
-            disable_main_poisson_packet_distribution,
             packet_size: Default::default(),
+            ack_wait_addition: base_client_debug_config.ack_wait_addition,
+            ack_wait_multiplier: base_client_debug_config.ack_wait_multiplier,
+            average_message_sending_delay: base_client_debug_config.message_sending_average_delay,
+            average_packet_delay_duration: base_client_debug_config.average_packet_delay,
+            average_ack_delay_duration: base_client_debug_config.average_ack_delay,
+            disable_main_poisson_packet_distribution: base_client_debug_config
+                .disable_main_poisson_packet_distribution,
+            minimum_reply_surb_request_size: base_client_debug_config
+                .minimum_reply_surb_request_size,
+            maximum_reply_surb_request_size: base_client_debug_config
+                .maximum_reply_surb_request_size,
+            maximum_allowed_reply_surb_request_size: base_client_debug_config
+                .maximum_allowed_reply_surb_request_size,
+            maximum_reply_surb_waiting_period: base_client_debug_config
+                .maximum_reply_surb_waiting_period,
+            maximum_reply_surb_age: base_client_debug_config.maximum_reply_surb_age,
+            maximum_reply_key_age: base_client_debug_config.maximum_reply_key_age,
         }
     }
 
@@ -95,75 +173,84 @@ impl Config {
     }
 }
 
-pub struct RealMessagesController<R>
+pub(crate) struct RealMessagesController<R>
 where
     R: CryptoRng + Rng,
 {
     out_queue_control: OutQueueControl<R>,
     ack_control: AcknowledgementController<R>,
+    reply_control: ReplyController<R>,
 }
 
 // obviously when we finally make shared rng that is on 'higher' level, this should become
 // generic `R`
 impl RealMessagesController<OsRng> {
     #[allow(clippy::too_many_arguments)]
-    pub fn new(
+    pub(crate) fn new(
         config: Config,
         ack_receiver: AcknowledgementReceiver,
         input_receiver: InputMessageReceiver,
         mix_sender: BatchMixMessageSender,
         topology_access: TopologyAccessor,
+        reply_storage: CombinedReplyStorage,
+        // so much refactoring needed, but this is temporary just to test things out
+        reply_controller_sender: ReplyControllerSender,
+        reply_controller_receiver: ReplyControllerReceiver,
         lane_queue_lengths: LaneQueueLengths,
         client_connection_rx: ConnectionCommandReceiver,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
     ) -> Self {
         let rng = OsRng;
 
+        // create channels for inter-task communication
         let (real_message_sender, real_message_receiver) = tokio::sync::mpsc::channel(1);
         let (sent_notifier_tx, sent_notifier_rx) = mpsc::unbounded();
-
+        let (ack_action_tx, ack_action_rx) = mpsc::unbounded();
         let ack_controller_connectors = AcknowledgementControllerConnectors::new(
-            real_message_sender,
             input_receiver,
             sent_notifier_rx,
             ack_receiver,
+            ack_action_tx.clone(),
+            ack_action_rx,
         );
 
-        let ack_control_config = acknowledgement_control::Config::new(
-            config.ack_wait_addition,
-            config.ack_wait_multiplier,
-            config.average_ack_delay_duration,
-            config.average_packet_delay_duration,
-        )
-        .with_custom_packet_size(config.packet_size);
+        // create all configs for the components
+        let ack_control_config = (&config).into();
+        let out_queue_config = (&config).into();
+        let reply_controller_config = (&config).into();
+        let message_handler_config = (&config).into();
+
+        // create the actual components
+        let message_handler = MessageHandler::new(
+            message_handler_config,
+            rng,
+            ack_action_tx,
+            real_message_sender,
+            topology_access.clone(),
+            reply_storage.key_storage(),
+            reply_storage.tags_storage(),
+        );
 
         let ack_control = AcknowledgementController::new(
             ack_control_config,
-            rng,
-            topology_access.clone(),
             Arc::clone(&config.ack_key),
-            config.self_recipient,
             ack_controller_connectors,
-            #[cfg(feature = "reply-surb")]
-            reply_key_storage,
+            message_handler.clone(),
+            reply_controller_sender,
         );
 
-        let out_queue_config = real_traffic_stream::Config::new(
-            config.average_ack_delay_duration,
-            config.average_packet_delay_duration,
-            config.average_message_sending_delay,
-            config.disable_main_poisson_packet_distribution,
-        )
-        .with_custom_cover_packet_size(config.packet_size);
+        let reply_control = ReplyController::new(
+            reply_controller_config,
+            message_handler,
+            reply_storage,
+            reply_controller_receiver,
+        );
 
         let out_queue_control = OutQueueControl::new(
             out_queue_config,
-            Arc::clone(&config.ack_key),
+            rng,
             sent_notifier_tx,
             mix_sender,
             real_message_receiver,
-            rng,
-            config.self_recipient,
             topology_access,
             lane_queue_lengths,
             client_connection_rx,
@@ -172,30 +259,26 @@ impl RealMessagesController<OsRng> {
         RealMessagesController {
             out_queue_control,
             ack_control,
+            reply_control,
         }
     }
 
-    pub fn start_with_shutdown(self, shutdown: task::ShutdownListener) {
+    pub fn start_with_shutdown(self, shutdown: task::TaskClient) {
         let mut out_queue_control = self.out_queue_control;
         let ack_control = self.ack_control;
+        let mut reply_control = self.reply_control;
 
         let shutdown_handle = shutdown.clone();
         spawn_future(async move {
             out_queue_control.run_with_shutdown(shutdown_handle).await;
             debug!("The out queue controller has finished execution!");
         });
+        let shutdown_handle = shutdown.clone();
+        spawn_future(async move {
+            reply_control.run_with_shutdown(shutdown_handle).await;
+            debug!("The reply controller has finished execution!");
+        });
+
         ack_control.start_with_shutdown(shutdown);
     }
-
-    #[cfg(target_arch = "wasm32")]
-    pub fn start(self) {
-        let mut out_queue_control = self.out_queue_control;
-        let ack_control = self.ack_control;
-
-        spawn_future(async move {
-            out_queue_control.run().await;
-            debug!("The out queue controller has finished execution!");
-        });
-        ack_control.start();
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs
index c6ec08c15e..2abbd4661e 100644
--- a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs
+++ b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs
@@ -1,9 +1,11 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use self::sending_delay_controller::SendingDelayController;
 use crate::client::mix_traffic::BatchMixMessageSender;
 use crate::client::real_messages_control::acknowledgement_control::SentPacketNotificationSender;
 use crate::client::topology_control::TopologyAccessor;
+use crate::client::transmission_buffer::TransmissionBuffer;
 use client_connections::{
     ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane,
 };
@@ -16,6 +18,7 @@ use nymsphinx::chunking::fragment::FragmentIdentifier;
 use nymsphinx::cover::generate_loop_cover_packet;
 use nymsphinx::forwarding::packet::MixPacket;
 use nymsphinx::params::PacketSize;
+use nymsphinx::preparer::PreparedFragment;
 use nymsphinx::utils::sample_poisson_duration;
 use rand::{CryptoRng, Rng};
 use std::pin::Pin;
@@ -28,25 +31,16 @@ use tokio::time;
 #[cfg(target_arch = "wasm32")]
 use wasm_timer;
 
-use self::{
-    sending_delay_controller::SendingDelayController, transmission_buffer::TransmissionBuffer,
-};
-
 mod sending_delay_controller;
-mod transmission_buffer;
-
-#[cfg(not(target_arch = "wasm32"))]
-fn get_time_now() -> time::Instant {
-    time::Instant::now()
-}
-
-#[cfg(target_arch = "wasm32")]
-fn get_time_now() -> wasm_timer::Instant {
-    wasm_timer::Instant::now()
-}
 
 /// Configurable parameters of the `OutQueueControl`
 pub(crate) struct Config {
+    /// Key used to encrypt and decrypt content of an ACK packet.
+    ack_key: Arc<AckKey>,
+
+    /// Represents full address of this client.
+    our_full_destination: Recipient,
+
     /// Average delay an acknowledgement packet is going to get delay at a single mixnode.
     average_ack_delay: Duration,
 
@@ -66,12 +60,16 @@ pub(crate) struct Config {
 
 impl Config {
     pub(crate) fn new(
+        ack_key: Arc<AckKey>,
+        our_full_destination: Recipient,
         average_ack_delay: Duration,
         average_packet_delay: Duration,
         average_message_sending_delay: Duration,
         disable_poisson_packet_distribution: bool,
     ) -> Self {
         Config {
+            ack_key,
+            our_full_destination,
             average_ack_delay,
             average_packet_delay,
             average_message_sending_delay,
@@ -93,9 +91,6 @@ where
     /// Configurable parameters of the `ActionController`
     config: Config,
 
-    /// Key used to encrypt and decrypt content of an ACK packet.
-    ack_key: Arc<AckKey>,
-
     /// Channel used for notifying of a real packet being sent out. Used to start up retransmission timer.
     sent_notifier: SentPacketNotificationSender,
 
@@ -119,9 +114,6 @@ where
     /// before being sent out into the network.
     real_receiver: BatchRealMessageReceiver,
 
-    /// Represents full address of this client.
-    our_full_destination: Recipient,
-
     /// Instance of a cryptographically secure random number generator.
     rng: R,
 
@@ -130,7 +122,7 @@ where
 
     /// Buffer containing all incoming real messages keyed by transmission lane, that we will send
     /// out to the mixnet.
-    transmission_buffer: TransmissionBuffer,
+    transmission_buffer: TransmissionBuffer<RealMessage>,
 
     /// Incoming channel for being notified of closed connections, so that we can close lanes
     /// corresponding to connections. To avoid sending traffic unnecessary
@@ -144,9 +136,23 @@ where
 pub(crate) struct RealMessage {
     mix_packet: MixPacket,
     fragment_id: FragmentIdentifier,
+    // TODO: add info about it being constructed with reply-surb
+}
+
+impl From<PreparedFragment> for RealMessage {
+    fn from(fragment: PreparedFragment) -> Self {
+        RealMessage {
+            mix_packet: fragment.mix_packet,
+            fragment_id: fragment.fragment_identifier,
+        }
+    }
 }
 
 impl RealMessage {
+    pub(crate) fn packet_size(&self) -> usize {
+        self.mix_packet.sphinx_packet().len()
+    }
+
     pub(crate) fn new(mix_packet: MixPacket, fragment_id: FragmentIdentifier) -> Self {
         RealMessage {
             mix_packet,
@@ -175,28 +181,24 @@ where
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         config: Config,
-        ack_key: Arc<AckKey>,
+        rng: R,
         sent_notifier: SentPacketNotificationSender,
         mix_tx: BatchMixMessageSender,
         real_receiver: BatchRealMessageReceiver,
-        rng: R,
-        our_full_destination: Recipient,
         topology_access: TopologyAccessor,
         lane_queue_lengths: LaneQueueLengths,
         client_connection_rx: ConnectionCommandReceiver,
     ) -> Self {
         OutQueueControl {
             config,
-            ack_key,
             sent_notifier,
             next_delay: None,
             sending_delay_controller: Default::default(),
             mix_tx,
             real_receiver,
-            our_full_destination,
             rng,
             topology_access,
-            transmission_buffer: Default::default(),
+            transmission_buffer: TransmissionBuffer::new(),
             client_connection_rx,
             lane_queue_lengths,
         }
@@ -220,24 +222,23 @@ where
                 // poisson delay, but is it really a problem?
                 let topology_permit = self.topology_access.get_read_permit().await;
                 // the ack is sent back to ourselves (and then ignored)
-                let topology_ref_option = topology_permit.try_get_valid_topology_ref(
-                    &self.our_full_destination,
-                    Some(&self.our_full_destination),
-                );
-                if topology_ref_option.is_none() {
-                    warn!(
-                        "No valid topology detected - won't send any loop cover message this time"
-                    );
-                    return;
-                }
-                let topology_ref = topology_ref_option.unwrap();
+                let topology_ref = match topology_permit.try_get_valid_topology_ref(
+                    &self.config.our_full_destination,
+                    Some(&self.config.our_full_destination),
+                ) {
+                    Ok(topology) => topology,
+                    Err(err) => {
+                        warn!("We're not going to send any loop cover message this time, as the current topology seem to be invalid - {err}");
+                        return;
+                    }
+                };
 
                 (
                     generate_loop_cover_packet(
                         &mut self.rng,
                         topology_ref,
-                        &self.ack_key,
-                        &self.our_full_destination,
+                        &self.config.ack_key,
+                        &self.config.our_full_destination,
                         self.config.average_ack_delay,
                         self.config.average_packet_delay,
                         self.config.cover_packet_size,
@@ -254,7 +255,7 @@ where
         };
 
         if let Err(err) = self.mix_tx.send(vec![next_message]).await {
-            log::error!("Failed to send: {}", err);
+            log::error!("Failed to send: {err}");
         }
 
         // notify ack controller about sending our message only after we actually managed to push it
@@ -318,7 +319,9 @@ where
 
     fn pop_next_message(&mut self) -> Option<RealMessage> {
         // Pop the next message from the transmission buffer
-        let (lane, real_next) = self.transmission_buffer.pop_next_message_at_random()?;
+        let (lane, real_next) = self
+            .transmission_buffer
+            .pop_next_message_at_random(&mut self.rng)?;
 
         // Update the published queue length
         let lane_length = self.transmission_buffer.lane_length(&lane);
@@ -459,7 +462,9 @@ where
     }
 
     #[cfg(not(target_arch = "wasm32"))]
-    fn log_status(&self) {
+    fn log_status(&self, shutdown: &mut task::TaskClient) {
+        use crate::error::ClientCoreStatusMessage;
+
         let packets = self.transmission_buffer.total_size();
         let backlog = self.transmission_buffer.total_size_in_bytes() as f64 / 1024.0;
         let lanes = self.transmission_buffer.num_lanes();
@@ -483,19 +488,26 @@ where
         } else {
             log::debug!("{status_str}");
         }
+
+        // Send status message to whoever is listening (possibly UI)
+        if mult == self.sending_delay_controller.max_multiplier() {
+            shutdown.send_status_msg(Box::new(ClientCoreStatusMessage::GatewayIsVerySlow));
+        } else if mult > self.sending_delay_controller.min_multiplier() {
+            shutdown.send_status_msg(Box::new(ClientCoreStatusMessage::GatewayIsSlow));
+        }
     }
 
     #[cfg(not(target_arch = "wasm32"))]
     fn log_status_infrequent(&self) {
         if self.sending_delay_controller.current_multiplier() > 1 {
             log::warn!(
-                "Unable to send packets fast enough - sending delay multiplier set to: {}",
+                "Unable to send packets at the default rate - rate reduced by setting the delay multiplier set to: {}",
                 self.sending_delay_controller.current_multiplier()
             );
         }
     }
 
-    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started OutQueueControl with graceful shutdown support");
 
         #[cfg(not(target_arch = "wasm32"))]
@@ -506,11 +518,11 @@ where
             while !shutdown.is_shutdown() {
                 tokio::select! {
                     biased;
-                    _ = shutdown.recv() => {
+                    _ = shutdown.recv_with_delay() => {
                         log::trace!("OutQueueControl: Received shutdown");
                     }
                     _ = status_timer.tick() => {
-                        self.log_status();
+                        self.log_status(&mut shutdown);
                     }
                     _ = infrequent_status_timer.tick() => {
                         self.log_status_infrequent();
@@ -547,16 +559,6 @@ where
         }
         log::debug!("OutQueueControl: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    pub(super) async fn run(&mut self) {
-        debug!("Started OutQueueControl without graceful shutdown support");
-
-        while let Some(next_message) = self.next().await {
-            self.on_message(next_message).await;
-        }
-    }
 }
 
 impl<R> Stream for OutQueueControl<R>
diff --git a/clients/client-core/src/client/real_messages_control/real_traffic_stream/sending_delay_controller.rs b/clients/client-core/src/client/real_messages_control/real_traffic_stream/sending_delay_controller.rs
index b22ffae7ff..b2d656f763 100644
--- a/clients/client-core/src/client/real_messages_control/real_traffic_stream/sending_delay_controller.rs
+++ b/clients/client-core/src/client/real_messages_control/real_traffic_stream/sending_delay_controller.rs
@@ -1,14 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::get_time_now;
+use crate::client::helpers::{get_time_now, Instant};
 use std::time::Duration;
 
-#[cfg(not(target_arch = "wasm32"))]
-use tokio::time;
-#[cfg(target_arch = "wasm32")]
-use wasm_timer;
-
 // The minimum time between increasing the average delay between packets. If we hit the ceiling in
 // the available buffer space we want to take somewhat swift action, but we still need to give a
 // short time to give the channel a chance reduce pressure.
@@ -39,19 +34,11 @@ pub(crate) struct SendingDelayController {
     lower_bound: u32,
 
     /// To make sure we don't change the multiplier to fast, we limit a change to some duration
-    #[cfg(not(target_arch = "wasm32"))]
-    time_when_changed: time::Instant,
-
-    #[cfg(target_arch = "wasm32")]
-    time_when_changed: wasm_timer::Instant,
+    time_when_changed: Instant,
 
     /// If we have a long enough time without any backpressure detected we try reducing the sending
     /// delay multiplier
-    #[cfg(not(target_arch = "wasm32"))]
-    time_when_backpressure_detected: time::Instant,
-
-    #[cfg(target_arch = "wasm32")]
-    time_when_backpressure_detected: wasm_timer::Instant,
+    time_when_backpressure_detected: Instant,
 }
 
 impl Default for SendingDelayController {
@@ -77,6 +64,16 @@ impl SendingDelayController {
         self.current_multiplier
     }
 
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn min_multiplier(&self) -> u32 {
+        self.lower_bound
+    }
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub(crate) fn max_multiplier(&self) -> u32 {
+        self.upper_bound
+    }
+
     pub(crate) fn increase_delay_multiplier(&mut self) {
         if self.current_multiplier < self.upper_bound {
             self.current_multiplier =
diff --git a/clients/client-core/src/client/received_buffer.rs b/clients/client-core/src/client/received_buffer.rs
index ed693993a2..afafec44ca 100644
--- a/clients/client-core/src/client/received_buffer.rs
+++ b/clients/client-core/src/client/received_buffer.rs
@@ -1,26 +1,26 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::client::replies::reply_controller::ReplyControllerSender;
+use crate::client::replies::reply_storage::SentReplyKeys;
 use crate::spawn_future;
 use crypto::asymmetric::encryption;
+use crypto::Digest;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 use futures::StreamExt;
 use gateway_client::MixnetMessageReceiver;
 use log::*;
+use nymsphinx::anonymous_replies::requests::{
+    RepliableMessage, RepliableMessageContent, ReplyMessage, ReplyMessageContent,
+};
+use nymsphinx::anonymous_replies::{encryption_key::EncryptionKeyDigest, SurbEncryptionKey};
+use nymsphinx::message::{NymMessage, PlainMessage};
+use nymsphinx::params::ReplySurbKeyDigestAlgorithm;
 use nymsphinx::receiver::{MessageReceiver, MessageRecoveryError, ReconstructedMessage};
 use std::collections::HashSet;
 use std::sync::Arc;
 
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorage;
-#[cfg(feature = "reply-surb")]
-use crypto::{symmetric::stream_cipher, Digest};
-#[cfg(feature = "reply-surb")]
-use nymsphinx::anonymous_replies::{encryption_key::EncryptionKeyDigest, SurbEncryptionKey};
-#[cfg(feature = "reply-surb")]
-use nymsphinx::params::{ReplySurbEncryptionAlgorithm, ReplySurbKeyDigestAlgorithm};
-
 // Buffer Requests to say "hey, send any reconstructed messages to this channel"
 // or to say "hey, I'm going offline, don't send anything more to me. Just buffer them instead"
 pub type ReceivedBufferRequestSender = mpsc::UnboundedSender<ReceivedBufferMessage>;
@@ -46,26 +46,15 @@ struct ReceivedMessagesBufferInner {
 }
 
 impl ReceivedMessagesBufferInner {
-    fn process_received_fragment(&mut self, raw_fragment: Vec<u8>) -> Option<ReconstructedMessage> {
-        let fragment_data = match self
-            .message_receiver
-            .recover_plaintext(self.local_encryption_keypair.private_key(), raw_fragment)
-        {
-            Err(e) => {
-                warn!("failed to recover fragment data: {:?}. The whole underlying message might be corrupted and unrecoverable!", e);
-                return None;
-            }
-            Ok(frag_data) => frag_data,
-        };
-
-        if nymsphinx::cover::is_cover(&fragment_data) {
+    fn recover_from_fragment(&mut self, fragment_data: &[u8]) -> Option<NymMessage> {
+        if nymsphinx::cover::is_cover(fragment_data) {
             trace!("The message was a loop cover message! Skipping it");
             return None;
         }
 
-        let fragment = match self.message_receiver.recover_fragment(&fragment_data) {
-            Err(e) => {
-                warn!("failed to recover fragment from raw data: {:?}. The whole underlying message might be corrupted and unrecoverable!", e);
+        let fragment = match self.message_receiver.recover_fragment(fragment_data) {
+            Err(err) => {
+                warn!("failed to recover fragment from raw data: {err}. The whole underlying message might be corrupted and unrecoverable!");
                 return None;
             }
             Ok(frag) => frag,
@@ -79,9 +68,10 @@ impl ReceivedMessagesBufferInner {
         // if we returned an error the underlying message is malformed in some way
         match self.message_receiver.insert_new_fragment(fragment) {
             Err(err) => match err {
-                MessageRecoveryError::MalformedReconstructedMessage(message_sets) => {
+                MessageRecoveryError::MalformedReconstructedMessage { source, used_sets } => {
+                    error!("message reconstruction failed - {source}. Attempting to re-use the message sets...");
                     // TODO: should we really insert reconstructed sets? could this be abused for some attack?
-                    for set_id in message_sets {
+                    for set_id in used_sets {
                         if !self.recently_reconstructed.insert(set_id) {
                             // or perhaps we should even panic at this point?
                             error!("Reconstructed another message containing already used set id!")
@@ -107,6 +97,34 @@ impl ReceivedMessagesBufferInner {
             },
         }
     }
+
+    fn process_received_reply(
+        &mut self,
+        reply_ciphertext: &mut [u8],
+        reply_key: SurbEncryptionKey,
+    ) -> Option<NymMessage> {
+        // note: this performs decryption IN PLACE without extra allocation
+        self.message_receiver
+            .recover_plaintext_from_reply(reply_ciphertext, reply_key);
+        let fragment_data = reply_ciphertext;
+
+        self.recover_from_fragment(fragment_data)
+    }
+
+    fn process_received_regular_packet(&mut self, mut raw_fragment: Vec<u8>) -> Option<NymMessage> {
+        let fragment_data = match self.message_receiver.recover_plaintext_from_regular_packet(
+            self.local_encryption_keypair.private_key(),
+            &mut raw_fragment,
+        ) {
+            Err(err) => {
+                warn!("failed to recover fragment data: {err}. The whole underlying message might be corrupted and unrecoverable!");
+                return None;
+            }
+            Ok(frag_data) => frag_data,
+        };
+
+        self.recover_from_fragment(fragment_data)
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -114,17 +132,15 @@ impl ReceivedMessagesBufferInner {
 // You should always use .clone() to create additional instances
 struct ReceivedMessagesBuffer {
     inner: Arc<Mutex<ReceivedMessagesBufferInner>>,
-
-    /// Storage containing keys to all [`ReplySURB`]s ever sent out that we did not receive back.
-    // There's no need to put it behind a Mutex since it's already properly concurrent
-    #[cfg(feature = "reply-surb")]
-    reply_key_storage: ReplyKeyStorage,
+    reply_key_storage: SentReplyKeys,
+    reply_controller_sender: ReplyControllerSender,
 }
 
 impl ReceivedMessagesBuffer {
     fn new(
         local_encryption_keypair: Arc<encryption::KeyPair>,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        reply_key_storage: SentReplyKeys,
+        reply_controller_sender: ReplyControllerSender,
     ) -> Self {
         ReceivedMessagesBuffer {
             inner: Arc::new(Mutex::new(ReceivedMessagesBufferInner {
@@ -134,8 +150,8 @@ impl ReceivedMessagesBuffer {
                 message_sender: None,
                 recently_reconstructed: HashSet::new(),
             })),
-            #[cfg(feature = "reply-surb")]
             reply_key_storage,
+            reply_controller_sender,
         }
     }
 
@@ -177,34 +193,139 @@ impl ReceivedMessagesBuffer {
         guard.message_sender = Some(sender);
     }
 
-    async fn add_reconstructed_messages(&mut self, msgs: Vec<ReconstructedMessage>) {
-        debug!("Adding {:?} new messages to the buffer!", msgs.len());
-        trace!("Adding new messages to the buffer! {:?}", msgs);
-        self.inner.lock().await.messages.extend(msgs)
+    fn handle_reconstructed_plain_messages(
+        &mut self,
+        msgs: Vec<PlainMessage>,
+    ) -> Vec<ReconstructedMessage> {
+        msgs.into_iter().map(Into::into).collect()
     }
 
-    #[cfg(feature = "reply-surb")]
-    fn process_received_reply(
-        reply_ciphertext: &[u8],
-        reply_key: SurbEncryptionKey,
-    ) -> Option<ReconstructedMessage> {
-        let zero_iv = stream_cipher::zero_iv::<ReplySurbEncryptionAlgorithm>();
+    fn handle_reconstructed_repliable_messages(
+        &mut self,
+        msgs: Vec<RepliableMessage>,
+    ) -> Vec<ReconstructedMessage> {
+        let mut reconstructed = Vec::new();
+        for msg in msgs {
+            let (reply_surbs, from_surb_request) = match msg.content {
+                RepliableMessageContent::Data {
+                    message,
+                    reply_surbs,
+                } => {
+                    trace!(
+                        "received message that also contained additional {} reply surbs from {:?}!",
+                        reply_surbs.len(),
+                        msg.sender_tag
+                    );
 
-        let mut reply_msg = stream_cipher::decrypt::<ReplySurbEncryptionAlgorithm>(
-            reply_key.inner(),
-            &zero_iv,
-            reply_ciphertext,
-        );
-        if let Err(err) = MessageReceiver::remove_padding(&mut reply_msg) {
-            warn!("Received reply had malformed padding! - {:?}", err);
-            None
-        } else {
-            // TODO: perhaps having to say it doesn't have a surb an indication the type should be changed?
-            Some(ReconstructedMessage {
-                message: reply_msg,
-                reply_surb: None,
-            })
+                    reconstructed.push(ReconstructedMessage::new(message, msg.sender_tag));
+
+                    (reply_surbs, false)
+                }
+                RepliableMessageContent::AdditionalSurbs { reply_surbs } => {
+                    trace!(
+                        "received additional {} reply surbs from {:?}!",
+                        reply_surbs.len(),
+                        msg.sender_tag
+                    );
+                    (reply_surbs, true)
+                }
+                RepliableMessageContent::Heartbeat {
+                    additional_reply_surbs,
+                } => {
+                    error!("received a repliable heartbeat message - we don't know how to handle it yet (and we won't know until future PRs)");
+                    (additional_reply_surbs, false)
+                }
+            };
+
+            self.reply_controller_sender.send_additional_surbs(
+                msg.sender_tag,
+                reply_surbs,
+                from_surb_request,
+            )
         }
+        reconstructed
+    }
+
+    fn handle_reconstructed_reply_messages(
+        &mut self,
+        msgs: Vec<ReplyMessage>,
+    ) -> Vec<ReconstructedMessage> {
+        let mut reconstructed = Vec::new();
+        for msg in msgs {
+            match msg.content {
+                ReplyMessageContent::Data { message } => reconstructed.push(message.into()),
+                ReplyMessageContent::SurbRequest { recipient, amount } => {
+                    debug!("received request for {amount} additional reply SURBs from {recipient}");
+                    self.reply_controller_sender
+                        .send_additional_surbs_request(*recipient, amount);
+                }
+            }
+        }
+        reconstructed
+    }
+
+    async fn handle_reconstructed_messages(&mut self, msgs: Vec<NymMessage>) {
+        if msgs.is_empty() {
+            return;
+        }
+
+        let mut plain_messages = Vec::new();
+        let mut repliable_messages = Vec::new();
+        let mut reply_messages = Vec::new();
+
+        for msg in msgs {
+            match msg {
+                NymMessage::Plain(plain) => plain_messages.push(plain),
+                NymMessage::Repliable(repliable) => repliable_messages.push(repliable),
+                NymMessage::Reply(reply) => reply_messages.push(reply),
+            }
+        }
+
+        let mut reconstructed_messages = self.handle_reconstructed_plain_messages(plain_messages);
+        reconstructed_messages
+            .append(&mut self.handle_reconstructed_repliable_messages(repliable_messages));
+        reconstructed_messages
+            .append(&mut self.handle_reconstructed_reply_messages(reply_messages));
+
+        let mut inner_guard = self.inner.lock().await;
+        debug!(
+            "Adding {:?} new messages to the buffer!",
+            reconstructed_messages.len()
+        );
+
+        if let Some(sender) = &inner_guard.message_sender {
+            trace!("Sending reconstructed messages to announced sender");
+            if let Err(err) = sender.unbounded_send(reconstructed_messages) {
+                warn!("The reconstructed message receiver went offline without explicit notification (relevant error: - {err})");
+                inner_guard.message_sender = None;
+                inner_guard.messages.extend(err.into_inner());
+            }
+        } else {
+            trace!("No sender available - buffering reconstructed messages");
+            inner_guard.messages.extend(reconstructed_messages)
+        }
+    }
+
+    // this function doesn't really belong here...
+    fn get_reply_key<'a>(
+        &self,
+        raw_message: &'a mut [u8],
+    ) -> Option<(SurbEncryptionKey, &'a mut [u8])> {
+        let reply_surb_digest_size = ReplySurbKeyDigestAlgorithm::output_size();
+        if raw_message.len() < reply_surb_digest_size {
+            return None;
+        }
+
+        let possible_key_digest =
+            EncryptionKeyDigest::clone_from_slice(&raw_message[..reply_surb_digest_size]);
+        self.reply_key_storage
+            .try_pop(possible_key_digest)
+            .map(|reply_encryption_key| {
+                (
+                    *reply_encryption_key,
+                    &mut raw_message[reply_surb_digest_size..],
+                )
+            })
     }
 
     async fn handle_new_received(&mut self, msgs: Vec<Vec<u8>>) {
@@ -217,69 +338,27 @@ impl ReceivedMessagesBuffer {
         let mut inner_guard = self.inner.lock().await;
 
         // first check if this is a reply or a chunked message
-        // TODO: verify with @AP if this way of doing it is safe or whether it could
-        // cause some attacks due to, I don't know, stupid edge case collisions?
-        // Update: this DOES introduce a possible leakage: https://github.com/nymtech/nym/issues/296
-        for msg in msgs {
-            // TODO:
-            // 1. make it nicer
-            // 2. make it not feature-locked
-
-            #[cfg(feature = "reply-surb")]
-            {
-                let reply_surb_digest_size = ReplySurbKeyDigestAlgorithm::output_size();
-
-                let possible_key_digest =
-                    EncryptionKeyDigest::clone_from_slice(&msg[..reply_surb_digest_size]);
-
-                // check first `HasherOutputSize` bytes if they correspond to known encryption key
-                // if yes - this is a reply message
-
-                // TODO: this might be a bottleneck - since the keys are stored on disk we, presumably,
-                // are doing a disk operation every single received fragment
-                if let Some(reply_encryption_key) = self
-                    .reply_key_storage
-                    .get_and_remove_encryption_key(possible_key_digest)
-                    .expect("storage operation failed!")
-                {
-                    if let Some(completed_message) = Self::process_received_reply(
-                        &msg[reply_surb_digest_size..],
-                        reply_encryption_key,
-                    ) {
-                        completed_messages.push(completed_message)
-                    }
+        // note: there's a possible information leakage associated with this check https://github.com/nymtech/nym/issues/296
+        for mut msg in msgs {
+            // check first `HasherOutputSize` bytes if they correspond to known encryption key
+            // if yes - this is a reply message
+            let completed_message =
+                if let Some((reply_key, reply_message)) = self.get_reply_key(&mut msg) {
+                    inner_guard.process_received_reply(reply_message, reply_key)
                 } else {
-                    // otherwise - it's a 'normal' message
-                    if let Some(completed_message) = inner_guard.process_received_fragment(msg) {
-                        completed_messages.push(completed_message)
-                    }
-                }
-            }
+                    inner_guard.process_received_regular_packet(msg)
+                };
 
-            #[cfg(not(feature = "reply-surb"))]
-            if let Some(completed_message) = inner_guard.process_received_fragment(msg) {
-                completed_messages.push(completed_message)
+            if let Some(completed) = completed_message {
+                info!("received {completed}");
+                completed_messages.push(completed)
             }
         }
 
+        drop(inner_guard);
+
         if !completed_messages.is_empty() {
-            if let Some(sender) = &inner_guard.message_sender {
-                trace!("Sending reconstructed messages to announced sender");
-                if let Err(err) = sender.unbounded_send(completed_messages) {
-                    warn!("The reconstructed message receiver went offline without explicit notification (relevant error: - {:?})", err);
-                    // make sure to drop the lock to not deadlock
-                    // (it is required by `add_reconstructed_messages`)
-                    inner_guard.message_sender = None;
-                    drop(inner_guard);
-                    self.add_reconstructed_messages(err.into_inner()).await;
-                }
-            } else {
-                // make sure to drop the lock to not deadlock
-                // (it is required by `add_reconstructed_messages`)
-                drop(inner_guard);
-                trace!("No sender available - buffering reconstructed messages");
-                self.add_reconstructed_messages(completed_messages).await;
-            }
+            self.handle_reconstructed_messages(completed_messages).await
         }
     }
 }
@@ -320,21 +399,20 @@ impl RequestReceiver {
         }
     }
 
-    async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started RequestReceiver with graceful shutdown support");
         while !shutdown.is_shutdown() {
             tokio::select! {
                 biased;
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("RequestReceiver: Received shutdown");
                 }
                 request = self.query_receiver.next() => {
-                    match request {
-                        Some(message) => self.handle_message(message).await,
-                        None => {
-                            log::trace!("RequestReceiver: Stopping since channel closed");
-                            break;
-                        },
+                    if let Some(message) = request {
+                        self.handle_message(message).await
+                    } else {
+                        log::trace!("RequestReceiver: Stopping since channel closed");
+                        break;
                     }
                 },
             }
@@ -342,16 +420,6 @@ impl RequestReceiver {
         shutdown.recv_timeout().await;
         log::debug!("RequestReceiver: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    async fn run(&mut self) {
-        debug!("Started RequestReceiver without graceful shutdown support");
-
-        while let Some(message) = self.query_receiver.next().await {
-            self.handle_message(message).await
-        }
-    }
 }
 
 struct FragmentedMessageReceiver {
@@ -370,20 +438,19 @@ impl FragmentedMessageReceiver {
         }
     }
 
-    async fn run_with_shutdown(&mut self, mut shutdown: task::ShutdownListener) {
+    async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
         debug!("Started FragmentedMessageReceiver with graceful shutdown support");
         while !shutdown.is_shutdown() {
             tokio::select! {
-                new_messages = self.mixnet_packet_receiver.next() => match new_messages {
-                    Some(new_messages) => {
+                new_messages = self.mixnet_packet_receiver.next() => {
+                    if let Some(new_messages) = new_messages {
                         self.received_buffer.handle_new_received(new_messages).await;
-                    }
-                    None => {
+                    } else {
                         log::trace!("FragmentedMessageReceiver: Stopping since channel closed");
                         break;
                     }
                 },
-                _ = shutdown.recv() => {
+                _ = shutdown.recv_with_delay() => {
                     log::trace!("FragmentedMessageReceiver: Received shutdown");
                 }
             }
@@ -391,34 +458,25 @@ impl FragmentedMessageReceiver {
         shutdown.recv_timeout().await;
         log::debug!("FragmentedMessageReceiver: Exiting");
     }
-
-    // todo: think whether this is still required
-    #[allow(dead_code)]
-    async fn run(&mut self) {
-        debug!("Started FragmentedMessageReceiver without graceful shutdown support");
-
-        while let Some(new_messages) = self.mixnet_packet_receiver.next().await {
-            self.received_buffer.handle_new_received(new_messages).await;
-        }
-    }
 }
 
-pub struct ReceivedMessagesBufferController {
+pub(crate) struct ReceivedMessagesBufferController {
     fragmented_message_receiver: FragmentedMessageReceiver,
     request_receiver: RequestReceiver,
 }
 
 impl ReceivedMessagesBufferController {
-    pub fn new(
+    pub(crate) fn new(
         local_encryption_keypair: Arc<encryption::KeyPair>,
         query_receiver: ReceivedBufferRequestReceiver,
         mixnet_packet_receiver: MixnetMessageReceiver,
-        #[cfg(feature = "reply-surb")] reply_key_storage: ReplyKeyStorage,
+        reply_key_storage: SentReplyKeys,
+        reply_controller_sender: ReplyControllerSender,
     ) -> Self {
         let received_buffer = ReceivedMessagesBuffer::new(
             local_encryption_keypair,
-            #[cfg(feature = "reply-surb")]
             reply_key_storage,
+            reply_controller_sender,
         );
 
         ReceivedMessagesBufferController {
@@ -430,7 +488,7 @@ impl ReceivedMessagesBufferController {
         }
     }
 
-    pub fn start_with_shutdown(self, shutdown: task::ShutdownListener) {
+    pub fn start_with_shutdown(self, shutdown: task::TaskClient) {
         let mut fragmented_message_receiver = self.fragmented_message_receiver;
         let mut request_receiver = self.request_receiver;
 
@@ -444,16 +502,4 @@ impl ReceivedMessagesBufferController {
             request_receiver.run_with_shutdown(shutdown).await;
         });
     }
-
-    #[cfg(target_arch = "wasm32")]
-    pub fn start(self) {
-        let mut fragmented_message_receiver = self.fragmented_message_receiver;
-        let mut request_receiver = self.request_receiver;
-        spawn_future(async move {
-            fragmented_message_receiver.run().await;
-        });
-        spawn_future(async move {
-            request_receiver.run().await;
-        });
-    }
 }
diff --git a/clients/client-core/src/client/replies/mod.rs b/clients/client-core/src/client/replies/mod.rs
new file mode 100644
index 0000000000..61b5f19abf
--- /dev/null
+++ b/clients/client-core/src/client/replies/mod.rs
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod reply_controller;
+pub mod reply_storage;
diff --git a/clients/client-core/src/client/replies/reply_controller/mod.rs b/clients/client-core/src/client/replies/reply_controller/mod.rs
new file mode 100644
index 0000000000..e8b8d980a9
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_controller/mod.rs
@@ -0,0 +1,865 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
+use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError};
+use crate::client::replies::reply_storage::CombinedReplyStorage;
+use client_connections::{ConnectionId, TransmissionLane};
+use futures::channel::oneshot;
+use futures::StreamExt;
+use log::{debug, error, info, trace, warn};
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
+use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::chunking::fragment::{Fragment, FragmentIdentifier};
+use rand::{CryptoRng, Rng};
+use std::cmp::{max, min};
+use std::collections::btree_map::Entry;
+use std::collections::{BTreeMap, HashMap};
+use std::sync::{Arc, Weak};
+use std::time::Duration;
+use time::OffsetDateTime;
+
+use crate::client::helpers::new_interval_stream;
+use crate::client::transmission_buffer::TransmissionBuffer;
+pub(crate) use requests::{ReplyControllerMessage, ReplyControllerReceiver, ReplyControllerSender};
+
+pub mod requests;
+
+pub struct Config {
+    min_surb_request_size: u32,
+    max_surb_request_size: u32,
+    maximum_allowed_reply_surb_request_size: u32,
+    max_surb_waiting_period: Duration,
+    max_reply_surb_age: Duration,
+    max_reply_key_age: Duration,
+}
+
+impl Config {
+    pub(crate) fn new(
+        min_surb_request_size: u32,
+        max_surb_request_size: u32,
+        maximum_allowed_reply_surb_request_size: u32,
+        max_surb_waiting_period: Duration,
+        max_reply_surb_age: Duration,
+        max_reply_key_age: Duration,
+    ) -> Self {
+        Self {
+            min_surb_request_size,
+            max_surb_request_size,
+            maximum_allowed_reply_surb_request_size,
+            max_surb_waiting_period,
+            max_reply_surb_age,
+            max_reply_key_age,
+        }
+    }
+}
+
+// the purpose of this task:
+// - buffers split messages from input message listener if there were insufficient surbs to send them
+// - upon getting extra surbs, resends them
+// - so I guess it will handle all 'RepliableMessage' and requests from 'ReplyMessage'
+// - replies to "give additional surbs" requests
+// - will reply to future heartbeats
+
+// TODO: this should be split into ingress and egress controllers
+// because currently its trying to perform two distinct jobs
+pub struct ReplyController<R> {
+    config: Config,
+
+    // TODO: incorporate that field at some point
+    // and use binomial distribution to determine the expected required number
+    // of surbs required to send the message through
+    // expected_reliability: f32,
+    request_receiver: ReplyControllerReceiver,
+    pending_replies: HashMap<AnonymousSenderTag, TransmissionBuffer<Fragment>>,
+
+    /// Retransmission packets that have already timed out and are waiting for additional reply SURBs
+    /// so that they could be sent back to the network. Once we receive more SURBs, we should send them ASAP.
+    // TODO: when purging stale entries, we must take extra care to also purge all pending ACK data!!
+    pending_retransmissions:
+        HashMap<AnonymousSenderTag, BTreeMap<FragmentIdentifier, Weak<PendingAcknowledgement>>>,
+
+    message_handler: MessageHandler<R>,
+    full_reply_storage: CombinedReplyStorage,
+}
+
+impl<R> ReplyController<R>
+where
+    R: CryptoRng + Rng,
+{
+    pub(crate) fn new(
+        config: Config,
+        message_handler: MessageHandler<R>,
+        full_reply_storage: CombinedReplyStorage,
+        request_receiver: ReplyControllerReceiver,
+    ) -> Self {
+        ReplyController {
+            config,
+            request_receiver,
+            pending_replies: HashMap::new(),
+            pending_retransmissions: HashMap::new(),
+            message_handler,
+            full_reply_storage,
+        }
+    }
+
+    fn insert_pending_replies<I: IntoIterator<Item = Fragment>>(
+        &mut self,
+        recipient: &AnonymousSenderTag,
+        fragments: I,
+        lane: TransmissionLane,
+    ) {
+        self.pending_replies
+            .entry(*recipient)
+            .or_insert_with(TransmissionBuffer::new)
+            .store(&lane, fragments)
+    }
+
+    fn re_insert_pending_replies(
+        &mut self,
+        recipient: &AnonymousSenderTag,
+        fragments: Vec<(TransmissionLane, Fragment)>,
+    ) {
+        // the buffer should ALWAYS exist at this point, if it doesn't, it's a bug...
+        self.pending_replies
+            .entry(*recipient)
+            .or_insert_with(TransmissionBuffer::new)
+            .store_multiple(fragments)
+    }
+
+    fn re_insert_pending_retransmission(
+        &mut self,
+        recipient: &AnonymousSenderTag,
+        data: Vec<Arc<PendingAcknowledgement>>,
+    ) {
+        // the underlying entry MUST exist as we've just got data from there
+        let map_entry = self
+            .pending_retransmissions
+            .get_mut(recipient)
+            .expect("our pending retransmission entry is somehow gone!");
+
+        for pending in data {
+            // if it's 0, we don't need to do anything - we just got that ack!
+            if Arc::strong_count(&pending) > 1 {
+                let id = pending.inner_fragment_identifier();
+                let downgraded = Arc::downgrade(&pending);
+                map_entry.insert(id, downgraded);
+            }
+        }
+    }
+
+    fn should_request_more_surbs(&self, target: &AnonymousSenderTag) -> bool {
+        trace!("checking if we should request more surbs from {:?}", target);
+
+        let pending_queue_size = self
+            .pending_replies
+            .get(target)
+            .map(|pending_queue| pending_queue.total_size())
+            .unwrap_or_default();
+
+        let retransmission_queue = self
+            .pending_retransmissions
+            .get(target)
+            .map(|pending_queue| pending_queue.len())
+            .unwrap_or_default();
+
+        let total_queue = pending_queue_size + retransmission_queue;
+
+        // simple as that - there's absolutely nothing to retransmit
+        if total_queue == 0 {
+            return false;
+        }
+
+        let available_surbs = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .available_surbs(target);
+        let pending_surbs = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .pending_reception(target) as usize;
+        let min_surbs_threshold = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .min_surb_threshold();
+        let max_surbs_threshold = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .max_surb_threshold();
+
+        debug!("total queue size: {total_queue} = pending data {pending_queue_size} + pending retransmission {retransmission_queue}, available surbs: {available_surbs} pending surbs: {pending_surbs} threshold range: {min_surbs_threshold}..{max_surbs_threshold}");
+
+        (pending_surbs + available_surbs) < max_surbs_threshold
+            && (pending_surbs + available_surbs) < (total_queue + min_surbs_threshold)
+    }
+
+    async fn handle_send_reply(
+        &mut self,
+        recipient_tag: AnonymousSenderTag,
+        data: Vec<u8>,
+        lane: TransmissionLane,
+    ) {
+        if !self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .contains_surbs_for(&recipient_tag)
+        {
+            warn!("received reply request for {:?} but we don't have any surbs stored for that recipient!", recipient_tag);
+            return;
+        }
+
+        trace!("handling reply to {:?}", recipient_tag);
+        let mut fragments = self.message_handler.split_reply_message(data);
+        let total_size = fragments.len();
+        trace!("This reply requires {:?} SURBs", total_size);
+
+        let available_surbs = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .available_surbs(&recipient_tag);
+        let min_surbs_threshold = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .min_surb_threshold();
+
+        let max_to_send = if available_surbs > min_surbs_threshold {
+            min(fragments.len(), available_surbs - min_surbs_threshold)
+        } else {
+            0
+        };
+
+        if max_to_send > 0 {
+            let (surbs, _surbs_left) = self
+                .full_reply_storage
+                .surbs_storage_ref()
+                .get_reply_surbs(&recipient_tag, max_to_send);
+
+            if let Some(reply_surbs) = surbs {
+                let to_send = fragments.drain(..max_to_send).collect::<Vec<_>>();
+                if let Err(err) = self
+                    .message_handler
+                    .try_send_reply_chunks_on_lane(
+                        recipient_tag,
+                        to_send.clone(),
+                        reply_surbs,
+                        lane,
+                    )
+                    .await
+                {
+                    let err = err.return_unused_surbs(
+                        self.full_reply_storage.surbs_storage_ref(),
+                        &recipient_tag,
+                    );
+                    warn!("failed to send reply to {recipient_tag}: {err}");
+                    self.insert_pending_replies(&recipient_tag, to_send, lane);
+                }
+            }
+        }
+
+        // if there's leftover data we didn't send because we didn't have enough (or any) surbs - buffer it
+        if !fragments.is_empty() {
+            self.insert_pending_replies(&recipient_tag, fragments, lane);
+        }
+
+        if self.should_request_more_surbs(&recipient_tag) {
+            self.request_reply_surbs_for_queue_clearing(recipient_tag)
+                .await;
+        }
+    }
+
+    async fn request_additional_reply_surbs(
+        &mut self,
+        target: AnonymousSenderTag,
+        amount: u32,
+    ) -> Result<(), PreparationError> {
+        let reply_surb = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .get_reply_surb_ignoring_threshold(&target)
+            .and_then(|(reply_surb, _)| reply_surb)
+            .ok_or(PreparationError::NotEnoughSurbs {
+                available: 0,
+                required: 1,
+            })?;
+
+        if let Err(err) = self
+            .message_handler
+            .try_request_additional_reply_surbs(target, reply_surb, amount)
+            .await
+        {
+            let err = err.return_unused_surbs(self.full_reply_storage.surbs_storage_ref(), &target);
+            warn!(
+                "failed to request additional surbs from {:?} - {err}",
+                target
+            );
+            return Err(err);
+        } else {
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .increment_pending_reception(&target, amount);
+        }
+
+        Ok(())
+    }
+
+    async fn try_clear_pending_retransmission(&mut self, target: AnonymousSenderTag) {
+        trace!("trying to clear pending retransmission queue");
+        let available_surbs = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .available_surbs(&target);
+        let min_surbs_threshold = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .min_surb_threshold();
+
+        let max_to_clear = if available_surbs > min_surbs_threshold {
+            available_surbs - min_surbs_threshold
+        } else {
+            trace!("we don't have enough surbs for retransmission queue clearing...");
+            return;
+        };
+        trace!("we can clear up to {max_to_clear} entries");
+
+        let Some(pending) = self.pending_retransmissions.get_mut(&target) else {
+            trace!("there are no pending retransmissions for {target}!");
+            return;
+        };
+
+        let mut to_take = Vec::new();
+
+        while to_take.len() < max_to_clear {
+            if let Some((_, data)) = pending.pop_first() {
+                // no need to do anything if we failed to upgrade the reference,
+                // it means we got the ack while the data was waiting in the queue
+                if let Some(upgraded) = data.upgrade() {
+                    to_take.push(upgraded)
+                }
+            } else {
+                // our map is empty!
+                break;
+            }
+        }
+
+        if to_take.is_empty() {
+            // no need to do anything
+            return;
+        }
+
+        let (surbs_for_reply, _) = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .get_reply_surbs(&target, to_take.len());
+
+        let Some(surbs_for_reply) = surbs_for_reply else {
+            error!("somehow different task has stolen our reply surbs! - this should have been impossible");
+            self.re_insert_pending_retransmission(&target, to_take);
+            return;
+        };
+
+        let to_send_vec = to_take.iter().map(|ack| ack.fragment_data()).collect();
+
+        let prepared_fragments = match self
+            .message_handler
+            .prepare_reply_chunks_for_sending(to_send_vec, surbs_for_reply)
+            .await
+        {
+            Ok(prepared) => prepared,
+            Err(err) => {
+                let err =
+                    err.return_unused_surbs(self.full_reply_storage.surbs_storage_ref(), &target);
+                self.re_insert_pending_retransmission(&target, to_take);
+
+                warn!(
+                    "failed to clear pending retransmission queue for {:?} - {err}",
+                    target
+                );
+                return;
+            }
+        };
+
+        // we can't fail at this point, so drop all references to acks so that timer updates wouldn't blow up
+        drop(to_take);
+
+        self.message_handler
+            .send_retransmission_reply_chunks(prepared_fragments, TransmissionLane::Retransmission)
+            .await;
+    }
+
+    fn pop_at_most_pending_replies(
+        &mut self,
+        from: &AnonymousSenderTag,
+        amount: usize,
+    ) -> Option<Vec<(TransmissionLane, Fragment)>> {
+        // if possible, pop all pending replies, if not, pop only entries for which we'd have a reply surb
+        let total = self.pending_replies.get(from)?.total_size();
+        trace!("pending queue has {total} elements");
+        if total == 0 {
+            return None;
+        }
+        self.pending_replies
+            .get_mut(from)?
+            .pop_at_most_n_next_messages_at_random(amount)
+    }
+
+    async fn try_clear_pending_queue(&mut self, target: AnonymousSenderTag) {
+        trace!("trying to clear pending queue");
+        let available_surbs = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .available_surbs(&target);
+        let min_surbs_threshold = self
+            .full_reply_storage
+            .surbs_storage_ref()
+            .min_surb_threshold();
+
+        let max_to_clear = if available_surbs > min_surbs_threshold {
+            available_surbs - min_surbs_threshold
+        } else {
+            trace!("we don't have enough surbs for queue clearing...");
+            return;
+        };
+        trace!("we can clear up to {max_to_clear} entries");
+
+        // we're guaranteed to not get more entries than we have reply surbs for
+        if let Some(to_send) = self.pop_at_most_pending_replies(&target, max_to_clear) {
+            let to_send_clone = to_send.clone();
+
+            if to_send_clone.is_empty() {
+                panic!(
+                    "please let the devs know if you ever see this message (reply_controller.rs)"
+                );
+            }
+
+            let (surbs_for_reply, _) = self
+                .full_reply_storage
+                .surbs_storage_ref()
+                .get_reply_surbs(&target, to_send_clone.len());
+
+            let Some(surbs_for_reply) = surbs_for_reply else {
+                error!("somehow different task has stolen our reply surbs! - this should have been impossible");
+                self.re_insert_pending_replies(&target, to_send);
+                return;
+            };
+
+            if let Err(err) = self
+                .message_handler
+                .try_send_reply_chunks(target, to_send_clone, surbs_for_reply)
+                .await
+            {
+                let err =
+                    err.return_unused_surbs(self.full_reply_storage.surbs_storage_ref(), &target);
+                self.re_insert_pending_replies(&target, to_send);
+                warn!("failed to clear pending queue for {:?} - {err}", target);
+            }
+        } else {
+            trace!("the pending queue is empty");
+        }
+    }
+
+    async fn handle_received_surbs(
+        &mut self,
+        from: AnonymousSenderTag,
+        reply_surbs: Vec<ReplySurb>,
+        from_surb_request: bool,
+    ) {
+        trace!("handling received surbs");
+
+        // clear the requesting flag since we should have been asking for surbs
+        self.full_reply_storage
+            .surbs_storage_ref()
+            .reset_surbs_last_received_at(&from);
+        if from_surb_request {
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .decrement_pending_reception(&from, reply_surbs.len() as u32);
+        }
+
+        // store received surbs
+        self.full_reply_storage
+            .surbs_storage_ref()
+            .insert_surbs(&from, reply_surbs);
+
+        // use as many as we can for clearing pending retransmission queue
+        self.try_clear_pending_retransmission(from).await;
+
+        // use as many as we can for clearing pending 'normal' queue
+        self.try_clear_pending_queue(from).await;
+
+        // if we have to, request more
+        if self.should_request_more_surbs(&from) {
+            self.request_reply_surbs_for_queue_clearing(from).await;
+        }
+    }
+
+    async fn handle_surb_request(&mut self, recipient: Recipient, mut amount: u32) {
+        // 1. check whether we sent any surbs in the past to this recipient, otherwise
+        // they have no business in asking for more
+        if !self
+            .full_reply_storage
+            .tags_storage_ref()
+            .exists(&recipient)
+        {
+            warn!("{recipient} asked us for reply SURBs even though we never sent them any anonymous messages before!");
+            return;
+        }
+
+        // 2. check whether the requested amount is within sane range
+        if amount > self.config.maximum_allowed_reply_surb_request_size {
+            warn!("The requested reply surb amount is larger than our maximum allowed ({amount} > {}). Lowering it to a more sane value...", self.config.maximum_allowed_reply_surb_request_size);
+            amount = self.config.maximum_allowed_reply_surb_request_size;
+        }
+
+        // 3. construct and send the surbs away
+        // (send them in smaller batches to make the experience a bit smoother
+        let mut remaining = amount;
+        while remaining > 0 {
+            let to_send = min(remaining, 100);
+            if let Err(err) = self
+                .message_handler
+                .try_send_additional_reply_surbs(recipient, to_send)
+                .await
+            {
+                warn!("failed to send additional surbs to {recipient} - {err}");
+            } else {
+                trace!("sent {to_send} reply SURBs to {recipient}");
+            }
+
+            remaining -= to_send;
+        }
+    }
+
+    fn buffer_pending_ack(
+        &mut self,
+        recipient: AnonymousSenderTag,
+        ack_ref: Arc<PendingAcknowledgement>,
+        weak_ack_ref: Weak<PendingAcknowledgement>,
+    ) {
+        let frag_id = ack_ref.inner_fragment_identifier();
+        if let Some(existing) = self.pending_retransmissions.get_mut(&recipient) {
+            if let Entry::Vacant(e) = existing.entry(frag_id) {
+                e.insert(weak_ack_ref);
+            } else {
+                warn!("we're already trying to retransmit {frag_id}. We must be really behind in surbs!");
+            }
+        } else {
+            let mut inner = BTreeMap::new();
+            inner.insert(frag_id, weak_ack_ref);
+            self.pending_retransmissions.insert(recipient, inner);
+        }
+    }
+
+    async fn handle_reply_retransmission(
+        &mut self,
+        recipient_tag: AnonymousSenderTag,
+        timed_out_ack: Weak<PendingAcknowledgement>,
+        extra_surbs_request: bool,
+    ) {
+        // seems we got the ack in the end
+        let ack_ref = match timed_out_ack.upgrade() {
+            Some(ack) => ack,
+            None => {
+                debug!("we received the ack for one of the reply packets as we were putting it in the retransmission queue");
+                return;
+            }
+        };
+
+        // if this is retransmission for obtaining additional reply surbs,
+        // we can dip below the storage threshold
+        let (maybe_reply_surb, _) = if extra_surbs_request {
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .get_reply_surb_ignoring_threshold(&recipient_tag)
+        } else {
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .get_reply_surb(&recipient_tag)
+        }
+        .expect("attempted to retransmit a packet to an unknown recipient - we shouldn't have sent the original packet in the first place!");
+
+        if let Some(reply_surb) = maybe_reply_surb {
+            match self
+                .message_handler
+                .try_prepare_single_reply_chunk_for_sending(reply_surb, ack_ref.fragment_data())
+                .await
+            {
+                Ok(prepared) => {
+                    // drop the ack ref so that controller would not panic on `UpdateTimer` if that task
+                    // got to handle the action before this function terminated (which is very much
+                    // possible if `forward_messages` takes a while)
+                    drop(ack_ref);
+
+                    self.message_handler
+                        .update_ack_delay(prepared.fragment_identifier, prepared.total_delay);
+                    self.message_handler
+                        .forward_messages(vec![prepared.into()], TransmissionLane::Retransmission)
+                        .await;
+                }
+                Err(err) => {
+                    let err = err.return_unused_surbs(
+                        self.full_reply_storage.surbs_storage_ref(),
+                        &recipient_tag,
+                    );
+                    warn!("failed to prepare message for retransmission - {err}");
+                    // we buffer that packet and to try another day
+                    self.buffer_pending_ack(recipient_tag, ack_ref, timed_out_ack);
+
+                    if self.should_request_more_surbs(&recipient_tag) {
+                        self.request_reply_surbs_for_queue_clearing(recipient_tag)
+                            .await;
+                    }
+                }
+            };
+        } else {
+            self.buffer_pending_ack(recipient_tag, ack_ref, timed_out_ack);
+
+            if self.should_request_more_surbs(&recipient_tag) {
+                self.request_reply_surbs_for_queue_clearing(recipient_tag)
+                    .await;
+            }
+        }
+    }
+
+    // to be honest this doesn't make a lot of sense in the context of `connection_id`,
+    // it should really be asked per tag
+    fn handle_lane_queue_length(
+        &self,
+        connection_id: ConnectionId,
+        response_channel: oneshot::Sender<usize>,
+    ) {
+        // TODO: if we ever have duplicate ids for different senders, it means our rng is super weak
+        // thus I don't think we have to worry about it?
+        let lane = TransmissionLane::ConnectionId(connection_id);
+        for buf in self.pending_replies.values() {
+            if let Some(length) = buf.lane_length(&lane) {
+                if response_channel.send(length).is_err() {
+                    error!("the requester for lane queue length has dropped the response channel!")
+                }
+                return;
+            }
+        }
+        // make sure that if we didn't find that lane, we reply with 0
+        if response_channel.send(0).is_err() {
+            error!("the requester for lane queue length has dropped the response channel!")
+        }
+    }
+
+    async fn handle_request(&mut self, request: ReplyControllerMessage) {
+        match request {
+            ReplyControllerMessage::RetransmitReply {
+                recipient,
+                timed_out_ack,
+                extra_surb_request,
+            } => {
+                self.handle_reply_retransmission(recipient, timed_out_ack, extra_surb_request)
+                    .await
+            }
+            ReplyControllerMessage::SendReply {
+                recipient,
+                message,
+                lane,
+            } => self.handle_send_reply(recipient, message, lane).await,
+            ReplyControllerMessage::AdditionalSurbs {
+                sender_tag,
+                reply_surbs,
+                from_surb_request,
+            } => {
+                self.handle_received_surbs(sender_tag, reply_surbs, from_surb_request)
+                    .await
+            }
+            ReplyControllerMessage::LaneQueueLength {
+                connection_id,
+                response_channel,
+            } => self.handle_lane_queue_length(connection_id, response_channel),
+            ReplyControllerMessage::AdditionalSurbsRequest { recipient, amount } => {
+                self.handle_surb_request(*recipient, amount).await
+            }
+        }
+    }
+
+    // TODO: modify this method to more accurately determine the amount of surbs it needs to request
+    // it should take into consideration the average latency, sending rate and queue size.
+    // it should request as many surbs as it takes to saturate its sending rate before next batch arrives
+    async fn request_reply_surbs_for_queue_clearing(&mut self, target: AnonymousSenderTag) {
+        trace!("requesting surbs for queues clearing");
+
+        let pending_queue_size = self
+            .pending_replies
+            .get(&target)
+            .map(|pending_queue| pending_queue.total_size())
+            .unwrap_or_default();
+
+        let retransmission_queue = self
+            .pending_retransmissions
+            .get(&target)
+            .map(|pending_queue| pending_queue.len())
+            .unwrap_or_default();
+
+        let total_queue = (pending_queue_size + retransmission_queue) as u32;
+
+        if total_queue == 0 {
+            trace!("the pending queues for {:?} are already empty", target);
+            return;
+        }
+
+        let request_size = min(
+            self.config.max_surb_request_size,
+            max(total_queue, self.config.min_surb_request_size),
+        );
+
+        if let Err(err) = self
+            .request_additional_reply_surbs(target, request_size)
+            .await
+        {
+            warn!("failed to request additional surbs... - {err}")
+        }
+    }
+
+    async fn inspect_stale_entries(&mut self) {
+        let mut to_request = Vec::new();
+        let mut to_remove = Vec::new();
+
+        let now = OffsetDateTime::now_utc();
+        for (pending_reply_target, vals) in &self.pending_replies {
+            if vals.is_empty() {
+                continue;
+            }
+
+            let Some(last_received) = self.full_reply_storage.surbs_storage_ref().surbs_last_received_at(pending_reply_target) else {
+                error!("we have {} pending replies for {pending_reply_target}, but we somehow never received any reply surbs from them!", vals.total_size());
+                to_remove.push(*pending_reply_target);
+                continue;
+            };
+
+            // this should never ever happen (famous last words, eh?), but in case it DOES happen eventually
+            // purge that malformed data
+            let Ok(last_received_time) = OffsetDateTime::from_unix_timestamp(last_received) else {
+                error!("somehow our stored timestamp ({last_received}) for surbs from {pending_reply_target} is corrupted!. Going to remove all the associated entries");
+                to_remove.push(*pending_reply_target);
+                continue;
+            };
+
+            let diff = now - last_received_time;
+
+            if diff > self.config.max_surb_waiting_period {
+                warn!("We haven't received any surbs in {:?} from {pending_reply_target}. Going to explicitly ask for more", diff);
+                to_request.push(*pending_reply_target);
+            }
+        }
+
+        for pending_reply_target in to_request {
+            self.request_reply_surbs_for_queue_clearing(pending_reply_target)
+                .await;
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .reset_pending_reception(&pending_reply_target)
+        }
+        for to_remove in to_remove {
+            self.pending_replies.remove(&to_remove);
+        }
+    }
+
+    async fn invalidate_old_data(&self) {
+        let now = OffsetDateTime::now_utc();
+
+        let mut to_remove_surbs = Vec::new();
+        let mut to_remove_keys = Vec::new();
+        for map_ref in self.full_reply_storage.surbs_storage_ref().as_raw_iter() {
+            let (sender, received) = map_ref.pair();
+            // TODO: handle the following edge case:
+            // there's a malicious client sending us exactly one reply surb just before we should have invalidated
+            // the data thus making us keep everything in memory
+            // possible solution: keep timestamp PER reply surb (but that seems like an overkill)
+            // but I doubt this is ever going to be a problem...
+            // ...
+            // However, if you're reading this message, it probably became a legit problem,
+            // so I guess add timestamp per surb then? chop-chop.
+
+            let last_received = received.surbs_last_received_at();
+            // this should never ever happen (famous last words, eh?), but in case it DOES happen eventually
+            // purge that malformed data
+            let Ok(last_received_time) = OffsetDateTime::from_unix_timestamp(last_received) else {
+                error!("somehow our stored timestamp ({last_received}) for surbs from {sender} is corrupted!. Going to remove all the associated entries");
+                to_remove_surbs.push(*sender);
+                continue;
+            };
+            let diff = now - last_received_time;
+
+            if diff > self.config.max_reply_surb_age {
+                info!("it's been {diff:?} since we last received any reply surb from {sender}. Going to remove all stored entries...");
+
+                to_remove_surbs.push(*sender);
+            }
+        }
+
+        for map_ref in self.full_reply_storage.key_storage_ref().as_raw_iter() {
+            let (digest, reply_key) = map_ref.pair();
+
+            // this should never ever happen (famous last words, eh?), but in case it DOES happen eventually
+            // purge that malformed data
+            let Ok(sent_at) = OffsetDateTime::from_unix_timestamp(reply_key.sent_at_timestamp) else {
+                error!("somehow our stored timestamp ({}) for one of our reply key is corrupted!. Going to remove all the entry", reply_key.sent_at_timestamp);
+                to_remove_keys.push(*digest);
+                continue;
+            };
+
+            let diff = now - sent_at;
+
+            if diff > self.config.max_reply_key_age {
+                debug!("it's been {diff:?} since we created this reply key. it's probably never going to get used, so we're going to purge it...");
+                to_remove_keys.push(*digest);
+            }
+        }
+
+        for to_remove in to_remove_surbs {
+            self.full_reply_storage
+                .surbs_storage_ref()
+                .remove(&to_remove);
+        }
+
+        for to_remove in to_remove_keys {
+            self.full_reply_storage.key_storage().remove(to_remove)
+        }
+    }
+
+    // #[cfg(not(target_arch = "wasm32"))]
+    // async fn log_status(&self) {
+    //     todo!()
+    // }
+
+    pub(crate) async fn run_with_shutdown(&mut self, mut shutdown: task::TaskClient) {
+        debug!("Started ReplyController with graceful shutdown support");
+
+        let polling_rate = Duration::from_secs(5);
+        let mut stale_inspection = new_interval_stream(polling_rate);
+
+        // this is in the order of hours/days so we don't have to poll it that often
+        let polling_rate = Duration::from_secs(self.config.max_reply_surb_age.as_secs() / 10);
+        let mut invalidation_inspection = new_interval_stream(polling_rate);
+
+        while !shutdown.is_shutdown() {
+            tokio::select! {
+                biased;
+                _ = shutdown.recv_with_delay() => {
+                    log::trace!("ReplyController: Received shutdown");
+                },
+                req = self.request_receiver.next() => match req {
+                    Some(req) => self.handle_request(req).await,
+                    None => {
+                        log::trace!("ReplyController: Stopping since channel closed");
+                        break;
+                    }
+                },
+                _ = stale_inspection.next() => {
+                    self.inspect_stale_entries().await
+                },
+                _ = invalidation_inspection.next() => {
+                    self.invalidate_old_data().await
+                }
+            }
+        }
+        assert!(shutdown.is_shutdown_poll());
+        log::debug!("ReplyController: Exiting");
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_controller/requests.rs b/clients/client-core/src/client/replies/reply_controller/requests.rs
new file mode 100644
index 0000000000..1f47f2ca07
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_controller/requests.rs
@@ -0,0 +1,136 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement;
+use client_connections::{ConnectionId, TransmissionLane};
+use futures::channel::{mpsc, oneshot};
+use log::error;
+use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
+use nymsphinx::anonymous_replies::ReplySurb;
+use std::sync::Weak;
+
+pub(crate) fn new_control_channels() -> (ReplyControllerSender, ReplyControllerReceiver) {
+    let (tx, rx) = mpsc::unbounded();
+    (tx.into(), rx)
+}
+
+#[derive(Debug, Clone)]
+pub struct ReplyControllerSender(mpsc::UnboundedSender<ReplyControllerMessage>);
+
+impl From<mpsc::UnboundedSender<ReplyControllerMessage>> for ReplyControllerSender {
+    fn from(inner: mpsc::UnboundedSender<ReplyControllerMessage>) -> Self {
+        ReplyControllerSender(inner)
+    }
+}
+
+impl ReplyControllerSender {
+    pub(crate) fn send_retransmission_data(
+        &self,
+        recipient: AnonymousSenderTag,
+        timed_out_ack: Weak<PendingAcknowledgement>,
+        extra_surb_request: bool,
+    ) {
+        self.0
+            .unbounded_send(ReplyControllerMessage::RetransmitReply {
+                recipient,
+                timed_out_ack,
+                extra_surb_request,
+            })
+            .expect("ReplyControllerReceiver has died!")
+    }
+
+    pub(crate) fn send_reply(
+        &self,
+        recipient: AnonymousSenderTag,
+        message: Vec<u8>,
+        lane: TransmissionLane,
+    ) {
+        self.0
+            .unbounded_send(ReplyControllerMessage::SendReply {
+                recipient,
+                message,
+                lane,
+            })
+            .expect("ReplyControllerReceiver has died!")
+    }
+
+    pub(crate) fn send_additional_surbs(
+        &self,
+        sender_tag: AnonymousSenderTag,
+        reply_surbs: Vec<ReplySurb>,
+        from_surb_request: bool,
+    ) {
+        self.0
+            .unbounded_send(ReplyControllerMessage::AdditionalSurbs {
+                sender_tag,
+                reply_surbs,
+                from_surb_request,
+            })
+            .expect("ReplyControllerReceiver has died!")
+    }
+
+    pub(crate) fn send_additional_surbs_request(&self, recipient: Recipient, amount: u32) {
+        self.0
+            .unbounded_send(ReplyControllerMessage::AdditionalSurbsRequest {
+                recipient: Box::new(recipient),
+                amount,
+            })
+            .expect("ReplyControllerReceiver has died!")
+    }
+
+    pub async fn get_lane_queue_length(&self, connection_id: ConnectionId) -> usize {
+        let (response_tx, response_rx) = oneshot::channel();
+        self.0
+            .unbounded_send(ReplyControllerMessage::LaneQueueLength {
+                connection_id,
+                response_channel: response_tx,
+            })
+            .expect("ReplyControllerReceiver has died!");
+
+        match response_rx.await {
+            Ok(length) => length,
+            Err(_) => {
+                error!("The reply controller has dropped our response channel!");
+                // TODO: should we panic here instead? this message implies something weird and unrecoverable has happened
+                0
+            }
+        }
+    }
+}
+
+pub(crate) type ReplyControllerReceiver = mpsc::UnboundedReceiver<ReplyControllerMessage>;
+
+#[derive(Debug)]
+pub(crate) enum ReplyControllerMessage {
+    RetransmitReply {
+        recipient: AnonymousSenderTag,
+        timed_out_ack: Weak<PendingAcknowledgement>,
+        extra_surb_request: bool,
+    },
+
+    SendReply {
+        recipient: AnonymousSenderTag,
+        message: Vec<u8>,
+        lane: TransmissionLane,
+    },
+
+    AdditionalSurbs {
+        sender_tag: AnonymousSenderTag,
+        reply_surbs: Vec<ReplySurb>,
+        from_surb_request: bool,
+    },
+
+    // this one doesn't belong here either...
+    LaneQueueLength {
+        connection_id: ConnectionId,
+        response_channel: oneshot::Sender<usize>,
+    },
+
+    // Should this also be handled in here? it's technically a completely different side of the pipe
+    // let's see how it works when combined, might split it before creating PR
+    AdditionalSurbsRequest {
+        recipient: Box<Recipient>,
+        amount: u32,
+    },
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/browser_backend.rs b/clients/client-core/src/client/replies/reply_storage/backend/browser_backend.rs
new file mode 100644
index 0000000000..9711ea759f
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/browser_backend.rs
@@ -0,0 +1,43 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::backend::Empty;
+use crate::client::replies::reply_storage::{CombinedReplyStorage, ReplyStorageBackend};
+use async_trait::async_trait;
+
+// well, right now we don't have the browser storage : (
+// so we keep everything in memory
+pub struct Backend {
+    empty: Empty,
+}
+
+impl Backend {
+    pub fn new(min_surb_threshold: usize, max_surb_threshold: usize) -> Self {
+        Backend {
+            empty: Empty {
+                min_surb_threshold,
+                max_surb_threshold,
+            },
+        }
+    }
+}
+
+#[async_trait]
+impl ReplyStorageBackend for Backend {
+    type StorageError = <Empty as ReplyStorageBackend>::StorageError;
+
+    async fn flush_surb_storage(
+        &mut self,
+        storage: &CombinedReplyStorage,
+    ) -> Result<(), Self::StorageError> {
+        self.empty.flush_surb_storage(storage).await
+    }
+
+    async fn init_fresh(&mut self, fresh: &CombinedReplyStorage) -> Result<(), Self::StorageError> {
+        self.empty.init_fresh(fresh).await
+    }
+
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
+        self.empty.load_surb_storage().await
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/error.rs b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/error.rs
new file mode 100644
index 0000000000..8164762123
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/error.rs
@@ -0,0 +1,53 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use std::io;
+use std::path::PathBuf;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum StorageError {
+    #[error("the provided database path doesn't have a filename defined")]
+    DatabasePathWithoutFilename { provided_path: PathBuf },
+
+    #[error("failed to rename our databse file - {source}")]
+    DatabaseRenameError {
+        #[source]
+        source: io::Error,
+    },
+
+    #[error("failed to rename our old databse file - {source}")]
+    DatabaseOldFileRemoveError {
+        #[source]
+        source: io::Error,
+    },
+
+    #[error("failed to perform sqlx migration: {source}")]
+    MigrationError {
+        #[source]
+        #[from]
+        source: sqlx::migrate::MigrateError,
+    },
+
+    #[error("failed to connect to the underlying connection pool: {source}")]
+    DatabaseConnectionError {
+        #[source]
+        source: sqlx::error::Error,
+    },
+
+    #[error("failed to run the SQL query: {source}")]
+    QueryError {
+        #[source]
+        #[from]
+        source: sqlx::error::Error,
+    },
+
+    #[error("The loaded data is inconsistent - it seems that on the last shutdown the client hasn't finished the data flush. You may have to remove the entire storage manually")]
+    IncompleteDataFlush,
+
+    #[error("data retrieved from the underlying storage is corrupted: {details}")]
+    CorruptedData {
+        details: String,
+        // err: Option<Box<dyn std::error::Error>>
+    },
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs
new file mode 100644
index 0000000000..578c0021a3
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/manager.rs
@@ -0,0 +1,257 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::backend::fs_backend::error::StorageError;
+use crate::client::replies::reply_storage::backend::fs_backend::models::{
+    ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag, StoredSurbSender,
+};
+use log::{error, info};
+use sqlx::ConnectOptions;
+use std::path::Path;
+
+#[derive(Debug, Clone)]
+pub(crate) struct StorageManager {
+    pub(crate) connection_pool: sqlx::SqlitePool,
+}
+
+// all SQL goes here
+impl StorageManager {
+    pub(crate) async fn init<P: AsRef<Path>>(
+        database_path: P,
+        fresh: bool,
+    ) -> Result<Self, StorageError> {
+        let mut opts = sqlx::sqlite::SqliteConnectOptions::new()
+            .filename(database_path)
+            .create_if_missing(fresh);
+
+        opts.disable_statement_logging();
+
+        let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
+            Ok(pool) => pool,
+            Err(err) => {
+                error!("Failed to connect to SQLx database: {err}");
+                return Err(StorageError::DatabaseConnectionError { source: err });
+            }
+        };
+
+        if let Err(err) = sqlx::migrate!("./fs_surbs_migrations")
+            .run(&connection_pool)
+            .await
+        {
+            error!("Failed to initialize SQLx database: {err}");
+            return Err(err.into());
+        }
+
+        info!("Database migration finished!");
+        Ok(StorageManager { connection_pool })
+    }
+
+    #[allow(dead_code)]
+    pub(crate) async fn status_table_exists(&self) -> Result<bool, sqlx::Error> {
+        sqlx::query!("SELECT name FROM sqlite_master WHERE type='table' AND name='status'")
+            .fetch_optional(&self.connection_pool)
+            .await
+            .map(|r| r.is_some())
+    }
+
+    pub(crate) async fn create_status_table(&self) -> Result<(), sqlx::Error> {
+        sqlx::query!("INSERT INTO status(flush_in_progress, previous_flush_timestamp, client_in_use) VALUES (0, 0, 1)")
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_flush_status(&self) -> Result<bool, sqlx::Error> {
+        sqlx::query!("SELECT flush_in_progress FROM status;")
+            .fetch_one(&self.connection_pool)
+            .await
+            .map(|r| r.flush_in_progress > 0)
+    }
+
+    pub(crate) async fn set_previous_flush_timestamp(
+        &self,
+        timestamp: i64,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!("UPDATE status SET previous_flush_timestamp = ?", timestamp)
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_previous_flush_timestamp(&self) -> Result<i64, sqlx::Error> {
+        sqlx::query!("SELECT previous_flush_timestamp FROM status;")
+            .fetch_one(&self.connection_pool)
+            .await
+            .map(|r| r.previous_flush_timestamp)
+    }
+
+    pub(crate) async fn set_flush_status(&self, in_progress: bool) -> Result<(), sqlx::Error> {
+        let in_progress_int = i64::from(in_progress);
+        sqlx::query!("UPDATE status SET flush_in_progress = ?", in_progress_int)
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_client_in_use_status(&self) -> Result<bool, sqlx::Error> {
+        sqlx::query!("SELECT client_in_use FROM status;")
+            .fetch_one(&self.connection_pool)
+            .await
+            .map(|r| r.client_in_use > 0)
+    }
+
+    pub(crate) async fn set_client_in_use_status(&self, in_use: bool) -> Result<(), sqlx::Error> {
+        let in_use_int = i64::from(in_use);
+        sqlx::query!("UPDATE status SET client_in_use = ?", in_use_int)
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn delete_all_tags(&self) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM sender_tag;")
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_tags(&self) -> Result<Vec<StoredSenderTag>, sqlx::Error> {
+        sqlx::query_as!(StoredSenderTag, "SELECT * FROM sender_tag;",)
+            .fetch_all(&self.connection_pool)
+            .await
+    }
+
+    pub(crate) async fn insert_tag(&self, stored_tag: StoredSenderTag) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            r#"
+                INSERT INTO sender_tag(recipient, tag) VALUES (?, ?);
+            "#,
+            stored_tag.recipient,
+            stored_tag.tag
+        )
+        .execute(&self.connection_pool)
+        .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn delete_all_reply_keys(&self) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM reply_key;")
+            .execute(&self.connection_pool)
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_reply_keys(&self) -> Result<Vec<StoredReplyKey>, sqlx::Error> {
+        sqlx::query_as!(StoredReplyKey, "SELECT * FROM reply_key;",)
+            .fetch_all(&self.connection_pool)
+            .await
+    }
+
+    pub(crate) async fn insert_reply_key(
+        &self,
+        stored_reply_key: StoredReplyKey,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            r#"
+                INSERT INTO reply_key(key_digest, reply_key, sent_at_timestamp) VALUES (?, ?, ?);
+            "#,
+            stored_reply_key.key_digest,
+            stored_reply_key.reply_key,
+            stored_reply_key.sent_at_timestamp
+        )
+        .execute(&self.connection_pool)
+        .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_surb_senders(&self) -> Result<Vec<StoredSurbSender>, sqlx::Error> {
+        sqlx::query_as!(StoredSurbSender, "SELECT * FROM reply_surb_sender;",)
+            .fetch_all(&self.connection_pool)
+            .await
+    }
+
+    pub(crate) async fn insert_surb_sender(
+        &self,
+        stored_surb_sender: StoredSurbSender,
+    ) -> Result<i64, sqlx::Error> {
+        let id = sqlx::query!(
+            r#"
+                INSERT INTO reply_surb_sender(tag, last_sent_timestamp) VALUES (?, ?);
+            "#,
+            stored_surb_sender.tag,
+            stored_surb_sender.last_sent_timestamp
+        )
+        .execute(&self.connection_pool)
+        .await?
+        .last_insert_rowid();
+        Ok(id)
+    }
+
+    pub(crate) async fn get_reply_surbs(
+        &self,
+        sender_id: i64,
+    ) -> Result<Vec<StoredReplySurb>, sqlx::Error> {
+        sqlx::query_as!(
+            StoredReplySurb,
+            "SELECT * FROM reply_surb WHERE reply_surb_sender_id = ?",
+            sender_id
+        )
+        .fetch_all(&self.connection_pool)
+        .await
+    }
+
+    pub(crate) async fn delete_all_reply_surb_data(&self) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM reply_surb;")
+            .execute(&self.connection_pool)
+            .await?;
+
+        sqlx::query!("DELETE FROM reply_surb_sender;")
+            .execute(&self.connection_pool)
+            .await?;
+
+        Ok(())
+    }
+
+    pub(crate) async fn insert_reply_surb(
+        &self,
+        stored_reply_surb: StoredReplySurb,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            r#"
+                INSERT INTO reply_surb(reply_surb_sender_id, reply_surb) VALUES (?, ?);
+            "#,
+            stored_reply_surb.reply_surb_sender_id,
+            stored_reply_surb.reply_surb
+        )
+        .execute(&self.connection_pool)
+        .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn get_reply_surb_storage_metadata(
+        &self,
+    ) -> Result<ReplySurbStorageMetadata, sqlx::Error> {
+        sqlx::query_as!(
+            ReplySurbStorageMetadata,
+             r#"
+                SELECT min_reply_surb_threshold as "min_reply_surb_threshold: u32", max_reply_surb_threshold as "max_reply_surb_threshold: u32" FROM reply_surb_storage_metadata;
+             "#,
+        )
+            .fetch_one(&self.connection_pool)
+            .await
+    }
+
+    pub(crate) async fn insert_reply_surb_storage_metadata(
+        &self,
+        metadata: ReplySurbStorageMetadata,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!(r#"
+            INSERT INTO reply_surb_storage_metadata(min_reply_surb_threshold, max_reply_surb_threshold)
+            VALUES (?, ?);
+        "#,
+            metadata.min_reply_surb_threshold,
+            metadata.max_reply_surb_threshold,
+        ).execute(&self.connection_pool).await?;
+        Ok(())
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/mod.rs b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/mod.rs
new file mode 100644
index 0000000000..9fd48bcd2c
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/mod.rs
@@ -0,0 +1,348 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::backend::fs_backend::manager::StorageManager;
+use crate::client::replies::reply_storage::backend::fs_backend::models::{
+    ReplySurbStorageMetadata, StoredReplyKey, StoredReplySurb, StoredSenderTag, StoredSurbSender,
+};
+use crate::client::replies::reply_storage::surb_storage::ReceivedReplySurbs;
+use crate::client::replies::reply_storage::{
+    CombinedReplyStorage, ReceivedReplySurbsMap, ReplyStorageBackend, SentReplyKeys, UsedSenderTags,
+};
+use async_trait::async_trait;
+use log::{error, info, warn};
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
+use std::fs;
+use std::path::{Path, PathBuf};
+use time::OffsetDateTime;
+
+pub use self::error::StorageError;
+
+mod error;
+mod manager;
+mod models;
+
+#[derive(Debug)]
+pub struct Backend {
+    temporary_old_path: Option<PathBuf>,
+    database_path: PathBuf,
+    manager: StorageManager,
+}
+
+impl Backend {
+    const OLD_EXTENSION: &'static str = "old";
+
+    pub async fn init<P: AsRef<Path>>(database_path: P) -> Result<Self, StorageError> {
+        let owned_path: PathBuf = database_path.as_ref().into();
+        if owned_path.file_name().is_none() {
+            return Err(StorageError::DatabasePathWithoutFilename {
+                provided_path: owned_path,
+            });
+        }
+
+        let backend = Backend {
+            temporary_old_path: None,
+            database_path: owned_path,
+            manager: StorageManager::init(database_path, true).await?,
+        };
+
+        backend.manager.create_status_table().await?;
+
+        Ok(backend)
+    }
+
+    pub async fn try_load<P: AsRef<Path>>(database_path: P) -> Result<Self, StorageError> {
+        let owned_path: PathBuf = database_path.as_ref().into();
+        if owned_path.file_name().is_none() {
+            return Err(StorageError::DatabasePathWithoutFilename {
+                provided_path: owned_path,
+            });
+        }
+
+        let manager = StorageManager::init(database_path, false).await?;
+
+        // the database flush wasn't fully finished and thus the data is in inconsistent state
+        // (we don't really know what's properly saved or what's not)
+        if manager.get_flush_status().await? {
+            return Err(StorageError::IncompleteDataFlush);
+        }
+
+        let last_flush_timestamp = manager.get_previous_flush_timestamp().await?;
+        if last_flush_timestamp == 0 {
+            // either this client has been running since 1970 or the flush failed
+            return Err(StorageError::IncompleteDataFlush);
+        }
+
+        // the process has gone down without full graceful shutdown,
+        // meaning the database doesn't contain valid data anymore
+        // so we have to purge it
+        if manager.get_client_in_use_status().await? {
+            error!("the client hasn't undergone through graceful shutdown the last time it's gone down - we can't trust its reply surbs or stored encryption keys. They shall get purged");
+            manager.delete_all_reply_surb_data().await?;
+            manager.delete_all_reply_keys().await?;
+        }
+
+        if let Err(err) = manager.get_reply_surb_storage_metadata().await {
+            // we can't recover here, we HAVE TO initialise fresh (because we don't know correct starting metadata)
+            error!("it seems the client has been shutdown gracefully - we're missing valid surb data dump. the existing database cannot be used");
+            return Err(err.into());
+        }
+
+        let last_flush = match OffsetDateTime::from_unix_timestamp(last_flush_timestamp) {
+            Ok(last_flush) => last_flush,
+            Err(err) => {
+                return Err(StorageError::CorruptedData {
+                    details: format!("failed to parse stored timestamp - {err}"),
+                });
+            }
+        };
+
+        // in theory clients can use our reply surbs whenever they want, even a year in the future
+        // (assuming no key rotation has happened)
+        // but the way it's currently coded, everyone will purge old data
+        let since_last_flush = OffsetDateTime::now_utc() - last_flush;
+        if since_last_flush.whole_days() > 0 {
+            info!("it's been over {} days and {} hours since we last used our data store. our reply surbs are already outdated - we're going to purge them now.", since_last_flush.whole_days(), since_last_flush.whole_hours());
+            manager.delete_all_reply_surb_data().await?;
+        }
+
+        if since_last_flush.whole_days() > 1 {
+            info!("it's been over {} days and {} hours since we last used our data store. our reply keys are already outdated - we're going to purge them now.", since_last_flush.whole_days(), since_last_flush.whole_hours());
+            manager.delete_all_reply_keys().await?;
+        }
+
+        if since_last_flush.whole_days() > 2 {
+            info!("it's been over {} days and {} hours since we last used our data store. our used sender tags are already outdated - we're going to purge them now.", since_last_flush.whole_days(), since_last_flush.whole_hours());
+            manager.delete_all_tags().await?;
+        }
+
+        Ok(Backend {
+            temporary_old_path: None,
+            database_path: owned_path,
+            manager,
+        })
+    }
+
+    async fn close_pool(&mut self) {
+        self.manager.connection_pool.close().await;
+    }
+
+    async fn rotate(&mut self) -> Result<(), StorageError> {
+        self.close_pool().await;
+
+        let new_extension = if let Some(existing_extension) =
+            self.database_path.extension().and_then(|ext| ext.to_str())
+        {
+            format!("{existing_extension}.{}", Self::OLD_EXTENSION)
+        } else {
+            Self::OLD_EXTENSION.to_string()
+        };
+
+        let mut temp_old = self.database_path.clone();
+        temp_old.set_extension(new_extension);
+
+        fs::rename(&self.database_path, &temp_old)
+            .map_err(|err| StorageError::DatabaseRenameError { source: err })?;
+        self.manager = StorageManager::init(&self.database_path, true).await?;
+        self.manager.create_status_table().await?;
+
+        self.temporary_old_path = Some(temp_old);
+        Ok(())
+    }
+
+    fn remove_old(&mut self) -> Result<(), StorageError> {
+        if let Some(old_path) = self.temporary_old_path.take() {
+            fs::remove_file(old_path)
+                .map_err(|err| StorageError::DatabaseOldFileRemoveError { source: err })
+        } else {
+            warn!("the old database file doesn't seem to exist!");
+            Ok(())
+        }
+    }
+
+    async fn start_storage_flush(&self) -> Result<(), StorageError> {
+        Ok(self.manager.set_flush_status(true).await?)
+    }
+
+    async fn end_storage_flush(&self) -> Result<(), StorageError> {
+        self.manager
+            .set_previous_flush_timestamp(OffsetDateTime::now_utc().unix_timestamp())
+            .await?;
+        Ok(self.manager.set_flush_status(false).await?)
+    }
+
+    async fn start_client_use(&self) -> Result<(), StorageError> {
+        Ok(self.manager.set_client_in_use_status(true).await?)
+    }
+
+    async fn stop_client_use(&self) -> Result<(), StorageError> {
+        Ok(self.manager.set_client_in_use_status(false).await?)
+    }
+
+    async fn get_stored_tags(&self) -> Result<UsedSenderTags, StorageError> {
+        let stored = self.manager.get_tags().await?;
+
+        // stop at the first instance of corruption. if even a single entry is malformed,
+        // something weird has happened and we can't trust the rest of the data
+        let raw = stored
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<_, _>>()?;
+
+        Ok(UsedSenderTags::from_raw(raw))
+    }
+
+    async fn dump_sender_tags(&self, tags: &UsedSenderTags) -> Result<(), StorageError> {
+        for map_ref in tags.as_raw_iter() {
+            let (recipient, tag) = map_ref.pair();
+            self.manager
+                .insert_tag(StoredSenderTag::new(*recipient, *tag))
+                .await?;
+        }
+        Ok(())
+    }
+
+    async fn get_stored_reply_keys(&self) -> Result<SentReplyKeys, StorageError> {
+        let stored = self.manager.get_reply_keys().await?;
+
+        // stop at the first instance of corruption. if even a single entry is malformed,
+        // something weird has happened and we can't trust the rest of the data
+        let raw = stored
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<_, _>>()?;
+
+        Ok(SentReplyKeys::from_raw(raw))
+    }
+
+    async fn dump_sender_reply_keys(&self, reply_keys: &SentReplyKeys) -> Result<(), StorageError> {
+        for map_ref in reply_keys.as_raw_iter() {
+            let (digest, key) = map_ref.pair();
+            self.manager
+                .insert_reply_key(StoredReplyKey::new(*digest, *key))
+                .await?;
+        }
+        Ok(())
+    }
+
+    async fn get_stored_reply_surbs(&self) -> Result<ReceivedReplySurbsMap, StorageError> {
+        let surb_senders = self.manager.get_surb_senders().await?;
+
+        let metadata = self.get_reply_surb_storage_metadata().await?;
+        let mut received_surbs = Vec::with_capacity(surb_senders.len());
+        for sender in surb_senders {
+            let sender_id = sender.id;
+            let (sender_tag, surbs_last_received_at_timestamp): (AnonymousSenderTag, i64) =
+                sender.try_into()?;
+            let stored_surbs = self
+                .manager
+                .get_reply_surbs(sender_id)
+                .await?
+                .into_iter()
+                .map(|raw| raw.try_into())
+                .collect::<Result<_, _>>()?;
+
+            received_surbs.push((
+                sender_tag,
+                ReceivedReplySurbs::new_retrieved(stored_surbs, surbs_last_received_at_timestamp),
+            ))
+        }
+
+        Ok(ReceivedReplySurbsMap::from_raw(
+            metadata.min_reply_surb_threshold as usize,
+            metadata.max_reply_surb_threshold as usize,
+            received_surbs,
+        ))
+    }
+
+    async fn dump_reply_surbs(
+        &self,
+        reply_surbs: &ReceivedReplySurbsMap,
+    ) -> Result<(), StorageError> {
+        for map_ref in reply_surbs.as_raw_iter() {
+            let (tag, received_surbs) = map_ref.pair();
+            let sender_id = self
+                .manager
+                .insert_surb_sender(StoredSurbSender::new(
+                    *tag,
+                    received_surbs.surbs_last_received_at(),
+                ))
+                .await?;
+
+            for reply_surb in received_surbs.surbs_ref() {
+                self.manager
+                    .insert_reply_surb(StoredReplySurb::new(sender_id, reply_surb))
+                    .await?
+            }
+        }
+        Ok(())
+    }
+
+    async fn get_reply_surb_storage_metadata(
+        &self,
+    ) -> Result<ReplySurbStorageMetadata, StorageError> {
+        self.manager
+            .get_reply_surb_storage_metadata()
+            .await
+            .map_err(Into::into)
+    }
+
+    async fn dump_reply_surb_storage_metadata(
+        &self,
+        reply_surbs: &ReceivedReplySurbsMap,
+    ) -> Result<(), StorageError> {
+        self.manager
+            .insert_reply_surb_storage_metadata(ReplySurbStorageMetadata::new(
+                reply_surbs.min_surb_threshold(),
+                reply_surbs.max_surb_threshold(),
+            ))
+            .await
+            .map_err(Into::into)
+    }
+}
+
+#[async_trait]
+impl ReplyStorageBackend for Backend {
+    type StorageError = error::StorageError;
+
+    async fn start_storage_session(&self) -> Result<(), Self::StorageError> {
+        self.start_client_use().await
+    }
+
+    async fn flush_surb_storage(
+        &mut self,
+        storage: &CombinedReplyStorage,
+    ) -> Result<(), Self::StorageError> {
+        // close all connections (there should be none! and rename the file to contain .old extension)
+        self.rotate().await?;
+        self.start_storage_flush().await?;
+
+        self.dump_sender_tags(storage.tags_storage_ref()).await?;
+        self.dump_sender_reply_keys(storage.key_storage_ref())
+            .await?;
+        let surbs_ref = storage.surbs_storage_ref();
+        self.dump_reply_surb_storage_metadata(surbs_ref).await?;
+        self.dump_reply_surbs(surbs_ref).await?;
+
+        self.remove_old()?;
+        self.end_storage_flush().await
+    }
+
+    async fn init_fresh(&mut self, fresh: &CombinedReplyStorage) -> Result<(), Self::StorageError> {
+        // for now nothing more to do apart from dumping the metadata
+        self.dump_reply_surb_storage_metadata(fresh.surbs_storage_ref())
+            .await
+    }
+
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
+        let reply_keys = self.get_stored_reply_keys().await?;
+        let tags = self.get_stored_tags().await?;
+        let reply_surbs = self.get_stored_reply_surbs().await?;
+
+        Ok(CombinedReplyStorage::load(reply_keys, reply_surbs, tags))
+    }
+
+    async fn stop_storage_session(self) -> Result<(), Self::StorageError> {
+        self.stop_client_use().await
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/models.rs b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/models.rs
new file mode 100644
index 0000000000..65088ad05e
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/fs_backend/models.rs
@@ -0,0 +1,185 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::backend::fs_backend::error::StorageError;
+use crate::client::replies::reply_storage::key_storage::UsedReplyKey;
+use crypto::generic_array::typenum::Unsigned;
+use crypto::Digest;
+use nymsphinx::addressing::clients::{Recipient, RecipientBytes};
+use nymsphinx::anonymous_replies::encryption_key::EncryptionKeyDigest;
+use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
+use nymsphinx::anonymous_replies::{ReplySurb, SurbEncryptionKey, SurbEncryptionKeySize};
+use nymsphinx::params::ReplySurbKeyDigestAlgorithm;
+
+#[derive(Debug, Clone)]
+pub(crate) struct StoredSenderTag {
+    pub(crate) recipient: Vec<u8>,
+    pub(crate) tag: Vec<u8>,
+}
+
+impl StoredSenderTag {
+    pub(crate) fn new(recipient: RecipientBytes, tag: AnonymousSenderTag) -> StoredSenderTag {
+        StoredSenderTag {
+            recipient: recipient.to_vec(),
+            tag: tag.to_bytes().to_vec(),
+        }
+    }
+}
+
+impl TryFrom<StoredSenderTag> for (RecipientBytes, AnonymousSenderTag) {
+    type Error = StorageError;
+
+    fn try_from(value: StoredSenderTag) -> Result<Self, Self::Error> {
+        let recipient_len = value.recipient.len();
+        let Ok(recipient_bytes) = value.recipient.try_into() else {
+            return Err(StorageError::CorruptedData {
+                details: format!(
+                    "the retrieved recipient has length of {recipient_len} while {} was expected",
+                    Recipient::LEN
+                ),
+            });
+        };
+
+        let tag_len = value.tag.len();
+        let Ok(sender_tag_bytes) = value.tag.try_into() else {
+            return Err(StorageError::CorruptedData {
+                details: format!(
+                    "the retrieved sender tag has length of {tag_len} while {} was expected",
+                    SENDER_TAG_SIZE
+                ),
+            });
+        };
+
+        Ok((
+            recipient_bytes,
+            AnonymousSenderTag::from_bytes(sender_tag_bytes),
+        ))
+    }
+}
+
+#[derive(Debug, Clone)]
+pub(crate) struct StoredReplyKey {
+    pub(crate) key_digest: Vec<u8>,
+    pub(crate) reply_key: Vec<u8>,
+    pub(crate) sent_at_timestamp: i64,
+}
+
+impl StoredReplyKey {
+    pub(crate) fn new(key_digest: EncryptionKeyDigest, reply_key: UsedReplyKey) -> StoredReplyKey {
+        StoredReplyKey {
+            key_digest: key_digest.to_vec(),
+            reply_key: (*reply_key).to_bytes(),
+            sent_at_timestamp: reply_key.sent_at_timestamp,
+        }
+    }
+}
+
+impl TryFrom<StoredReplyKey> for (EncryptionKeyDigest, UsedReplyKey) {
+    type Error = StorageError;
+
+    fn try_from(value: StoredReplyKey) -> Result<Self, Self::Error> {
+        let expected_reply_key_digest_size = ReplySurbKeyDigestAlgorithm::output_size();
+        let reply_key_digest_size = value.key_digest.len();
+
+        let Some(digest) = EncryptionKeyDigest::from_exact_iter(value.key_digest) else {
+            return Err(StorageError::CorruptedData {
+                details: format!(
+                    "the reply surb digest has length of {reply_key_digest_size} while {expected_reply_key_digest_size} was expected",
+                ),
+            });
+        };
+
+        let reply_key_len = value.reply_key.len();
+        let Ok(reply_key) = SurbEncryptionKey::try_from_bytes(&value.reply_key) else {
+            return Err(StorageError::CorruptedData {
+                details: format!(
+                    "the reply key has length of {reply_key_len} while {} was expected",
+                    SurbEncryptionKeySize::USIZE
+                ),
+            });
+        };
+
+        Ok((
+            digest,
+            UsedReplyKey::new(reply_key, value.sent_at_timestamp),
+        ))
+    }
+}
+
+pub(crate) struct StoredSurbSender {
+    pub(crate) id: i64,
+    pub(crate) tag: Vec<u8>,
+    pub(crate) last_sent_timestamp: i64,
+}
+
+impl StoredSurbSender {
+    pub(crate) fn new(tag: AnonymousSenderTag, last_sent_timestamp: i64) -> Self {
+        StoredSurbSender {
+            // for the purposes of STORING data,
+            // we ignore that field anyway
+            id: 0,
+            tag: tag.to_bytes().to_vec(),
+            last_sent_timestamp,
+        }
+    }
+}
+
+impl TryFrom<StoredSurbSender> for (AnonymousSenderTag, i64) {
+    type Error = StorageError;
+
+    fn try_from(value: StoredSurbSender) -> Result<Self, Self::Error> {
+        let tag_len = value.tag.len();
+        let Ok(sender_tag_bytes) = value.tag.try_into() else {
+            return Err(StorageError::CorruptedData {
+                details: format!(
+                    "the retrieved sender tag has length of {tag_len} while {} was expected",
+                    SENDER_TAG_SIZE
+                ),
+            });
+        };
+
+        Ok((
+            AnonymousSenderTag::from_bytes(sender_tag_bytes),
+            value.last_sent_timestamp,
+        ))
+    }
+}
+
+pub(crate) struct StoredReplySurb {
+    pub(crate) reply_surb_sender_id: i64,
+    pub(crate) reply_surb: Vec<u8>,
+}
+
+impl StoredReplySurb {
+    pub(crate) fn new(reply_surb_sender_id: i64, reply_surb: &ReplySurb) -> Self {
+        StoredReplySurb {
+            reply_surb_sender_id,
+            reply_surb: reply_surb.to_bytes(),
+        }
+    }
+}
+
+impl TryFrom<StoredReplySurb> for ReplySurb {
+    type Error = StorageError;
+
+    fn try_from(value: StoredReplySurb) -> Result<Self, Self::Error> {
+        ReplySurb::from_bytes(&value.reply_surb).map_err(|err| StorageError::CorruptedData {
+            details: format!("failed to recover the reply surb: {err}"),
+        })
+    }
+}
+
+#[derive(Copy, Clone)]
+pub(crate) struct ReplySurbStorageMetadata {
+    pub(crate) min_reply_surb_threshold: u32,
+    pub(crate) max_reply_surb_threshold: u32,
+}
+
+impl ReplySurbStorageMetadata {
+    pub(crate) fn new(min_reply_surb_threshold: usize, max_reply_surb_threshold: usize) -> Self {
+        Self {
+            min_reply_surb_threshold: min_reply_surb_threshold as u32,
+            max_reply_surb_threshold: max_reply_surb_threshold as u32,
+        }
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/backend/mod.rs b/clients/client-core/src/client/replies/reply_storage/backend/mod.rs
new file mode 100644
index 0000000000..d80231ae1e
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/backend/mod.rs
@@ -0,0 +1,78 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::CombinedReplyStorage;
+use async_trait::async_trait;
+use std::error::Error;
+use thiserror::Error;
+
+#[cfg(target_arch = "wasm32")]
+pub mod browser_backend;
+
+#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+pub mod fs_backend;
+
+// #[cfg(all(test, feature = "std"))]
+// third case: node with actual filesystem
+
+#[derive(Debug, Error)]
+#[error("no information provided")]
+pub struct UndefinedError;
+
+pub struct Empty {
+    // we need to keep 'basic' metadata here to "load" the CombinedReplyStorage
+    min_surb_threshold: usize,
+    max_surb_threshold: usize,
+}
+
+#[async_trait]
+impl ReplyStorageBackend for Empty {
+    type StorageError = UndefinedError;
+
+    async fn flush_surb_storage(
+        &mut self,
+        _storage: &CombinedReplyStorage,
+    ) -> Result<(), Self::StorageError> {
+        Ok(())
+    }
+
+    async fn init_fresh(
+        &mut self,
+        _fresh: &CombinedReplyStorage,
+    ) -> Result<(), Self::StorageError> {
+        Ok(())
+    }
+
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError> {
+        Ok(CombinedReplyStorage::new(
+            self.min_surb_threshold,
+            self.max_surb_threshold,
+        ))
+    }
+}
+
+#[async_trait]
+pub trait ReplyStorageBackend: Sized {
+    type StorageError: Error + 'static;
+
+    async fn start_storage_session(&self) -> Result<(), Self::StorageError> {
+        Ok(())
+    }
+
+    // reply keys and surbs would need additional field set when data is loaded
+    // so if there's some failure, we'd trash it all
+    async fn flush_surb_storage(
+        &mut self,
+        storage: &CombinedReplyStorage,
+    ) -> Result<(), Self::StorageError>;
+
+    /// The purpose of this call is to save any metadata that might be present.
+    /// (such as surb thresholds)
+    async fn init_fresh(&mut self, fresh: &CombinedReplyStorage) -> Result<(), Self::StorageError>;
+
+    async fn load_surb_storage(&self) -> Result<CombinedReplyStorage, Self::StorageError>;
+
+    async fn stop_storage_session(self) -> Result<(), Self::StorageError> {
+        Ok(())
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/combined.rs b/clients/client-core/src/client/replies/reply_storage/combined.rs
new file mode 100644
index 0000000000..c9fb9e4a5c
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/combined.rs
@@ -0,0 +1,60 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags};
+
+#[derive(Debug, Clone)]
+pub struct CombinedReplyStorage {
+    sent_reply_keys: SentReplyKeys,
+    received_reply_surbs: ReceivedReplySurbsMap,
+    used_tags: UsedSenderTags,
+}
+
+impl CombinedReplyStorage {
+    pub fn new(min_surb_threshold: usize, max_surb_threshold: usize) -> CombinedReplyStorage {
+        CombinedReplyStorage {
+            sent_reply_keys: SentReplyKeys::new(),
+            received_reply_surbs: ReceivedReplySurbsMap::new(
+                min_surb_threshold,
+                max_surb_threshold,
+            ),
+            used_tags: UsedSenderTags::new(),
+        }
+    }
+
+    pub fn load(
+        sent_reply_keys: SentReplyKeys,
+        received_reply_surbs: ReceivedReplySurbsMap,
+        used_tags: UsedSenderTags,
+    ) -> Self {
+        CombinedReplyStorage {
+            sent_reply_keys,
+            received_reply_surbs,
+            used_tags,
+        }
+    }
+
+    pub fn key_storage(&self) -> SentReplyKeys {
+        self.sent_reply_keys.clone()
+    }
+
+    pub fn surbs_storage(&self) -> ReceivedReplySurbsMap {
+        self.received_reply_surbs.clone()
+    }
+
+    pub fn tags_storage(&self) -> UsedSenderTags {
+        self.used_tags.clone()
+    }
+
+    pub fn key_storage_ref(&self) -> &SentReplyKeys {
+        &self.sent_reply_keys
+    }
+
+    pub fn surbs_storage_ref(&self) -> &ReceivedReplySurbsMap {
+        &self.received_reply_surbs
+    }
+
+    pub fn tags_storage_ref(&self) -> &UsedSenderTags {
+        &self.used_tags
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/key_storage.rs b/clients/client-core/src/client/replies/reply_storage/key_storage.rs
new file mode 100644
index 0000000000..9c68f40e06
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/key_storage.rs
@@ -0,0 +1,86 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use dashmap::iter::Iter;
+use dashmap::DashMap;
+use nymsphinx::anonymous_replies::encryption_key::EncryptionKeyDigest;
+use nymsphinx::anonymous_replies::SurbEncryptionKey;
+use std::ops::Deref;
+use std::sync::Arc;
+use time::OffsetDateTime;
+
+#[derive(Debug, Clone)]
+pub struct SentReplyKeys {
+    inner: Arc<SentReplyKeysInner>,
+}
+
+#[derive(Debug)]
+struct SentReplyKeysInner {
+    data: DashMap<EncryptionKeyDigest, UsedReplyKey>,
+}
+
+impl SentReplyKeys {
+    pub(crate) fn new() -> SentReplyKeys {
+        SentReplyKeys {
+            inner: Arc::new(SentReplyKeysInner {
+                data: DashMap::new(),
+            }),
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn from_raw(raw: Vec<(EncryptionKeyDigest, UsedReplyKey)>) -> SentReplyKeys {
+        SentReplyKeys {
+            inner: Arc::new(SentReplyKeysInner {
+                data: raw.into_iter().collect(),
+            }),
+        }
+    }
+
+    pub(crate) fn as_raw_iter(&self) -> Iter<'_, EncryptionKeyDigest, UsedReplyKey> {
+        self.inner.data.iter()
+    }
+
+    pub(crate) fn insert_multiple(&self, keys: Vec<SurbEncryptionKey>) {
+        let now = OffsetDateTime::now_utc().unix_timestamp();
+        for key in keys {
+            self.insert(UsedReplyKey::new(key, now))
+        }
+    }
+
+    pub(crate) fn insert(&self, key: UsedReplyKey) {
+        self.inner.data.insert(key.compute_digest(), key);
+    }
+
+    pub(crate) fn try_pop(&self, digest: EncryptionKeyDigest) -> Option<UsedReplyKey> {
+        self.inner.data.remove(&digest).map(|(_k, v)| v)
+    }
+
+    pub(crate) fn remove(&self, digest: EncryptionKeyDigest) {
+        self.inner.data.remove(&digest);
+    }
+}
+
+#[derive(Debug, Copy, Clone)]
+pub(crate) struct UsedReplyKey {
+    key: SurbEncryptionKey,
+    // the purpose of this field is to perform invalidation at relatively very long intervals
+    pub(crate) sent_at_timestamp: i64,
+}
+
+impl UsedReplyKey {
+    pub(crate) fn new(key: SurbEncryptionKey, sent_at_timestamp: i64) -> Self {
+        UsedReplyKey {
+            key,
+            sent_at_timestamp,
+        }
+    }
+}
+
+impl Deref for UsedReplyKey {
+    type Target = SurbEncryptionKey;
+
+    fn deref(&self) -> &Self::Target {
+        &self.key
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/mod.rs b/clients/client-core/src/client/replies/reply_storage/mod.rs
new file mode 100644
index 0000000000..c74ad2bb6b
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/mod.rs
@@ -0,0 +1,64 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub use crate::client::replies::reply_storage::combined::CombinedReplyStorage;
+pub use crate::client::replies::reply_storage::key_storage::SentReplyKeys;
+pub use crate::client::replies::reply_storage::surb_storage::ReceivedReplySurbsMap;
+pub use crate::client::replies::reply_storage::tag_storage::UsedSenderTags;
+pub use backend::*;
+
+mod backend;
+mod combined;
+mod key_storage;
+mod surb_storage;
+mod tag_storage;
+
+// only really exists to get information about shutdown and save data to the backing storage
+pub struct PersistentReplyStorage<T = backend::Empty>
+where
+    T: ReplyStorageBackend,
+{
+    backend: T,
+}
+
+impl<T> PersistentReplyStorage<T>
+where
+    T: ReplyStorageBackend + Send + Sync,
+{
+    pub fn new(backend: T) -> Self {
+        PersistentReplyStorage { backend }
+    }
+
+    pub async fn load_state_from_backend(&self) -> Result<CombinedReplyStorage, T::StorageError> {
+        self.backend.load_surb_storage().await
+    }
+
+    // this will have to get enabled after merging develop
+    pub async fn flush_on_shutdown(
+        mut self,
+        mem_state: CombinedReplyStorage,
+        mut shutdown: task::TaskClient,
+    ) {
+        use log::{debug, error, info, warn};
+
+        debug!("Started PersistentReplyStorage");
+        if let Err(err) = self.backend.start_storage_session().await {
+            error!("failed to start the storage session - {err}");
+            return;
+        }
+
+        shutdown.recv().await;
+
+        info!("PersistentReplyStorage is flushing all reply-related data to underlying storage");
+        warn!("you MUST NOT forcefully shutdown now or you risk data corruption!");
+        if let Err(err) = self.backend.flush_surb_storage(&mem_state).await {
+            error!("failed to flush our reply-related data to the persistent storage: {err}")
+        } else {
+            info!("Data flush is complete")
+        }
+
+        if let Err(err) = self.backend.stop_storage_session().await {
+            error!("failed to properly stop the storage session - {err}. We might not be able to smoothly restore it")
+        }
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/surb_storage.rs b/clients/client-core/src/client/replies/reply_storage/surb_storage.rs
new file mode 100644
index 0000000000..ed2fd8d846
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/surb_storage.rs
@@ -0,0 +1,278 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use dashmap::iter::Iter;
+use dashmap::DashMap;
+use log::trace;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
+use nymsphinx::anonymous_replies::ReplySurb;
+use std::collections::VecDeque;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
+use time::OffsetDateTime;
+
+#[derive(Debug, Clone)]
+pub struct ReceivedReplySurbsMap {
+    inner: Arc<ReceivedReplySurbsMapInner>,
+}
+
+#[derive(Debug)]
+struct ReceivedReplySurbsMapInner {
+    data: DashMap<AnonymousSenderTag, ReceivedReplySurbs>,
+
+    // the minimum amount of surbs that have to be kept in storage for requests for more surbs
+    min_surb_threshold: AtomicUsize,
+
+    // the maximum amount of surbs that we want to keep in storage so that we don't over-request them
+    max_surb_threshold: AtomicUsize,
+}
+
+impl ReceivedReplySurbsMap {
+    pub(crate) fn new(
+        min_surb_threshold: usize,
+        max_surb_threshold: usize,
+    ) -> ReceivedReplySurbsMap {
+        ReceivedReplySurbsMap {
+            inner: Arc::new(ReceivedReplySurbsMapInner {
+                data: DashMap::new(),
+                min_surb_threshold: AtomicUsize::new(min_surb_threshold),
+                max_surb_threshold: AtomicUsize::new(max_surb_threshold),
+            }),
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn from_raw(
+        min_surb_threshold: usize,
+        max_surb_threshold: usize,
+        raw: Vec<(AnonymousSenderTag, ReceivedReplySurbs)>,
+    ) -> ReceivedReplySurbsMap {
+        ReceivedReplySurbsMap {
+            inner: Arc::new(ReceivedReplySurbsMapInner {
+                data: raw.into_iter().collect(),
+                min_surb_threshold: AtomicUsize::new(min_surb_threshold),
+                max_surb_threshold: AtomicUsize::new(max_surb_threshold),
+            }),
+        }
+    }
+
+    pub(crate) fn as_raw_iter(&self) -> Iter<'_, AnonymousSenderTag, ReceivedReplySurbs> {
+        self.inner.data.iter()
+    }
+
+    pub(crate) fn remove(&self, target: &AnonymousSenderTag) {
+        self.inner.data.remove(target);
+    }
+
+    pub(crate) fn reset_surbs_last_received_at(&self, target: &AnonymousSenderTag) {
+        if let Some(mut entry) = self.inner.data.get_mut(target) {
+            entry.surbs_last_received_at_timestamp = OffsetDateTime::now_utc().unix_timestamp();
+        }
+    }
+
+    pub(crate) fn surbs_last_received_at(&self, target: &AnonymousSenderTag) -> Option<i64> {
+        self.inner
+            .data
+            .get(target)
+            .map(|e| e.surbs_last_received_at())
+    }
+
+    pub(crate) fn pending_reception(&self, target: &AnonymousSenderTag) -> u32 {
+        self.inner
+            .data
+            .get(target)
+            .map(|e| e.pending_reception())
+            .unwrap_or_default()
+    }
+
+    pub(crate) fn increment_pending_reception(
+        &self,
+        target: &AnonymousSenderTag,
+        amount: u32,
+    ) -> Option<u32> {
+        self.inner
+            .data
+            .get_mut(target)
+            .map(|mut e| e.increment_pending_reception(amount))
+    }
+
+    pub(crate) fn decrement_pending_reception(
+        &self,
+        target: &AnonymousSenderTag,
+        amount: u32,
+    ) -> Option<u32> {
+        self.inner
+            .data
+            .get_mut(target)
+            .map(|mut e| e.decrement_pending_reception(amount))
+    }
+
+    pub(crate) fn reset_pending_reception(&self, target: &AnonymousSenderTag) {
+        if let Some(mut e) = self.inner.data.get_mut(target) {
+            e.reset_pending_reception()
+        }
+    }
+
+    pub(crate) fn min_surb_threshold(&self) -> usize {
+        self.inner.min_surb_threshold.load(Ordering::Relaxed)
+    }
+
+    pub(crate) fn max_surb_threshold(&self) -> usize {
+        self.inner.max_surb_threshold.load(Ordering::Relaxed)
+    }
+
+    pub(crate) fn available_surbs(&self, target: &AnonymousSenderTag) -> usize {
+        self.inner
+            .data
+            .get(target)
+            .map(|entry| entry.items_left())
+            .unwrap_or_default()
+    }
+
+    pub(crate) fn contains_surbs_for(&self, target: &AnonymousSenderTag) -> bool {
+        self.inner.data.contains_key(target)
+    }
+
+    pub(crate) fn get_reply_surbs(
+        &self,
+        target: &AnonymousSenderTag,
+        amount: usize,
+    ) -> (Option<Vec<ReplySurb>>, usize) {
+        if let Some(mut entry) = self.inner.data.get_mut(target) {
+            let surbs_left = entry.items_left();
+            if surbs_left < self.min_surb_threshold() + amount {
+                (None, surbs_left)
+            } else {
+                entry.get_reply_surbs(amount)
+            }
+        } else {
+            (None, 0)
+        }
+    }
+
+    pub(crate) fn get_reply_surb_ignoring_threshold(
+        &self,
+        target: &AnonymousSenderTag,
+    ) -> Option<(Option<ReplySurb>, usize)> {
+        self.inner
+            .data
+            .get_mut(target)
+            .map(|mut s| s.get_reply_surb())
+    }
+
+    pub(crate) fn get_reply_surb(
+        &self,
+        target: &AnonymousSenderTag,
+    ) -> Option<(Option<ReplySurb>, usize)> {
+        self.inner.data.get_mut(target).map(|mut entry| {
+            let surbs_left = entry.items_left();
+            if surbs_left < self.min_surb_threshold() {
+                (None, surbs_left)
+            } else {
+                entry.get_reply_surb()
+            }
+        })
+    }
+
+    pub(crate) fn insert_surbs<I: IntoIterator<Item = ReplySurb>>(
+        &self,
+        target: &AnonymousSenderTag,
+        surbs: I,
+    ) {
+        if let Some(mut existing_data) = self.inner.data.get_mut(target) {
+            existing_data.insert_reply_surbs(surbs)
+        } else {
+            let new_entry = ReceivedReplySurbs::new(surbs.into_iter().collect());
+            self.inner.data.insert(*target, new_entry);
+        }
+    }
+}
+
+#[derive(Debug)]
+pub(crate) struct ReceivedReplySurbs {
+    // in the future we'd probably want to put extra data here to indicate when the SURBs got received
+    // so we could invalidate entries from the previous key rotations
+    data: VecDeque<ReplySurb>,
+
+    pending_reception: u32,
+    surbs_last_received_at_timestamp: i64,
+}
+
+impl ReceivedReplySurbs {
+    fn new(initial_surbs: VecDeque<ReplySurb>) -> Self {
+        ReceivedReplySurbs {
+            data: initial_surbs,
+            pending_reception: 0,
+            surbs_last_received_at_timestamp: OffsetDateTime::now_utc().unix_timestamp(),
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn new_retrieved(
+        surbs: Vec<ReplySurb>,
+        surbs_last_received_at_timestamp: i64,
+    ) -> ReceivedReplySurbs {
+        ReceivedReplySurbs {
+            data: surbs.into(),
+            pending_reception: 0,
+            surbs_last_received_at_timestamp,
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn surbs_ref(&self) -> &VecDeque<ReplySurb> {
+        &self.data
+    }
+
+    pub(crate) fn surbs_last_received_at(&self) -> i64 {
+        self.surbs_last_received_at_timestamp
+    }
+
+    pub(crate) fn pending_reception(&self) -> u32 {
+        self.pending_reception
+    }
+
+    pub(crate) fn increment_pending_reception(&mut self, amount: u32) -> u32 {
+        self.pending_reception += amount;
+        self.pending_reception
+    }
+
+    pub(crate) fn decrement_pending_reception(&mut self, amount: u32) -> u32 {
+        self.pending_reception = self.pending_reception.saturating_sub(amount);
+        self.pending_reception
+    }
+
+    pub(crate) fn reset_pending_reception(&mut self) {
+        self.pending_reception = 0;
+    }
+
+    pub(crate) fn get_reply_surbs(&mut self, amount: usize) -> (Option<Vec<ReplySurb>>, usize) {
+        if self.items_left() < amount {
+            (None, self.items_left())
+        } else {
+            let surbs = self.data.drain(..amount).collect();
+            (Some(surbs), self.items_left())
+        }
+    }
+
+    pub(crate) fn get_reply_surb(&mut self) -> (Option<ReplySurb>, usize) {
+        (self.pop_surb(), self.items_left())
+    }
+
+    fn pop_surb(&mut self) -> Option<ReplySurb> {
+        self.data.pop_front()
+    }
+
+    fn items_left(&self) -> usize {
+        self.data.len()
+    }
+
+    // realistically we're always going to be getting multiple surbs at once
+    pub(crate) fn insert_reply_surbs<I: IntoIterator<Item = ReplySurb>>(&mut self, surbs: I) {
+        let mut v = surbs.into_iter().collect::<VecDeque<_>>();
+        trace!("storing {} surbs in the storage", v.len());
+        self.data.append(&mut v);
+        self.surbs_last_received_at_timestamp = OffsetDateTime::now_utc().unix_timestamp();
+        trace!("we now have {} surbs!", self.data.len());
+    }
+}
diff --git a/clients/client-core/src/client/replies/reply_storage/tag_storage.rs b/clients/client-core/src/client/replies/reply_storage/tag_storage.rs
new file mode 100644
index 0000000000..c91d2b003e
--- /dev/null
+++ b/clients/client-core/src/client/replies/reply_storage/tag_storage.rs
@@ -0,0 +1,59 @@
+// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use dashmap::DashMap;
+use nymsphinx::addressing::clients::{Recipient, RecipientBytes};
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
+use std::sync::Arc;
+
+#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+use dashmap::iter::Iter;
+
+#[derive(Debug, Clone)]
+pub struct UsedSenderTags {
+    inner: Arc<UsedSenderTagsInner>,
+}
+
+#[derive(Debug)]
+struct UsedSenderTagsInner {
+    data: DashMap<RecipientBytes, AnonymousSenderTag>,
+}
+
+impl UsedSenderTags {
+    pub(crate) fn new() -> UsedSenderTags {
+        UsedSenderTags {
+            inner: Arc::new(UsedSenderTagsInner {
+                data: DashMap::new(),
+            }),
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn from_raw(raw: Vec<(RecipientBytes, AnonymousSenderTag)>) -> UsedSenderTags {
+        UsedSenderTags {
+            inner: Arc::new(UsedSenderTagsInner {
+                data: raw.into_iter().collect(),
+            }),
+        }
+    }
+
+    #[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+    pub(crate) fn as_raw_iter(&self) -> Iter<'_, RecipientBytes, AnonymousSenderTag> {
+        self.inner.data.iter()
+    }
+
+    pub(crate) fn insert_new(&self, recipient: &Recipient, tag: AnonymousSenderTag) {
+        self.inner.data.insert(recipient.to_bytes(), tag);
+    }
+
+    pub(crate) fn try_get_existing(&self, recipient: &Recipient) -> Option<AnonymousSenderTag> {
+        self.inner
+            .data
+            .get(&recipient.to_bytes())
+            .map(|r| *r.value())
+    }
+
+    pub(crate) fn exists(&self, recipient: &Recipient) -> bool {
+        self.inner.data.contains_key(&recipient.to_bytes())
+    }
+}
diff --git a/clients/client-core/src/client/reply_key_storage.rs b/clients/client-core/src/client/reply_key_storage.rs
deleted file mode 100644
index bfe1c43b9b..0000000000
--- a/clients/client-core/src/client/reply_key_storage.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crypto::generic_array::typenum::Unsigned;
-use log::*;
-use nymsphinx::anonymous_replies::{
-    encryption_key::EncryptionKeyDigest, SurbEncryptionKey, SurbEncryptionKeySize,
-};
-use std::path::Path;
-
-#[derive(Debug, thiserror::Error)]
-pub enum ReplyKeyStorageError {
-    #[error("DB Read Error: {0}")]
-    DbReadError(sled::Error),
-    #[error("DB Write Error: {0}")]
-    DbWriteError(sled::Error),
-    #[error("DB Open Error: {0}")]
-    DbOpenError(sled::Error),
-}
-
-/// Permanent storage for keys in all sent [`ReplySURB`]
-///
-/// Each sent out [`ReplySURB`] has a new key associated with it that is going to be used for
-/// payload encryption. In order to -decrypt whatever reply we receive, we need to know which
-/// key to use for that purpose. We do it based on received `H(t)` which has to be included
-/// with each reply.
-/// Moreover, there is no restriction when the [`ReplySURB`] might get used so we need to
-/// have a permanent storage for all the keys that we might ever see in the future.
-#[derive(Debug, Clone)]
-pub struct ReplyKeyStorage {
-    db: sled::Db,
-}
-
-impl ReplyKeyStorage {
-    pub fn load<P: AsRef<Path>>(path: P) -> Result<Self, ReplyKeyStorageError> {
-        let db = match sled::open(path) {
-            Err(e) => return Err(ReplyKeyStorageError::DbOpenError(e)),
-            Ok(db) => db,
-        };
-
-        Ok(ReplyKeyStorage { db })
-    }
-
-    fn read_encryption_key(&self, raw_key: sled::IVec) -> SurbEncryptionKey {
-        let key_bytes_ref = raw_key.as_ref();
-        // if this fails it means we have some database corruption and we
-        // absolutely can't continue
-
-        if key_bytes_ref.len() != SurbEncryptionKeySize::USIZE {
-            error!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
-            panic!("REPLY KEY STORAGE DATA CORRUPTION - ENCRYPTION KEY HAS INVALID LENGTH");
-        }
-
-        // this can only fail if the bytes have invalid length but we already asserted it
-        SurbEncryptionKey::try_from_bytes(key_bytes_ref).unwrap()
-    }
-
-    // TOOD: perhaps we could also store some part of original message here too?
-    pub fn insert_encryption_key(
-        &mut self,
-        encryption_key: SurbEncryptionKey,
-    ) -> Result<(), ReplyKeyStorageError> {
-        let digest = encryption_key.compute_digest();
-
-        let insertion_result = match self.db.insert(digest, encryption_key.to_bytes()) {
-            Err(e) => Err(ReplyKeyStorageError::DbWriteError(e)),
-            Ok(existing_key) => {
-                if existing_key.is_some() {
-                    panic!("HASH COLLISION DETECTED")
-                };
-                Ok(())
-            }
-        };
-
-        // TODO: perhaps we could implement some batching mechanism to avoid frequent flushes?
-        self.db.flush().unwrap();
-        insertion_result
-    }
-
-    // Once we use key once, we do not expect to use it again
-    pub fn get_and_remove_encryption_key(
-        &self,
-        key_digest: EncryptionKeyDigest,
-    ) -> Result<Option<SurbEncryptionKey>, ReplyKeyStorageError> {
-        let removal_result = match self.db.remove(key_digest) {
-            Err(e) => Err(ReplyKeyStorageError::DbReadError(e)),
-            Ok(existing_key) => {
-                Ok(existing_key.map(|existing_key| self.read_encryption_key(existing_key)))
-            }
-        };
-
-        // TODO: not sure how to feel about flushing it every single time here...
-        // same with insertion
-        self.db.flush().unwrap();
-        removal_result
-    }
-}
diff --git a/clients/client-core/src/client/topology_control.rs b/clients/client-core/src/client/topology_control.rs
index 6d1b82e066..fd5b27860d 100644
--- a/clients/client-core/src/client/topology_control.rs
+++ b/clients/client-core/src/client/topology_control.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::spawn_future;
@@ -10,10 +10,9 @@ use rand::seq::SliceRandom;
 use rand::thread_rng;
 use std::ops::Deref;
 use std::sync::Arc;
-use std::time;
 use std::time::Duration;
 use tokio::sync::{RwLock, RwLockReadGuard};
-use topology::{nym_topology_from_detailed, NymTopology};
+use topology::{nym_topology_from_detailed, NymTopology, NymTopologyError};
 use url::Url;
 
 // I'm extremely curious why compiler NEVER complained about lack of Debug here before
@@ -55,18 +54,36 @@ impl<'a> TopologyReadPermit<'a> {
         &'a self,
         ack_recipient: &Recipient,
         packet_recipient: Option<&Recipient>,
-    ) -> Option<&'a NymTopology> {
-        // Note: implicit deref with Deref for TopologyReadPermit is happening here
-        let topology_ref_option = self.permit.as_ref();
-        topology_ref_option.as_ref().filter(|topology_ref| {
-            !(!topology_ref.can_construct_path_through(DEFAULT_NUM_MIX_HOPS)
-                || !topology_ref.gateway_exists(ack_recipient.gateway())
-                || if let Some(packet_recipient) = packet_recipient {
-                    !topology_ref.gateway_exists(packet_recipient.gateway())
-                } else {
-                    false
-                })
-        })
+    ) -> Result<&'a NymTopology, NymTopologyError> {
+        // 1. Have we managed to get anything from the refresher, i.e. have the nym-api queries gone through?
+        let topology = self
+            .permit
+            .as_ref()
+            .as_ref()
+            .ok_or(NymTopologyError::EmptyNetworkTopology)?;
+
+        // 2. does it have any mixnode at all?
+        // 3. does it have any gateways at all?
+        // 4. does it have a mixnode on each layer?
+        topology.ensure_can_construct_path_through(DEFAULT_NUM_MIX_HOPS)?;
+
+        // 5. does it contain OUR gateway (so that we could create an ack packet)?
+        if !topology.gateway_exists(ack_recipient.gateway()) {
+            return Err(NymTopologyError::NonExistentGatewayError {
+                identity_key: ack_recipient.gateway().to_base58_string(),
+            });
+        }
+
+        // 6. for our target recipient, does it contain THEIR gateway (so that we could create
+        if let Some(recipient) = packet_recipient {
+            if !topology.gateway_exists(recipient.gateway()) {
+                return Err(NymTopologyError::NonExistentGatewayError {
+                    identity_key: recipient.gateway().to_base58_string(),
+                });
+            }
+        }
+
+        Ok(topology)
     }
 }
 
@@ -104,10 +121,10 @@ impl TopologyAccessor {
 
     // only used by the client at startup to get a slightly more reasonable error message
     // (currently displays as unused because health checker is disabled due to required changes)
-    pub async fn is_routable(&self) -> bool {
+    pub async fn ensure_is_routable(&self) -> Result<(), NymTopologyError> {
         match &self.inner.read().await.0 {
-            None => false,
-            Some(ref topology) => topology.can_construct_path_through(DEFAULT_NUM_MIX_HOPS),
+            None => Err(NymTopologyError::EmptyNetworkTopology),
+            Some(ref topology) => topology.ensure_can_construct_path_through(DEFAULT_NUM_MIX_HOPS),
         }
     }
 }
@@ -119,19 +136,15 @@ impl Default for TopologyAccessor {
 }
 
 pub struct TopologyRefresherConfig {
-    validator_api_urls: Vec<Url>,
-    refresh_rate: time::Duration,
+    nym_api_urls: Vec<Url>,
+    refresh_rate: Duration,
     client_version: String,
 }
 
 impl TopologyRefresherConfig {
-    pub fn new(
-        validator_api_urls: Vec<Url>,
-        refresh_rate: time::Duration,
-        client_version: String,
-    ) -> Self {
+    pub fn new(nym_api_urls: Vec<Url>, refresh_rate: Duration, client_version: String) -> Self {
         TopologyRefresherConfig {
-            validator_api_urls,
+            nym_api_urls,
             refresh_rate,
             client_version,
         }
@@ -139,10 +152,10 @@ impl TopologyRefresherConfig {
 }
 
 pub struct TopologyRefresher {
-    validator_client: validator_client::client::ApiClient,
+    validator_client: validator_client::client::NymApiClient,
     client_version: String,
 
-    validator_api_urls: Vec<Url>,
+    nym_api_urls: Vec<Url>,
     topology_accessor: TopologyAccessor,
     refresh_rate: Duration,
 
@@ -152,14 +165,14 @@ pub struct TopologyRefresher {
 
 impl TopologyRefresher {
     pub fn new(mut cfg: TopologyRefresherConfig, topology_accessor: TopologyAccessor) -> Self {
-        cfg.validator_api_urls.shuffle(&mut thread_rng());
+        cfg.nym_api_urls.shuffle(&mut thread_rng());
 
         TopologyRefresher {
-            validator_client: validator_client::client::ApiClient::new(
-                cfg.validator_api_urls[0].clone(),
+            validator_client: validator_client::client::NymApiClient::new(
+                cfg.nym_api_urls[0].clone(),
             ),
             client_version: cfg.client_version,
-            validator_api_urls: cfg.validator_api_urls,
+            nym_api_urls: cfg.nym_api_urls,
             topology_accessor,
             refresh_rate: cfg.refresh_rate,
             currently_used_api: 0,
@@ -167,15 +180,15 @@ impl TopologyRefresher {
         }
     }
 
-    fn use_next_validator_api(&mut self) {
-        if self.validator_api_urls.len() == 1 {
-            warn!("There's only a single validator API available - it won't be possible to use a different one");
+    fn use_next_nym_api(&mut self) {
+        if self.nym_api_urls.len() == 1 {
+            warn!("There's only a single nym API available - it won't be possible to use a different one");
             return;
         }
 
-        self.currently_used_api = (self.currently_used_api + 1) % self.validator_api_urls.len();
+        self.currently_used_api = (self.currently_used_api + 1) % self.nym_api_urls.len();
         self.validator_client
-            .change_validator_api(self.validator_api_urls[self.currently_used_api].clone())
+            .change_nym_api(self.nym_api_urls[self.currently_used_api].clone())
     }
 
     /// Verifies whether nodes a reasonably distributed among all mix layers.
@@ -187,13 +200,10 @@ impl TopologyRefresher {
     /// # Arguments
     ///
     /// * `topology`: active topology constructed from validator api data
-    /// * `mixnodes_count`: total number of active mixnodes
-    fn check_layer_distribution(
-        &self,
-        active_topology: &NymTopology,
-        mixnodes_count: usize,
-    ) -> bool {
+    fn check_layer_distribution(&self, active_topology: &NymTopology) -> bool {
         let mixes = active_topology.mixes();
+        let mixnodes_count = active_topology.num_mixnodes();
+
         if active_topology.gateways().is_empty() {
             return false;
         }
@@ -244,7 +254,7 @@ impl TopologyRefresher {
 
         let mixnodes = match self.validator_client.get_cached_active_mixnodes().await {
             Err(err) => {
-                error!("failed to get network mixnodes - {}", err);
+                error!("failed to get network mixnodes - {err}");
                 return None;
             }
             Ok(mixes) => mixes,
@@ -252,17 +262,16 @@ impl TopologyRefresher {
 
         let gateways = match self.validator_client.get_cached_gateways().await {
             Err(err) => {
-                error!("failed to get network gateways - {}", err);
+                error!("failed to get network gateways - {err}");
                 return None;
             }
             Ok(gateways) => gateways,
         };
 
-        let mixnodes_count = mixnodes.len();
         let topology = nym_topology_from_detailed(mixnodes, gateways)
             .filter_system_version(&self.client_version);
 
-        if !self.check_layer_distribution(&topology, mixnodes_count) {
+        if !self.check_layer_distribution(&topology) {
             warn!("The current filtered active topology has extremely skewed layer distribution. It cannot be used.");
             None
         } else {
@@ -275,7 +284,7 @@ impl TopologyRefresher {
         let new_topology = self.get_current_compatible_topology().await;
 
         if new_topology.is_none() {
-            self.use_next_validator_api();
+            self.use_next_nym_api();
         }
 
         if new_topology.is_none() && self.was_latest_valid {
@@ -293,11 +302,11 @@ impl TopologyRefresher {
             .await;
     }
 
-    pub async fn is_topology_routable(&self) -> bool {
-        self.topology_accessor.is_routable().await
+    pub async fn ensure_topology_is_routable(&self) -> Result<(), NymTopologyError> {
+        self.topology_accessor.ensure_is_routable().await
     }
 
-    pub fn start_with_shutdown(mut self, mut shutdown: task::ShutdownListener) {
+    pub fn start_with_shutdown(mut self, mut shutdown: task::TaskClient) {
         spawn_future(async move {
             debug!("Started TopologyRefresher with graceful shutdown support");
 
@@ -324,21 +333,4 @@ impl TopologyRefresher {
             log::debug!("TopologyRefresher: Exiting");
         })
     }
-
-    pub fn start(mut self) {
-        spawn_future(async move {
-            #[cfg(not(target_arch = "wasm32"))]
-            let mut interval = tokio_stream::wrappers::IntervalStream::new(tokio::time::interval(
-                self.refresh_rate,
-            ));
-
-            #[cfg(target_arch = "wasm32")]
-            let mut interval =
-                gloo_timers::future::IntervalStream::new(self.refresh_rate.as_millis() as u32);
-
-            while (interval.next().await).is_some() {
-                self.refresh().await;
-            }
-        })
-    }
 }
diff --git a/clients/client-core/src/client/real_messages_control/real_traffic_stream/transmission_buffer.rs b/clients/client-core/src/client/transmission_buffer.rs
similarity index 51%
rename from clients/client-core/src/client/real_messages_control/real_traffic_stream/transmission_buffer.rs
rename to clients/client-core/src/client/transmission_buffer.rs
index b47aaf470e..1420ce0a7b 100644
--- a/clients/client-core/src/client/real_messages_control/real_traffic_stream/transmission_buffer.rs
+++ b/clients/client-core/src/client/transmission_buffer.rs
@@ -1,38 +1,57 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::client::helpers::{get_time_now, Instant};
+use crate::client::real_messages_control::real_traffic_stream::RealMessage;
 use client_connections::TransmissionLane;
-use rand::seq::SliceRandom;
+use nymsphinx::chunking::fragment::Fragment;
+use rand::{seq::SliceRandom, Rng};
 use std::{
     collections::{HashMap, HashSet, VecDeque},
     time::Duration,
 };
 
-#[cfg(not(target_arch = "wasm32"))]
-use tokio::time;
-
-#[cfg(target_arch = "wasm32")]
-use wasm_timer;
-
-use super::{get_time_now, RealMessage};
-
 // The number of lanes included in the oldest set. Used when we need to prioritize traffic.
-const OLDEST_LANE_SET_SIZE: usize = 5;
+const OLDEST_LANE_SET_SIZE: usize = 4;
 // As a way of prune connections we also check for timeouts.
 const MSG_CONSIDERED_STALE_AFTER_SECS: u64 = 10 * 60;
 
-#[derive(Default)]
-pub(crate) struct TransmissionBuffer {
-    buffer: HashMap<TransmissionLane, LaneBufferEntry>,
+pub(crate) trait SizedData {
+    fn data_size(&self) -> usize;
 }
 
-impl TransmissionBuffer {
+impl SizedData for RealMessage {
+    fn data_size(&self) -> usize {
+        self.packet_size()
+    }
+}
+
+impl SizedData for Fragment {
+    fn data_size(&self) -> usize {
+        // note that raw `Fragment` is smaller than sphinx packet payload
+        // as it doesn't include surb-ack or the [shared] key materials
+        self.payload_size()
+    }
+}
+
+#[derive(Default)]
+pub(crate) struct TransmissionBuffer<T> {
+    buffer: HashMap<TransmissionLane, LaneBufferEntry<T>>,
+}
+
+impl<T> TransmissionBuffer<T> {
+    pub(crate) fn new() -> Self {
+        TransmissionBuffer {
+            buffer: HashMap::new(),
+        }
+    }
+
     #[allow(unused)]
     pub(crate) fn is_empty(&self) -> bool {
         self.buffer.is_empty()
     }
 
-    pub(crate) fn remove(&mut self, lane: &TransmissionLane) -> Option<LaneBufferEntry> {
+    pub(crate) fn remove(&mut self, lane: &TransmissionLane) -> Option<LaneBufferEntry<T>> {
         self.buffer.remove(lane)
     }
 
@@ -57,20 +76,22 @@ impl TransmissionBuffer {
             .collect()
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
     pub(crate) fn total_size(&self) -> usize {
         self.buffer.values().map(LaneBufferEntry::len).sum()
     }
 
     #[cfg(not(target_arch = "wasm32"))]
-    pub(crate) fn total_size_in_bytes(&self) -> usize {
+    pub(crate) fn total_size_in_bytes(&self) -> usize
+    where
+        T: SizedData,
+    {
         self.buffer
             .values()
             .map(|lane_buffer_entry| {
                 lane_buffer_entry
-                    .real_messages
+                    .items
                     .iter()
-                    .map(|real_message| real_message.mix_packet.sphinx_packet().len())
+                    .map(|item| item.data_size())
                     .sum::<usize>()
             })
             .sum()
@@ -92,36 +113,51 @@ impl TransmissionBuffer {
             .collect()
     }
 
-    pub(crate) fn store(&mut self, lane: &TransmissionLane, real_messages: Vec<RealMessage>) {
+    pub(crate) fn store<I: IntoIterator<Item = T>>(&mut self, lane: &TransmissionLane, items: I) {
         if let Some(lane_buffer_entry) = self.buffer.get_mut(lane) {
-            lane_buffer_entry.append(real_messages);
+            lane_buffer_entry.extend(items);
         } else {
             self.buffer
-                .insert(*lane, LaneBufferEntry::new(real_messages));
+                .insert(*lane, LaneBufferEntry::new(items.into_iter().collect()));
         }
     }
 
-    fn pick_random_lane(&self) -> Option<&TransmissionLane> {
-        let lanes: Vec<&TransmissionLane> = self.buffer.keys().collect();
-        lanes.choose(&mut rand::thread_rng()).copied()
+    pub(crate) fn store_multiple(&mut self, items: Vec<(TransmissionLane, T)>) {
+        for (lane, item) in items {
+            self.buffer
+                .entry(lane)
+                .or_insert_with(LaneBufferEntry::new_empty)
+                .push_item(item)
+        }
     }
 
-    fn pick_random_small_lane(&self) -> Option<&TransmissionLane> {
+    fn pick_random_lane<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<&TransmissionLane> {
+        let lanes: Vec<&TransmissionLane> = self.buffer.keys().collect();
+        lanes.choose(rng).copied()
+    }
+
+    fn pick_random_small_lane<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<&TransmissionLane> {
         let lanes: Vec<&TransmissionLane> = self
             .buffer
             .iter()
             .filter(|(_, v)| v.is_small())
             .map(|(k, _)| k)
             .collect();
-        lanes.choose(&mut rand::thread_rng()).copied()
+        lanes.choose(rng).copied()
     }
 
-    fn pick_random_old_lane(&self) -> Option<TransmissionLane> {
-        let lanes = self.get_oldest_set();
-        lanes.choose(&mut rand::thread_rng()).copied()
+    // 2/3 chance to pick from the old lanes
+    fn pick_random_old_lane<R: Rng + ?Sized>(&self, rng: &mut R) -> Option<TransmissionLane> {
+        let rand = &mut rand::thread_rng();
+        if rand.gen_ratio(2, 3) {
+            let lanes = self.get_oldest_set();
+            lanes.choose(rand).copied()
+        } else {
+            self.pick_random_lane(rng).copied()
+        }
     }
 
-    fn pop_front_from_lane(&mut self, lane: &TransmissionLane) -> Option<RealMessage> {
+    fn pop_front_from_lane(&mut self, lane: &TransmissionLane) -> Option<T> {
         let real_msgs_queued = self.buffer.get_mut(lane)?;
         let real_next = real_msgs_queued.pop_front()?;
         real_msgs_queued.messages_transmitted += 1;
@@ -131,19 +167,48 @@ impl TransmissionBuffer {
         Some(real_next)
     }
 
-    pub(crate) fn pop_next_message_at_random(&mut self) -> Option<(TransmissionLane, RealMessage)> {
+    pub(crate) fn pop_at_most_n_next_messages_at_random(
+        &mut self,
+        n: usize,
+    ) -> Option<Vec<(TransmissionLane, T)>> {
+        // let start = Instant::now();
+
+        if self.buffer.is_empty() {
+            return None;
+        }
+
+        let rng = &mut rand::thread_rng();
+        let mut items = Vec::with_capacity(n);
+
+        while items.len() < n {
+            let Some(next) = self.pop_next_message_at_random(rng) else {
+               break
+            };
+            items.push(next)
+        }
+
+        // todo!("time time taken");
+
+        Some(items)
+    }
+
+    pub(crate) fn pop_next_message_at_random<R: Rng + ?Sized>(
+        &mut self,
+        // turns out the caller always have access to some rng, so no point in instantiating new one
+        rng: &mut R,
+    ) -> Option<(TransmissionLane, T)> {
         if self.buffer.is_empty() {
             return None;
         }
 
         // Very basic heuristic where we prioritize according to small lanes first, the older lanes
         // to try to finish lanes when possible, then the rest.
-        let lane = if let Some(small_lane) = self.pick_random_small_lane() {
+        let lane = if let Some(small_lane) = self.pick_random_small_lane(rng) {
             *small_lane
-        } else if let Some(old_lane) = self.pick_random_old_lane() {
+        } else if let Some(old_lane) = self.pick_random_old_lane(rng) {
             old_lane
         } else {
-            *self.pick_random_lane()?
+            *self.pick_random_lane(rng)?
         };
 
         let msg = self.pop_front_from_lane(&lane)?;
@@ -165,35 +230,46 @@ impl TransmissionBuffer {
     }
 }
 
-pub(crate) struct LaneBufferEntry {
-    pub real_messages: VecDeque<RealMessage>,
+pub(crate) struct LaneBufferEntry<T> {
+    pub items: VecDeque<T>,
     pub messages_transmitted: usize,
-    #[cfg(not(target_arch = "wasm32"))]
-    pub time_for_last_activity: time::Instant,
-    #[cfg(target_arch = "wasm32")]
-    pub time_for_last_activity: wasm_timer::Instant,
+    pub time_for_last_activity: Instant,
 }
 
-impl LaneBufferEntry {
-    fn new(real_messages: Vec<RealMessage>) -> Self {
+impl<T> LaneBufferEntry<T> {
+    fn new_empty() -> Self {
         LaneBufferEntry {
-            real_messages: real_messages.into(),
+            items: VecDeque::new(),
             messages_transmitted: 0,
             time_for_last_activity: get_time_now(),
         }
     }
 
-    fn append(&mut self, real_messages: Vec<RealMessage>) {
-        self.real_messages.append(&mut real_messages.into());
+    fn new(items: VecDeque<T>) -> Self {
+        LaneBufferEntry {
+            items,
+            messages_transmitted: 0,
+            time_for_last_activity: get_time_now(),
+        }
+    }
+
+    fn push_item(&mut self, item: T) {
+        self.items.push_back(item);
+        // I'm not updating time here on purpose. This method is called just after `new_empty`,
+        // where the time is already set. Furthermore, this method is called there multiple times at once
+    }
+
+    fn extend<I: IntoIterator<Item = T>>(&mut self, items: I) {
+        self.items.extend(items);
         self.time_for_last_activity = get_time_now();
     }
 
-    fn pop_front(&mut self) -> Option<RealMessage> {
-        self.real_messages.pop_front()
+    fn pop_front(&mut self) -> Option<T> {
+        self.items.pop_front()
     }
 
     fn is_small(&self) -> bool {
-        self.real_messages.len() < 100
+        self.items.len() < 100
     }
 
     fn is_stale(&self) -> bool {
@@ -202,10 +278,10 @@ impl LaneBufferEntry {
     }
 
     fn len(&self) -> usize {
-        self.real_messages.len()
+        self.items.len()
     }
 
     fn is_empty(&self) -> bool {
-        self.real_messages.is_empty()
+        self.items.is_empty()
     }
 }
diff --git a/clients/client-core/src/config/mod.rs b/clients/client-core/src/config/mod.rs
index 82317a6431..97b7c85c1a 100644
--- a/clients/client-core/src/config/mod.rs
+++ b/clients/client-core/src/config/mod.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use config::NymConfig;
+use config::{NymConfig, OptionalSet, DB_FILE_NAME};
 use nymsphinx::params::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
@@ -30,10 +30,36 @@ const DEFAULT_TOPOLOGY_RESOLUTION_TIMEOUT: Duration = Duration::from_millis(5_00
 // bandwidth bridging protocol, we can come back to a smaller timeout value
 const DEFAULT_GATEWAY_RESPONSE_TIMEOUT: Duration = Duration::from_secs(5 * 60);
 
+// reply-surbs related:
+
+// define when to request
+// clients/client-core/src/client/replies/reply_storage/surb_storage.rs
+const DEFAULT_MINIMUM_REPLY_SURB_STORAGE_THRESHOLD: usize = 10;
+const DEFAULT_MAXIMUM_REPLY_SURB_STORAGE_THRESHOLD: usize = 200;
+
+// define how much to request at once
+// clients/client-core/src/client/replies/reply_controller.rs
+const DEFAULT_MINIMUM_REPLY_SURB_REQUEST_SIZE: u32 = 10;
+const DEFAULT_MAXIMUM_REPLY_SURB_REQUEST_SIZE: u32 = 100;
+
+const DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE: u32 = 500;
+
+const DEFAULT_MAXIMUM_REPLY_SURB_WAITING_PERIOD: Duration = Duration::from_secs(10);
+
+// 12 hours
+const DEFAULT_MAXIMUM_REPLY_SURB_AGE: Duration = Duration::from_secs(12 * 60 * 60);
+
+// 24 hours
+const DEFAULT_MAXIMUM_REPLY_KEY_AGE: Duration = Duration::from_secs(24 * 60 * 60);
+
 pub fn missing_string_value() -> String {
     MISSING_VALUE.to_string()
 }
 
+pub trait ClientCoreConfigTrait {
+    fn get_gateway_endpoint(&self) -> &GatewayEndpointConfig;
+}
+
 #[derive(Debug, Clone, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Config<T> {
@@ -45,30 +71,48 @@ pub struct Config<T> {
     debug: DebugConfig,
 }
 
+impl<T> ClientCoreConfigTrait for Config<T> {
+    fn get_gateway_endpoint(&self) -> &GatewayEndpointConfig {
+        &self.client.gateway_endpoint
+    }
+}
+
+impl<T> OptionalSet for Config<T> where T: NymConfig {}
+
 impl<T> Config<T> {
     pub fn new<S: Into<String>>(id: S) -> Self
     where
         T: NymConfig,
     {
-        let mut cfg = Config::default();
-        cfg.with_id(id);
-        cfg
+        Config::default().with_id(id)
     }
 
-    pub fn with_id<S: Into<String>>(&mut self, id: S)
+    pub fn with_id<S: Into<String>>(mut self, id: S) -> Self
     where
         T: NymConfig,
     {
-        let id = id.into();
+        self.client.id = id.into();
+        self.set_empty_fields_to_defaults();
+        self
+    }
+
+    pub fn set_empty_fields_to_defaults(&mut self) -> bool
+    where
+        T: NymConfig,
+    {
+        let id = &self.client.id;
+        let mut changes_made = false;
 
         // identity key setting
         if self.client.private_identity_key_file.as_os_str().is_empty() {
+            changes_made = true;
             self.client.private_identity_key_file =
-                self::Client::<T>::default_private_identity_key_file(&id);
+                self::Client::<T>::default_private_identity_key_file(id);
         }
         if self.client.public_identity_key_file.as_os_str().is_empty() {
+            changes_made = true;
             self.client.public_identity_key_file =
-                self::Client::<T>::default_public_identity_key_file(&id);
+                self::Client::<T>::default_public_identity_key_file(id);
         }
 
         // encryption key setting
@@ -78,8 +122,9 @@ impl<T> Config<T> {
             .as_os_str()
             .is_empty()
         {
+            changes_made = true;
             self.client.private_encryption_key_file =
-                self::Client::<T>::default_private_encryption_key_file(&id);
+                self::Client::<T>::default_private_encryption_key_file(id);
         }
         if self
             .client
@@ -87,40 +132,40 @@ impl<T> Config<T> {
             .as_os_str()
             .is_empty()
         {
+            changes_made = true;
             self.client.public_encryption_key_file =
-                self::Client::<T>::default_public_encryption_key_file(&id);
+                self::Client::<T>::default_public_encryption_key_file(id);
         }
 
         // shared gateway key setting
         if self.client.gateway_shared_key_file.as_os_str().is_empty() {
+            changes_made = true;
             self.client.gateway_shared_key_file =
-                self::Client::<T>::default_gateway_shared_key_file(&id);
+                self::Client::<T>::default_gateway_shared_key_file(id);
         }
 
         // ack key setting
         if self.client.ack_key_file.as_os_str().is_empty() {
-            self.client.ack_key_file = self::Client::<T>::default_ack_key_file(&id);
+            changes_made = true;
+            self.client.ack_key_file = self::Client::<T>::default_ack_key_file(id);
         }
 
-        if self
-            .client
-            .reply_encryption_key_store_path
-            .as_os_str()
-            .is_empty()
-        {
-            self.client.reply_encryption_key_store_path =
-                self::Client::<T>::default_reply_encryption_key_store_path(&id);
+        if self.client.reply_surb_database_path.as_os_str().is_empty() {
+            changes_made = true;
+            self.client.reply_surb_database_path =
+                self::Client::<T>::default_reply_surb_database_path(id);
         }
 
         if self.client.database_path.as_os_str().is_empty() {
-            self.client.database_path = self::Client::<T>::default_database_path(&id);
+            changes_made = true;
+            self.client.database_path = self::Client::<T>::default_database_path(id);
         }
-
-        self.client.id = id;
+        changes_made
     }
 
-    pub fn with_disabled_credentials(&mut self, disabled_credentials_mode: bool) {
+    pub fn with_disabled_credentials(mut self, disabled_credentials_mode: bool) -> Self {
         self.client.disabled_credentials_mode = disabled_credentials_mode;
+        self
     }
 
     pub fn with_gateway_endpoint(&mut self, gateway_endpoint: GatewayEndpointConfig) {
@@ -131,18 +176,49 @@ impl<T> Config<T> {
         self.client.gateway_endpoint.gateway_id = id.into();
     }
 
-    pub fn set_custom_validators(&mut self, validator_urls: Vec<Url>) {
-        self.client.validator_urls = validator_urls;
+    pub fn with_custom_nyxd(mut self, urls: Vec<Url>) -> Self {
+        self.client.nyxd_urls = urls;
+        self
     }
 
-    pub fn set_custom_validator_apis(&mut self, validator_api_urls: Vec<Url>) {
-        self.client.validator_api_urls = validator_api_urls;
+    pub fn set_custom_nyxd(&mut self, nyxd_urls: Vec<Url>) {
+        self.client.nyxd_urls = nyxd_urls;
+    }
+
+    pub fn with_custom_nym_apis(mut self, nym_api_urls: Vec<Url>) -> Self {
+        self.client.nym_api_urls = nym_api_urls;
+        self
+    }
+
+    pub fn set_custom_nym_apis(&mut self, nym_api_urls: Vec<Url>) {
+        self.client.nym_api_urls = nym_api_urls;
+    }
+
+    pub fn with_high_default_traffic_volume(mut self, enabled: bool) -> Self {
+        if enabled {
+            self.set_high_default_traffic_volume();
+        }
+        self
     }
 
     pub fn set_high_default_traffic_volume(&mut self) {
         self.debug.average_packet_delay = Duration::from_millis(10);
-        self.debug.loop_cover_traffic_average_delay = Duration::from_millis(2_000_000); // basically don't really send cover messages
-        self.debug.message_sending_average_delay = Duration::from_millis(4); // 250 "real" messages / s
+        // basically don't really send cover messages
+        self.debug.loop_cover_traffic_average_delay = Duration::from_millis(2_000_000);
+        // 250 "real" messages / s
+        self.debug.message_sending_average_delay = Duration::from_millis(4);
+    }
+
+    pub fn with_disabled_cover_traffic(mut self, disabled: bool) -> Self {
+        if disabled {
+            self.set_no_cover_traffic()
+        }
+        self
+    }
+
+    pub fn set_no_cover_traffic(&mut self) {
+        self.debug.disable_loop_cover_traffic_stream = true;
+        self.debug.disable_main_poisson_packet_distribution = true;
     }
 
     pub fn set_custom_version(&mut self, version: &str) {
@@ -181,20 +257,16 @@ impl<T> Config<T> {
         self.client.gateway_shared_key_file.clone()
     }
 
-    pub fn get_reply_encryption_key_store_path(&self) -> PathBuf {
-        self.client.reply_encryption_key_store_path.clone()
-    }
-
     pub fn get_ack_key_file(&self) -> PathBuf {
         self.client.ack_key_file.clone()
     }
 
     pub fn get_validator_endpoints(&self) -> Vec<Url> {
-        self.client.validator_urls.clone()
+        self.client.nyxd_urls.clone()
     }
 
-    pub fn get_validator_api_endpoints(&self) -> Vec<Url> {
-        self.client.validator_api_urls.clone()
+    pub fn get_nym_api_endpoints(&self) -> Vec<Url> {
+        self.client.nym_api_urls.clone()
     }
 
     pub fn get_gateway_id(&self) -> String {
@@ -213,14 +285,18 @@ impl<T> Config<T> {
         &self.client.gateway_endpoint
     }
 
-    pub fn get_gateway_endpoint(&self) -> &GatewayEndpointConfig {
-        &self.client.gateway_endpoint
-    }
-
     pub fn get_database_path(&self) -> PathBuf {
         self.client.database_path.clone()
     }
 
+    pub fn get_reply_surb_database_path(&self) -> PathBuf {
+        self.client.reply_surb_database_path.clone()
+    }
+
+    pub fn get_version(&self) -> &str {
+        &self.client.version
+    }
+
     // Debug getters
     pub fn get_debug_config(&self) -> &DebugConfig {
         &self.debug
@@ -274,8 +350,36 @@ impl<T> Config<T> {
         self.debug.use_extended_packet_size
     }
 
-    pub fn get_version(&self) -> &str {
-        &self.client.version
+    pub fn get_minimum_reply_surb_storage_threshold(&self) -> usize {
+        self.debug.minimum_reply_surb_storage_threshold
+    }
+
+    pub fn get_maximum_reply_surb_storage_threshold(&self) -> usize {
+        self.debug.maximum_reply_surb_storage_threshold
+    }
+
+    pub fn get_minimum_reply_surb_request_size(&self) -> u32 {
+        self.debug.minimum_reply_surb_request_size
+    }
+
+    pub fn get_maximum_reply_surb_request_size(&self) -> u32 {
+        self.debug.maximum_reply_surb_request_size
+    }
+
+    pub fn get_maximum_allowed_reply_surb_request_size(&self) -> u32 {
+        self.debug.maximum_allowed_reply_surb_request_size
+    }
+
+    pub fn get_maximum_reply_surb_waiting_period(&self) -> Duration {
+        self.debug.maximum_reply_surb_waiting_period
+    }
+
+    pub fn get_maximum_reply_surb_age(&self) -> Duration {
+        self.debug.maximum_reply_surb_age
+    }
+
+    pub fn get_maximum_reply_key_age(&self) -> Duration {
+        self.debug.maximum_reply_key_age
     }
 }
 
@@ -303,6 +407,22 @@ pub struct GatewayEndpointConfig {
     pub gateway_listener: String,
 }
 
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
+impl GatewayEndpointConfig {
+    #[cfg_attr(target_arch = "wasm32", wasm_bindgen(constructor))]
+    pub fn new(
+        gateway_id: String,
+        gateway_owner: String,
+        gateway_listener: String,
+    ) -> GatewayEndpointConfig {
+        GatewayEndpointConfig {
+            gateway_id,
+            gateway_owner,
+            gateway_listener,
+        }
+    }
+}
+
 impl From<topology::gateway::Node> for GatewayEndpointConfig {
     fn from(node: topology::gateway::Node) -> GatewayEndpointConfig {
         let gateway_listener = node.clients_address();
@@ -328,12 +448,13 @@ pub struct Client<T> {
     #[serde(default)]
     disabled_credentials_mode: bool,
 
-    /// Addresses to nymd validators via which the client can communicate with the chain.
-    #[serde(default)]
-    validator_urls: Vec<Url>,
+    /// Addresses to nyxd validators via which the client can communicate with the chain.
+    #[serde(alias = "validator_urls")]
+    nyxd_urls: Vec<Url>,
 
     /// Addresses to APIs running on validator from which the client gets the view of the network.
-    validator_api_urls: Vec<Url>,
+    #[serde(alias = "validator_api_urls")]
+    nym_api_urls: Vec<Url>,
 
     /// Path to file containing private identity key.
     private_identity_key_file: PathBuf,
@@ -355,16 +476,19 @@ pub struct Client<T> {
     /// acknowledgement so that nobody besides the client knows which packet it refers to.
     ack_key_file: PathBuf,
 
-    /// Full path to file containing reply encryption keys of all reply-SURBs we have ever
-    /// sent but not received back.
-    reply_encryption_key_store_path: PathBuf,
-
     /// Information regarding how the client should send data to gateway.
     gateway_endpoint: GatewayEndpointConfig,
 
     /// Path to the database containing bandwidth credentials of this client.
     database_path: PathBuf,
 
+    /// Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
+    // this was set to use #[serde(default)] for the purposes of compatibility for multi-surbs introduced in 1.1.4.
+    // if you're reading this message and we have already introduced some breaking changes, feel free
+    // to remove that attribute since at this point the client configs should have gotten regenerated
+    #[serde(default)]
+    reply_surb_database_path: PathBuf,
+
     /// nym_home_directory specifies absolute path to the home nym Clients directory.
     /// It is expected to use default value and hence .toml file should not redefine this field.
     nym_root_directory: PathBuf,
@@ -380,17 +504,17 @@ impl<T: NymConfig> Default for Client<T> {
             version: env!("CARGO_PKG_VERSION").to_string(),
             id: "".to_string(),
             disabled_credentials_mode: true,
-            validator_urls: vec![],
-            validator_api_urls: vec![],
+            nyxd_urls: vec![],
+            nym_api_urls: vec![],
             private_identity_key_file: Default::default(),
             public_identity_key_file: Default::default(),
             private_encryption_key_file: Default::default(),
             public_encryption_key_file: Default::default(),
             gateway_shared_key_file: Default::default(),
             ack_key_file: Default::default(),
-            reply_encryption_key_store_path: Default::default(),
             gateway_endpoint: Default::default(),
             database_path: Default::default(),
+            reply_surb_database_path: Default::default(),
             nym_root_directory: T::default_root_directory(),
             super_struct: Default::default(),
         }
@@ -422,11 +546,12 @@ impl<T: NymConfig> Client<T> {
         T::default_data_directory(Some(id)).join("ack_key.pem")
     }
 
-    fn default_reply_encryption_key_store_path(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("reply_key_store")
+    fn default_reply_surb_database_path(id: &str) -> PathBuf {
+        T::default_data_directory(Some(id)).join("persistent_reply_store.sqlite")
     }
+
     fn default_database_path(id: &str) -> PathBuf {
-        T::default_data_directory(Some(id)).join("db.sqlite")
+        T::default_data_directory(Some(id)).join(DB_FILE_NAME)
     }
 }
 
@@ -500,6 +625,37 @@ pub struct DebugConfig {
 
     /// Controls whether the sent sphinx packet use a NON-DEFAULT bigger size.
     pub use_extended_packet_size: Option<ExtendedPacketSize>,
+
+    /// Defines the minimum number of reply surbs the client wants to keep in its storage at all times.
+    /// It can only allow to go below that value if its to request additional reply surbs.
+    pub minimum_reply_surb_storage_threshold: usize,
+
+    /// Defines the maximum number of reply surbs the client wants to keep in its storage at any times.
+    pub maximum_reply_surb_storage_threshold: usize,
+
+    /// Defines the minimum number of reply surbs the client would request.
+    pub minimum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs the client would request.
+    pub maximum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs a remote party is allowed to request from this client at once.
+    pub maximum_allowed_reply_surb_request_size: u32,
+
+    /// Defines maximum amount of time the client is going to wait for reply surbs before explicitly asking
+    /// for more even though in theory they wouldn't need to.
+    #[serde(with = "humantime_serde")]
+    pub maximum_reply_surb_waiting_period: Duration,
+
+    /// Defines maximum amount of time given reply surb is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    #[serde(with = "humantime_serde")]
+    pub maximum_reply_surb_age: Duration,
+
+    /// Defines maximum amount of time given reply key is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    #[serde(with = "humantime_serde")]
+    pub maximum_reply_key_age: Duration,
 }
 
 #[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -525,6 +681,14 @@ impl Default for DebugConfig {
             disable_loop_cover_traffic_stream: false,
             disable_main_poisson_packet_distribution: false,
             use_extended_packet_size: None,
+            minimum_reply_surb_storage_threshold: DEFAULT_MINIMUM_REPLY_SURB_STORAGE_THRESHOLD,
+            maximum_reply_surb_storage_threshold: DEFAULT_MAXIMUM_REPLY_SURB_STORAGE_THRESHOLD,
+            minimum_reply_surb_request_size: DEFAULT_MINIMUM_REPLY_SURB_REQUEST_SIZE,
+            maximum_reply_surb_request_size: DEFAULT_MAXIMUM_REPLY_SURB_REQUEST_SIZE,
+            maximum_allowed_reply_surb_request_size: DEFAULT_MAXIMUM_ALLOWED_SURB_REQUEST_SIZE,
+            maximum_reply_surb_waiting_period: DEFAULT_MAXIMUM_REPLY_SURB_WAITING_PERIOD,
+            maximum_reply_surb_age: DEFAULT_MAXIMUM_REPLY_SURB_AGE,
+            maximum_reply_key_age: DEFAULT_MAXIMUM_REPLY_KEY_AGE,
         }
     }
 }
diff --git a/clients/client-core/src/error.rs b/clients/client-core/src/error.rs
index e173a987fc..07bd9442ec 100644
--- a/clients/client-core/src/error.rs
+++ b/clients/client-core/src/error.rs
@@ -1,38 +1,69 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(feature = "reply-surb")]
-use crate::client::reply_key_storage::ReplyKeyStorageError;
 use crypto::asymmetric::identity::Ed25519RecoveryError;
 use gateway_client::error::GatewayClientError;
+use topology::NymTopologyError;
 use validator_client::ValidatorClientError;
 
 #[derive(thiserror::Error, Debug)]
 pub enum ClientCoreError {
     #[error("I/O error: {0}")]
     IoError(#[from] std::io::Error),
+
     #[error("Gateway client error: {0}")]
     GatewayClientError(#[from] GatewayClientError),
+
     #[error("Ed25519 error: {0}")]
     Ed25519RecoveryError(#[from] Ed25519RecoveryError),
+
     #[error("Validator client error: {0}")]
     ValidatorClientError(#[from] ValidatorClientError),
 
-    #[cfg(feature = "reply-surb")]
-    #[error("Reply key storage error: {0}")]
-    ReplyKeyStorageError(#[from] ReplyKeyStorageError),
-
     #[error("No gateway with id: {0}")]
     NoGatewayWithId(String),
+
     #[error("No gateways on network")]
     NoGatewaysOnNetwork,
-    #[error("List of validator apis is empty")]
-    ListOfValidatorApisIsEmpty,
+
+    #[error("Failed to setup gateway")]
+    FailedToSetupGateway,
+
+    #[error("List of nym apis is empty")]
+    ListOfNymApisIsEmpty,
+
     #[error("Could not load existing gateway configuration: {0}")]
     CouldNotLoadExistingGatewayConfiguration(std::io::Error),
+
     #[error("The current network topology seem to be insufficient to route any packets through")]
-    InsufficientNetworkTopology,
+    InsufficientNetworkTopology(#[from] NymTopologyError),
+
+    #[error("experienced a failure with our reply surb persistent storage: {source}")]
+    SurbStorageError {
+        source: Box<dyn std::error::Error + Send + Sync>,
+    },
+
+    #[error("The gateway id is invalid - {0}")]
+    UnableToCreatePublicKeyFromGatewayId(Ed25519RecoveryError),
+
+    #[error("The identity of the gateway is unknwown - did you run init?")]
+    GatewayIdUnknown,
+
+    #[error("The owner of the gateway is unknown - did you run init?")]
+    GatewayOwnerUnknown,
+
+    #[error("The address of the gateway is unknown - did you run init?")]
+    GatwayAddressUnknown,
 
     #[error("Unexpected exit")]
     UnexpectedExit,
 }
+
+/// Set of messages that the client can send to listeners via the task manager
+#[derive(thiserror::Error, Debug)]
+pub enum ClientCoreStatusMessage {
+    #[error("The connected gateway is slow, or the connection to it is slow")]
+    GatewayIsSlow,
+    #[error("The connected gateway is very slow, or the connection to it is very slow")]
+    GatewayIsVerySlow,
+}
diff --git a/clients/client-core/src/init.rs b/clients/client-core/src/init/helpers.rs
similarity index 54%
rename from clients/client-core/src/init.rs
rename to clients/client-core/src/init/helpers.rs
index 5e7c1e6c2a..01318e3b3c 100644
--- a/clients/client-core/src/init.rs
+++ b/clients/client-core/src/init/helpers.rs
@@ -1,39 +1,31 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-//! Collection of initialization steps used by client implementations
-
-use std::{sync::Arc, time::Duration};
-
-use config::NymConfig;
-use crypto::asymmetric::{encryption, identity};
-use gateway_client::GatewayClient;
-use gateway_requests::registration::handshake::SharedKeys;
-use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::addressing::nodes::NodeIdentity;
-use rand::rngs::OsRng;
-use rand::seq::SliceRandom;
-use rand::thread_rng;
-use tap::TapFallible;
-use topology::{filter::VersionFilterable, gateway};
-use url::Url;
-
 use crate::{
     client::key_manager::KeyManager,
     config::{persistence::key_pathfinder::ClientKeyPathfinder, Config},
     error::ClientCoreError,
 };
+use config::NymConfig;
+use crypto::asymmetric::identity;
+use gateway_client::GatewayClient;
+use gateway_requests::registration::handshake::SharedKeys;
+use rand::{rngs::OsRng, seq::SliceRandom, thread_rng};
+use std::{sync::Arc, time::Duration};
+use tap::TapFallible;
+use topology::{filter::VersionFilterable, gateway};
+use url::Url;
 
-pub async fn query_gateway_details(
+pub(super) async fn query_gateway_details(
     validator_servers: Vec<Url>,
-    chosen_gateway_id: Option<&str>,
+    chosen_gateway_id: Option<String>,
 ) -> Result<gateway::Node, ClientCoreError> {
-    let validator_api = validator_servers
+    let nym_api = validator_servers
         .choose(&mut thread_rng())
-        .ok_or(ClientCoreError::ListOfValidatorApisIsEmpty)?;
-    let validator_client = validator_client::client::ApiClient::new(validator_api.clone());
+        .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
+    let validator_client = validator_client::client::NymApiClient::new(nym_api.clone());
 
-    log::trace!("Fetching list of gateways from: {}", validator_api);
+    log::trace!("Fetching list of gateways from: {}", nym_api);
     let gateways = validator_client.get_cached_gateways().await?;
     let valid_gateways = gateways
         .into_iter()
@@ -59,7 +51,30 @@ pub async fn query_gateway_details(
     }
 }
 
-pub async fn register_with_gateway_and_store_keys<T>(
+async fn register_with_gateway(
+    gateway: &gateway::Node,
+    our_identity: Arc<identity::KeyPair>,
+) -> Result<Arc<SharedKeys>, ClientCoreError> {
+    let timeout = Duration::from_millis(1500);
+    let mut gateway_client = GatewayClient::new_init(
+        gateway.clients_address(),
+        gateway.identity_key,
+        gateway.owner.clone(),
+        our_identity.clone(),
+        timeout,
+    );
+    gateway_client
+        .establish_connection()
+        .await
+        .tap_err(|_| log::warn!("Failed to establish connection with gateway!"))?;
+    let shared_keys = gateway_client
+        .perform_initial_authentication()
+        .await
+        .tap_err(|_| log::warn!("Failed to register with the gateway!"))?;
+    Ok(shared_keys)
+}
+
+pub(super) async fn register_with_gateway_and_store_keys<T>(
     gateway_details: gateway::Node,
     config: &Config<T>,
 ) -> Result<(), ClientCoreError>
@@ -78,71 +93,3 @@ where
         .store_keys(&pathfinder)
         .tap_err(|err| log::error!("Failed to generate keys: {err}"))?)
 }
-
-async fn register_with_gateway(
-    gateway: &gateway::Node,
-    our_identity: Arc<identity::KeyPair>,
-) -> Result<Arc<SharedKeys>, ClientCoreError> {
-    let timeout = Duration::from_millis(1500);
-    let mut gateway_client = GatewayClient::new_init(
-        gateway.clients_address(),
-        gateway.identity_key,
-        gateway.owner.clone(),
-        our_identity.clone(),
-        timeout,
-        None,
-    );
-    gateway_client
-        .establish_connection()
-        .await
-        .tap_err(|_| log::warn!("Failed to establish connection with gateway!"))?;
-    let shared_keys = gateway_client
-        .perform_initial_authentication()
-        .await
-        .tap_err(|_| log::warn!("Failed to register with the gateway!"))?;
-    Ok(shared_keys)
-}
-
-pub fn show_address<T>(config: &Config<T>) -> Result<(), ClientCoreError>
-where
-    T: config::NymConfig,
-{
-    fn load_identity_keys(
-        pathfinder: &ClientKeyPathfinder,
-    ) -> Result<identity::KeyPair, ClientCoreError> {
-        let identity_keypair: identity::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
-                pathfinder.private_identity_key().to_owned(),
-                pathfinder.public_identity_key().to_owned(),
-            ))
-            .tap_err(|_| log::error!("Failed to read stored identity key files"))?;
-        Ok(identity_keypair)
-    }
-
-    fn load_sphinx_keys(
-        pathfinder: &ClientKeyPathfinder,
-    ) -> Result<encryption::KeyPair, ClientCoreError> {
-        let sphinx_keypair: encryption::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
-                pathfinder.private_encryption_key().to_owned(),
-                pathfinder.public_encryption_key().to_owned(),
-            ))
-            .tap_err(|_| log::error!("Failed to read stored sphinx key files"))?;
-        Ok(sphinx_keypair)
-    }
-
-    let pathfinder = ClientKeyPathfinder::new_from_config(config);
-    let identity_keypair = load_identity_keys(&pathfinder)?;
-    let sphinx_keypair = load_sphinx_keys(&pathfinder)?;
-
-    let client_recipient = Recipient::new(
-        *identity_keypair.public_key(),
-        *sphinx_keypair.public_key(),
-        // TODO: below only works under assumption that gateway address == gateway id
-        // (which currently is true)
-        NodeIdentity::from_base58_string(config.get_gateway_id())?,
-    );
-
-    println!("\nThe address of this client is: {}", client_recipient);
-    Ok(())
-}
diff --git a/clients/client-core/src/init/mod.rs b/clients/client-core/src/init/mod.rs
new file mode 100644
index 0000000000..4d012d366b
--- /dev/null
+++ b/clients/client-core/src/init/mod.rs
@@ -0,0 +1,200 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+//! Collection of initialization steps used by client implementations
+
+use std::fmt::Display;
+
+use nymsphinx::addressing::{clients::Recipient, nodes::NodeIdentity};
+use serde::Serialize;
+use tap::TapFallible;
+
+use config::NymConfig;
+use crypto::asymmetric::{encryption, identity};
+
+use crate::{
+    config::{
+        persistence::key_pathfinder::ClientKeyPathfinder, ClientCoreConfigTrait, Config,
+        GatewayEndpointConfig,
+    },
+    error::ClientCoreError,
+    init::helpers::{query_gateway_details, register_with_gateway_and_store_keys},
+};
+
+mod helpers;
+
+#[derive(Debug, Serialize)]
+pub struct InitResults {
+    version: String,
+    id: String,
+    identity_key: String,
+    encryption_key: String,
+    gateway_id: String,
+    gateway_listener: String,
+}
+
+impl InitResults {
+    pub fn new<T>(config: &Config<T>, address: &Recipient) -> Self
+    where
+        T: NymConfig,
+    {
+        Self {
+            version: config.get_version().to_string(),
+            id: config.get_id(),
+            identity_key: address.identity().to_base58_string(),
+            encryption_key: address.encryption_key().to_base58_string(),
+            gateway_id: config.get_gateway_id(),
+            gateway_listener: config.get_gateway_listener(),
+        }
+    }
+}
+
+impl Display for InitResults {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "Version: {}", self.version)?;
+        writeln!(f, "ID: {}", self.id)?;
+        writeln!(f, "Identity key: {}", self.identity_key)?;
+        writeln!(f, "Encryption: {}", self.encryption_key)?;
+        writeln!(f, "Gateway ID: {}", self.gateway_id)?;
+        write!(f, "Gateway: {}", self.gateway_listener)
+    }
+}
+
+/// Convenience function for setting up the gateway for a client. Depending on the arguments given
+/// it will do the sensible thing.
+pub async fn setup_gateway<C, T>(
+    register_gateway: bool,
+    // TODO: this should get refactored to instead take Option<identity::PublicKey>
+    user_chosen_gateway_id: Option<String>,
+    config: &Config<T>,
+) -> Result<GatewayEndpointConfig, ClientCoreError>
+where
+    C: NymConfig + ClientCoreConfigTrait,
+    T: NymConfig,
+{
+    let id = config.get_id();
+    if register_gateway {
+        register_with_gateway(user_chosen_gateway_id, config).await
+    } else if let Some(user_chosen_gateway_id) = user_chosen_gateway_id {
+        config_gateway_with_existing_keys(user_chosen_gateway_id, config).await
+    } else {
+        reuse_existing_gateway_config::<C>(&id)
+    }
+}
+
+/// Get the gateway details by querying the validator-api. Either pick one at random or use
+/// the chosen one if it's among the available ones.
+/// Saves keys to disk, specified by the paths in `config`.
+pub async fn register_with_gateway<T>(
+    user_chosen_gateway_id: Option<String>,
+    config: &Config<T>,
+) -> Result<GatewayEndpointConfig, ClientCoreError>
+where
+    T: NymConfig,
+{
+    println!("Configuring gateway");
+    let gateway =
+        query_gateway_details(config.get_nym_api_endpoints(), user_chosen_gateway_id).await?;
+    log::debug!("Querying gateway gives: {}", gateway);
+
+    // Registering with gateway by setting up and writing shared keys to disk
+    log::trace!("Registering gateway");
+    register_with_gateway_and_store_keys(gateway.clone(), config).await?;
+    println!("Saved all generated keys");
+
+    Ok(gateway.into())
+}
+
+/// Set the gateway using the usual procedue of querying the validator-api, but don't register or
+/// create any keys.
+/// This assumes that the user knows what they are doing, and that the existing keys are valid for
+/// the gateway being used
+pub async fn config_gateway_with_existing_keys<T>(
+    user_chosen_gateway_id: String,
+    config: &Config<T>,
+) -> Result<GatewayEndpointConfig, ClientCoreError>
+where
+    T: NymConfig,
+{
+    println!("Using gateway provided by user, keeping existing keys");
+    let gateway =
+        query_gateway_details(config.get_nym_api_endpoints(), Some(user_chosen_gateway_id)).await?;
+    log::debug!("Querying gateway gives: {}", gateway);
+    Ok(gateway.into())
+}
+
+/// Read and reuse the existing gateway configuration from a file that was generate earlier.
+pub fn reuse_existing_gateway_config<T>(id: &str) -> Result<GatewayEndpointConfig, ClientCoreError>
+where
+    T: NymConfig + ClientCoreConfigTrait,
+{
+    println!("Not registering gateway, will reuse existing config and keys");
+    T::load_from_file(Some(id))
+        .map(|existing_config| existing_config.get_gateway_endpoint().clone())
+        .map_err(|err| {
+            log::error!(
+                "Unable to configure gateway: {err}. \n
+                Seems like the client was already initialized but it was not possible to read \
+                the existing configuration file. \n
+                CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
+                removing the existing configuration and starting over."
+            );
+            ClientCoreError::CouldNotLoadExistingGatewayConfiguration(err)
+        })
+}
+
+/// Get the client address by loading the keys from stored files.
+pub fn get_client_address_from_stored_keys<T>(
+    config: &Config<T>,
+) -> Result<Recipient, ClientCoreError>
+where
+    T: config::NymConfig,
+{
+    fn load_identity_keys(
+        pathfinder: &ClientKeyPathfinder,
+    ) -> Result<identity::KeyPair, ClientCoreError> {
+        let identity_keypair: identity::KeyPair =
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+                pathfinder.private_identity_key().to_owned(),
+                pathfinder.public_identity_key().to_owned(),
+            ))
+            .tap_err(|_| log::error!("Failed to read stored identity key files"))?;
+        Ok(identity_keypair)
+    }
+
+    fn load_sphinx_keys(
+        pathfinder: &ClientKeyPathfinder,
+    ) -> Result<encryption::KeyPair, ClientCoreError> {
+        let sphinx_keypair: encryption::KeyPair =
+            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+                pathfinder.private_encryption_key().to_owned(),
+                pathfinder.public_encryption_key().to_owned(),
+            ))
+            .tap_err(|_| log::error!("Failed to read stored sphinx key files"))?;
+        Ok(sphinx_keypair)
+    }
+
+    let pathfinder = ClientKeyPathfinder::new_from_config(config);
+    let identity_keypair = load_identity_keys(&pathfinder)?;
+    let sphinx_keypair = load_sphinx_keys(&pathfinder)?;
+
+    let client_recipient = Recipient::new(
+        *identity_keypair.public_key(),
+        *sphinx_keypair.public_key(),
+        // TODO: below only works under assumption that gateway address == gateway id
+        // (which currently is true)
+        NodeIdentity::from_base58_string(config.get_gateway_id())?,
+    );
+
+    Ok(client_recipient)
+}
+
+pub fn output_to_json<T: Serialize>(init_results: &T, output_file: &str) {
+    match std::fs::File::create(output_file) {
+        Ok(file) => match serde_json::to_writer_pretty(file, init_results) {
+            Ok(_) => println!("Saved: {}", output_file),
+            Err(err) => eprintln!("Could not save {}: {err}", output_file),
+        },
+        Err(err) => eprintln!("Could not save {}: {err}", output_file),
+    }
+}
diff --git a/clients/credential/Cargo.toml b/clients/credential/Cargo.toml
index 81fe361ad0..1fee702592 100644
--- a/clients/credential/Cargo.toml
+++ b/clients/credential/Cargo.toml
@@ -6,11 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.52"
 bip39 = "1.0.1"
 cfg-if = "0.1"
-clap = { version = "3.2", features = ["cargo", "derive"] }
-pickledb = "0.4.1"
+clap = { version = "4.0", features = ["cargo", "derive"] }
 rand = "0.7.3"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
@@ -25,7 +23,7 @@ credential-storage = { path = "../../common/credential-storage" }
 crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 network-defaults = { path = "../../common/network-defaults" }
 pemstore = { path = "../../common/pemstore" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 
 [features]
 coconut = ["credentials/coconut"]
diff --git a/clients/credential/src/client.rs b/clients/credential/src/client.rs
index 0eb63bf340..d4ee436698 100644
--- a/clients/credential/src/client.rs
+++ b/clients/credential/src/client.rs
@@ -6,27 +6,27 @@ use bip39::Mnemonic;
 use network_defaults::{NymNetworkDetails, VOUCHER_INFO};
 use std::str::FromStr;
 use url::Url;
-use validator_client::nymd;
-use validator_client::nymd::traits::CoconutBandwidthSigningClient;
-use validator_client::nymd::{Coin, Fee, NymdClient, SigningNymdClient};
+use validator_client::nyxd;
+use validator_client::nyxd::traits::CoconutBandwidthSigningClient;
+use validator_client::nyxd::{Coin, Fee, NyxdClient, SigningNyxdClient};
 
 pub(crate) struct Client {
-    nymd_client: NymdClient<SigningNymdClient>,
+    nyxd_client: NyxdClient<SigningNyxdClient>,
     mix_denom_base: String,
 }
 
 impl Client {
-    pub fn new(nymd_url: &str, mnemonic: &str) -> Self {
-        let nymd_url = Url::from_str(nymd_url).unwrap();
+    pub fn new(nyxd_url: &str, mnemonic: &str) -> Self {
+        let nyxd_url = Url::from_str(nyxd_url).unwrap();
         let mnemonic = Mnemonic::from_str(mnemonic).unwrap();
         let network_details = NymNetworkDetails::new_from_env();
-        let config = nymd::Config::try_from_nym_network_details(&network_details)
+        let config = nyxd::Config::try_from_nym_network_details(&network_details)
             .expect("failed to construct valid validator client config with the provided network");
-        let nymd_client =
-            NymdClient::connect_with_mnemonic(config, nymd_url.as_ref(), mnemonic, None).unwrap();
+        let nyxd_client =
+            NyxdClient::connect_with_mnemonic(config, nyxd_url.as_ref(), mnemonic, None).unwrap();
 
         Client {
-            nymd_client,
+            nyxd_client,
             mix_denom_base: network_details.chain_details.mix_denom.base,
         }
     }
@@ -40,7 +40,7 @@ impl Client {
     ) -> Result<String> {
         let amount = Coin::new(amount as u128, self.mix_denom_base.clone());
         Ok(self
-            .nymd_client
+            .nyxd_client
             .deposit(
                 amount,
                 String::from(VOUCHER_INFO),
diff --git a/clients/credential/src/commands.rs b/clients/credential/src/commands.rs
index 7f9d3ae2e1..f697a98d7d 100644
--- a/clients/credential/src/commands.rs
+++ b/clients/credential/src/commands.rs
@@ -1,35 +1,29 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use async_trait::async_trait;
 use clap::{Args, Subcommand};
 use completions::ArgShell;
-use pickledb::PickleDb;
 use rand::rngs::OsRng;
 use std::str::FromStr;
 
-use coconut_interface::{Attribute, Base58, BlindSignRequest, Bytable, Parameters};
+use coconut_interface::{Base58, Parameters};
 use credential_storage::storage::Storage;
 use credential_storage::PersistentStorage;
 use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
 use credentials::coconut::utils::obtain_aggregate_signature;
 use crypto::asymmetric::{encryption, identity};
 use network_defaults::{NymNetworkDetails, VOUCHER_INFO};
-use validator_client::nymd::tx::Hash;
+use validator_client::nyxd::tx::Hash;
 use validator_client::{CoconutApiClient, Config};
 
 use crate::client::Client;
 use crate::error::{CredentialClientError, Result};
-use crate::state::{KeyPair, RequestData, State};
+use crate::state::{KeyPair, State};
 
 #[derive(Subcommand)]
-pub(crate) enum Commands {
-    /// Deposit funds for buying coconut credential
-    Deposit(Deposit),
-    /// Lists the tx hashes of previous deposits
-    ListDeposits(ListDeposits),
-    /// Get a credential for a given deposit
-    GetCredential(GetCredential),
+pub(crate) enum Command {
+    /// Run the binary
+    Run(Run),
 
     /// Generate shell completions
     Completions(ArgShell),
@@ -38,169 +32,82 @@ pub(crate) enum Commands {
     GenerateFigSpec,
 }
 
-#[async_trait]
-pub(crate) trait Execute {
-    async fn execute(&self, db: &mut PickleDb, shared_storage: PersistentStorage) -> Result<()>;
+#[derive(Args)]
+pub(crate) struct Run {
+    /// Home directory of the client that is supposed to use the credential.
+    #[clap(long)]
+    pub(crate) client_home_directory: std::path::PathBuf,
+
+    /// The nyxd URL that should be used
+    #[clap(long)]
+    pub(crate) nyxd_url: String,
+
+    /// A mnemonic for the account that buys the credential
+    #[clap(long)]
+    pub(crate) mnemonic: String,
+
+    /// The amount of utokens the credential will hold
+    #[clap(long)]
+    pub(crate) amount: u64,
 }
 
-#[derive(Args, Clone)]
-pub(crate) struct Deposit {
-    /// The nymd URL that should be used
-    #[clap(long)]
-    nymd_url: String,
-    /// A mnemonic for the account that does the deposit
-    #[clap(long)]
-    mnemonic: String,
-    /// The amount that needs to be deposited
-    #[clap(long)]
-    amount: u64,
-}
+pub(crate) async fn deposit(nyxd_url: &str, mnemonic: &str, amount: u64) -> Result<State> {
+    let mut rng = OsRng;
+    let signing_keypair = KeyPair::from(identity::KeyPair::new(&mut rng));
+    let encryption_keypair = KeyPair::from(encryption::KeyPair::new(&mut rng));
 
-#[async_trait]
-impl Execute for Deposit {
-    async fn execute(&self, db: &mut PickleDb, _shared_storage: PersistentStorage) -> Result<()> {
-        let mut rng = OsRng;
-        let signing_keypair = KeyPair::from(identity::KeyPair::new(&mut rng));
-        let encryption_keypair = KeyPair::from(encryption::KeyPair::new(&mut rng));
-
-        let client = Client::new(&self.nymd_url, &self.mnemonic);
-        let tx_hash = client
-            .deposit(
-                self.amount,
-                signing_keypair.public_key.clone(),
-                encryption_keypair.public_key.clone(),
-                None,
-            )
-            .await?;
-
-        let state = State {
-            amount: self.amount,
-            tx_hash: tx_hash.clone(),
-            signing_keypair,
-            encryption_keypair,
-            blind_request_data: None,
-            signature: None,
-        };
-        db.set(&tx_hash, &state).unwrap();
-
-        println!("{:?}", state);
-
-        Ok(())
-    }
-}
-
-#[derive(Args, Clone)]
-pub(crate) struct ListDeposits {}
-
-#[async_trait]
-impl Execute for ListDeposits {
-    async fn execute(&self, db: &mut PickleDb, _shared_storage: PersistentStorage) -> Result<()> {
-        for kv in db.iter() {
-            println!("{:?}", kv.get_value::<State>());
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Args, Clone)]
-pub(crate) struct GetCredential {
-    /// The hash of a successful deposit transaction
-    #[clap(long)]
-    tx_hash: String,
-    /// The nymd URL that should be used
-    #[clap(long)]
-    nymd_url: String,
-    /// If we want to get the signature without attaching a blind sign request; it is expected that
-    /// there is already a signature stored on the signer
-    #[clap(long, parse(from_flag))]
-    __no_request: bool,
-}
-
-#[async_trait]
-impl Execute for GetCredential {
-    async fn execute(&self, db: &mut PickleDb, shared_storage: PersistentStorage) -> Result<()> {
-        let mut state = db
-            .get::<State>(&self.tx_hash)
-            .ok_or(CredentialClientError::NoDeposit)?;
-
-        let network_details = NymNetworkDetails::new_from_env();
-        let config = Config::try_from_nym_network_details(&network_details)?;
-        let client = validator_client::Client::new_query(config)?;
-        let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client).await?;
-
-        let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
-        let bandwidth_credential_attributes = if self.__no_request {
-            if let Some(blind_request_data) = state.blind_request_data {
-                let serial_number =
-                    Attribute::try_from_byte_slice(&blind_request_data.serial_number)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                let binding_number =
-                    Attribute::try_from_byte_slice(&blind_request_data.binding_number)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                let pedersen_commitments_openings = vec![
-                    Attribute::try_from_byte_slice(&blind_request_data.first_attribute)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?,
-                    Attribute::try_from_byte_slice(&blind_request_data.second_attribute)
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?,
-                ];
-                let blind_sign_request =
-                    BlindSignRequest::from_bytes(blind_request_data.blind_sign_req.as_slice())
-                        .map_err(|_| CredentialClientError::CorruptedBlindSignRequest)?;
-                BandwidthVoucher::new_with_blind_sign_req(
-                    [serial_number, binding_number],
-                    [&state.amount.to_string(), VOUCHER_INFO],
-                    Hash::from_str(&self.tx_hash)
-                        .map_err(|_| CredentialClientError::InvalidTxHash)?,
-                    identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
-                    encryption::PrivateKey::from_base58_string(
-                        &state.encryption_keypair.private_key,
-                    )?,
-                    pedersen_commitments_openings,
-                    blind_sign_request,
-                )
-            } else {
-                return Err(CredentialClientError::NoLocalBlindSignRequest);
-            }
-        } else {
-            BandwidthVoucher::new(
-                &params,
-                state.amount.to_string(),
-                VOUCHER_INFO.to_string(),
-                Hash::from_str(&self.tx_hash).map_err(|_| CredentialClientError::InvalidTxHash)?,
-                identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
-                encryption::PrivateKey::from_base58_string(&state.encryption_keypair.private_key)?,
-            )
-        };
-
-        // Back up the blind sign req data, in case of sporadic failures
-        state.blind_request_data = Some(RequestData::new(
-            bandwidth_credential_attributes.get_private_attributes(),
-            bandwidth_credential_attributes.pedersen_commitments_openings(),
-            bandwidth_credential_attributes.blind_sign_request(),
-        )?);
-        db.set(&self.tx_hash, &state).unwrap();
-
-        let signature = obtain_aggregate_signature(
-            &params,
-            &bandwidth_credential_attributes,
-            &coconut_api_clients,
+    let client = Client::new(nyxd_url, mnemonic);
+    let tx_hash = client
+        .deposit(
+            amount,
+            signing_keypair.public_key.clone(),
+            encryption_keypair.public_key.clone(),
+            None,
         )
         .await?;
-        shared_storage
-            .insert_coconut_credential(
-                state.amount.to_string(),
-                VOUCHER_INFO.to_string(),
-                bandwidth_credential_attributes.get_private_attributes()[0].to_bs58(),
-                bandwidth_credential_attributes.get_private_attributes()[1].to_bs58(),
-                signature.to_bs58(),
-            )
-            .await?;
-        state.signature = Some(signature.to_bs58());
-        db.set(&self.tx_hash, &state).unwrap();
 
-        println!("Signature: {:?}", state.signature);
+    let state = State {
+        amount,
+        tx_hash,
+        signing_keypair,
+        encryption_keypair,
+    };
 
-        Ok(())
-    }
+    Ok(state)
+}
+
+pub(crate) async fn get_credential(state: &State, shared_storage: PersistentStorage) -> Result<()> {
+    let network_details = NymNetworkDetails::new_from_env();
+    let config = Config::try_from_nym_network_details(&network_details)?;
+    let client = validator_client::Client::new_query(config)?;
+    let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client).await?;
+
+    let params = Parameters::new(TOTAL_ATTRIBUTES).unwrap();
+    let bandwidth_credential_attributes = BandwidthVoucher::new(
+        &params,
+        state.amount.to_string(),
+        VOUCHER_INFO.to_string(),
+        Hash::from_str(&state.tx_hash).map_err(|_| CredentialClientError::InvalidTxHash)?,
+        identity::PrivateKey::from_base58_string(&state.signing_keypair.private_key)?,
+        encryption::PrivateKey::from_base58_string(&state.encryption_keypair.private_key)?,
+    );
+
+    let signature = obtain_aggregate_signature(
+        &params,
+        &bandwidth_credential_attributes,
+        &coconut_api_clients,
+    )
+    .await?;
+    println!("Signature: {:?}", signature.to_bs58());
+    shared_storage
+        .insert_coconut_credential(
+            state.amount.to_string(),
+            VOUCHER_INFO.to_string(),
+            bandwidth_credential_attributes.get_private_attributes()[0].to_bs58(),
+            bandwidth_credential_attributes.get_private_attributes()[1].to_bs58(),
+            signature.to_bs58(),
+        )
+        .await?;
+
+    Ok(())
 }
diff --git a/clients/credential/src/error.rs b/clients/credential/src/error.rs
index 08bd0001e9..f793957e2f 100644
--- a/clients/credential/src/error.rs
+++ b/clients/credential/src/error.rs
@@ -7,15 +7,15 @@ use credential_storage::error::StorageError;
 use credentials::error::Error as CredentialError;
 use crypto::asymmetric::encryption::KeyRecoveryError;
 use crypto::asymmetric::identity::Ed25519RecoveryError;
-use validator_client::nymd::error::NymdError;
+use validator_client::nyxd::error::NyxdError;
 use validator_client::ValidatorClientError;
 
 pub type Result<T> = std::result::Result<T, CredentialClientError>;
 
 #[derive(Error, Debug)]
 pub enum CredentialClientError {
-    #[error("Nymd error: {0}")]
-    Nymd(#[from] NymdError),
+    #[error("Nyxd error: {0}")]
+    Nyxd(#[from] NyxdError),
 
     #[error("Validator client error: {0}")]
     ValidatorClientError(#[from] ValidatorClientError),
@@ -23,18 +23,6 @@ pub enum CredentialClientError {
     #[error("Credential error: {0}")]
     Credential(#[from] CredentialError),
 
-    #[error("No previous deposit with that tx hash")]
-    NoDeposit,
-
-    #[error("Wrong number of attributes")]
-    WrongAttributeNumber,
-
-    #[error("Could not find any backed up blind sign request data")]
-    NoLocalBlindSignRequest,
-
-    #[error("The local blind sign request data is corrupted")]
-    CorruptedBlindSignRequest,
-
     #[error("The tx hash provided is not valid")]
     InvalidTxHash,
 
diff --git a/clients/credential/src/main.rs b/clients/credential/src/main.rs
index cc0263e048..b27571909d 100644
--- a/clients/credential/src/main.rs
+++ b/clients/credential/src/main.rs
@@ -9,14 +9,13 @@ cfg_if::cfg_if! {
         mod error;
         mod state;
 
-        use commands::{Commands, Execute};
         use error::Result;
         use network_defaults::setup_env;
-        use clap::CommandFactory;
         use completions::fig_generate;
+        use commands::*;
+        use config::{DATA_DIR, DB_FILE_NAME};
 
-        use clap::Parser;
-        use pickledb::{PickleDb, PickleDbDumpPolicy, SerializationMethod};
+        use clap::{CommandFactory, Parser};
 
         #[derive(Parser)]
         #[clap(author = "Nymtech", version, about)]
@@ -25,43 +24,26 @@ cfg_if::cfg_if! {
             #[clap(short, long)]
             pub(crate) config_env_file: Option<std::path::PathBuf>,
 
-            /// Path where the sqlite credental database will be located.
-            /// It should point to a $HOME/$CLIENT_ID/data/db.sqlite file of
-            /// the client that is supposed to use the credential.
-            #[clap(long)]
-            pub(crate) credential_db_path: std::path::PathBuf,
-
             #[clap(subcommand)]
-            command: Commands,
+            pub(crate) command: Command,
         }
 
         #[tokio::main]
         async fn main() -> Result<()> {
             let args = Cli::parse();
-            setup_env(args.config_env_file.clone());
-
-            let shared_storage = credential_storage::initialise_storage(args.credential_db_path.clone()).await;
-            let mut db = match PickleDb::load(
-                "credential.db",
-                PickleDbDumpPolicy::AutoDump,
-                SerializationMethod::Json,
-            ) {
-                Ok(db) => db,
-                Err(_) => PickleDb::new(
-                    "credential.db",
-                    PickleDbDumpPolicy::AutoDump,
-                    SerializationMethod::Json,
-                ),
-            };
-
+            setup_env(args.config_env_file.as_ref());
             let bin_name = "nym-credential-client";
 
-            match &args.command {
-                Commands::Deposit(m) => m.execute(&mut db, shared_storage).await?,
-                Commands::ListDeposits(m) => m.execute(&mut db, shared_storage).await?,
-                Commands::GetCredential(m) => m.execute(&mut db, shared_storage).await?,
-                Commands::Completions(s) => s.generate(&mut crate::Cli::into_app(), bin_name),
-                Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name)
+            match args.command {
+                Command::Run(r) => {
+                    let db_path = r.client_home_directory.join(DATA_DIR).join(DB_FILE_NAME);
+                    let shared_storage = credential_storage::initialise_storage(db_path).await;
+
+                    let state = deposit(&r.nyxd_url, &r.mnemonic, r.amount).await?;
+                    get_credential(&state, shared_storage).await?;
+                }
+                Command::Completions(c) => c.generate(&mut crate::Cli::command(), bin_name),
+                Command::GenerateFigSpec => fig_generate(&mut crate::Cli::command(), bin_name)
             }
 
             Ok(())
diff --git a/clients/credential/src/state.rs b/clients/credential/src/state.rs
index 6da1ae6faa..98cbb307df 100644
--- a/clients/credential/src/state.rs
+++ b/clients/credential/src/state.rs
@@ -1,13 +1,10 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use coconut_interface::{Attribute, BlindSignRequest, Bytable, PrivateAttribute};
 use serde::{Deserialize, Serialize};
 
 use crypto::asymmetric::{encryption, identity};
 
-use crate::error::{CredentialClientError, Result};
-
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub(crate) struct KeyPair {
     pub public_key: String,
@@ -38,35 +35,4 @@ pub(crate) struct State {
     pub tx_hash: String,
     pub signing_keypair: KeyPair,
     pub encryption_keypair: KeyPair,
-    pub blind_request_data: Option<RequestData>,
-    pub signature: Option<String>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub(crate) struct RequestData {
-    pub serial_number: Vec<u8>,
-    pub binding_number: Vec<u8>,
-    pub first_attribute: Vec<u8>,
-    pub second_attribute: Vec<u8>,
-    pub blind_sign_req: Vec<u8>,
-}
-
-impl RequestData {
-    pub fn new(
-        private_attributes: Vec<PrivateAttribute>,
-        attributes: &[Attribute],
-        blind_sign_request: &BlindSignRequest,
-    ) -> Result<Self> {
-        if private_attributes.len() != 2 || attributes.len() != 2 {
-            Err(CredentialClientError::WrongAttributeNumber)
-        } else {
-            Ok(RequestData {
-                serial_number: private_attributes[0].to_byte_vec(),
-                binding_number: private_attributes[1].to_byte_vec(),
-                first_attribute: attributes[0].to_byte_vec(),
-                second_attribute: attributes[1].to_byte_vec(),
-                blind_sign_req: blind_sign_request.to_bytes(),
-            })
-        }
-    }
 }
diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml
index eb4c722501..27f13bbbc4 100644
--- a/clients/native/Cargo.toml
+++ b/clients/native/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.1"
+version = "1.1.4"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"
@@ -20,19 +20,22 @@ futures = "0.3" # bunch of futures stuff, however, now that I think about it, it
 # and the single instance of abortable we have should really be refactored anyway
 url = "2.2"
 
-clap = { version = "3.2", features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 dirs = "4.0"
+lazy_static = "1.4.0"
 log = "0.4" # self explanatory
 pretty_env_logger = "0.4" # for formatting log messages
 rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits + some rng implementation to use
 serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
-sled = "0.34" # for storage of replySURB decryption keys
+serde_json = "1.0"
 thiserror = "1.0.34"
+tap = "1.0.1"
 tokio = { version = "1.21.2", features = ["rt-multi-thread", "net", "signal"] } # async runtime
 tokio-tungstenite = "0.14" # websocket
 
 ## internal
-client-core = { path = "../client-core" }
+build-information = { path = "../../common/build-information" }
+client-core = { path = "../client-core", features = ["fs-surb-storage"] }
 client-connections = { path = "../../common/client-connections" }
 coconut-interface = { path = "../../common/coconut-interface", optional = true }
 config = { path = "../../common/config" }
@@ -48,16 +51,12 @@ nymsphinx = { path = "../../common/nymsphinx" }
 pemstore = { path = "../../common/pemstore" }
 task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 version-checker = { path = "../../common/version-checker" }
 websocket-requests = { path = "websocket-requests" }
-tap = "1.0.1"
 
 [features]
 coconut = ["coconut-interface", "credentials", "credentials/coconut", "gateway-requests/coconut", "gateway-client/coconut", "client-core/coconut"]
 
 [dev-dependencies]
 serde_json = "1.0" # for the "textsend" example
-
-[build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
diff --git a/clients/native/examples/js-examples/websocket/package-lock.json b/clients/native/examples/js-examples/websocket/package-lock.json
index 4fc3fbbd83..0c20aed18c 100644
--- a/clients/native/examples/js-examples/websocket/package-lock.json
+++ b/clients/native/examples/js-examples/websocket/package-lock.json
@@ -477,13 +477,13 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -674,30 +674,42 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -1006,23 +1018,17 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -1033,9 +1039,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -1180,10 +1186,14 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
@@ -1299,7 +1309,7 @@
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "node_modules/electron-to-chromium": {
@@ -1310,7 +1320,7 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -1409,7 +1419,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -1453,38 +1463,39 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -1499,11 +1510,23 @@
       "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
       "dev": true
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -1617,23 +1640,32 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
+    "node_modules/finalhandler/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.14.9",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
@@ -1666,7 +1698,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -1928,26 +1960,38 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/http-parser-js": {
       "version": "0.5.3",
@@ -2379,7 +2423,7 @@
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -2439,19 +2483,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -2528,9 +2572,9 @@
       "dev": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -2605,6 +2649,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-is": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
@@ -2637,9 +2690,9 @@
       "dev": true
     },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "dependencies": {
         "ee-first": "1.1.1"
@@ -2933,12 +2986,18 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/queue-microtask": {
@@ -2979,13 +3038,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -2994,9 +3053,9 @@
       }
     },
     "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -3239,35 +3298,53 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -3322,24 +3399,24 @@
       "dev": true
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "node_modules/shallow-clone": {
@@ -3375,6 +3452,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -3642,9 +3733,9 @@
       "dev": true
     },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -3671,7 +3762,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -4793,13 +4884,13 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
@@ -4939,27 +5030,35 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+          "dev": true
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
           "dev": true
         }
       }
@@ -5186,20 +5285,12 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
+        "safe-buffer": "5.2.1"
       }
     },
     "content-type": {
@@ -5209,9 +5300,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true
     },
     "cookie-signature": {
@@ -5323,9 +5414,9 @@
       "dev": true
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-node": {
@@ -5421,7 +5512,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "electron-to-chromium": {
@@ -5432,7 +5523,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true
     },
     "enhanced-resolve": {
@@ -5503,7 +5594,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
     "eventemitter3": {
@@ -5535,38 +5626,39 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -5578,10 +5670,16 @@
           "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
           "dev": true
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -5679,18 +5777,26 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
     "follow-redirects": {
@@ -5708,7 +5814,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "fs-monkey": {
@@ -5900,22 +6006,28 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -6230,7 +6342,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true
     },
     "memfs": {
@@ -6272,16 +6384,16 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-      "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.31",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
-      "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.48.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-fn": {
@@ -6343,9 +6455,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -6402,6 +6514,12 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true
+    },
     "object-is": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
@@ -6425,9 +6543,9 @@
       "dev": true
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "requires": {
         "ee-first": "1.1.1"
@@ -6656,10 +6774,13 @@
       }
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -6682,21 +6803,21 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
           "dev": true
         }
       }
@@ -6868,30 +6989,42 @@
       }
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -6946,21 +7079,21 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "shallow-clone": {
@@ -6987,6 +7120,17 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -7181,9 +7325,9 @@
       "dev": true
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "tslib": {
@@ -7204,7 +7348,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true
     },
     "uri-js": {
diff --git a/clients/native/examples/websocket_binarysend.rs b/clients/native/examples/websocket_binarysend.rs
index f103815af2..2c22f0d03b 100644
--- a/clients/native/examples/websocket_binarysend.rs
+++ b/clients/native/examples/websocket_binarysend.rs
@@ -25,58 +25,59 @@ async fn get_self_address(ws_stream: &mut WebSocketStream<MaybeTlsStream<TcpStre
     let response = send_message_and_get_response(ws_stream, self_address_request).await;
 
     match response {
-        ServerResponse::SelfAddress(recipient) => recipient,
+        ServerResponse::SelfAddress(recipient) => *recipient,
         _ => panic!("received an unexpected response!"),
     }
 }
 
 async fn send_file_with_reply() {
-    let uri = "ws://localhost:1977";
-    let (mut ws_stream, _) = connect_async(uri).await.unwrap();
-
-    let recipient = get_self_address(&mut ws_stream).await;
-    println!("our full address is: {}", recipient);
-
-    let read_data = std::fs::read("examples/dummy_file").unwrap();
-
-    let send_request = ClientRequest::Send {
-        recipient,
-        message: read_data,
-        with_reply_surb: true,
-        connection_id: Some(0),
-    };
-
-    println!("sending content of 'dummy_file' over the mix network...");
-    let response = send_message_and_get_response(&mut ws_stream, send_request.serialize()).await;
-
-    let received = match response {
-        ServerResponse::Received(received) => received,
-        _ => panic!("received an unexpected response!"),
-    };
-
-    println!("writing the file back to the disk!");
-    std::fs::write("examples/received_file_withreply", received.message).unwrap();
-
-    let reply_message = b"hello from reply SURB! - thanks for sending me the file!".to_vec();
-    let reply_request = ClientRequest::Reply {
-        message: reply_message.clone(),
-        reply_surb: received.reply_surb.unwrap(),
-    };
-
-    println!(
-        "sending {:?} (using reply SURB!) over the mix network...",
-        String::from_utf8(reply_message).unwrap()
-    );
-    let response = send_message_and_get_response(&mut ws_stream, reply_request.serialize()).await;
-    let received = match response {
-        ServerResponse::Received(received) => received,
-        _ => panic!("received an unexpected response!"),
-    };
-
-    println!(
-        "received {:#?} from the mix network!",
-        String::from_utf8(received.message).unwrap()
-    );
+    todo!("reimplement surb usage here : )")
+    // let uri = "ws://localhost:1977";
+    // let (mut ws_stream, _) = connect_async(uri).await.unwrap();
+    //
+    // let recipient = get_self_address(&mut ws_stream).await;
+    // println!("our full address is: {}", recipient);
+    //
+    // let read_data = std::fs::read("examples/dummy_file").unwrap();
+    //
+    // let send_request = ClientRequest::Send {
+    //     recipient,
+    //     message: read_data,
+    //     with_reply_surb: true,
+    //     connection_id: Some(0),
+    // };
+    //
+    // println!("sending content of 'dummy_file' over the mix network...");
+    // let response = send_message_and_get_response(&mut ws_stream, send_request.serialize()).await;
+    //
+    // let received = match response {
+    //     ServerResponse::Received(received) => received,
+    //     _ => panic!("received an unexpected response!"),
+    // };
+    //
+    // println!("writing the file back to the disk!");
+    // std::fs::write("examples/received_file_withreply", received.message).unwrap();
+    //
+    // let reply_message = b"hello from reply SURB! - thanks for sending me the file!".to_vec();
+    // let reply_request = ClientRequest::Reply {
+    //     message: reply_message.clone(),
+    //     reply_surb: received.reply_surb.unwrap(),
+    // };
+    //
+    // println!(
+    //     "sending {:?} (using reply SURB!) over the mix network...",
+    //     String::from_utf8(reply_message).unwrap()
+    // );
+    // let response = send_message_and_get_response(&mut ws_stream, reply_request.serialize()).await;
+    // let received = match response {
+    //     ServerResponse::Received(received) => received,
+    //     _ => panic!("received an unexpected response!"),
+    // };
+    //
+    // println!(
+    //     "received {:#?} from the mix network!",
+    //     String::from_utf8(received.message).unwrap()
+    // );
 }
 
 async fn send_file_without_reply() {
@@ -91,7 +92,6 @@ async fn send_file_without_reply() {
     let send_request = ClientRequest::Send {
         recipient,
         message: read_data,
-        with_reply_surb: false,
         connection_id: Some(0),
     };
 
diff --git a/clients/native/src/client/config/mod.rs b/clients/native/src/client/config/mod.rs
index 8ce268e9ea..e49d2e7569 100644
--- a/clients/native/src/client/config/mod.rs
+++ b/clients/native/src/client/config/mod.rs
@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::config::template::config_template;
-use client_core::config::Config as BaseConfig;
+pub use client_core::config::Config as BaseConfig;
 pub use client_core::config::MISSING_VALUE;
+use client_core::config::{ClientCoreConfigTrait, DebugConfig};
 use config::defaults::DEFAULT_WEBSOCKET_LISTENING_PORT;
-use config::NymConfig;
+use config::{NymConfig, OptionalSet};
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 use std::path::PathBuf;
+use std::str::FromStr;
 
 mod template;
 
@@ -73,6 +76,12 @@ impl NymConfig for Config {
     }
 }
 
+impl ClientCoreConfigTrait for Config {
+    fn get_gateway_endpoint(&self) -> &client_core::config::GatewayEndpointConfig {
+        self.base.get_gateway_endpoint()
+    }
+}
+
 impl Config {
     pub fn new<S: Into<String>>(id: S) -> Self {
         Config {
@@ -86,6 +95,15 @@ impl Config {
         self
     }
 
+    pub fn with_disabled_socket(mut self, disabled: bool) -> Self {
+        if disabled {
+            self.socket.socket_type = SocketType::None;
+        } else {
+            self.socket.socket_type = SocketType::WebSocket;
+        }
+        self
+    }
+
     pub fn with_port(mut self, port: u16) -> Self {
         self.socket.listening_port = port;
         self
@@ -104,6 +122,10 @@ impl Config {
         &mut self.base
     }
 
+    pub fn get_debug_settings(&self) -> &DebugConfig {
+        self.get_base().get_debug_config()
+    }
+
     pub fn get_socket_type(&self) -> SocketType {
         self.socket.socket_type
     }
@@ -111,6 +133,50 @@ impl Config {
     pub fn get_listening_port(&self) -> u16 {
         self.socket.listening_port
     }
+
+    // poor man's 'builder' method
+    pub fn with_base<F, T>(mut self, f: F, val: T) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+    {
+        self.base = f(self.base, val);
+        self
+    }
+
+    // helper methods to use `OptionalSet` trait. Those are defined due to very... ehm. 'specific' structure of this config
+    // (plz, lets refactor it)
+    pub fn with_optional_ext<F, T>(mut self, f: F, val: Option<T>) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+    {
+        self.base = self.base.with_optional(f, val);
+        self
+    }
+
+    pub fn with_optional_env_ext<F, T>(mut self, f: F, val: Option<T>, env_var: &str) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+        T: FromStr,
+        <T as FromStr>::Err: Debug,
+    {
+        self.base = self.base.with_optional_env(f, val, env_var);
+        self
+    }
+
+    pub fn with_optional_custom_env_ext<F, T, G>(
+        mut self,
+        f: F,
+        val: Option<T>,
+        env_var: &str,
+        parser: G,
+    ) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+        G: Fn(&str) -> T,
+    {
+        self.base = self.base.with_optional_custom_env(f, val, env_var, parser);
+        self
+    }
 }
 
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
diff --git a/clients/native/src/client/config/template.rs b/clients/native/src/client/config/template.rs
index c327d286ff..15a0763ed9 100644
--- a/clients/native/src/client/config/template.rs
+++ b/clients/native/src/client/config/template.rs
@@ -23,16 +23,16 @@ id = '{{ client.id }}'
 # to claim bandwidth without presenting bandwidth credentials.
 disabled_credentials_mode = {{ client.disabled_credentials_mode }}
 
-# Addresses to nymd validators via which the client can communicate with the chain.
-validator_urls = [
-    {{#each client.validator_urls }}
+# Addresses to nyxd validators via which the client can communicate with the chain.
+nyxd_urls = [
+    {{#each client.nyxd_urls }}
         '{{this}}',
     {{/each}}
 ]
 
 # Addresses to APIs running on validator from which the client gets the view of the network.
-validator_api_urls = [
-    {{#each client.validator_api_urls }}
+nym_api_urls = [
+    {{#each client.nym_api_urls }}
         '{{this}}',
     {{/each}}
 ]
@@ -49,13 +49,12 @@ private_encryption_key_file = '{{ client.private_encryption_key_file }}'
 # Path to file containing public encryption key.
 public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 
-# Full path to file containing reply encryption keys of all reply-SURBs we have ever
-# sent but not received back.
-reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'
-
 # Path to the database containing bandwidth credentials
 database_path = '{{ client.database_path }}'
 
+# Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
+reply_surb_database_path = '{{ client.reply_surb_database_path }}'
+
 ##### additional client config options #####
 
 # A gateway specific, optional, base58 stringified shared key used for
diff --git a/clients/native/src/client/mod.rs b/clients/native/src/client/mod.rs
index 5dc01920cc..de6aa2748d 100644
--- a/clients/native/src/client/mod.rs
+++ b/clients/native/src/client/mod.rs
@@ -1,22 +1,27 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::error::Error;
+
 use crate::client::config::Config;
 use crate::error::ClientError;
 use crate::websocket;
 use client_connections::TransmissionLane;
-use client_core::client::base_client::{BaseClientBuilder, ClientInput, ClientOutput};
+use client_core::client::base_client::{
+    non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput,
+};
 use client_core::client::inbound_messages::InputMessage;
 use client_core::client::key_manager::KeyManager;
 use client_core::client::received_buffer::{ReceivedBufferMessage, ReconstructedMessagesReceiver};
+use client_core::client::replies::reply_controller::requests::ReplyControllerSender;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nymsphinx::receiver::ReconstructedMessage;
-use task::{wait_for_signal, ShutdownNotifier};
+use task::TaskManager;
 
 pub(crate) mod config;
 
@@ -44,8 +49,21 @@ impl SocketClient {
         #[cfg(feature = "coconut")]
         let bandwidth_controller = {
             let details = network_defaults::NymNetworkDetails::new_from_env();
-            let client_config = validator_client::Config::try_from_nym_network_details(&details)
-                .expect("failed to construct validator client config");
+            let mut client_config =
+                validator_client::Config::try_from_nym_network_details(&details)
+                    .expect("failed to construct validator client config");
+            let nyxd_url = config
+                .get_base()
+                .get_validator_endpoints()
+                .pop()
+                .expect("No nyxd validator endpoint provided");
+            let api_url = config
+                .get_base()
+                .get_nym_api_endpoints()
+                .pop()
+                .expect("No validator api endpoint provided");
+            // overwrite env configuration with config URLs
+            client_config = client_config.with_urls(nyxd_url, api_url);
             let client = validator_client::Client::new_query(client_config)
                 .expect("Could not construct query client");
             let coconut_api_clients =
@@ -69,52 +87,51 @@ impl SocketClient {
         config: &Config,
         client_input: ClientInput,
         client_output: ClientOutput,
-        self_address: Recipient,
+        self_address: &Recipient,
+        reply_controller_sender: ReplyControllerSender,
+        shutdown: task::TaskClient,
     ) {
         info!("Starting websocket listener...");
 
         let ClientInput {
-            shared_lane_queue_lengths,
             connection_command_sender,
             input_sender,
         } = client_input;
 
-        let received_buffer_request_sender = client_output.received_buffer_request_sender;
+        let ClientOutput {
+            shared_lane_queue_lengths,
+            received_buffer_request_sender,
+        } = client_output;
 
-        let websocket_handler = websocket::Handler::new(
+        let websocket_handler = websocket::HandlerBuilder::new(
             input_sender,
             connection_command_sender,
             received_buffer_request_sender,
             self_address,
             shared_lane_queue_lengths,
+            reply_controller_sender,
         );
 
-        websocket::Listener::new(config.get_listening_port()).start(websocket_handler);
+        websocket::Listener::new(config.get_listening_port()).start(websocket_handler, shutdown);
     }
 
     /// blocking version of `start_socket` method. Will run forever (or until SIGINT is sent)
-    pub async fn run_socket_forever(self) -> Result<(), ClientError> {
-        let shutdown = self.start_socket().await?;
-        wait_for_signal().await;
+    pub async fn run_socket_forever(self) -> Result<(), Box<dyn Error + Send + Sync>> {
+        let mut shutdown = self.start_socket().await?;
 
-        println!(
-            "Received signal - the client will terminate now (threads are not yet nicely stopped, if you see stack traces that's alright)."
-        );
+        let res = task::wait_for_signal_and_error(&mut shutdown).await;
 
         log::info!("Sending shutdown");
         shutdown.signal_shutdown().ok();
 
-        // Some of these components have shutdown signalling implemented as part of socks5 work,
-        // but since it's not fully implemented (yet) for all the components of the native client,
-        // we don't try to wait and instead just stop immediately.
-        //log::info!("Waiting for tasks to finish... (Press ctrl-c to force)");
-        //shutdown.wait_for_shutdown().await;
+        log::info!("Waiting for tasks to finish... (Press ctrl-c to force)");
+        shutdown.wait_for_shutdown().await;
 
         log::info!("Stopping nym-client");
-        Ok(())
+        res
     }
 
-    pub async fn start_socket(self) -> Result<ShutdownNotifier, ClientError> {
+    pub async fn start_socket(self) -> Result<TaskManager, ClientError> {
         if !self.config.get_socket_type().is_websocket() {
             return Err(ClientError::InvalidSocketMode);
         }
@@ -123,6 +140,11 @@ impl SocketClient {
             self.config.get_base(),
             self.key_manager,
             Some(Self::create_bandwidth_controller(&self.config).await),
+            non_wasm_helpers::setup_fs_reply_surb_backend(
+                self.config.get_base().get_reply_surb_database_path(),
+                self.config.get_debug_settings(),
+            )
+            .await?,
         );
 
         let self_address = base_builder.as_mix_recipient();
@@ -130,12 +152,19 @@ impl SocketClient {
         let client_input = started_client.client_input.register_producer();
         let client_output = started_client.client_output.register_consumer();
 
-        Self::start_websocket_listener(&self.config, client_input, client_output, self_address);
+        Self::start_websocket_listener(
+            &self.config,
+            client_input,
+            client_output,
+            &self_address,
+            started_client.reply_controller_sender,
+            started_client.task_manager.subscribe(),
+        );
 
         info!("Client startup finished!");
         info!("The address of this client is: {}", self_address);
 
-        Ok(started_client.shutdown_notifier)
+        Ok(started_client.task_manager)
     }
 
     pub async fn start_direct(self) -> Result<DirectClient, ClientError> {
@@ -147,6 +176,11 @@ impl SocketClient {
             self.config.get_base(),
             self.key_manager,
             Some(Self::create_bandwidth_controller(&self.config).await),
+            non_wasm_helpers::setup_fs_reply_surb_backend(
+                self.config.get_base().get_reply_surb_database_path(),
+                self.config.get_debug_settings(),
+            )
+            .await?,
         );
 
         let mut started_client = base_client.start_base().await?;
@@ -167,7 +201,7 @@ impl SocketClient {
         Ok(DirectClient {
             client_input,
             reconstructed_receiver,
-            _shutdown_notifier: started_client.shutdown_notifier,
+            _shutdown_notifier: started_client.task_manager,
         })
     }
 }
@@ -177,21 +211,16 @@ pub struct DirectClient {
     reconstructed_receiver: ReconstructedMessagesReceiver,
 
     // we need to keep reference to this guy otherwise things will start dropping
-    _shutdown_notifier: ShutdownNotifier,
+    _shutdown_notifier: TaskManager,
 }
 
 impl DirectClient {
     /// EXPERIMENTAL DIRECT RUST API
     /// It's untested and there are absolutely no guarantees about it (but seems to have worked
     /// well enough in local tests)
-    pub async fn send_message(
-        &mut self,
-        recipient: Recipient,
-        message: Vec<u8>,
-        with_reply_surb: bool,
-    ) {
+    pub async fn send_regular_message(&mut self, recipient: Recipient, message: Vec<u8>) {
         let lane = TransmissionLane::General;
-        let input_msg = InputMessage::new_fresh(recipient, message, with_reply_surb, lane);
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
 
         self.client_input
             .input_sender
@@ -203,8 +232,28 @@ impl DirectClient {
     /// EXPERIMENTAL DIRECT RUST API
     /// It's untested and there are absolutely no guarantees about it (but seems to have worked
     /// well enough in local tests)
-    pub async fn send_reply(&mut self, reply_surb: ReplySurb, message: Vec<u8>) {
-        let input_msg = InputMessage::new_reply(reply_surb, message);
+    pub async fn send_anonymous_message(
+        &mut self,
+        recipient: Recipient,
+        message: Vec<u8>,
+        reply_surbs: u32,
+    ) {
+        let lane = TransmissionLane::General;
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
+
+        self.client_input
+            .input_sender
+            .send(input_msg)
+            .await
+            .expect("InputMessageReceiver has stopped receiving!");
+    }
+
+    /// EXPERIMENTAL DIRECT RUST API
+    /// It's untested and there are absolutely no guarantees about it (but seems to have worked
+    /// well enough in local tests)
+    pub async fn send_reply(&mut self, recipient_tag: AnonymousSenderTag, message: Vec<u8>) {
+        let lane = TransmissionLane::General;
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
 
         self.client_input
             .input_sender
diff --git a/clients/native/src/commands/init.rs b/clients/native/src/commands/init.rs
index d97bcc8e60..8f8380349f 100644
--- a/clients/native/src/commands/init.rs
+++ b/clients/native/src/commands/init.rs
@@ -1,14 +1,18 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::Args;
-use client_core::{config::GatewayEndpointConfig, error::ClientCoreError};
-use config::NymConfig;
-
 use crate::{
     client::config::Config,
     commands::{override_config, OverrideConfig},
+    error::ClientError,
 };
+use clap::Args;
+use config::NymConfig;
+use crypto::asymmetric::identity;
+use nymsphinx::addressing::clients::Recipient;
+use serde::Serialize;
+use std::fmt::Display;
+use tap::TapFallible;
 
 #[derive(Args, Clone)]
 pub(crate) struct Init {
@@ -18,20 +22,22 @@ pub(crate) struct Init {
 
     /// Id of the gateway we are going to connect to.
     #[clap(long)]
-    gateway: Option<String>,
+    gateway: Option<identity::PublicKey>,
 
     /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
     /// potentially causing loss of access.
     #[clap(long)]
     force_register_gateway: bool,
 
-    /// Comma separated list of rest endpoints of the nymd validators
-    #[clap(long)]
-    nymd_validators: Option<String>,
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[cfg(feature = "coconut")]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
-    #[clap(long)]
-    api_validators: Option<String>,
+    #[clap(long, alias = "api_validators", value_delimiter = ',')]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Whether to not start the websocket
     #[clap(long)]
@@ -43,32 +49,65 @@ pub(crate) struct Init {
 
     /// Mostly debug-related option to increase default traffic rate so that you would not need to
     /// modify config post init
-    #[clap(long, hidden = true)]
+    #[clap(long, hide = true)]
     fastmode: bool,
 
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
     #[cfg(feature = "coconut")]
     #[clap(long)]
     enabled_credentials_mode: bool,
+
+    /// Save a summary of the initialization to a json file
+    #[clap(long)]
+    output_json: bool,
 }
 
 impl From<Init> for OverrideConfig {
     fn from(init_config: Init) -> Self {
         OverrideConfig {
-            nymd_validators: init_config.nymd_validators,
-            api_validators: init_config.api_validators,
+            nym_apis: init_config.nym_apis,
             disable_socket: init_config.disable_socket,
             port: init_config.port,
             fastmode: init_config.fastmode,
+            no_cover: init_config.no_cover,
 
+            #[cfg(feature = "coconut")]
+            nyxd_urls: init_config.nyxd_urls,
             #[cfg(feature = "coconut")]
             enabled_credentials_mode: init_config.enabled_credentials_mode,
         }
     }
 }
 
-pub(crate) async fn execute(args: &Init) {
+#[derive(Debug, Serialize)]
+pub struct InitResults {
+    #[serde(flatten)]
+    client_core: client_core::init::InitResults,
+    client_listening_port: String,
+}
+
+impl InitResults {
+    fn new(config: &Config, address: &Recipient) -> Self {
+        Self {
+            client_core: client_core::init::InitResults::new(config.get_base(), address),
+            client_listening_port: config.get_listening_port().to_string(),
+        }
+    }
+}
+
+impl Display for InitResults {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "{}", self.client_core)?;
+        write!(f, "Client listening port: {}", self.client_listening_port)
+    }
+}
+
+pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
     println!("Initialising client...");
 
     let id = &args.id;
@@ -92,25 +131,44 @@ pub(crate) async fn execute(args: &Init) {
     let register_gateway = !already_init || user_wants_force_register;
 
     // Attempt to use a user-provided gateway, if possible
-    let user_chosen_gateway_id = args.gateway.as_deref();
+    let user_chosen_gateway_id = args.gateway;
 
-    let mut config = Config::new(id);
-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+    // Load and potentially override config
+    let mut config = override_config(Config::new(id), OverrideConfig::from(args.clone()));
+
+    // Setup gateway by either registering a new one, or creating a new config from the selected
+    // one but with keys kept, or reusing the gateway configuration.
+    let gateway = client_core::init::setup_gateway::<Config, _>(
+        register_gateway,
+        user_chosen_gateway_id.map(|id| id.to_base58_string()),
+        config.get_base(),
+    )
+    .await
+    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
 
-    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config)
-        .await
-        .unwrap_or_else(|err| {
-            eprintln!("Failed to setup gateway\nError: {err}");
-            std::process::exit(1)
-        });
     config.get_base_mut().with_gateway_endpoint(gateway);
 
-    let config_save_location = config.get_config_file_save_location();
-    config
-        .save_to_file(None)
-        .expect("Failed to save the config file");
+    config.save_to_file(None).tap_err(|_| {
+        log::error!("Failed to save the config file");
+    })?;
 
+    print_saved_config(&config);
+
+    let address = client_core::init::get_client_address_from_stored_keys(config.get_base())?;
+    let init_results = InitResults::new(&config, &address);
+    println!("{init_results}");
+
+    // Output summary to a json file, if specified
+    if args.output_json {
+        client_core::init::output_to_json(&init_results, "client_init_results.json");
+    }
+
+    println!("\nThe address of this client is: {address}\n");
+    Ok(())
+}
+
+fn print_saved_config(config: &Config) {
+    let config_save_location = config.get_config_file_save_location();
     println!("Saved configuration file to {:?}", config_save_location);
     println!("Using gateway: {}", config.get_base().get_gateway_id());
     log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
@@ -119,63 +177,5 @@ pub(crate) async fn execute(args: &Init) {
         "Gateway listener: {}",
         config.get_base().get_gateway_listener()
     );
-    println!("Client configuration completed.");
-
-    client_core::init::show_address(config.get_base()).unwrap_or_else(|err| {
-        eprintln!("Failed to show address\nError: {err}");
-        std::process::exit(1)
-    });
-}
-
-async fn setup_gateway(
-    id: &str,
-    register: bool,
-    user_chosen_gateway_id: Option<&str>,
-    config: &Config,
-) -> Result<GatewayEndpointConfig, ClientCoreError> {
-    if register {
-        // Get the gateway details by querying the validator-api. Either pick one at random or use
-        // the chosen one if it's among the available ones.
-        println!("Configuring gateway");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-
-        // Registering with gateway by setting up and writing shared keys to disk
-        log::trace!("Registering gateway");
-        client_core::init::register_with_gateway_and_store_keys(gateway.clone(), config.get_base())
-            .await?;
-        println!("Saved all generated keys");
-
-        Ok(gateway.into())
-    } else if user_chosen_gateway_id.is_some() {
-        // Just set the config, don't register or create any keys
-        // This assumes that the user knows what they are doing, and that the existing keys are
-        // valid for the gateway being used
-        println!("Using gateway provided by user, keeping existing keys");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-        Ok(gateway.into())
-    } else {
-        println!("Not registering gateway, will reuse existing config and keys");
-        let existing_config = Config::load_from_file(Some(id)).map_err(|err| {
-            log::error!(
-                "Unable to configure gateway: {err}. \n
-                Seems like the client was already initialized but it was not possible to read \
-                the existing configuration file. \n
-                CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
-                removing the existing configuration and starting over."
-            );
-            ClientCoreError::CouldNotLoadExistingGatewayConfiguration(err)
-        })?;
-
-        Ok(existing_config.get_base().get_gateway_endpoint().clone())
-    }
+    println!("Client configuration completed.\n");
 }
diff --git a/clients/native/src/commands/mod.rs b/clients/native/src/commands/mod.rs
index 648a1d6002..14ac39056f 100644
--- a/clients/native/src/commands/mod.rs
+++ b/clients/native/src/commands/mod.rs
@@ -1,53 +1,31 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::client::config::{Config, SocketType};
-use crate::error::ClientError;
+use crate::client::config::{BaseConfig, Config};
+use build_information::BinaryBuildInformation;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use completions::{fig_generate, ArgShell};
+use config::OptionalSet;
+use lazy_static::lazy_static;
+use std::error::Error;
 
 pub(crate) mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
 
-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE"),
-    )
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
 }
 
-fn long_version_static() -> &'static str {
-    Box::leak(long_version().into_boxed_str())
+// Helper for passing LONG_VERSION to clap
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
 }
 
 #[derive(Parser)]
-#[clap(author = "Nymtech", version, long_version = long_version_static(), about)]
+#[clap(author = "Nymtech", version, long_version = pretty_build_info_static(), about)]
 pub(crate) struct Cli {
     /// Path pointing to an env file that configures the client.
     #[clap(short, long)]
@@ -75,70 +53,57 @@ pub(crate) enum Commands {
 
 // Configuration that can be overridden.
 pub(crate) struct OverrideConfig {
-    nymd_validators: Option<String>,
-    api_validators: Option<String>,
+    nym_apis: Option<Vec<url::Url>>,
     disable_socket: bool,
     port: Option<u16>,
     fastmode: bool,
+    no_cover: bool,
 
+    #[cfg(feature = "coconut")]
+    nyxd_urls: Option<Vec<url::Url>>,
     #[cfg(feature = "coconut")]
     enabled_credentials_mode: bool,
 }
 
-pub(crate) async fn execute(args: &Cli) -> Result<(), ClientError> {
+pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
     let bin_name = "nym-native-client";
 
     match &args.command {
-        Commands::Init(m) => init::execute(m).await,
+        Commands::Init(m) => init::execute(m).await?,
         Commands::Run(m) => run::execute(m).await?,
         Commands::Upgrade(m) => upgrade::execute(m),
-        Commands::Completions(s) => s.generate(&mut Cli::into_app(), bin_name),
-        Commands::GenerateFigSpec => fig_generate(&mut Cli::into_app(), bin_name),
+        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
     }
     Ok(())
 }
 
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
-    if let Some(raw_validators) = args.nymd_validators {
-        config
-            .get_base_mut()
-            .set_custom_validators(config::parse_validators(&raw_validators));
-    } else if std::env::var(network_defaults::var_names::CONFIGURED).is_ok() {
-        let raw_validators = std::env::var(network_defaults::var_names::NYMD_VALIDATOR)
-            .expect("nymd validator not set");
-        config
-            .get_base_mut()
-            .set_custom_validators(config::parse_validators(&raw_validators));
-    }
-    if let Some(raw_validators) = args.api_validators {
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(config::parse_validators(&raw_validators));
-    } else if std::env::var(network_defaults::var_names::CONFIGURED).is_ok() {
-        let raw_validators = std::env::var(network_defaults::var_names::API_VALIDATOR)
-            .expect("api validator not set");
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(config::parse_validators(&raw_validators));
-    }
-
-    if args.disable_socket {
-        config = config.with_socket(SocketType::None);
-    }
-
-    if let Some(port) = args.port {
-        config = config.with_port(port);
-    }
+    config = config
+        .with_disabled_socket(args.disable_socket)
+        .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
+        .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
+        .with_optional(Config::with_port, args.port)
+        .with_optional_custom_env_ext(
+            BaseConfig::with_custom_nym_apis,
+            args.nym_apis,
+            network_defaults::var_names::NYM_API,
+            config::parse_urls,
+        );
 
     #[cfg(feature = "coconut")]
     {
-        if args.enabled_credentials_mode {
-            config.get_base_mut().with_disabled_credentials(false)
-        }
-    }
-
-    if args.fastmode {
-        config.get_base_mut().set_high_default_traffic_volume();
+        config = config
+            .with_optional_custom_env_ext(
+                BaseConfig::with_custom_nyxd,
+                args.nyxd_urls,
+                network_defaults::var_names::NYXD,
+                config::parse_urls,
+            )
+            .with_base(
+                BaseConfig::with_disabled_credentials,
+                !args.enabled_credentials_mode,
+            );
     }
 
     config
diff --git a/clients/native/src/commands/run.rs b/clients/native/src/commands/run.rs
index df49471ea9..123bb827e4 100644
--- a/clients/native/src/commands/run.rs
+++ b/clients/native/src/commands/run.rs
@@ -1,6 +1,8 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::error::Error;
+
 use crate::{
     client::{config::Config, SocketClient},
     commands::{override_config, OverrideConfig},
@@ -9,6 +11,7 @@ use crate::{
 
 use clap::Args;
 use config::NymConfig;
+use crypto::asymmetric::identity;
 use log::*;
 use version_checker::is_minor_version_compatible;
 
@@ -18,18 +21,20 @@ pub(crate) struct Run {
     #[clap(long)]
     id: String,
 
-    /// Comma separated list of rest endpoints of the nymd validators
-    #[clap(long)]
-    nymd_validators: Option<String>,
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[cfg(feature = "coconut")]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
-    #[clap(long)]
-    api_validators: Option<String>,
+    #[clap(long, alias = "api_validators", value_delimiter = ',')]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
     /// ensure prior registration happened
     #[clap(long)]
-    gateway: Option<String>,
+    gateway: Option<identity::PublicKey>,
 
     /// Whether to not start the websocket
     #[clap(long)]
@@ -39,6 +44,15 @@ pub(crate) struct Run {
     #[clap(short, long)]
     port: Option<u16>,
 
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
     #[cfg(feature = "coconut")]
@@ -49,11 +63,14 @@ pub(crate) struct Run {
 impl From<Run> for OverrideConfig {
     fn from(run_config: Run) -> Self {
         OverrideConfig {
-            nymd_validators: run_config.nymd_validators,
-            api_validators: run_config.api_validators,
+            nym_apis: run_config.nym_apis,
             disable_socket: run_config.disable_socket,
             port: run_config.port,
-            fastmode: false,
+            fastmode: run_config.fastmode,
+            no_cover: run_config.no_cover,
+
+            #[cfg(feature = "coconut")]
+            nyxd_urls: run_config.nyxd_urls,
             #[cfg(feature = "coconut")]
             enabled_credentials_mode: run_config.enabled_credentials_mode,
         }
@@ -79,23 +96,27 @@ fn version_check(cfg: &Config) -> bool {
     }
 }
 
-pub(crate) async fn execute(args: &Run) -> Result<(), ClientError> {
+pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn Error + Send + Sync>> {
     let id = &args.id;
 
     let mut config = match Config::load_from_file(Some(id)) {
         Ok(cfg) => cfg,
         Err(err) => {
-            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {})", id, err);
-            return Err(ClientError::FailedToLoadConfig(id.to_string()));
+            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);
+            return Err(Box::new(ClientError::FailedToLoadConfig(id.to_string())));
         }
     };
 
     let override_config_fields = OverrideConfig::from(args.clone());
     config = override_config(config, override_config_fields);
 
+    if config.get_base_mut().set_empty_fields_to_defaults() {
+        warn!("some of the core config options were left unset. the default values are going to get used instead.");
+    }
+
     if !version_check(&config) {
         error!("failed the local version check");
-        return Err(ClientError::FailedLocalVersionCheck);
+        return Err(Box::new(ClientError::FailedLocalVersionCheck));
     }
 
     SocketClient::new(config).run_socket_forever().await
diff --git a/clients/native/src/commands/upgrade.rs b/clients/native/src/commands/upgrade.rs
index c84073200c..6aaa732624 100644
--- a/clients/native/src/commands/upgrade.rs
+++ b/clients/native/src/commands/upgrade.rs
@@ -59,7 +59,7 @@ pub(crate) struct Upgrade {
 
 fn parse_config_version(config: &Config) -> Version {
     let version = Version::parse(config.get_base().get_version()).unwrap_or_else(|err| {
-        eprintln!("failed to parse client version! - {:?}", err);
+        eprintln!("failed to parse client version! - {err}");
         process::exit(1)
     });
 
@@ -110,7 +110,7 @@ fn minor_0_12_upgrade(
         .set_custom_version(to_version.to_string().as_ref());
 
     config.save_to_file(None).unwrap_or_else(|err| {
-        eprintln!("failed to overwrite config file! - {:?}", err);
+        eprintln!("failed to overwrite config file! - {err}");
         print_failed_upgrade(config_version, &to_version);
         process::exit(1);
     });
@@ -146,7 +146,7 @@ pub(crate) fn execute(args: &Upgrade) {
     let id = &args.id;
 
     let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
-        eprintln!("failed to load existing config file! - {:?}", err);
+        eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });
 
diff --git a/clients/native/src/error.rs b/clients/native/src/error.rs
index 06c45116b6..700e6e9336 100644
--- a/clients/native/src/error.rs
+++ b/clients/native/src/error.rs
@@ -2,11 +2,15 @@ use client_core::error::ClientCoreError;
 
 #[derive(thiserror::Error, Debug)]
 pub enum ClientError {
+    #[error("I/O error: {0}")]
+    IoError(#[from] std::io::Error),
+
     #[error("client-core error: {0}")]
     ClientCoreError(#[from] ClientCoreError),
 
     #[error("Failed to load config for: {0}")]
     FailedToLoadConfig(String),
+
     #[error("Failed local version check, client and config mismatch")]
     FailedLocalVersionCheck,
 
diff --git a/clients/native/src/main.rs b/clients/native/src/main.rs
index 00529494e7..edb7c56f1a 100644
--- a/clients/native/src/main.rs
+++ b/clients/native/src/main.rs
@@ -1,8 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::error::Error;
+
 use clap::{crate_version, Parser};
-use error::ClientError;
 use logging::setup_logging;
 use network_defaults::setup_env;
 
@@ -12,12 +13,12 @@ pub mod error;
 pub mod websocket;
 
 #[tokio::main]
-async fn main() -> Result<(), ClientError> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     setup_logging();
     println!("{}", banner());
 
     let args = commands::Cli::parse();
-    setup_env(args.config_env_file.clone());
+    setup_env(args.config_env_file.as_ref());
     commands::execute(&args).await
 }
 
diff --git a/clients/native/src/websocket/handler.rs b/clients/native/src/websocket/handler.rs
index 6dc0d398ad..c929a907cc 100644
--- a/clients/native/src/websocket/handler.rs
+++ b/clients/native/src/websocket/handler.rs
@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use client_connections::{
-    ConnectionCommand, ConnectionCommandSender, LaneQueueLengths, TransmissionLane,
+    ConnectionCommand, ConnectionCommandSender, ConnectionId, LaneQueueLengths, TransmissionLane,
 };
+use client_core::client::replies::reply_controller::requests::ReplyControllerSender;
 use client_core::client::{
     inbound_messages::{InputMessage, InputMessageSender},
     received_buffer::{
@@ -14,9 +15,11 @@ use futures::channel::mpsc;
 use futures::{SinkExt, StreamExt};
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nymsphinx::receiver::ReconstructedMessage;
+use std::time::Duration;
 use tokio::net::TcpStream;
+use tokio::time::Instant;
 use tokio_tungstenite::{
     accept_async,
     tungstenite::{protocol::Message as WsMessage, Error as WsError},
@@ -35,19 +38,36 @@ impl Default for ReceivedResponseType {
     }
 }
 
-pub(crate) struct Handler {
+pub(crate) struct HandlerBuilder {
     msg_input: InputMessageSender,
     client_connection_tx: ConnectionCommandSender,
     buffer_requester: ReceivedBufferRequestSender,
     self_full_address: Recipient,
-    socket: Option<WebSocketStream<TcpStream>>,
-    received_response_type: ReceivedResponseType,
     lane_queue_lengths: LaneQueueLengths,
+    reply_controller_sender: ReplyControllerSender,
 }
 
-// clone is used to use handler on a new connection, which initially is `None`
-impl Clone for Handler {
-    fn clone(&self) -> Self {
+impl HandlerBuilder {
+    pub(crate) fn new(
+        msg_input: InputMessageSender,
+        client_connection_tx: ConnectionCommandSender,
+        buffer_requester: ReceivedBufferRequestSender,
+        self_full_address: &Recipient,
+        lane_queue_lengths: LaneQueueLengths,
+        reply_controller_sender: ReplyControllerSender,
+    ) -> Self {
+        Self {
+            msg_input,
+            client_connection_tx,
+            buffer_requester,
+            self_full_address: *self_full_address,
+            lane_queue_lengths,
+            reply_controller_sender,
+        }
+    }
+
+    // TODO: make sure we only ever have one active handler
+    pub fn create_active_handler(&self) -> Handler {
         Handler {
             msg_input: self.msg_input.clone(),
             client_connection_tx: self.client_connection_tx.clone(),
@@ -56,106 +76,168 @@ impl Clone for Handler {
             socket: None,
             received_response_type: Default::default(),
             lane_queue_lengths: self.lane_queue_lengths.clone(),
+            reply_controller_sender: self.reply_controller_sender.clone(),
         }
     }
 }
 
+pub(crate) struct Handler {
+    msg_input: InputMessageSender,
+    client_connection_tx: ConnectionCommandSender,
+    buffer_requester: ReceivedBufferRequestSender,
+    self_full_address: Recipient,
+    socket: Option<WebSocketStream<TcpStream>>,
+    received_response_type: ReceivedResponseType,
+    lane_queue_lengths: LaneQueueLengths,
+    reply_controller_sender: ReplyControllerSender,
+}
+
 impl Drop for Handler {
     fn drop(&mut self) {
-        self.buffer_requester
+        if self
+            .buffer_requester
             .unbounded_send(ReceivedBufferMessage::ReceiverDisconnect)
-            .expect("the buffer request failed!")
+            .is_err()
+        {
+            error!("we failed to disconnect the receiver from the buffer! presumably the shutdown procedure has been initiated!")
+        }
     }
 }
 
 impl Handler {
-    pub(crate) fn new(
-        msg_input: InputMessageSender,
-        client_connection_tx: ConnectionCommandSender,
-        buffer_requester: ReceivedBufferRequestSender,
-        self_full_address: Recipient,
-        lane_queue_lengths: LaneQueueLengths,
-    ) -> Self {
-        Handler {
-            msg_input,
-            client_connection_tx,
-            buffer_requester,
-            self_full_address,
-            socket: None,
-            received_response_type: Default::default(),
-            lane_queue_lengths,
+    async fn get_lane_queue_length(&self, connection_id: ConnectionId) -> Option<ServerResponse> {
+        let req_start = Instant::now();
+
+        // get the base queue length
+        // Note that this does _NOT_ take into account the packets that have been received but not
+        // yet reach `OutQueueControl`, so it might be a tad low.
+        let conn_lane = TransmissionLane::ConnectionId(connection_id);
+        let Ok(base_length) = self
+            .lane_queue_lengths
+            .lock()
+            .map(|guard| guard.get(&conn_lane).unwrap_or_default()) else {
+            // I'd argue we should panic here as this error it not recoverable
+            error!("The lane queue length lock is poisoned!!");
+            return None
+        };
+
+        // get the number of pending replies waiting for reply surbs
+        let reply_queue_length = self
+            .reply_controller_sender
+            .get_lane_queue_length(connection_id)
+            .await;
+
+        let queue_length = base_length + reply_queue_length;
+
+        let time_taken = req_start.elapsed();
+        let msg =
+            format!("it took {time_taken:?} to get lane length for connection {connection_id}. The length is: {queue_length} = {base_length} (already queued up) + {reply_queue_length} (waiting for reply SURBs)");
+
+        if time_taken > Duration::from_millis(1) {
+            info!("{msg}");
+        } else if time_taken > Duration::from_millis(10) {
+            warn!("{msg}");
+        } else if time_taken > Duration::from_millis(50) {
+            error!("{msg}");
         }
+
+        Some(ServerResponse::LaneQueueLength {
+            lane: connection_id,
+            queue_length,
+        })
     }
 
     async fn handle_send(
         &mut self,
-        recipient: &Recipient,
+        recipient: Recipient,
         message: Vec<u8>,
-        with_reply_surb: bool,
         connection_id: Option<u64>,
     ) -> Option<ServerResponse> {
+        info!(
+            "Attempting to send {:.2} kiB message to {recipient} on connection_id {connection_id:?}",
+            message.len() as f64 / 1024.0
+        );
+
         // We map the absence of a connection id as going into the general lane.
         let lane = connection_id.map_or(TransmissionLane::General, |id| {
             TransmissionLane::ConnectionId(id)
         });
 
         // the ack control is now responsible for chunking, etc.
-        let input_msg = InputMessage::new_fresh(*recipient, message, with_reply_surb, lane);
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
         self.msg_input
             .send(input_msg)
             .await
             .expect("InputMessageReceiver has stopped receiving!");
 
         // Only reply back with a `LaneQueueLength` if the sender providided a connection id
-        let connection_id = match lane {
-            TransmissionLane::General
-            | TransmissionLane::Reply
-            | TransmissionLane::Retransmission
-            | TransmissionLane::Control => return None,
-            TransmissionLane::ConnectionId(id) => id,
+        let TransmissionLane::ConnectionId(connection_id) = lane else {
+          return None
         };
 
-        // on receiving a send, we reply back the current lane queue length for that connection id.
-        // Note that this does _NOT_ take into account the packets that have been received but not
-        // yet reach `OutQueueControl`, so it might be a tad low.
-        let Ok(lane_queue_lengths) = self.lane_queue_lengths.lock() else {
-            log::warn!(
-                "Failed to get the lane queue length lock, \
-                not responding back with the current queue length"
-            );
-            return None;
-        };
-
-        let queue_length = lane_queue_lengths.get(&lane).unwrap_or(0);
-        Some(ServerResponse::LaneQueueLength(connection_id, queue_length))
+        self.get_lane_queue_length(connection_id).await
     }
 
-    async fn handle_reply(
+    async fn handle_send_anonymous(
         &mut self,
-        reply_surb: ReplySurb,
+        recipient: Recipient,
         message: Vec<u8>,
+        reply_surbs: u32,
+        connection_id: Option<u64>,
     ) -> Option<ServerResponse> {
-        if message.len() > ReplySurb::max_msg_len(Default::default()) {
-            return Some(
-                ServerResponse::new_error(
-                    format!(
-                        "too long message to put inside a reply SURB. Received: {} bytes and maximum is {} bytes",
-                        message.len(), ReplySurb::max_msg_len(Default::default()))
-                    )
-                );
-        }
+        info!(
+            "Attempting to anonymously send {:.2} kiB message to {recipient} on connection_id {connection_id:?} while attaching {reply_surbs} replySURBs.",
+            message.len() as f64 / 1024.0
+        );
 
-        let input_msg = InputMessage::new_reply(reply_surb, message);
+        // We map the absence of a connection id as going into the general lane.
+        let lane = connection_id.map_or(TransmissionLane::General, |id| {
+            TransmissionLane::ConnectionId(id)
+        });
+
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
         self.msg_input
             .send(input_msg)
             .await
             .expect("InputMessageReceiver has stopped receiving!");
 
-        None
+        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
+        let TransmissionLane::ConnectionId(connection_id) = lane else {
+          return None
+        };
+
+        self.get_lane_queue_length(connection_id).await
+    }
+
+    async fn handle_reply(
+        &mut self,
+        recipient_tag: AnonymousSenderTag,
+        message: Vec<u8>,
+        connection_id: Option<u64>,
+    ) -> Option<ServerResponse> {
+        info!("Attempting to send {:.2} kiB reply message to {recipient_tag} on connection_id {connection_id:?}", message.len() as f64 / 1024.0);
+
+        // We map the absence of a connection id as going into the general lane.
+        let lane = connection_id.map_or(TransmissionLane::General, |id| {
+            TransmissionLane::ConnectionId(id)
+        });
+
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
+        self.msg_input
+            .send(input_msg)
+            .await
+            .expect("InputMessageReceiver has stopped receiving!");
+
+        // Only reply back with a `LaneQueueLength` if the sender providided a connection id
+        let TransmissionLane::ConnectionId(connection_id) = lane else {
+          return None
+        };
+
+        self.get_lane_queue_length(connection_id).await
     }
 
     fn handle_self_address(&self) -> ServerResponse {
-        ServerResponse::SelfAddress(self.self_full_address)
+        ServerResponse::SelfAddress(Box::new(self.self_full_address))
     }
 
     fn handle_closed_connection(&self, connection_id: u64) -> Option<ServerResponse> {
@@ -165,17 +247,8 @@ impl Handler {
         None
     }
 
-    fn handle_get_lane_queue_length(&self, connection_id: u64) -> Option<ServerResponse> {
-        let Ok(lane_queue_lengths) = self.lane_queue_lengths.lock() else {
-            log::warn!(
-                "Failed to get the lane queue length lock, not responding back with the current queue length"
-            );
-            return None;
-        };
-
-        let lane = TransmissionLane::ConnectionId(connection_id);
-        let queue_length = lane_queue_lengths.get(&lane).unwrap_or(0);
-        Some(ServerResponse::LaneQueueLength(connection_id, queue_length))
+    async fn handle_get_lane_queue_length(&self, connection_id: u64) -> Option<ServerResponse> {
+        self.get_lane_queue_length(connection_id).await
     }
 
     async fn handle_request(&mut self, request: ClientRequest) -> Option<ServerResponse> {
@@ -183,19 +256,28 @@ impl Handler {
             ClientRequest::Send {
                 recipient,
                 message,
-                with_reply_surb,
+                connection_id,
+            } => self.handle_send(recipient, message, connection_id).await,
+
+            ClientRequest::SendAnonymous {
+                recipient,
+                message,
+                reply_surbs,
                 connection_id,
             } => {
-                self.handle_send(&recipient, message, with_reply_surb, connection_id)
+                self.handle_send_anonymous(recipient, message, reply_surbs, connection_id)
                     .await
             }
+
             ClientRequest::Reply {
                 message,
-                reply_surb,
-            } => self.handle_reply(reply_surb, message).await,
+                sender_tag,
+                connection_id,
+            } => self.handle_reply(sender_tag, message, connection_id).await,
+
             ClientRequest::SelfAddress => Some(self.handle_self_address()),
             ClientRequest::ClosedConnection(id) => self.handle_closed_connection(id),
-            ClientRequest::GetLaneQueueLength(id) => self.handle_get_lane_queue_length(id),
+            ClientRequest::GetLaneQueueLength(id) => self.handle_get_lane_queue_length(id).await,
         }
     }
 
@@ -276,8 +358,12 @@ impl Handler {
         }
     }
 
-    async fn listen_for_requests(&mut self, mut msg_receiver: ReconstructedMessagesReceiver) {
-        loop {
+    async fn listen_for_requests(
+        &mut self,
+        mut msg_receiver: ReconstructedMessagesReceiver,
+        mut task_client: task::TaskClient,
+    ) {
+        while !task_client.is_shutdown() {
             tokio::select! {
                 // we can either get a client request from the websocket
                 socket_msg = self.next_websocket_request() => {
@@ -287,7 +373,7 @@ impl Handler {
                     let socket_msg = match socket_msg.unwrap() {
                         Ok(socket_msg) => socket_msg,
                         Err(err) => {
-                            warn!("failed to obtain message from websocket stream! stopping connection handler: {}", err);
+                            warn!("failed to obtain message from websocket stream! stopping connection handler: {err}");
                             break;
                         }
                     };
@@ -299,8 +385,7 @@ impl Handler {
                     if let Some(response) = self.handle_ws_request(socket_msg).await {
                         if let Err(err) = self.send_websocket_response(response).await {
                             warn!(
-                                "Failed to send message over websocket: {}. Assuming the connection is dead.",
-                                err
+                                "Failed to send message over websocket: {err}. Assuming the connection is dead.",
                             );
                             break;
                         }
@@ -308,24 +393,37 @@ impl Handler {
                 }
                 // or a reconstructed mix message that we need to push back to the client
                 mix_messages = msg_receiver.next() => {
-                    let mix_messages = mix_messages.expect(
-                        "mix messages sender was unexpectedly closed! this shouldn't have ever happened!",
-                    );
-                    if let Err(e) = self.push_websocket_received_plaintexts(mix_messages).await {
-                        warn!("failed to send sphinx packets back to the client - {:?}, assuming the connection is dead", e);
+                    let Some(mix_messages) = mix_messages else {
+                        error!("mix messages sender was unexpectedly closed! this shouldn't have ever happened! (unless we're shutting down - TODO: implement proper graceful shutdown handler)");
+                        return
+                    };
+                    if let Err(err) = self.push_websocket_received_plaintexts(mix_messages).await {
+                        warn!("failed to send sphinx packets back to the client - {err}, assuming the connection is dead");
                         break;
                     }
                 }
+                _ = task_client.recv() => {
+                    log::trace!("Websocket handler: Received shutdown");
+                }
             }
         }
+        log::debug!("Websocket handler: Exiting");
     }
 
     // consume self to make sure `drop` is called after this is done
-    pub(crate) async fn handle_connection(mut self, socket: TcpStream) {
+    pub(crate) async fn handle_connection(
+        mut self,
+        socket: TcpStream,
+        mut task_client: task::TaskClient,
+    ) {
+        // We don't want a crash in the connection handler to trigger a shutdown of the whole
+        // process.
+        task_client.mark_as_success();
+
         let ws_stream = match accept_async(socket).await {
             Ok(ws_stream) => ws_stream,
             Err(err) => {
-                warn!("error while performing the websocket handshake - {:?}", err);
+                warn!("error while performing the websocket handshake - {err}");
                 return;
             }
         };
@@ -340,7 +438,8 @@ impl Handler {
             ))
             .expect("the buffer request failed!");
 
-        self.listen_for_requests(reconstructed_receiver).await;
+        self.listen_for_requests(reconstructed_receiver, task_client)
+            .await;
     }
 }
 
diff --git a/clients/native/src/websocket/listener.rs b/clients/native/src/websocket/listener.rs
index bdaa27d4fc..459eb1bc17 100644
--- a/clients/native/src/websocket/listener.rs
+++ b/clients/native/src/websocket/listener.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::handler::Handler;
+use super::handler::HandlerBuilder;
 use log::*;
 use std::{net::SocketAddr, process, sync::Arc};
 use tokio::io::AsyncWriteExt;
@@ -32,11 +32,11 @@ impl Listener {
         }
     }
 
-    pub(crate) async fn run(&mut self, handler: Handler) {
+    pub(crate) async fn run(&mut self, handler: HandlerBuilder, mut task_client: task::TaskClient) {
         let tcp_listener = match tokio::net::TcpListener::bind(self.address).await {
             Ok(listener) => listener,
             Err(err) => {
-                error!("Failed to bind to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address, err);
+                error!("Failed to bind to {} - {err}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address);
                 process::exit(1);
             }
         };
@@ -45,18 +45,30 @@ impl Listener {
 
         loop {
             tokio::select! {
+                // When the handler finishes we check if shutdown is signalled
                 _ = notify.notified() => {
+                    if task_client.is_shutdown() {
+                        log::trace!("Websocket listener: detected shutdown after connection closed");
+                        break;
+                    }
                     // our connection terminated - we are open to a new one now!
                     self.state = State::AwaitingConnection;
                 }
+                // ... but when there is no connected client at the time of shutdown being
+                // signalled, we handle it here.
+                _ = task_client.recv() => {
+                    if !self.state.is_connected() {
+                        log::trace!("Not connected: shutting down");
+                        break;
+                    }
+                }
                 new_conn = tcp_listener.accept() => {
                     match new_conn {
                         Ok((mut socket, remote_addr)) => {
                             debug!("Received connection from {:?}", remote_addr);
                             if self.state.is_connected() {
-                                warn!("tried to duplicate!");
+                                warn!("Tried to open a duplicate websocket connection. The request came from {}", remote_addr);
                                 // if we've already got a connection, don't allow another one
-                                debug!("but there was already a connection present!");
                                 // while we only ever want to accept a single connection, we don't want
                                 // to leave clients hanging (and also allow for reconnection if it somehow
                                 // was dropped)
@@ -64,31 +76,37 @@ impl Listener {
                                     Ok(_) => trace!(
                                         "closed the connection between attempting websocket handshake"
                                     ),
-                                    Err(e) => warn!("failed to cleanly close the connection - {:?}", e),
+                                    Err(err) => warn!("failed to cleanly close the connection - {err}"),
                                 };
                             } else {
                                 // even though we're spawning a new task with the handler here, we will only ever spawn a single one.
                                 // it's done so that any new connections to this listener could be rejected rather than left
                                 // hanging because the executor doesn't come back here
                                 let notify_clone = Arc::clone(&notify);
-                                let fresh_handler = handler.clone();
+                                let fresh_handler = handler.create_active_handler();
+                                let task_client_handler = task_client.clone();
                                 tokio::spawn(async move {
-                                    fresh_handler.handle_connection(socket).await;
+                                    fresh_handler.handle_connection(socket, task_client_handler).await;
                                     notify_clone.notify_one();
                                 });
                                 self.state = State::Connected;
                             }
                         }
-                        Err(e) => warn!("failed to get client: {:?}", e),
+                        Err(err) => warn!("failed to get client: {err}"),
                     }
                 }
             }
         }
+        log::debug!("Websocket listener: Exiting");
     }
 
-    pub(crate) fn start(mut self, handler: Handler) -> JoinHandle<()> {
+    pub(crate) fn start(
+        mut self,
+        handler: HandlerBuilder,
+        shutdown: task::TaskClient,
+    ) -> JoinHandle<()> {
         info!("Running websocket on {:?}", self.address.to_string());
 
-        tokio::spawn(async move { self.run(handler).await })
+        tokio::spawn(async move { self.run(handler, shutdown).await })
     }
 }
diff --git a/clients/native/src/websocket/mod.rs b/clients/native/src/websocket/mod.rs
index bd17b6ee08..38dadbd005 100644
--- a/clients/native/src/websocket/mod.rs
+++ b/clients/native/src/websocket/mod.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub(crate) use handler::Handler;
+pub(crate) use handler::HandlerBuilder;
 pub(crate) use listener::Listener;
 
 pub(crate) mod handler;
diff --git a/clients/native/websocket-requests/src/error.rs b/clients/native/websocket-requests/src/error.rs
index f9fdd029cf..2d9035c19d 100644
--- a/clients/native/websocket-requests/src/error.rs
+++ b/clients/native/websocket-requests/src/error.rs
@@ -24,8 +24,11 @@ impl fmt::Debug for Error {
 }
 
 impl Error {
-    pub fn new(kind: ErrorKind, message: String) -> Self {
-        Error { kind, message }
+    pub fn new<S: Into<String>>(kind: ErrorKind, message: S) -> Self {
+        Error {
+            kind,
+            message: message.into(),
+        }
     }
 }
 
@@ -62,6 +65,31 @@ pub enum ErrorKind {
     Other = 0xFF,
 }
 
+impl TryFrom<u8> for ErrorKind {
+    type Error = Error;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            _ if value == (ErrorKind::EmptyRequest as u8) => Ok(ErrorKind::EmptyRequest),
+            _ if value == (ErrorKind::TooShortRequest as u8) => Ok(ErrorKind::TooShortRequest),
+            _ if value == (ErrorKind::UnknownRequest as u8) => Ok(ErrorKind::UnknownRequest),
+            _ if value == (ErrorKind::MalformedRequest as u8) => Ok(ErrorKind::MalformedRequest),
+
+            _ if value == (ErrorKind::EmptyResponse as u8) => Ok(ErrorKind::EmptyResponse),
+            _ if value == (ErrorKind::TooShortResponse as u8) => Ok(ErrorKind::TooShortResponse),
+            _ if value == (ErrorKind::UnknownResponse as u8) => Ok(ErrorKind::UnknownResponse),
+            _ if value == (ErrorKind::MalformedResponse as u8) => Ok(ErrorKind::MalformedResponse),
+
+            _ if value == (ErrorKind::Other as u8) => Ok(ErrorKind::Other),
+
+            n => Err(Error::new(
+                ErrorKind::MalformedResponse,
+                format!("invalid error code {}", n),
+            )),
+        }
+    }
+}
+
 impl ErrorKind {
     pub(crate) fn as_str(&self) -> &'static str {
         match *self {
diff --git a/clients/native/websocket-requests/src/requests.rs b/clients/native/websocket-requests/src/requests.rs
index 315399ae3d..637db0daba 100644
--- a/clients/native/websocket-requests/src/requests.rs
+++ b/clients/native/websocket-requests/src/requests.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 // all variable size data is always prefixed with u64 length
@@ -7,69 +7,115 @@
 use crate::error::{self, ErrorKind};
 use crate::text::ClientRequestText;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
 use std::convert::{TryFrom, TryInto};
 use std::mem::size_of;
 
-/// Value tag representing [`Send`] variant of the [`ClientRequest`]
-pub const SEND_REQUEST_TAG: u8 = 0x00;
+#[repr(u8)]
+enum ClientRequestTag {
+    /// Value tag representing [`Send`] variant of the [`ClientRequest`]
+    Send = 0x00,
 
-/// Value tag representing [`Reply`] variant of the [`ClientRequest`]
-pub const REPLY_REQUEST_TAG: u8 = 0x01;
+    /// Value tag representing [`SendAnonymous`] variant of the [`ClientRequest`]
+    SendAnonymous = 0x01,
 
-/// Value tag representing [`SelfAddress`] variant of the [`ClientRequest`]
-pub const SELF_ADDRESS_REQUEST_TAG: u8 = 0x02;
+    /// Value tag representing [`Reply`] variant of the [`ClientRequest`]
+    Reply = 0x02,
 
-/// Value tag representing [`ClosedConnection`] variant of the [`ClientRequest`]
-pub const CLOSED_CONNECTION_REQUEST_TAG: u8 = 0x03;
+    /// Value tag representing [`SelfAddress`] variant of the [`ClientRequest`]
+    SelfAddress = 0x03,
 
-/// Value tag representing [`GetLaneQueueLength`] variant of the [`ClientRequest`]
-pub const GET_LANE_QUEUE_LENGHT_TAG: u8 = 0x04;
+    /// Value tag representing [`ClosedConnection`] variant of the [`ClientRequest`]
+    ClosedConnection = 0x04,
+
+    /// Value tag representing [`GetLaneQueueLength`] variant of the [`ClientRequest`]
+    GetLaneQueueLength = 0x05,
+}
+
+impl TryFrom<u8> for ClientRequestTag {
+    type Error = error::Error;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            _ if value == (Self::Send as u8) => Ok(Self::Send),
+            _ if value == (Self::SendAnonymous as u8) => Ok(Self::SendAnonymous),
+            _ if value == (Self::Reply as u8) => Ok(Self::Reply),
+            _ if value == (Self::SelfAddress as u8) => Ok(Self::SelfAddress),
+            _ if value == (Self::ClosedConnection as u8) => Ok(Self::ClosedConnection),
+            _ if value == (Self::GetLaneQueueLength as u8) => Ok(Self::GetLaneQueueLength),
+            n => Err(error::Error::new(
+                ErrorKind::UnknownRequest,
+                format!("{n} does not correspond to any valid request tag"),
+            )),
+        }
+    }
+}
 
 #[allow(non_snake_case)]
 #[derive(Debug)]
 pub enum ClientRequest {
+    /// The simplest message variant where no additional information is attached.
+    /// You're simply sending your `data` to specified `recipient` without any tagging.
+    ///
+    /// Ends up with `NymMessage::Plain` variant
     Send {
         recipient: Recipient,
         message: Vec<u8>,
-        // Perhaps we could change it to a number to indicate how many reply_SURBs we want to include?
-        with_reply_surb: bool,
         connection_id: Option<u64>,
     },
-    Reply {
+
+    /// Create a message used for a duplex anonymous communication where the recipient
+    /// will never learn of our true identity. This is achieved by carefully sending `reply_surbs`.
+    ///
+    /// Note that if reply_surbs is set to zero then
+    /// this variant requires the client having sent some reply_surbs in the past
+    /// (and thus the recipient also knowing our sender tag).
+    ///
+    /// Ends up with `NymMessage::Repliable` variant
+    SendAnonymous {
+        recipient: Recipient,
         message: Vec<u8>,
-        reply_surb: ReplySurb,
+        reply_surbs: u32,
+        connection_id: Option<u64>,
     },
+
+    /// Attempt to use our internally received and stored `ReplySurb` to send the message back
+    /// to specified recipient whilst not knowing its full identity (or even gateway).
+    ///
+    /// Ends up with `NymMessage::Reply` variant
+    Reply {
+        sender_tag: AnonymousSenderTag,
+        message: Vec<u8>,
+        connection_id: Option<u64>,
+    },
+
     SelfAddress,
+
     ClosedConnection(u64),
+
     GetLaneQueueLength(u64),
 }
 
 // we could have been parsing it directly TryFrom<WsMessage>, but we want to retain
 // information about whether it came from binary or text to send appropriate response back
 impl ClientRequest {
-    // SEND_REQUEST_TAG || with_surb || recipient || conn_id || data_len || data
-    fn serialize_send(
-        recipient: Recipient,
-        data: Vec<u8>,
-        with_reply_surb: bool,
-        connection_id: Option<u64>,
-    ) -> Vec<u8> {
+    // SEND_REQUEST_TAG || recipient || conn_id || data_len || data
+    fn serialize_send(recipient: Recipient, data: Vec<u8>, connection_id: Option<u64>) -> Vec<u8> {
         let data_len_bytes = (data.len() as u64).to_be_bytes();
         let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
-        std::iter::once(SEND_REQUEST_TAG)
-            .chain(std::iter::once(with_reply_surb as u8))
-            .chain(recipient.to_bytes().iter().cloned()) // will not be length prefixed because the length is constant
-            .chain(conn_id_bytes.iter().cloned())
-            .chain(data_len_bytes.iter().cloned())
+
+        std::iter::once(ClientRequestTag::Send as u8)
+            .chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
+            .chain(conn_id_bytes.into_iter())
+            .chain(data_len_bytes.into_iter())
             .chain(data.into_iter())
             .collect()
     }
 
-    // SEND_REQUEST_TAG || with_reply || recipient || conn_id || data_len || data
+    // SEND_REQUEST_TAG || recipient || conn_id || data_len || data
     fn deserialize_send(b: &[u8]) -> Result<Self, error::Error> {
-        // we need to have at least 1 (tag) + 1 (reply flag) + Recipient::LEN + 2*sizeof<u64> bytes
-        if b.len() < 2 + Recipient::LEN + 2 * size_of::<u64>() {
+        // we need to have at least 1 (tag) + Recipient::LEN + 2*sizeof<u64> bytes
+        if b.len() < 1 + Recipient::LEN + 2 * size_of::<u64>() {
             return Err(error::Error::new(
                 ErrorKind::TooShortRequest,
                 "not enough data provided to recover 'send'".to_string(),
@@ -77,34 +123,23 @@ impl ClientRequest {
         }
 
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], SEND_REQUEST_TAG);
-
-        let with_reply_surb = match b[1] {
-            0 => false,
-            1 => true,
-            n => {
-                return Err(error::Error::new(
-                    ErrorKind::MalformedRequest,
-                    format!("invalid reply surb flag {}", n),
-                ))
-            }
-        };
+        debug_assert_eq!(b[0], ClientRequestTag::Send as u8);
 
         let mut recipient_bytes = [0u8; Recipient::LEN];
-        recipient_bytes.copy_from_slice(&b[2..2 + Recipient::LEN]);
+        recipient_bytes.copy_from_slice(&b[1..1 + Recipient::LEN]);
         let recipient = match Recipient::try_from_bytes(recipient_bytes) {
             Ok(recipient) => recipient,
             Err(err) => {
                 return Err(error::Error::new(
                     ErrorKind::MalformedRequest,
-                    format!("malformed recipient: {:?}", err),
+                    format!("malformed recipient: {err}"),
                 ))
             }
         };
 
         let mut connection_id_bytes = [0u8; size_of::<u64>()];
         connection_id_bytes
-            .copy_from_slice(&b[2 + Recipient::LEN..2 + Recipient::LEN + size_of::<u64>()]);
+            .copy_from_slice(&b[1 + Recipient::LEN..1 + Recipient::LEN + size_of::<u64>()]);
         let connection_id = u64::from_be_bytes(connection_id_bytes);
         let connection_id = if connection_id == 0 {
             None
@@ -113,9 +148,9 @@ impl ClientRequest {
         };
 
         let data_len_bytes =
-            &b[2 + Recipient::LEN + size_of::<u64>()..2 + Recipient::LEN + 2 * size_of::<u64>()];
+            &b[1 + Recipient::LEN + size_of::<u64>()..1 + Recipient::LEN + 2 * size_of::<u64>()];
         let data_len = u64::from_be_bytes(data_len_bytes.try_into().unwrap());
-        let data = &b[2 + Recipient::LEN + 2 * size_of::<u64>()..];
+        let data = &b[1 + Recipient::LEN + 2 * size_of::<u64>()..];
         if data.len() as u64 != data_len {
             return Err(error::Error::new(
                 ErrorKind::MalformedRequest,
@@ -128,33 +163,111 @@ impl ClientRequest {
         }
 
         Ok(ClientRequest::Send {
-            with_reply_surb,
             recipient,
             message: data.to_vec(),
             connection_id,
         })
     }
 
-    // REPLY_REQUEST_TAG || surb_len || surb || message_len || message
-    fn serialize_reply(message: Vec<u8>, reply_surb: &ReplySurb) -> Vec<u8> {
-        let reply_surb_bytes = reply_surb.to_bytes();
-        let surb_len_bytes = (reply_surb_bytes.len() as u64).to_be_bytes();
-        let message_len_bytes = (message.len() as u64).to_be_bytes();
+    // SEND_ANONYMOUS_REQUEST_TAG || reply_surbs || recipient || conn_id || data_len || data
+    fn serialize_send_anonymous(
+        recipient: Recipient,
+        data: Vec<u8>,
+        reply_surbs: u32,
+        connection_id: Option<u64>,
+    ) -> Vec<u8> {
+        let data_len_bytes = (data.len() as u64).to_be_bytes();
+        let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
 
-        std::iter::once(REPLY_REQUEST_TAG)
-            .chain(surb_len_bytes.iter().cloned())
-            .chain(reply_surb_bytes.into_iter())
-            .chain(message_len_bytes.iter().cloned())
+        std::iter::once(ClientRequestTag::SendAnonymous as u8)
+            .chain(reply_surbs.to_be_bytes().into_iter())
+            .chain(recipient.to_bytes().into_iter()) // will not be length prefixed because the length is constant
+            .chain(conn_id_bytes.into_iter())
+            .chain(data_len_bytes.into_iter())
+            .chain(data.into_iter())
+            .collect()
+    }
+
+    // SEND_ANONYMOUS_REQUEST_TAG || reply_surbs || recipient || data_len || data
+    fn deserialize_send_anonymous(b: &[u8]) -> Result<Self, error::Error> {
+        // we need to have at least 1 (tag) + sizeof<u32> (num surbs) + Recipient::LEN + 2 *sizeof<u64> bytes
+        if b.len() < 1 + size_of::<u32>() + Recipient::LEN + 2 * size_of::<u64>() {
+            return Err(error::Error::new(
+                ErrorKind::TooShortRequest,
+                "not enough data provided to recover 'send_anonymous'".to_string(),
+            ));
+        }
+
+        // this MUST match because it was called by 'deserialize'
+        debug_assert_eq!(b[0], ClientRequestTag::SendAnonymous as u8);
+
+        let reply_surbs = u32::from_be_bytes([b[1], b[2], b[3], b[4]]);
+
+        let mut recipient_bytes = [0u8; Recipient::LEN];
+        recipient_bytes.copy_from_slice(&b[5..5 + Recipient::LEN]);
+        let recipient = match Recipient::try_from_bytes(recipient_bytes) {
+            Ok(recipient) => recipient,
+            Err(err) => {
+                return Err(error::Error::new(
+                    ErrorKind::MalformedRequest,
+                    format!("malformed recipient: {err}"),
+                ))
+            }
+        };
+
+        let mut connection_id_bytes = [0u8; size_of::<u64>()];
+        connection_id_bytes
+            .copy_from_slice(&b[5 + Recipient::LEN..5 + Recipient::LEN + size_of::<u64>()]);
+        let connection_id = u64::from_be_bytes(connection_id_bytes);
+        let connection_id = if connection_id == 0 {
+            None
+        } else {
+            Some(connection_id)
+        };
+
+        let data_len_bytes =
+            &b[5 + Recipient::LEN + size_of::<u64>()..5 + Recipient::LEN + 2 * size_of::<u64>()];
+        let data_len = u64::from_be_bytes(data_len_bytes.try_into().unwrap());
+        let data = &b[5 + Recipient::LEN + 2 * size_of::<u64>()..];
+        if data.len() as u64 != data_len {
+            return Err(error::Error::new(
+                ErrorKind::MalformedRequest,
+                format!(
+                    "data len has inconsistent length. specified: {} got: {}",
+                    data_len,
+                    data.len()
+                ),
+            ));
+        }
+
+        Ok(ClientRequest::SendAnonymous {
+            reply_surbs,
+            recipient,
+            message: data.to_vec(),
+            connection_id,
+        })
+    }
+
+    // REPLY_REQUEST_TAG || SENDER_TAG || conn_id || message_len || message
+    fn serialize_reply(
+        message: Vec<u8>,
+        sender_tag: AnonymousSenderTag,
+        connection_id: Option<u64>,
+    ) -> Vec<u8> {
+        let message_len_bytes = (message.len() as u64).to_be_bytes();
+        let conn_id_bytes = connection_id.unwrap_or(0).to_be_bytes();
+
+        std::iter::once(ClientRequestTag::Reply as u8)
+            .chain(sender_tag.to_bytes().into_iter())
+            .chain(conn_id_bytes.into_iter())
+            .chain(message_len_bytes.into_iter())
             .chain(message.into_iter())
             .collect()
     }
 
-    // REPLY_REQUEST_TAG || surb_len || surb || message_len || message
+    // REPLY_REQUEST_TAG || SENDER_TAG || conn_id || message_len || message
     fn deserialize_reply(b: &[u8]) -> Result<Self, error::Error> {
-        // we need to have at the very least 2 * sizeof<u64> bytes (in case, for some peculiar reason
-        // message and reply surb were 0 len - the request would still be malformed, but would in theory
-        // be parse'able)
-        if b.len() < 1 + 2 * size_of::<u64>() {
+        if b.len() < 1 + SENDER_TAG_SIZE + 2 * size_of::<u64>() {
             return Err(error::Error::new(
                 ErrorKind::TooShortRequest,
                 "not enough data provided to recover 'reply'".to_string(),
@@ -162,42 +275,28 @@ impl ClientRequest {
         }
 
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], REPLY_REQUEST_TAG);
+        debug_assert_eq!(b[0], ClientRequestTag::Reply as u8);
 
-        let reply_surb_len =
-            u64::from_be_bytes(b[1..1 + size_of::<u64>()].as_ref().try_into().unwrap());
+        // the unwrap here is fine as we're definitely using exactly SENDER_TAG_SIZE bytes
+        let sender_tag =
+            AnonymousSenderTag::from_bytes(b[1..1 + SENDER_TAG_SIZE].try_into().unwrap());
 
-        // make sure we won't go out of bounds here
-        if reply_surb_len > (b.len() - 1 + 2 * size_of::<u64>()) as u64 {
-            return Err(error::Error::new(
-                ErrorKind::MalformedRequest,
-                format!(
-                    "not enough data to recover reply surb with specified length {}",
-                    reply_surb_len
-                ),
-            ));
-        }
-
-        let surb_bound = 1 + size_of::<u64>() + reply_surb_len as usize;
-
-        let reply_surb_bytes = &b[1 + size_of::<u64>()..surb_bound];
-        let reply_surb = match ReplySurb::from_bytes(reply_surb_bytes) {
-            Ok(reply_surb) => reply_surb,
-            Err(err) => {
-                return Err(error::Error::new(
-                    ErrorKind::MalformedRequest,
-                    format!("malformed reply surb: {:?}", err),
-                ))
-            }
+        let mut connection_id_bytes = [0u8; size_of::<u64>()];
+        connection_id_bytes
+            .copy_from_slice(&b[1 + SENDER_TAG_SIZE..1 + SENDER_TAG_SIZE + size_of::<u64>()]);
+        let connection_id = u64::from_be_bytes(connection_id_bytes);
+        let connection_id = if connection_id == 0 {
+            None
+        } else {
+            Some(connection_id)
         };
 
         let message_len = u64::from_be_bytes(
-            b[surb_bound..surb_bound + size_of::<u64>()]
-                .as_ref()
+            b[1 + SENDER_TAG_SIZE + size_of::<u64>()..1 + SENDER_TAG_SIZE + 2 * size_of::<u64>()]
                 .try_into()
                 .unwrap(),
         );
-        let message = &b[surb_bound + size_of::<u64>()..];
+        let message = &b[1 + SENDER_TAG_SIZE + 2 * size_of::<u64>()..];
         if message.len() as u64 != message_len {
             return Err(error::Error::new(
                 ErrorKind::MalformedRequest,
@@ -208,33 +307,32 @@ impl ClientRequest {
                 ),
             ));
         }
-        // TODO: should this blow HERE, i.e. during deserialization that the data you're trying
-        // to send via reply is too long?
 
         Ok(ClientRequest::Reply {
-            reply_surb,
             message: message.to_vec(),
+            sender_tag,
+            connection_id,
         })
     }
 
     // SELF_ADDRESS_REQUEST_TAG
     fn serialize_self_address() -> Vec<u8> {
-        std::iter::once(SELF_ADDRESS_REQUEST_TAG).collect()
+        vec![ClientRequestTag::SelfAddress as u8]
     }
 
     // SELF_ADDRESS_REQUEST_TAG
-    fn deserialize_self_address(b: &[u8]) -> Self {
+    fn deserialize_self_address(b: &[u8]) -> Result<Self, error::Error> {
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], SELF_ADDRESS_REQUEST_TAG);
+        debug_assert_eq!(b[0], ClientRequestTag::SelfAddress as u8);
 
-        ClientRequest::SelfAddress
+        Ok(ClientRequest::SelfAddress)
     }
 
     // CLOSED_CONNECTION_REQUEST_TAG
     fn serialize_closed_connection(connection_id: u64) -> Vec<u8> {
         let conn_id_bytes = connection_id.to_be_bytes();
-        std::iter::once(CLOSED_CONNECTION_REQUEST_TAG)
-            .chain(conn_id_bytes.iter().copied())
+        std::iter::once(ClientRequestTag::ClosedConnection as u8)
+            .chain(conn_id_bytes.into_iter())
             .collect()
     }
 
@@ -243,12 +341,12 @@ impl ClientRequest {
         if b.len() != 1 + size_of::<u64>() {
             return Err(error::Error::new(
                 ErrorKind::MalformedRequest,
-                "the received closed connection has invalid length".to_string(),
+                "The received closed connection has invalid length",
             ));
         }
 
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], CLOSED_CONNECTION_REQUEST_TAG);
+        debug_assert_eq!(b[0], ClientRequestTag::ClosedConnection as u8);
 
         let mut connection_id_bytes = [0u8; size_of::<u64>()];
         connection_id_bytes.copy_from_slice(&b[1..=size_of::<u64>()]);
@@ -260,8 +358,8 @@ impl ClientRequest {
     // GET_LANE_QUEUE_LENGHT_TAG
     fn serialize_get_lane_queue_lengths(connection_id: u64) -> Vec<u8> {
         let conn_id_bytes = connection_id.to_be_bytes();
-        std::iter::once(GET_LANE_QUEUE_LENGHT_TAG)
-            .chain(conn_id_bytes.iter().copied())
+        std::iter::once(ClientRequestTag::GetLaneQueueLength as u8)
+            .chain(conn_id_bytes.into_iter())
             .collect()
     }
 
@@ -270,12 +368,12 @@ impl ClientRequest {
         if b.len() != 1 + size_of::<u64>() {
             return Err(error::Error::new(
                 ErrorKind::MalformedRequest,
-                "the received get lane queue length has invalid length".to_string(),
+                "The received get lane queue lengths has invalid length",
             ));
         }
 
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], GET_LANE_QUEUE_LENGHT_TAG);
+        debug_assert_eq!(b[0], ClientRequestTag::GetLaneQueueLength as u8);
 
         let mut connection_id_bytes = [0u8; size_of::<u64>()];
         connection_id_bytes.copy_from_slice(&b[1..=size_of::<u64>()]);
@@ -289,14 +387,21 @@ impl ClientRequest {
             ClientRequest::Send {
                 recipient,
                 message,
-                with_reply_surb,
                 connection_id,
-            } => Self::serialize_send(recipient, message, with_reply_surb, connection_id),
+            } => Self::serialize_send(recipient, message, connection_id),
+
+            ClientRequest::SendAnonymous {
+                recipient,
+                message,
+                reply_surbs,
+                connection_id,
+            } => Self::serialize_send_anonymous(recipient, message, reply_surbs, connection_id),
 
             ClientRequest::Reply {
                 message,
-                reply_surb,
-            } => Self::serialize_reply(message, &reply_surb),
+                sender_tag,
+                connection_id,
+            } => Self::serialize_reply(message, sender_tag, connection_id),
 
             ClientRequest::SelfAddress => Self::serialize_self_address(),
 
@@ -316,28 +421,16 @@ impl ClientRequest {
             ));
         }
 
-        if b.len() < size_of::<u8>() {
-            return Err(error::Error::new(
-                ErrorKind::TooShortRequest,
-                format!(
-                    "not enough data provided to recover request tag. Provided only {} bytes",
-                    b.len()
-                ),
-            ));
-        }
-        let request_tag = b[0];
+        let request_tag = ClientRequestTag::try_from(b[0])?;
 
         // determine what kind of request that is and try to deserialize it
         match request_tag {
-            SEND_REQUEST_TAG => Self::deserialize_send(b),
-            REPLY_REQUEST_TAG => Self::deserialize_reply(b),
-            SELF_ADDRESS_REQUEST_TAG => Ok(Self::deserialize_self_address(b)),
-            CLOSED_CONNECTION_REQUEST_TAG => Self::deserialize_closed_connection(b),
-            GET_LANE_QUEUE_LENGHT_TAG => Self::deserialize_get_lane_queue_length(b),
-            n => Err(error::Error::new(
-                ErrorKind::UnknownRequest,
-                format!("type {n}"),
-            )),
+            ClientRequestTag::Send => Self::deserialize_send(b),
+            ClientRequestTag::SendAnonymous => Self::deserialize_send_anonymous(b),
+            ClientRequestTag::Reply => Self::deserialize_reply(b),
+            ClientRequestTag::SelfAddress => Self::deserialize_self_address(b),
+            ClientRequestTag::ClosedConnection => Self::deserialize_closed_connection(b),
+            ClientRequestTag::GetLaneQueueLength => Self::deserialize_get_lane_queue_length(b),
         }
     }
 
@@ -365,50 +458,52 @@ mod tests {
         let recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
         let recipient_string = recipient.to_string();
 
-        let send_request_no_surb = ClientRequest::Send {
+        let send_request = ClientRequest::Send {
             recipient,
             message: b"foomp".to_vec(),
-            with_reply_surb: false,
             connection_id: Some(42),
         };
 
-        let bytes = send_request_no_surb.serialize();
+        let bytes = send_request.serialize();
         let recovered = ClientRequest::deserialize(&bytes).unwrap();
         match recovered {
             ClientRequest::Send {
                 recipient,
                 message,
-                with_reply_surb,
                 connection_id,
             } => {
                 assert_eq!(recipient.to_string(), recipient_string);
                 assert_eq!(message, b"foomp".to_vec());
-                assert!(!with_reply_surb);
                 assert_eq!(connection_id, Some(42))
             }
             _ => unreachable!(),
         }
+    }
 
-        let send_request_surb = ClientRequest::Send {
-            recipient,
+    #[test]
+    fn send_anonymous_request_serialization_works() {
+        let original_recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
+
+        let send_anonymous_request = ClientRequest::SendAnonymous {
+            recipient: original_recipient,
             message: b"foomp".to_vec(),
-            with_reply_surb: true,
-            connection_id: None,
+            reply_surbs: 666,
+            connection_id: Some(42),
         };
 
-        let bytes = send_request_surb.serialize();
+        let bytes = send_anonymous_request.serialize();
         let recovered = ClientRequest::deserialize(&bytes).unwrap();
         match recovered {
-            ClientRequest::Send {
+            ClientRequest::SendAnonymous {
                 recipient,
                 message,
-                with_reply_surb,
+                reply_surbs,
                 connection_id,
             } => {
-                assert_eq!(recipient.to_string(), recipient_string);
+                assert_eq!(recipient, original_recipient);
                 assert_eq!(message, b"foomp".to_vec());
-                assert!(with_reply_surb);
-                assert_eq!(connection_id, None)
+                assert_eq!(connection_id, Some(42));
+                assert_eq!(reply_surbs, 666)
             }
             _ => unreachable!(),
         }
@@ -416,22 +511,23 @@ mod tests {
 
     #[test]
     fn reply_request_serialization_works() {
-        let reply_surb_string = "CjfVbHbfAjbC3W1BvNHGXmM8KNAnDNYGaHMLqVDxRYeo352csAihstup9bvqXam4dTWgfHak6KYwL9STaxWJ47E8XFZbSEvs7hEsfCkxr6K9WJuSBPK84GDDEvad8ZAuMCoaXsAd5S2Lj9a5eYyzG4SL1jHzhSMni55LyJwumxo1ZTGZNXggxw1RREosvyzNrW9Rsi3owyPqLCwXpiei2tHZty8w8midVvg8vDa7ZEJD842CLv8D4ohynSG7gDpqTrhkRaqYAuz7dzqNbMXLJRM7v823Jn16fA1L7YQxmcaUdUigyRSgTdb4i9ebiLGSyJ1iDe6Acz613PQZh6Ua3bZ2zVKq3dSycpDm9ngarRK4zJrAaUxRkdih8YzW3BY4nL9eqkfKA4N1TWCLaRU7zpSaf8yMEwrAZReU3d5zLV8c5KBfa2w8R5anhQeBojduZEGEad8kkHuKU52Zg93FeWHvH1qgZaEJMHH4nN7gKXz9mvWDhYwyF4vt3Uy2NhCHC3N5pL1gMme27YcoPcTEia1fxKZtnt6rtEozzTrAgCJGswigkFbkafiV5QaJwLKTUxtzhkZ57eEuLPte9UvJHzhhXUQ2CV7R2BUkJjYZy3Zsx6YYvdYWiAFFkWUwNEGA4QpShUHciBfsQVHQ7pN41YcyYUhbywQDFnTVgEmdUZ1XCBi3gyK5U3tDQmFzP1u9m3mWrUA8qB9mRDE7ptNDm5c3c1458L6uXLUth7sdMaa1Was5LCmCdmNDtvNpCDAEt1in6q6mrZFR85aCSU9b1baNGwZoCqPpPvydkVe63gXWoi8ebvdyxARrqACFrSB3ZdY3uJBw8CTMNkKK6MvcefMkSVVsbLd36TQAtYSCqrpiMc5dQuKcEu5QfciwvWYXYx8WFNAgKwP2mv49KCTvfozNDUCbjzDwSx92Zv5zjG8HbFpB13bY9UZGeyTPvv7gGxCzjGjJGbW6FRAheRQaaje5fUgCNM95Tv7wBmAMRHHFgWafeK1sdFH7dtCX9u898HucGTaboSKLsVh8J78gbbkHErwjMh7y9YRkceq5TTYS5da4kHnyNKYWSbxgZrmFg44XGKoeYcqoHB3XTZrdsf7F5fFeNwnihkmADvhAcaxXUmVqq4rQFZH84a1iC3WBWXYcqiZH2L7ujGWV7mMDT4HBEerDYjc8rNY4xGTPfivCrBCJW1i14aqW8xRdsdgTM88eTksvC3WPJLJ7iMzfKXeL7fMW1Ek6QGyQtLBW98vEESpdcDg6DeZ5rMz6VqjTGGqcCaFGfHoqtfxMDaBAEsyQ8h7XDX6dg1wq9wH6j4Tw7Tj1MEv1b8uj5NJkozZdzVdYA2QyE2Dp8vuurQG6uVdTDNww2d88RBQ8sVgjxN8gR45y4woJLhFAaNTAtrY6wDTxyXST13ni6oyqdYxjFVk9Am4v3DzH7Y2K8iRVSHfTk4FRbPULyaeK6wt2anvMJH1XdvVRgc14h67MnBxMgMD1UFk8AErN7CDj26fppe3c5G6KozJe4cSqQUGbBjVzBnrHCruqrfZBn5hNZHTV37bQiomqhRQXohxhuKEnNrGbAe1xNvJr9X";
-        let reply_surb = ReplySurb::from_base58_string(reply_surb_string).unwrap();
         let reply_request = ClientRequest::Reply {
+            sender_tag: [8u8; SENDER_TAG_SIZE].into(),
             message: b"foomp".to_vec(),
-            reply_surb,
+            connection_id: Some(42),
         };
 
         let bytes = reply_request.serialize();
         let recovered = ClientRequest::deserialize(&bytes).unwrap();
         match recovered {
             ClientRequest::Reply {
-                reply_surb,
+                sender_tag,
                 message,
+                connection_id,
             } => {
-                assert_eq!(reply_surb.to_base58_string(), reply_surb_string);
+                assert_eq!(sender_tag, [8u8; SENDER_TAG_SIZE].into());
                 assert_eq!(message, b"foomp".to_vec());
+                assert_eq!(connection_id, Some(42));
             }
             _ => unreachable!(),
         }
@@ -458,4 +554,15 @@ mod tests {
             _ => unreachable!(),
         }
     }
+
+    #[test]
+    fn get_lane_queue_length_request_serialization_works() {
+        let close_connection_request = ClientRequest::GetLaneQueueLength(42);
+        let bytes = close_connection_request.serialize();
+        let recovered = ClientRequest::deserialize(&bytes).unwrap();
+        match recovered {
+            ClientRequest::GetLaneQueueLength(id) => assert_eq!(id, 42),
+            _ => unreachable!(),
+        }
+    }
 }
diff --git a/clients/native/websocket-requests/src/responses.rs b/clients/native/websocket-requests/src/responses.rs
index 7a32645957..8b4e60963a 100644
--- a/clients/native/websocket-requests/src/responses.rs
+++ b/clients/native/websocket-requests/src/responses.rs
@@ -1,36 +1,54 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 // all variable size data is always prefixed with u64 length
 // tags are u8
 
-#![allow(unknown_lints)] // due to using `clippy::branches_sharing_code` which does not exist on `stable` just yet
-
 use crate::error::{self, ErrorKind};
 use crate::text::ServerResponseText;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};
 use nymsphinx::receiver::ReconstructedMessage;
 use std::convert::TryInto;
 use std::mem::size_of;
 
-/// Value tag representing [`Error`] variant of the [`ServerResponse`]
-pub const ERROR_RESPONSE_TAG: u8 = 0x00;
+#[repr(u8)]
+enum ServerResponseTag {
+    /// Value tag representing [`Error`] variant of the [`ServerResponse`]
+    Error = 0x00,
 
-/// Value tag representing [`Received`] variant of the [`ServerResponse`]
-pub const RECEIVED_RESPONSE_TAG: u8 = 0x01;
+    /// Value tag representing [`Received`] variant of the [`ServerResponse`]
+    Received = 0x01,
 
-/// Value tag representing [`SelfAddress`] variant of the [`ServerResponse`]
-pub const SELF_ADDRESS_RESPONSE_TAG: u8 = 0x02;
+    /// Value tag representing [`SelfAddress`] variant of the [`ServerResponse`]
+    SelfAddress = 0x02,
 
-/// Value tag representing [`LaneQueueLength`] variant of the [`ServerResponse`]
-pub const LANE_QUEUE_LENGTH_RESPONSE_TAG: u8 = 0x03;
+    /// Value tag representing [`LaneQueueLength`] variant of the [`ServerResponse`]
+    LaneQueueLength = 0x03,
+}
+
+impl TryFrom<u8> for ServerResponseTag {
+    type Error = error::Error;
+
+    fn try_from(value: u8) -> Result<Self, error::Error> {
+        match value {
+            _ if value == (Self::Error as u8) => Ok(Self::Error),
+            _ if value == (Self::Received as u8) => Ok(Self::Received),
+            _ if value == (Self::SelfAddress as u8) => Ok(Self::SelfAddress),
+            _ if value == (Self::LaneQueueLength as u8) => Ok(Self::LaneQueueLength),
+            n => Err(error::Error::new(
+                ErrorKind::UnknownResponse,
+                format!("{n} does not correspond to any valid response tag"),
+            )),
+        }
+    }
+}
 
 #[derive(Debug)]
 pub enum ServerResponse {
     Received(ReconstructedMessage),
-    SelfAddress(Recipient),
-    LaneQueueLength(u64, usize),
+    SelfAddress(Box<Recipient>),
+    LaneQueueLength { lane: u64, queue_length: usize },
     Error(error::Error),
 }
 
@@ -42,24 +60,19 @@ impl ServerResponse {
         })
     }
 
-    // RECEIVED_RESPONSE_TAG || with_reply || (surb_len || surb) || msg_len || msg
+    // RECEIVED_RESPONSE_TAG || 1 | 0 indicating sender_tag || Option<sender_tag> || msg_len || msg
     fn serialize_received(reconstructed_message: ReconstructedMessage) -> Vec<u8> {
         let message_len_bytes = (reconstructed_message.message.len() as u64).to_be_bytes();
-        if let Some(reply_surb) = reconstructed_message.reply_surb {
-            let reply_surb_bytes = reply_surb.to_bytes();
-            let surb_len_bytes = (reply_surb_bytes.len() as u64).to_be_bytes();
 
-            // with_reply || surb_len || surb || msg_len || msg
-            std::iter::once(RECEIVED_RESPONSE_TAG)
+        if let Some(sender_tag) = reconstructed_message.sender_tag {
+            std::iter::once(ServerResponseTag::Received as u8)
                 .chain(std::iter::once(true as u8))
-                .chain(surb_len_bytes.iter().cloned())
-                .chain(reply_surb_bytes.iter().cloned())
+                .chain(sender_tag.to_bytes().into_iter())
                 .chain(message_len_bytes.iter().cloned())
                 .chain(reconstructed_message.message.into_iter())
                 .collect()
         } else {
-            // without_reply || msg_len || msg
-            std::iter::once(RECEIVED_RESPONSE_TAG)
+            std::iter::once(ServerResponseTag::Received as u8)
                 .chain(std::iter::once(false as u8))
                 .chain(message_len_bytes.iter().cloned())
                 .chain(reconstructed_message.message.into_iter())
@@ -67,10 +80,9 @@ impl ServerResponse {
         }
     }
 
-    // RECEIVED_RESPONSE_TAG || with_reply || (surb_len || surb) || msg_len || msg
+    // RECEIVED_RESPONSE_TAG || 1 | 0 indicating sender_tag || Option<sender_tag> || msg_len || msg
     fn deserialize_received(b: &[u8]) -> Result<Self, error::Error> {
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], RECEIVED_RESPONSE_TAG);
 
         // we must be able to read at the very least if it has a reply_surb and length of some field
         if b.len() < 2 + size_of::<u64>() {
@@ -79,101 +91,70 @@ impl ServerResponse {
                 "not enough data provided to recover 'received'".to_string(),
             ));
         }
+        debug_assert_eq!(b[0], ServerResponseTag::Received as u8);
 
-        let with_reply_surb = match b[1] {
+        let has_sender_tag = match b[1] {
             0 => false,
             1 => true,
             n => {
                 return Err(error::Error::new(
                     ErrorKind::MalformedResponse,
-                    format!("invalid reply flag {}", n),
+                    format!("invalid sender tag flag {n}"),
                 ))
             }
         };
 
-        // this is a false positive as even though the code is the same, it refers to different things
-        #[allow(clippy::branches_sharing_code)]
-        if with_reply_surb {
-            let reply_surb_len =
-                u64::from_be_bytes(b[2..2 + size_of::<u64>()].as_ref().try_into().unwrap());
-
-            // make sure we won't go out of bounds here
-            if reply_surb_len > (b.len() - 2 + 2 * size_of::<u64>()) as u64 {
+        let mut i = 2;
+        let sender_tag = if has_sender_tag {
+            if b[2..].len() < SENDER_TAG_SIZE {
                 return Err(error::Error::new(
-                    ErrorKind::MalformedResponse,
-                    "not enough bytes to read reply_surb bytes!".to_string(),
+                    ErrorKind::TooShortResponse,
+                    "not enough data provided to recover 'received'".to_string(),
                 ));
             }
-
-            let surb_bound = 2 + size_of::<u64>() + reply_surb_len as usize;
-
-            let reply_surb_bytes = &b[2 + size_of::<u64>()..surb_bound];
-            let reply_surb = match ReplySurb::from_bytes(reply_surb_bytes) {
-                Ok(reply_surb) => reply_surb,
-                Err(err) => {
-                    return Err(error::Error::new(
-                        ErrorKind::MalformedResponse,
-                        format!("malformed reply SURB: {:?}", err),
-                    ))
-                }
-            };
-
-            let message_len = u64::from_be_bytes(
-                b[surb_bound..surb_bound + size_of::<u64>()]
-                    .as_ref()
-                    .try_into()
-                    .unwrap(),
-            );
-            let message = &b[surb_bound + size_of::<u64>()..];
-            if message.len() as u64 != message_len {
-                return Err(error::Error::new(
-                    ErrorKind::MalformedResponse,
-                    format!(
-                        "message len has inconsistent length. specified: {} got: {}",
-                        message_len,
-                        message.len()
-                    ),
-                ));
-            }
-
-            Ok(ServerResponse::Received(ReconstructedMessage {
-                message: message.to_vec(),
-                reply_surb: Some(reply_surb),
-            }))
+            i += SENDER_TAG_SIZE;
+            Some(AnonymousSenderTag::from_bytes(
+                b[2..2 + SENDER_TAG_SIZE].try_into().unwrap(),
+            ))
         } else {
-            let message_len =
-                u64::from_be_bytes(b[2..2 + size_of::<u64>()].as_ref().try_into().unwrap());
-            let message = &b[2 + size_of::<u64>()..];
-            if message.len() as u64 != message_len {
-                return Err(error::Error::new(
-                    ErrorKind::MalformedResponse,
-                    format!(
-                        "message len has inconsistent length. specified: {} got: {}",
-                        message_len,
-                        message.len()
-                    ),
-                ));
-            }
+            None
+        };
 
-            Ok(ServerResponse::Received(ReconstructedMessage {
-                message: message.to_vec(),
-                reply_surb: None,
-            }))
+        if b[i..].len() < size_of::<u64>() {
+            return Err(error::Error::new(
+                ErrorKind::TooShortResponse,
+                "not enough data provided to recover 'received'".to_string(),
+            ));
         }
+
+        let message_len = u64::from_be_bytes(b[i..i + size_of::<u64>()].try_into().unwrap());
+        let message = &b[i + size_of::<u64>()..];
+        if message.len() as u64 != message_len {
+            return Err(error::Error::new(
+                ErrorKind::MalformedResponse,
+                format!(
+                    "message len has inconsistent length. specified: {} got: {}",
+                    message_len,
+                    message.len()
+                ),
+            ));
+        }
+
+        Ok(ServerResponse::Received(ReconstructedMessage {
+            message: message.to_vec(),
+            sender_tag,
+        }))
     }
 
     // SELF_ADDRESS_RESPONSE_TAG || self_address
     fn serialize_self_address(address: Recipient) -> Vec<u8> {
-        std::iter::once(SELF_ADDRESS_RESPONSE_TAG)
-            .chain(address.to_bytes().iter().cloned())
+        std::iter::once(ServerResponseTag::SelfAddress as u8)
+            .chain(address.to_bytes().into_iter())
             .collect()
     }
 
     // SELF_ADDRESS_RESPONSE_TAG || self_address
     fn deserialize_self_address(b: &[u8]) -> Result<Self, error::Error> {
-        // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], SELF_ADDRESS_RESPONSE_TAG);
-
         if b.len() != 1 + Recipient::LEN {
             return Err(error::Error::new(
                 ErrorKind::TooShortResponse,
@@ -181,6 +162,9 @@ impl ServerResponse {
             ));
         }
 
+        // this MUST match because it was called by 'deserialize'
+        debug_assert_eq!(b[0], ServerResponseTag::SelfAddress as u8);
+
         let mut recipient_bytes = [0u8; Recipient::LEN];
         recipient_bytes.copy_from_slice(&b[1..1 + Recipient::LEN]);
 
@@ -189,17 +173,17 @@ impl ServerResponse {
             Err(err) => {
                 return Err(error::Error::new(
                     ErrorKind::MalformedResponse,
-                    format!("malformed Recipient: {:?}", err),
+                    format!("malformed Recipient: {err}"),
                 ))
             }
         };
 
-        Ok(ServerResponse::SelfAddress(recipient))
+        Ok(ServerResponse::SelfAddress(Box::new(recipient)))
     }
 
     // LANE_QUEUE_LENGTH_RESPONSE_TAG || lane || queue_length
     fn serialize_lane_queue_length(lane: u64, queue_length: usize) -> Vec<u8> {
-        std::iter::once(LANE_QUEUE_LENGTH_RESPONSE_TAG)
+        std::iter::once(ServerResponseTag::LaneQueueLength as u8)
             .chain(lane.to_be_bytes().iter().cloned())
             .chain(queue_length.to_be_bytes().iter().cloned())
             .collect()
@@ -208,7 +192,7 @@ impl ServerResponse {
     // LANE_QUEUE_LENGTH_RESPONSE_TAG || lane || queue_length
     fn deserialize_lane_queue_length(b: &[u8]) -> Result<Self, error::Error> {
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], LANE_QUEUE_LENGTH_RESPONSE_TAG);
+        debug_assert_eq!(b[0], ServerResponseTag::LaneQueueLength as u8);
 
         let mut lane_bytes = [0u8; size_of::<u64>()];
         lane_bytes.copy_from_slice(&b[1..=size_of::<u64>()]);
@@ -219,15 +203,15 @@ impl ServerResponse {
             .copy_from_slice(&b[1 + size_of::<u64>()..1 + size_of::<u64>() + size_of::<usize>()]);
         let queue_length = usize::from_be_bytes(queue_length_bytes);
 
-        Ok(ServerResponse::LaneQueueLength(lane, queue_length))
+        Ok(ServerResponse::LaneQueueLength { lane, queue_length })
     }
 
     // ERROR_RESPONSE_TAG || err_code || msg_len || msg
     fn serialize_error(error: error::Error) -> Vec<u8> {
         let message_len_bytes = (error.message.len() as u64).to_be_bytes();
-        std::iter::once(ERROR_RESPONSE_TAG)
+        std::iter::once(ServerResponseTag::Error as u8)
             .chain(std::iter::once(error.kind as u8))
-            .chain(message_len_bytes.iter().cloned())
+            .chain(message_len_bytes.into_iter())
             .chain(error.message.into_bytes().into_iter())
             .collect()
     }
@@ -235,7 +219,7 @@ impl ServerResponse {
     // ERROR_RESPONSE_TAG || err_code || msg_len || msg
     fn deserialize_error(b: &[u8]) -> Result<Self, error::Error> {
         // this MUST match because it was called by 'deserialize'
-        debug_assert_eq!(b[0], ERROR_RESPONSE_TAG);
+        debug_assert_eq!(b[0], ServerResponseTag::Error as u8);
 
         if b.len() < size_of::<u8>() + size_of::<u64>() {
             return Err(error::Error::new(
@@ -244,26 +228,7 @@ impl ServerResponse {
             ));
         }
 
-        let error_kind = match b[1] {
-            _ if b[1] == (ErrorKind::EmptyRequest as u8) => ErrorKind::EmptyRequest,
-            _ if b[1] == (ErrorKind::TooShortRequest as u8) => ErrorKind::TooShortRequest,
-            _ if b[1] == (ErrorKind::UnknownRequest as u8) => ErrorKind::UnknownRequest,
-            _ if b[1] == (ErrorKind::MalformedRequest as u8) => ErrorKind::MalformedRequest,
-
-            _ if b[1] == (ErrorKind::EmptyResponse as u8) => ErrorKind::EmptyResponse,
-            _ if b[1] == (ErrorKind::TooShortResponse as u8) => ErrorKind::TooShortResponse,
-            _ if b[1] == (ErrorKind::UnknownResponse as u8) => ErrorKind::UnknownResponse,
-            _ if b[1] == (ErrorKind::MalformedResponse as u8) => ErrorKind::MalformedResponse,
-
-            _ if b[1] == (ErrorKind::Other as u8) => ErrorKind::Other,
-
-            n => {
-                return Err(error::Error::new(
-                    ErrorKind::MalformedResponse,
-                    format!("invalid error code {}", n),
-                ))
-            }
-        };
+        let error_kind = ErrorKind::try_from(b[1])?;
 
         let message_len =
             u64::from_be_bytes(b[2..2 + size_of::<u64>()].as_ref().try_into().unwrap());
@@ -284,7 +249,7 @@ impl ServerResponse {
             Err(err) => {
                 return Err(error::Error::new(
                     ErrorKind::MalformedResponse,
-                    format!("malformed error message: {:?}", err),
+                    format!("malformed error message: {err}"),
                 ))
             }
         };
@@ -300,8 +265,8 @@ impl ServerResponse {
             ServerResponse::Received(reconstructed_message) => {
                 Self::serialize_received(reconstructed_message)
             }
-            ServerResponse::SelfAddress(address) => Self::serialize_self_address(address),
-            ServerResponse::LaneQueueLength(lane, queue_length) => {
+            ServerResponse::SelfAddress(address) => Self::serialize_self_address(*address),
+            ServerResponse::LaneQueueLength { lane, queue_length } => {
                 Self::serialize_lane_queue_length(lane, queue_length)
             }
             ServerResponse::Error(err) => Self::serialize_error(err),
@@ -328,18 +293,14 @@ impl ServerResponse {
             ));
         }
 
-        let response_tag = b[0];
+        let response_tag = ServerResponseTag::try_from(b[0])?;
 
         // determine what kind of response that is and try to deserialize it
         match response_tag {
-            RECEIVED_RESPONSE_TAG => Self::deserialize_received(b),
-            SELF_ADDRESS_RESPONSE_TAG => Self::deserialize_self_address(b),
-            LANE_QUEUE_LENGTH_RESPONSE_TAG => Self::deserialize_lane_queue_length(b),
-            ERROR_RESPONSE_TAG => Self::deserialize_error(b),
-            n => Err(error::Error::new(
-                ErrorKind::UnknownResponse,
-                format!("type {}", n),
-            )),
+            ServerResponseTag::Received => Self::deserialize_received(b),
+            ServerResponseTag::SelfAddress => Self::deserialize_self_address(b),
+            ServerResponseTag::LaneQueueLength => Self::deserialize_lane_queue_length(b),
+            ServerResponseTag::Error => Self::deserialize_error(b),
         }
     }
 
@@ -361,35 +322,33 @@ mod tests {
 
     #[test]
     fn received_response_serialization_works() {
-        let reply_surb_string = "CjfVbHbfAjbC3W1BvNHGXmM8KNAnDNYGaHMLqVDxRYeo352csAihstup9bvqXam4dTWgfHak6KYwL9STaxWJ47E8XFZbSEvs7hEsfCkxr6K9WJuSBPK84GDDEvad8ZAuMCoaXsAd5S2Lj9a5eYyzG4SL1jHzhSMni55LyJwumxo1ZTGZNXggxw1RREosvyzNrW9Rsi3owyPqLCwXpiei2tHZty8w8midVvg8vDa7ZEJD842CLv8D4ohynSG7gDpqTrhkRaqYAuz7dzqNbMXLJRM7v823Jn16fA1L7YQxmcaUdUigyRSgTdb4i9ebiLGSyJ1iDe6Acz613PQZh6Ua3bZ2zVKq3dSycpDm9ngarRK4zJrAaUxRkdih8YzW3BY4nL9eqkfKA4N1TWCLaRU7zpSaf8yMEwrAZReU3d5zLV8c5KBfa2w8R5anhQeBojduZEGEad8kkHuKU52Zg93FeWHvH1qgZaEJMHH4nN7gKXz9mvWDhYwyF4vt3Uy2NhCHC3N5pL1gMme27YcoPcTEia1fxKZtnt6rtEozzTrAgCJGswigkFbkafiV5QaJwLKTUxtzhkZ57eEuLPte9UvJHzhhXUQ2CV7R2BUkJjYZy3Zsx6YYvdYWiAFFkWUwNEGA4QpShUHciBfsQVHQ7pN41YcyYUhbywQDFnTVgEmdUZ1XCBi3gyK5U3tDQmFzP1u9m3mWrUA8qB9mRDE7ptNDm5c3c1458L6uXLUth7sdMaa1Was5LCmCdmNDtvNpCDAEt1in6q6mrZFR85aCSU9b1baNGwZoCqPpPvydkVe63gXWoi8ebvdyxARrqACFrSB3ZdY3uJBw8CTMNkKK6MvcefMkSVVsbLd36TQAtYSCqrpiMc5dQuKcEu5QfciwvWYXYx8WFNAgKwP2mv49KCTvfozNDUCbjzDwSx92Zv5zjG8HbFpB13bY9UZGeyTPvv7gGxCzjGjJGbW6FRAheRQaaje5fUgCNM95Tv7wBmAMRHHFgWafeK1sdFH7dtCX9u898HucGTaboSKLsVh8J78gbbkHErwjMh7y9YRkceq5TTYS5da4kHnyNKYWSbxgZrmFg44XGKoeYcqoHB3XTZrdsf7F5fFeNwnihkmADvhAcaxXUmVqq4rQFZH84a1iC3WBWXYcqiZH2L7ujGWV7mMDT4HBEerDYjc8rNY4xGTPfivCrBCJW1i14aqW8xRdsdgTM88eTksvC3WPJLJ7iMzfKXeL7fMW1Ek6QGyQtLBW98vEESpdcDg6DeZ5rMz6VqjTGGqcCaFGfHoqtfxMDaBAEsyQ8h7XDX6dg1wq9wH6j4Tw7Tj1MEv1b8uj5NJkozZdzVdYA2QyE2Dp8vuurQG6uVdTDNww2d88RBQ8sVgjxN8gR45y4woJLhFAaNTAtrY6wDTxyXST13ni6oyqdYxjFVk9Am4v3DzH7Y2K8iRVSHfTk4FRbPULyaeK6wt2anvMJH1XdvVRgc14h67MnBxMgMD1UFk8AErN7CDj26fppe3c5G6KozJe4cSqQUGbBjVzBnrHCruqrfZBn5hNZHTV37bQiomqhRQXohxhuKEnNrGbAe1xNvJr9X";
-
-        let received_with_surb = ServerResponse::Received(ReconstructedMessage {
+        let received_with_sender_tag = ServerResponse::Received(ReconstructedMessage {
             message: b"foomp".to_vec(),
-            reply_surb: Some(ReplySurb::from_base58_string(reply_surb_string).unwrap()),
+            sender_tag: Some([42u8; SENDER_TAG_SIZE].into()),
         });
-        let bytes = received_with_surb.serialize();
+        let bytes = received_with_sender_tag.serialize();
         let recovered = ServerResponse::deserialize(&bytes).unwrap();
         match recovered {
             ServerResponse::Received(reconstructed) => {
                 assert_eq!(reconstructed.message, b"foomp".to_vec());
                 assert_eq!(
-                    reconstructed.reply_surb.unwrap().to_base58_string(),
-                    reply_surb_string
+                    reconstructed.sender_tag,
+                    Some([42u8; SENDER_TAG_SIZE].into())
                 )
             }
             _ => unreachable!(),
         }
 
-        let received_without_surb = ServerResponse::Received(ReconstructedMessage {
+        let received_without_sender_tag = ServerResponse::Received(ReconstructedMessage {
             message: b"foomp".to_vec(),
-            reply_surb: None,
+            sender_tag: None,
         });
-        let bytes = received_without_surb.serialize();
+        let bytes = received_without_sender_tag.serialize();
         let recovered = ServerResponse::deserialize(&bytes).unwrap();
         match recovered {
             ServerResponse::Received(reconstructed) => {
                 assert_eq!(reconstructed.message, b"foomp".to_vec());
-                assert!(reconstructed.reply_surb.is_none())
+                assert!(reconstructed.sender_tag.is_none())
             }
             _ => unreachable!(),
         }
@@ -400,7 +359,7 @@ mod tests {
         let recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
         let recipient_string = recipient.to_string();
 
-        let self_address_response = ServerResponse::SelfAddress(recipient);
+        let self_address_response = ServerResponse::SelfAddress(Box::new(recipient));
         let bytes = self_address_response.serialize();
         let recovered = ServerResponse::deserialize(&bytes).unwrap();
         match recovered {
@@ -413,11 +372,14 @@ mod tests {
 
     #[test]
     fn lane_queue_length_response_serialization_works() {
-        let lane_queue_length_response = ServerResponse::LaneQueueLength(13, 42);
+        let lane_queue_length_response = ServerResponse::LaneQueueLength {
+            lane: 13,
+            queue_length: 42,
+        };
         let bytes = lane_queue_length_response.serialize();
         let recovered = ServerResponse::deserialize(&bytes).unwrap();
         match recovered {
-            ServerResponse::LaneQueueLength(lane, queue_length) => {
+            ServerResponse::LaneQueueLength { lane, queue_length } => {
                 assert_eq!(lane, 13);
                 assert_eq!(queue_length, 42)
             }
diff --git a/clients/native/websocket-requests/src/text.rs b/clients/native/websocket-requests/src/text.rs
index 1083ecd9a8..68091dbecf 100644
--- a/clients/native/websocket-requests/src/text.rs
+++ b/clients/native/websocket-requests/src/text.rs
@@ -1,11 +1,11 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::ErrorKind;
 use crate::requests::ClientRequest;
 use crate::responses::ServerResponse;
 use nymsphinx::addressing::clients::Recipient;
-use nymsphinx::anonymous_replies::ReplySurb;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use serde::{Deserialize, Serialize};
 use std::convert::{TryFrom, TryInto};
 
@@ -19,15 +19,22 @@ pub(super) enum ClientRequestText {
     Send {
         message: String,
         recipient: String,
-        with_reply_surb: bool,
+        connection_id: Option<u64>,
+    },
+    #[serde(rename_all = "camelCase")]
+    SendAnonymous {
+        recipient: String,
+        message: String,
+        reply_surbs: u32,
+        connection_id: Option<u64>,
+    },
+    #[serde(rename_all = "camelCase")]
+    Reply {
+        sender_tag: String,
+        message: String,
         connection_id: Option<u64>,
     },
     SelfAddress,
-    #[serde(rename_all = "camelCase")]
-    Reply {
-        message: String,
-        reply_surb: String,
-    },
 }
 
 impl TryFrom<String> for ClientRequestText {
@@ -46,7 +53,6 @@ impl TryInto<ClientRequest> for ClientRequestText {
             ClientRequestText::Send {
                 message,
                 recipient,
-                with_reply_surb,
                 connection_id,
             } => {
                 let message_bytes = message.into_bytes();
@@ -57,23 +63,42 @@ impl TryInto<ClientRequest> for ClientRequestText {
                 Ok(ClientRequest::Send {
                     message: message_bytes,
                     recipient,
-                    with_reply_surb,
+                    connection_id,
+                })
+            }
+            ClientRequestText::SendAnonymous {
+                recipient,
+                message,
+                reply_surbs,
+                connection_id,
+            } => {
+                let message_bytes = message.into_bytes();
+                let recipient = Recipient::try_from_base58_string(recipient).map_err(|err| {
+                    Self::Error::new(ErrorKind::MalformedRequest, err.to_string())
+                })?;
+                Ok(ClientRequest::SendAnonymous {
+                    recipient,
+                    message: message_bytes,
+                    reply_surbs,
                     connection_id,
                 })
             }
             ClientRequestText::SelfAddress => Ok(ClientRequest::SelfAddress),
             ClientRequestText::Reply {
+                sender_tag,
                 message,
-                reply_surb,
+                connection_id,
             } => {
                 let message_bytes = message.into_bytes();
-                let reply_surb = ReplySurb::from_base58_string(reply_surb).map_err(|err| {
-                    Self::Error::new(ErrorKind::MalformedRequest, err.to_string())
-                })?;
+                let sender_tag =
+                    AnonymousSenderTag::try_from_base58_string(sender_tag).map_err(|err| {
+                        Self::Error::new(ErrorKind::MalformedRequest, err.to_string())
+                    })?;
 
                 Ok(ClientRequest::Reply {
+                    sender_tag,
                     message: message_bytes,
-                    reply_surb,
+                    connection_id,
                 })
             }
         }
@@ -89,7 +114,7 @@ pub(super) enum ServerResponseText {
     #[serde(rename_all = "camelCase")]
     Received {
         message: String,
-        reply_surb: Option<String>,
+        sender_tag: Option<String>,
     },
     SelfAddress {
         address: String,
@@ -131,15 +156,13 @@ impl From<ServerResponse> for ServerResponseText {
                     // TODO: ask DH what is more appropriate, lossy utf8 conversion or returning error and then
                     // pure binary later
                     message: String::from_utf8_lossy(&reconstructed.message).into_owned(),
-                    reply_surb: reconstructed
-                        .reply_surb
-                        .map(|reply_surb| reply_surb.to_base58_string()),
+                    sender_tag: reconstructed.sender_tag.map(|tag| tag.to_base58_string()),
                 }
             }
             ServerResponse::SelfAddress(recipient) => ServerResponseText::SelfAddress {
                 address: recipient.to_string(),
             },
-            ServerResponse::LaneQueueLength(lane, queue_length) => {
+            ServerResponse::LaneQueueLength { lane, queue_length } => {
                 ServerResponseText::LaneQueueLength { lane, queue_length }
             }
             ServerResponse::Error(err) => ServerResponseText::Error {
diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml
index b5eb3a1a9d..c4218c45e4 100644
--- a/clients/socks5/Cargo.toml
+++ b/clients/socks5/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.1"
+version = "1.1.4"
 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"
@@ -11,21 +11,24 @@ name = "nym_socks5"
 path = "src/lib.rs"
 
 [dependencies]
-clap = { version = "3.2", features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 dirs = "4.0"
 futures = "0.3"
+lazy_static = "1.4.0"
 log = "0.4"
 pin-project = "1.0"
 pretty_env_logger = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 serde = { version = "1.0", features = ["derive"] } # for config serialization/deserialization
-snafu = "0.6"
+serde_json = "1.0.89"
+tap = "1.0.1"
 thiserror = "1.0.34"
 tokio = { version = "1.21.2", features = ["rt-multi-thread", "net", "signal"] }
 url = "2.2"
 
 # internal
-client-core = { path = "../client-core" }
+build-information = { path = "../../common/build-information" }
+client-core = { path = "../client-core", features = ["fs-surb-storage"] }
 client-connections = { path = "../../common/client-connections" }
 coconut-interface = { path = "../../common/coconut-interface", optional = true }
 config = { path = "../../common/config" }
@@ -44,13 +47,9 @@ proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
 socks5-requests = { path = "../../common/socks5/requests" }
 task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 version-checker = { path = "../../common/version-checker" }
-tap = "1.0.1"
 
 [features]
 coconut = ["coconut-interface", "credentials", "gateway-requests/coconut", "gateway-client/coconut", "credentials/coconut", "client-core/coconut"]
 eth = []
-
-[build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
diff --git a/clients/socks5/build.rs b/clients/socks5/build.rs
deleted file mode 100644
index 01b3a20dc6..0000000000
--- a/clients/socks5/build.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use vergen::{vergen, Config};
-
-fn main() {
-    vergen(Config::default()).expect("failed to extract build metadata")
-}
diff --git a/clients/socks5/src/client/config/mod.rs b/clients/socks5/src/client/config/mod.rs
index 4c43984f35..346eb37b34 100644
--- a/clients/socks5/src/client/config/mod.rs
+++ b/clients/socks5/src/client/config/mod.rs
@@ -2,16 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::config::template::config_template;
-use client_core::config::Config as BaseConfig;
+pub use client_core::config::Config as BaseConfig;
 pub use client_core::config::MISSING_VALUE;
+use client_core::config::{ClientCoreConfigTrait, DebugConfig};
 use config::defaults::DEFAULT_SOCKS5_LISTENING_PORT;
-use config::NymConfig;
+use config::{NymConfig, OptionalSet};
 use nymsphinx::addressing::clients::Recipient;
 use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
 use std::path::PathBuf;
+use std::str::FromStr;
 
 mod template;
 
+const DEFAULT_CONNECTION_START_SURBS: u32 = 20;
+const DEFAULT_PER_REQUEST_SURBS: u32 = 3;
+
 #[derive(Debug, Default, Deserialize, PartialEq, Serialize)]
 #[serde(deny_unknown_fields)]
 pub struct Config {
@@ -19,6 +25,9 @@ pub struct Config {
     base: BaseConfig<Config>,
 
     socks5: Socks5,
+
+    #[serde(default)]
+    socks5_debug: Socks5Debug,
 }
 
 impl NymConfig for Config {
@@ -52,25 +61,51 @@ impl NymConfig for Config {
     }
 }
 
+impl ClientCoreConfigTrait for Config {
+    fn get_gateway_endpoint(&self) -> &client_core::config::GatewayEndpointConfig {
+        self.base.get_gateway_endpoint()
+    }
+}
+
 impl Config {
     pub fn new<S: Into<String>>(id: S, provider_mix_address: S) -> Self {
         Config {
             base: BaseConfig::new(id),
             socks5: Socks5::new(provider_mix_address),
+            socks5_debug: Socks5Debug::default(),
         }
     }
 
+    #[must_use]
     pub fn with_port(mut self, port: u16) -> Self {
         self.socks5.listening_port = port;
         self
     }
 
+    #[must_use]
     pub fn with_provider_mix_address(mut self, address: String) -> Self {
         self.socks5.provider_mix_address = address;
         self
     }
 
+    pub fn with_anonymous_replies(mut self, anonymous_replies: bool) -> Self {
+        self.socks5.send_anonymously = anonymous_replies;
+        self
+    }
+
     // getters
+    pub fn get_base(&self) -> &BaseConfig<Self> {
+        &self.base
+    }
+
+    pub fn get_base_mut(&mut self) -> &mut BaseConfig<Self> {
+        &mut self.base
+    }
+
+    pub fn get_debug_settings(&self) -> &DebugConfig {
+        self.get_base().get_debug_config()
+    }
+
     pub fn get_config_file_save_location(&self) -> PathBuf {
         self.config_directory().join(Self::config_file_name())
     }
@@ -80,17 +115,65 @@ impl Config {
             .expect("malformed provider address")
     }
 
-    pub fn get_base(&self) -> &BaseConfig<Self> {
-        &self.base
-    }
-
-    pub fn get_base_mut(&mut self) -> &mut BaseConfig<Self> {
-        &mut self.base
+    pub fn get_send_anonymously(&self) -> bool {
+        self.socks5.send_anonymously
     }
 
     pub fn get_listening_port(&self) -> u16 {
         self.socks5.listening_port
     }
+
+    pub fn get_connection_start_surbs(&self) -> u32 {
+        self.socks5_debug.connection_start_surbs
+    }
+
+    pub fn get_per_request_surbs(&self) -> u32 {
+        self.socks5_debug.per_request_surbs
+    }
+
+    // poor man's 'builder' method
+    pub fn with_base<F, T>(mut self, f: F, val: T) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+    {
+        self.base = f(self.base, val);
+        self
+    }
+
+    // helper methods to use `OptionalSet` trait. Those are defined due to very... ehm. 'specific' structure of this config
+    // (plz, lets refactor it)
+    pub fn with_optional_ext<F, T>(mut self, f: F, val: Option<T>) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+    {
+        self.base = self.base.with_optional(f, val);
+        self
+    }
+
+    pub fn with_optional_env_ext<F, T>(mut self, f: F, val: Option<T>, env_var: &str) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+        T: FromStr,
+        <T as FromStr>::Err: Debug,
+    {
+        self.base = self.base.with_optional_env(f, val, env_var);
+        self
+    }
+
+    pub fn with_optional_custom_env_ext<F, T, G>(
+        mut self,
+        f: F,
+        val: Option<T>,
+        env_var: &str,
+        parser: G,
+    ) -> Self
+    where
+        F: Fn(BaseConfig<Self>, T) -> BaseConfig<Self>,
+        G: Fn(&str) -> T,
+    {
+        self.base = self.base.with_optional_custom_env(f, val, env_var, parser);
+        self
+    }
 }
 
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
@@ -101,6 +184,14 @@ pub struct Socks5 {
 
     /// The mix address of the provider to which all requests are going to be sent.
     provider_mix_address: String,
+
+    /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
+    /// While this is going to hide its actual address information, it will make the actual communication
+    /// slower and consume nearly double the bandwidth as it will require sending reply SURBs.
+    ///
+    /// Note that some service providers might not support this.
+    #[serde(default)]
+    send_anonymously: bool,
 }
 
 impl Socks5 {
@@ -108,6 +199,7 @@ impl Socks5 {
         Socks5 {
             listening_port: DEFAULT_SOCKS5_LISTENING_PORT,
             provider_mix_address: provider_mix_address.into(),
+            send_anonymously: false,
         }
     }
 }
@@ -117,6 +209,26 @@ impl Default for Socks5 {
         Socks5 {
             listening_port: DEFAULT_SOCKS5_LISTENING_PORT,
             provider_mix_address: "".into(),
+            send_anonymously: false,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
+#[serde(deny_unknown_fields)]
+pub struct Socks5Debug {
+    /// Number of reply SURBs attached to each `Request::Connect` message.
+    connection_start_surbs: u32,
+
+    /// Number of reply SURBs attached to each `Request::Send` message.
+    per_request_surbs: u32,
+}
+
+impl Default for Socks5Debug {
+    fn default() -> Self {
+        Socks5Debug {
+            connection_start_surbs: DEFAULT_CONNECTION_START_SURBS,
+            per_request_surbs: DEFAULT_PER_REQUEST_SURBS,
         }
     }
 }
diff --git a/clients/socks5/src/client/config/template.rs b/clients/socks5/src/client/config/template.rs
index 11d3185f56..f8c274c27c 100644
--- a/clients/socks5/src/client/config/template.rs
+++ b/clients/socks5/src/client/config/template.rs
@@ -23,16 +23,16 @@ id = '{{ client.id }}'
 # to claim bandwidth without presenting bandwidth credentials.
 disabled_credentials_mode = {{ client.disabled_credentials_mode }}
 
-# Addresses to nymd validators via which the client can communicate with the chain.
-validator_urls = [
-    {{#each client.validator_urls }}
+# Addresses to nyxd validators via which the client can communicate with the chain.
+nyxd_urls = [
+    {{#each client.nyxd_urls }}
         '{{this}}',
     {{/each}}
 ]
 
 # Addresses to APIs running on validator from which the client gets the view of the network.
-validator_api_urls = [
-    {{#each client.validator_api_urls }}
+nym_api_urls = [
+    {{#each client.nym_api_urls }}
         '{{this}}',
     {{/each}}
 ]
@@ -49,13 +49,12 @@ private_encryption_key_file = '{{ client.private_encryption_key_file }}'
 # Path to file containing public encryption key.
 public_encryption_key_file = '{{ client.public_encryption_key_file }}'
 
-# Full path to file containing reply encryption keys of all reply-SURBs we have ever
-# sent but not received back.
-reply_encryption_key_store_path = '{{ client.reply_encryption_key_store_path }}'
-
 # Path to the database containing bandwidth credentials
 database_path = '{{ client.database_path }}'
 
+# Path to the persistent store for received reply surbs, unused encryption keys and used sender tags.
+reply_surb_database_path = '{{ client.reply_surb_database_path }}'
+
 ##### additional client config options #####
 
 # A gateway specific, optional, base58 stringified shared key used for
@@ -92,6 +91,12 @@ provider_mix_address = '{{ socks5.provider_mix_address }}'
 # The port on which the client will be listening for incoming requests
 listening_port = {{ socks5.listening_port }}
 
+# Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
+# While this is going to hide its actual address information, it will make the actual communication
+# slower and consume nearly double the bandwidth as it will require sending reply SURBs.
+#
+# Note that some service providers might not support this.
+send_anonymously = {{ socks5.send_anonymously }}
 
 ##### logging configuration options #####
 
@@ -104,6 +109,9 @@ listening_port = {{ socks5.listening_port }}
 # The following options should not be modified unless you know EXACTLY what you are doing
 # as if set incorrectly, they may impact your anonymity.
 
+# [socks5_debug]
+
+
 [debug]
 
 average_packet_delay = '{{ debug.average_packet_delay }}'
diff --git a/clients/socks5/src/client/mod.rs b/clients/socks5/src/client/mod.rs
index 0784666af8..96bdf00932 100644
--- a/clients/socks5/src/client/mod.rs
+++ b/clients/socks5/src/client/mod.rs
@@ -3,11 +3,14 @@
 
 use crate::client::config::Config;
 use crate::error::Socks5ClientError;
+use crate::socks;
 use crate::socks::{
     authentication::{AuthenticationMethods, Authenticator, User},
     server::SphinxSocksServer,
 };
-use client_core::client::base_client::{BaseClientBuilder, ClientInput, ClientOutput};
+use client_core::client::base_client::{
+    non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput,
+};
 use client_core::client::key_manager::KeyManager;
 use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use futures::channel::mpsc;
@@ -16,7 +19,7 @@ use gateway_client::bandwidth::BandwidthController;
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
 use std::error::Error;
-use task::{wait_for_signal_and_error, ShutdownListener, ShutdownNotifier};
+use task::{wait_for_signal_and_error, TaskClient, TaskManager};
 
 pub mod config;
 
@@ -54,8 +57,21 @@ impl NymClient {
         #[cfg(feature = "coconut")]
         let bandwidth_controller = {
             let details = network_defaults::NymNetworkDetails::new_from_env();
-            let client_config = validator_client::Config::try_from_nym_network_details(&details)
-                .expect("failed to construct validator client config");
+            let mut client_config =
+                validator_client::Config::try_from_nym_network_details(&details)
+                    .expect("failed to construct validator client config");
+            let nyxd_url = config
+                .get_base()
+                .get_validator_endpoints()
+                .pop()
+                .expect("No nyxd validator endpoint provided");
+            let api_url = config
+                .get_base()
+                .get_nym_api_endpoints()
+                .pop()
+                .expect("No validator api endpoint provided");
+            // overwrite env configuration with config URLs
+            client_config = client_config.with_urls(nyxd_url, api_url);
             let client = validator_client::Client::new_query(client_config)
                 .expect("Could not construct query client");
             let coconut_api_clients =
@@ -80,19 +96,21 @@ impl NymClient {
         client_input: ClientInput,
         client_output: ClientOutput,
         self_address: Recipient,
-        mut shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
         info!("Starting socks5 listener...");
         let auth_methods = vec![AuthenticationMethods::NoAuth as u8];
         let allowed_users: Vec<User> = Vec::new();
 
         let ClientInput {
-            shared_lane_queue_lengths,
             connection_command_sender,
             input_sender,
         } = client_input;
 
-        let received_buffer_request_sender = client_output.received_buffer_request_sender;
+        let ClientOutput {
+            shared_lane_queue_lengths,
+            received_buffer_request_sender,
+        } = client_output;
 
         let authenticator = Authenticator::new(auth_methods, allowed_users);
         let mut sphinx_socks = SphinxSocksServer::new(
@@ -101,35 +119,30 @@ impl NymClient {
             config.get_provider_mix_address(),
             self_address,
             shared_lane_queue_lengths,
+            socks::client::Config::new(
+                config.get_send_anonymously(),
+                config.get_connection_start_surbs(),
+                config.get_per_request_surbs(),
+            ),
             shutdown.clone(),
         );
-        tokio::spawn(async move {
-            // Ideally we should have a fully fledged task manager to check for errors in all
-            // tasks.
-            // However, pragmatically, we start out by at least reporting errors for some of the
-            // tasks that interact with the outside world and can fail in normal operation, such as
-            // network issues.
-            // TODO: replace this by a generic solution, such as a task manager that stores all
-            // JoinHandles of all spawned tasks.
-            if let Err(res) = sphinx_socks
-                .serve(
-                    input_sender,
-                    received_buffer_request_sender,
-                    connection_command_sender,
-                )
-                .await
-            {
-                shutdown.send_we_stopped(Box::new(res));
-            }
-        });
+        task::spawn_with_report_error(
+            async move {
+                sphinx_socks
+                    .serve(
+                        input_sender,
+                        received_buffer_request_sender,
+                        connection_command_sender,
+                    )
+                    .await
+            },
+            shutdown,
+        );
     }
 
     /// blocking version of `start` method. Will run forever (or until SIGINT is sent)
-    pub async fn run_forever(self) -> Result<(), Box<dyn Error + Send>> {
-        let mut shutdown = self
-            .start()
-            .await
-            .map_err(|err| Box::new(err) as Box<dyn Error + Send>)?;
+    pub async fn run_forever(self) -> Result<(), Box<dyn Error + Send + Sync>> {
+        let mut shutdown = self.start().await?;
 
         let res = wait_for_signal_and_error(&mut shutdown).await;
 
@@ -147,12 +160,13 @@ impl NymClient {
     pub async fn run_and_listen(
         self,
         mut receiver: Socks5ControlMessageReceiver,
-    ) -> Result<(), Box<dyn Error + Send>> {
+        sender: task::StatusSender,
+    ) -> Result<(), Box<dyn Error + Send + Sync>> {
         // Start the main task
-        let mut shutdown = self
-            .start()
-            .await
-            .map_err(|err| Box::new(err) as Box<dyn Error + Send>)?;
+        let mut shutdown = self.start().await?;
+
+        // Listen to status messages from task, that we forward back to the caller
+        shutdown.start_status_listener(sender).await;
 
         let res = tokio::select! {
             biased;
@@ -188,11 +202,16 @@ impl NymClient {
         res
     }
 
-    pub async fn start(self) -> Result<ShutdownNotifier, Socks5ClientError> {
+    pub async fn start(self) -> Result<TaskManager, Socks5ClientError> {
         let base_builder = BaseClientBuilder::new_from_base_config(
             self.config.get_base(),
             self.key_manager,
             Some(Self::create_bandwidth_controller(&self.config).await),
+            non_wasm_helpers::setup_fs_reply_surb_backend(
+                self.config.get_base().get_reply_surb_database_path(),
+                self.config.get_debug_settings(),
+            )
+            .await?,
         );
 
         let self_address = base_builder.as_mix_recipient();
@@ -205,12 +224,12 @@ impl NymClient {
             client_input,
             client_output,
             self_address,
-            started_client.shutdown_notifier.subscribe(),
+            started_client.task_manager.subscribe(),
         );
 
         info!("Client startup finished!");
         info!("The address of this client is: {}", self_address);
 
-        Ok(started_client.shutdown_notifier)
+        Ok(started_client.task_manager)
     }
 }
diff --git a/clients/socks5/src/commands/init.rs b/clients/socks5/src/commands/init.rs
index a1d123fc75..80087a59e6 100644
--- a/clients/socks5/src/commands/init.rs
+++ b/clients/socks5/src/commands/init.rs
@@ -1,14 +1,18 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::Args;
-use client_core::{config::GatewayEndpointConfig, error::ClientCoreError};
-use config::NymConfig;
-
 use crate::{
     client::config::Config,
     commands::{override_config, OverrideConfig},
+    error::Socks5ClientError,
 };
+use clap::Args;
+use config::NymConfig;
+use crypto::asymmetric::identity;
+use nymsphinx::addressing::clients::Recipient;
+use serde::Serialize;
+use std::fmt::Display;
+use tap::TapFallible;
 
 #[derive(Args, Clone)]
 pub(crate) struct Init {
@@ -18,24 +22,35 @@ pub(crate) struct Init {
 
     /// Address of the socks5 provider to send messages to.
     #[clap(long)]
-    provider: String,
+    provider: Recipient,
+
+    /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
+    /// While this is going to hide its actual address information, it will make the actual communication
+    /// slower and consume nearly double the bandwidth as it will require sending reply SURBs.
+    ///
+    /// Note that some service providers might not support this.
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    #[clap(long, alias = "use_anonymous_sender_tag")]
+    use_reply_surbs: bool,
 
     /// Id of the gateway we are going to connect to.
     #[clap(long)]
-    gateway: Option<String>,
+    gateway: Option<identity::PublicKey>,
 
     /// Force register gateway. WARNING: this will overwrite any existing keys for the given id,
     /// potentially causing loss of access.
     #[clap(long)]
     force_register_gateway: bool,
 
-    /// Comma separated list of rest endpoints of the nymd validators
-    #[clap(long)]
-    nymd_validators: Option<String>,
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[cfg(feature = "coconut")]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    nyxd_urls: Option<Vec<url::Url>>,
 
     /// Comma separated list of rest endpoints of the API validators
-    #[clap(long)]
-    api_validators: Option<String>,
+    #[clap(long, alias = "api_validators", value_delimiter = ',')]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Port for the socket to listen on in all subsequent runs
     #[clap(short, long)]
@@ -43,30 +58,65 @@ pub(crate) struct Init {
 
     /// Mostly debug-related option to increase default traffic rate so that you would not need to
     /// modify config post init
-    #[clap(long, hidden = true)]
+    #[clap(long, hide = true)]
     fastmode: bool,
 
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
     #[cfg(feature = "coconut")]
     #[clap(long)]
     enabled_credentials_mode: bool,
+
+    /// Save a summary of the initialization to a json file
+    #[clap(long)]
+    output_json: bool,
 }
 
 impl From<Init> for OverrideConfig {
     fn from(init_config: Init) -> Self {
         OverrideConfig {
-            nymd_validators: init_config.nymd_validators,
-            api_validators: init_config.api_validators,
+            nym_apis: init_config.nym_apis,
             port: init_config.port,
+            use_anonymous_replies: init_config.use_reply_surbs,
             fastmode: init_config.fastmode,
+            no_cover: init_config.no_cover,
+
+            #[cfg(feature = "coconut")]
+            nyxd_urls: init_config.nyxd_urls,
             #[cfg(feature = "coconut")]
             enabled_credentials_mode: init_config.enabled_credentials_mode,
         }
     }
 }
 
-pub(crate) async fn execute(args: &Init) {
+#[derive(Debug, Serialize)]
+pub struct InitResults {
+    #[serde(flatten)]
+    client_core: client_core::init::InitResults,
+    socks5_listening_port: String,
+}
+
+impl InitResults {
+    fn new(config: &Config, address: &Recipient) -> Self {
+        Self {
+            client_core: client_core::init::InitResults::new(config.get_base(), address),
+            socks5_listening_port: config.get_listening_port().to_string(),
+        }
+    }
+}
+
+impl Display for InitResults {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "{}", self.client_core)?;
+        write!(f, "SOCKS5 listening port: {}", self.socks5_listening_port)
+    }
+}
+
+pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
     println!("Initialising client...");
 
     let id = &args.id;
@@ -91,25 +141,47 @@ pub(crate) async fn execute(args: &Init) {
     let register_gateway = !already_init || user_wants_force_register;
 
     // Attempt to use a user-provided gateway, if possible
-    let user_chosen_gateway_id = args.gateway.as_deref();
+    let user_chosen_gateway_id = args.gateway;
 
-    let mut config = Config::new(id, provider_address);
-    let override_config_fields = OverrideConfig::from(args.clone());
-    config = override_config(config, override_config_fields);
+    // Load and potentially override config
+    let mut config = override_config(
+        Config::new(id, &provider_address.to_string()),
+        OverrideConfig::from(args.clone()),
+    );
+
+    // Setup gateway by either registering a new one, or creating a new config from the selected
+    // one but with keys kept, or reusing the gateway configuration.
+    let gateway = client_core::init::setup_gateway::<Config, _>(
+        register_gateway,
+        user_chosen_gateway_id.map(|id| id.to_base58_string()),
+        config.get_base(),
+    )
+    .await
+    .tap_err(|err| eprintln!("Failed to setup gateway\nError: {err}"))?;
 
-    let gateway = setup_gateway(id, register_gateway, user_chosen_gateway_id, &config)
-        .await
-        .unwrap_or_else(|err| {
-            eprintln!("Failed to setup gateway\nError: {err}");
-            std::process::exit(1)
-        });
     config.get_base_mut().with_gateway_endpoint(gateway);
 
-    let config_save_location = config.get_config_file_save_location();
-    config
-        .save_to_file(None)
-        .expect("Failed to save the config file");
+    config.save_to_file(None).tap_err(|_| {
+        log::error!("Failed to save the config file");
+    })?;
 
+    print_saved_config(&config);
+
+    let address = client_core::init::get_client_address_from_stored_keys(config.get_base())?;
+    let init_results = InitResults::new(&config, &address);
+    println!("{}", init_results);
+
+    // Output summary to a json file, if specified
+    if args.output_json {
+        client_core::init::output_to_json(&init_results, "socks5_client_init_results.json");
+    }
+
+    println!("\nThe address of this client is: {}\n", address);
+    Ok(())
+}
+
+fn print_saved_config(config: &Config) {
+    let config_save_location = config.get_config_file_save_location();
     println!("Saved configuration file to {:?}", config_save_location);
     println!("Using gateway: {}", config.get_base().get_gateway_id());
     log::debug!("Gateway id: {}", config.get_base().get_gateway_id());
@@ -118,62 +190,5 @@ pub(crate) async fn execute(args: &Init) {
         "Gateway listener: {}",
         config.get_base().get_gateway_listener()
     );
-    println!("Client configuration completed.");
-
-    client_core::init::show_address(config.get_base()).unwrap_or_else(|err| {
-        eprintln!("Failed to show address\nError: {err}");
-        std::process::exit(1)
-    });
-}
-
-async fn setup_gateway(
-    id: &str,
-    register: bool,
-    user_chosen_gateway_id: Option<&str>,
-    config: &Config,
-) -> Result<GatewayEndpointConfig, ClientCoreError> {
-    if register {
-        // Get the gateway details by querying the validator-api. Either pick one at random or use
-        // the chosen one if it's among the available ones.
-        println!("Configuring gateway");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-
-        // Registering with gateway by setting up and writing shared keys to disk
-        log::trace!("Registering gateway");
-        client_core::init::register_with_gateway_and_store_keys(gateway.clone(), config.get_base())
-            .await?;
-        println!("Saved all generated keys");
-
-        Ok(gateway.into())
-    } else if user_chosen_gateway_id.is_some() {
-        // Just set the config, don't register or create any keys
-        // This assumes that the user knows what they are doing, and that the existing keys are
-        // valid for the gateway being used
-        println!("Using gateway provided by user, keeping existing keys");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-        Ok(gateway.into())
-    } else {
-        println!("Not registering gateway, will reuse existing config and keys");
-        let existing_config = Config::load_from_file(Some(id)).map_err(|err| {
-            log::error!(
-                "Unable to configure gateway: {err}. \n
-                Seems like the client was already initialized but it was not possible to read \
-                the existing configuration file. \n
-                CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
-                removing the existing configuration and starting over."
-            );
-            ClientCoreError::CouldNotLoadExistingGatewayConfiguration(err)
-        })?;
-        Ok(existing_config.get_base().get_gateway_endpoint().clone())
-    }
+    println!("Client configuration completed.\n");
 }
diff --git a/clients/socks5/src/commands/mod.rs b/clients/socks5/src/commands/mod.rs
index e1d42e0fb1..a825fb882e 100644
--- a/clients/socks5/src/commands/mod.rs
+++ b/clients/socks5/src/commands/mod.rs
@@ -1,55 +1,31 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use std::error::Error;
-
-use crate::client::config::Config;
+use crate::client::config::{BaseConfig, Config};
+use build_information::BinaryBuildInformation;
 use clap::CommandFactory;
 use clap::{Parser, Subcommand};
 use completions::{fig_generate, ArgShell};
-use config::parse_validators;
+use config::OptionalSet;
+use lazy_static::lazy_static;
+use std::error::Error;
 
 pub mod init;
 pub(crate) mod run;
 pub(crate) mod upgrade;
 
-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE"),
-    )
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
 }
 
-fn long_version_static() -> &'static str {
-    Box::leak(long_version().into_boxed_str())
+// Helper for passing LONG_VERSION to clap
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
 }
 
 #[derive(Parser)]
-#[clap(author = "Nymtech", version, long_version = long_version_static(), about)]
+#[clap(author = "Nymtech", version, long_version = pretty_build_info_static(), about)]
 pub(crate) struct Cli {
     /// Path pointing to an env file that configures the client.
     #[clap(short, long)]
@@ -79,61 +55,57 @@ pub(crate) enum Commands {
 
 // Configuration that can be overridden.
 pub(crate) struct OverrideConfig {
-    nymd_validators: Option<String>,
-    api_validators: Option<String>,
+    nym_apis: Option<Vec<url::Url>>,
     port: Option<u16>,
+    use_anonymous_replies: bool,
     fastmode: bool,
+    no_cover: bool,
 
+    #[cfg(feature = "coconut")]
+    nyxd_urls: Option<Vec<url::Url>>,
     #[cfg(feature = "coconut")]
     enabled_credentials_mode: bool,
 }
 
-pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send>> {
+pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
     let bin_name = "nym-socks5-client";
 
     match &args.command {
-        Commands::Init(m) => init::execute(m).await,
+        Commands::Init(m) => init::execute(m).await?,
         Commands::Run(m) => run::execute(m).await?,
         Commands::Upgrade(m) => upgrade::execute(m),
-        Commands::Completions(s) => s.generate(&mut Cli::into_app(), bin_name),
-        Commands::GenerateFigSpec => fig_generate(&mut Cli::into_app(), bin_name),
+        Commands::Completions(s) => s.generate(&mut Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut Cli::command(), bin_name),
     }
     Ok(())
 }
 
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
-    if let Some(raw_validators) = args.nymd_validators {
-        config
-            .get_base_mut()
-            .set_custom_validators(parse_validators(&raw_validators));
-    } else if let Ok(raw_validators) = std::env::var(network_defaults::var_names::NYMD_VALIDATOR) {
-        config
-            .get_base_mut()
-            .set_custom_validators(parse_validators(&raw_validators));
-    }
-    if let Some(raw_validators) = args.api_validators {
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
-    } else if let Ok(raw_validators) = std::env::var(network_defaults::var_names::API_VALIDATOR) {
-        config
-            .get_base_mut()
-            .set_custom_validator_apis(parse_validators(&raw_validators));
-    }
-
-    if let Some(port) = args.port {
-        config = config.with_port(port);
-    }
+    config = config
+        .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
+        .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
+        .with_anonymous_replies(args.use_anonymous_replies)
+        .with_optional(Config::with_port, args.port)
+        .with_optional_custom_env_ext(
+            BaseConfig::with_custom_nym_apis,
+            args.nym_apis,
+            network_defaults::var_names::NYM_API,
+            config::parse_urls,
+        );
 
     #[cfg(feature = "coconut")]
     {
-        if args.enabled_credentials_mode {
-            config.get_base_mut().with_disabled_credentials(false)
-        }
-    }
-
-    if args.fastmode {
-        config.get_base_mut().set_high_default_traffic_volume();
+        config = config
+            .with_optional_custom_env_ext(
+                BaseConfig::with_custom_nyxd,
+                args.nyxd_urls,
+                network_defaults::var_names::NYXD,
+                config::parse_urls,
+            )
+            .with_base(
+                BaseConfig::with_disabled_credentials,
+                !args.enabled_credentials_mode,
+            );
     }
 
     config
diff --git a/clients/socks5/src/commands/run.rs b/clients/socks5/src/commands/run.rs
index d74e6678fe..9d60479e71 100644
--- a/clients/socks5/src/commands/run.rs
+++ b/clients/socks5/src/commands/run.rs
@@ -9,7 +9,9 @@ use crate::{
 
 use clap::Args;
 use config::NymConfig;
+use crypto::asymmetric::identity;
 use log::*;
+use nymsphinx::addressing::clients::Recipient;
 use version_checker::is_minor_version_compatible;
 
 #[derive(Args, Clone)]
@@ -22,27 +24,46 @@ pub(crate) struct Run {
     #[clap(long)]
     config: Option<String>,
 
+    /// Specifies whether this client is going to use an anonymous sender tag for communication with the service provider.
+    /// While this is going to hide its actual address information, it will make the actual communication
+    /// slower and consume nearly double the bandwidth as it will require sending reply SURBs.
+    ///
+    /// Note that some service providers might not support this.
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    #[clap(long, alias = "use_anonymous_sender_tag")]
+    use_anonymous_replies: bool,
+
     /// Address of the socks5 provider to send messages to.
     #[clap(long)]
-    provider: Option<String>,
+    provider: Option<Recipient>,
 
     /// Id of the gateway we want to connect to. If overridden, it is user's responsibility to
     /// ensure prior registration happened
     #[clap(long)]
-    gateway: Option<String>,
+    gateway: Option<identity::PublicKey>,
 
-    /// Comma separated list of rest endpoints of the nymd validators
-    #[clap(long)]
-    nymd_validators: Option<String>,
+    /// Comma separated list of rest endpoints of the nyxd validators
+    #[cfg(feature = "coconut")]
+    #[clap(long, alias = "nymd_validators", value_delimiter = ',')]
+    nyxd_urls: Option<Vec<url::Url>>,
 
-    /// Comma separated list of rest endpoints of the API validators
-    #[clap(long)]
-    api_validators: Option<String>,
+    /// Comma separated list of rest endpoints of the Nym APIs
+    #[clap(long, value_delimiter = ',')]
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Port for the socket to listen on
     #[clap(short, long)]
     port: Option<u16>,
 
+    /// Mostly debug-related option to increase default traffic rate so that you would not need to
+    /// modify config post init
+    #[clap(long, hide = true)]
+    fastmode: bool,
+
+    /// Disable loop cover traffic and the Poisson rate limiter (for debugging only)
+    #[clap(long, hide = true)]
+    no_cover: bool,
+
     /// Set this client to work in a enabled credentials mode that would attempt to use gateway
     /// with bandwidth credential requirement.
     #[cfg(feature = "coconut")]
@@ -53,11 +74,14 @@ pub(crate) struct Run {
 impl From<Run> for OverrideConfig {
     fn from(run_config: Run) -> Self {
         OverrideConfig {
-            nymd_validators: run_config.nymd_validators,
-            api_validators: run_config.api_validators,
+            nym_apis: run_config.nym_apis,
             port: run_config.port,
-            fastmode: false,
+            use_anonymous_replies: run_config.use_anonymous_replies,
+            fastmode: run_config.fastmode,
+            no_cover: run_config.no_cover,
 
+            #[cfg(feature = "coconut")]
+            nyxd_urls: run_config.nyxd_urls,
             #[cfg(feature = "coconut")]
             enabled_credentials_mode: run_config.enabled_credentials_mode,
         }
@@ -86,13 +110,13 @@ fn version_check(cfg: &Config) -> bool {
     }
 }
 
-pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error + Send>> {
+pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let id = &args.id;
 
     let mut config = match Config::load_from_file(Some(id)) {
         Ok(cfg) => cfg,
         Err(err) => {
-            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {})", id, err);
+            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", id);
             return Err(Box::new(Socks5ClientError::FailedToLoadConfig(
                 id.to_string(),
             )));
@@ -102,6 +126,10 @@ pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error
     let override_config_fields = OverrideConfig::from(args.clone());
     config = override_config(config, override_config_fields);
 
+    if config.get_base_mut().set_empty_fields_to_defaults() {
+        warn!("some of the core config options were left unset. the default values are going to get used instead.");
+    }
+
     if !version_check(&config) {
         error!("failed the local version check");
         return Err(Box::new(Socks5ClientError::FailedLocalVersionCheck));
diff --git a/clients/socks5/src/commands/upgrade.rs b/clients/socks5/src/commands/upgrade.rs
index ff41f3ce6e..db77167f34 100644
--- a/clients/socks5/src/commands/upgrade.rs
+++ b/clients/socks5/src/commands/upgrade.rs
@@ -58,7 +58,7 @@ pub(crate) struct Upgrade {
 
 fn parse_config_version(config: &Config) -> Version {
     let version = Version::parse(config.get_base().get_version()).unwrap_or_else(|err| {
-        eprintln!("failed to parse client version! - {:?}", err);
+        eprintln!("failed to parse client version! - {err}");
         process::exit(1)
     });
 
@@ -109,7 +109,7 @@ fn minor_0_12_upgrade(
         .set_custom_version(to_version.to_string().as_ref());
 
     config.save_to_file(None).unwrap_or_else(|err| {
-        eprintln!("failed to overwrite config file! - {:?}", err);
+        eprintln!("failed to overwrite config file! - {err}");
         print_failed_upgrade(config_version, &to_version);
         process::exit(1);
     });
@@ -145,7 +145,7 @@ pub(crate) fn execute(args: &Upgrade) {
     let id = &args.id;
 
     let existing_config = Config::load_from_file(Some(id)).unwrap_or_else(|err| {
-        eprintln!("failed to load existing config file! - {:?}", err);
+        eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });
 
diff --git a/clients/socks5/src/error.rs b/clients/socks5/src/error.rs
index 2ff6ffbfc2..96e98f91cc 100644
--- a/clients/socks5/src/error.rs
+++ b/clients/socks5/src/error.rs
@@ -1,11 +1,12 @@
-use client_core::error::ClientCoreError;
-
 use crate::socks::types::SocksProxyError;
+use client_core::error::ClientCoreError;
+use socks5_requests::ConnectionId;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Socks5ClientError {
     #[error("I/O error: {0}")]
     IoError(#[from] std::io::Error),
+
     #[error("client-core error: {0}")]
     ClientCoreError(#[from] ClientCoreError),
 
@@ -14,8 +15,16 @@ pub enum Socks5ClientError {
 
     #[error("Failed to load config for: {0}")]
     FailedToLoadConfig(String),
+
     #[error("Failed local version check, client and config mismatch")]
     FailedLocalVersionCheck,
+
     #[error("Fail to bind address")]
     FailToBindAddress,
+
+    #[error("Network requester: connection id {connection_id}: {error}")]
+    NetworkRequesterError {
+        connection_id: ConnectionId,
+        error: String,
+    },
 }
diff --git a/clients/socks5/src/main.rs b/clients/socks5/src/main.rs
index d41e5e4bd8..6dcd9183ab 100644
--- a/clients/socks5/src/main.rs
+++ b/clients/socks5/src/main.rs
@@ -13,12 +13,12 @@ pub mod error;
 pub mod socks;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error + Send>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     setup_logging();
     println!("{}", banner());
 
     let args = commands::Cli::parse();
-    setup_env(args.config_env_file.clone());
+    setup_env(args.config_env_file.as_ref());
     commands::execute(&args).await
 }
 
diff --git a/clients/socks5/src/socks/client.rs b/clients/socks5/src/socks/client.rs
index 3e3c24347c..ff7caa1b6b 100644
--- a/clients/socks5/src/socks/client.rs
+++ b/clients/socks5/src/socks/client.rs
@@ -2,8 +2,8 @@
 
 use super::authentication::{AuthenticationMethods, Authenticator, User};
 use super::request::{SocksCommand, SocksRequest};
-use super::types::{ResponseCode, SocksProxyError};
-use super::{RESERVED, SOCKS_VERSION};
+use super::types::{ResponseCodeV4, ResponseCodeV5, SocksProxyError};
+use super::{SocksVersion, RESERVED, SOCKS4_VERSION, SOCKS5_VERSION};
 use client_connections::{LaneQueueLengths, TransmissionLane};
 use client_core::client::inbound_messages::{InputMessage, InputMessageSender};
 use futures::channel::mpsc;
@@ -20,7 +20,7 @@ use socks5_requests::{ConnectionId, Message, RemoteAddress, Request};
 use std::io;
 use std::net::SocketAddr;
 use std::pin::Pin;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
 use tokio::{self, net::TcpStream};
 
@@ -126,23 +126,45 @@ impl AsyncWrite for StreamState {
     }
 }
 
+#[derive(Debug, Copy, Clone)]
+pub(crate) struct Config {
+    use_surbs_for_responses: bool,
+    connection_start_surbs: u32,
+    per_request_surbs: u32,
+}
+
+impl Config {
+    pub(crate) fn new(
+        use_surbs_for_responses: bool,
+        connection_start_surbs: u32,
+        per_request_surbs: u32,
+    ) -> Self {
+        Self {
+            use_surbs_for_responses,
+            connection_start_surbs,
+            per_request_surbs,
+        }
+    }
+}
+
 /// A client connecting to the Socks proxy server, because
 /// it wants to make a Nym-protected outbound request. Typically, this is
 /// something like e.g. a wallet app running on your laptop connecting to
-/// SphinxSocksServer.
+/// `SphinxSocksServer`.
 pub(crate) struct SocksClient {
+    config: Config,
     controller_sender: ControllerSender,
     stream: StreamState,
     auth_nmethods: u8,
     authenticator: Authenticator,
-    socks_version: u8,
+    socks_version: Option<SocksVersion>,
     input_sender: InputMessageSender,
     connection_id: ConnectionId,
     service_provider: Recipient,
     self_address: Recipient,
     started_proxy: bool,
     lane_queue_lengths: LaneQueueLengths,
-    shutdown_listener: ShutdownListener,
+    shutdown_listener: TaskClient,
 }
 
 impl Drop for SocksClient {
@@ -158,29 +180,34 @@ impl Drop for SocksClient {
 }
 
 impl SocksClient {
-    /// Create a new SOCKClient
     #[allow(clippy::too_many_arguments)]
     pub fn new(
+        config: Config,
         stream: TcpStream,
         authenticator: Authenticator,
         input_sender: InputMessageSender,
-        service_provider: Recipient,
+        service_provider: &Recipient,
         controller_sender: ControllerSender,
-        self_address: Recipient,
+        self_address: &Recipient,
         lane_queue_lengths: LaneQueueLengths,
-        shutdown_listener: ShutdownListener,
+        mut shutdown_listener: TaskClient,
     ) -> Self {
+        // If this task fails and exits, we don't want to send shutdown signal
+        shutdown_listener.mark_as_success();
+
         let connection_id = Self::generate_random();
+
         SocksClient {
+            config,
             controller_sender,
             connection_id,
             stream: StreamState::Available(stream),
             auth_nmethods: 0,
-            socks_version: 0,
+            socks_version: None,
             authenticator,
             input_sender,
-            service_provider,
-            self_address,
+            service_provider: *service_provider,
+            self_address: *self_address,
             started_proxy: false,
             lane_queue_lengths,
             shutdown_listener,
@@ -192,13 +219,45 @@ impl SocksClient {
         rng.next_u64()
     }
 
+    pub async fn send_error(&mut self, err: SocksProxyError) -> Result<(), SocksProxyError> {
+        let error_text = format!("{err}");
+        let Some(ref version) = self.socks_version else {
+            log::error!("Trying to send error without knowing the version");
+            return Ok(());
+        };
+
+        match version {
+            SocksVersion::V4 => {
+                let response = ResponseCodeV4::RequestRejected;
+                self.send_error_v4(response).await
+            }
+            SocksVersion::V5 => {
+                let response = if error_text.contains("Host") {
+                    ResponseCodeV5::HostUnreachable
+                } else if error_text.contains("Network") {
+                    ResponseCodeV5::NetworkUnreachable
+                } else if error_text.contains("ttl") {
+                    ResponseCodeV5::TtlExpired
+                } else {
+                    ResponseCodeV5::Failure
+                };
+                self.send_error_v5(response).await
+            }
+        }
+    }
+
     // Send an error back to the client
-    pub async fn error(&mut self, r: ResponseCode) -> Result<(), SocksProxyError> {
-        self.stream.write_all(&[5, r as u8]).await?;
+    pub async fn send_error_v4(&mut self, r: ResponseCodeV4) -> Result<(), SocksProxyError> {
+        self.stream.write_all(&[SOCKS4_VERSION, r as u8]).await?;
         Ok(())
     }
 
-    /// Shutdown the TcpStream to the client and end the session
+    pub async fn send_error_v5(&mut self, r: ResponseCodeV5) -> Result<(), SocksProxyError> {
+        self.stream.write_all(&[SOCKS5_VERSION, r as u8]).await?;
+        Ok(())
+    }
+
+    /// Shutdown the `TcpStream` to the client and end the session
     pub async fn shutdown(&mut self) -> Result<(), SocksProxyError> {
         info!("client is shutting down its TCP stream");
         self.stream.shutdown().await?;
@@ -210,35 +269,37 @@ impl SocksClient {
     /// is in use and that the client is authenticated, then runs the request.
     pub async fn run(&mut self) -> Result<(), SocksProxyError> {
         debug!("New connection from: {}", self.stream.peer_addr()?.ip());
-        let mut header = [0u8; 2];
+
         // Read a byte from the stream and determine the version being requested
+        let mut header = [0u8];
         self.stream.read_exact(&mut header).await?;
 
-        self.socks_version = header[0];
-        self.auth_nmethods = header[1];
+        self.socks_version = match SocksVersion::try_from(header[0]) {
+            Ok(version) => Some(version),
+            Err(_err) => {
+                warn!("Init: Unsupported version: SOCKS{}", header[0]);
+                return self.shutdown().await;
+            }
+        };
 
-        // Handle SOCKS4 requests
-        if header[0] != SOCKS_VERSION {
-            warn!("Init: Unsupported version: SOCKS{}", self.socks_version);
-            self.shutdown().await
-        }
-        // Valid SOCKS5
-        else {
-            // Authenticate w/ client
-            self.authenticate().await?;
-            // Handle requests
-            self.handle_request().await
+        if self.socks_version == Some(SocksVersion::V5) {
+            let mut auth = [0u8];
+            self.stream.read_exact(&mut auth).await?;
+            self.auth_nmethods = auth[0];
+            self.authenticate_socks5().await?;
         }
+
+        self.handle_request().await
     }
 
-    async fn send_connect_to_mixnet(&mut self, remote_address: RemoteAddress) {
-        let req = Request::new_connect(self.connection_id, remote_address, self.self_address);
+    async fn send_anonymous_connect_to_mixnet(&mut self, remote_address: RemoteAddress) {
+        let req = Request::new_connect(self.connection_id, remote_address, None);
         let msg = Message::Request(req);
 
-        let input_message = InputMessage::new_fresh(
+        let input_message = InputMessage::new_anonymous(
             self.service_provider,
             msg.into_bytes(),
-            false,
+            self.config.connection_start_surbs,
             TransmissionLane::ConnectionId(self.connection_id),
         );
         self.input_sender
@@ -247,17 +308,48 @@ impl SocksClient {
             .expect("InputMessageReceiver has stopped receiving!");
     }
 
+    async fn send_connect_to_mixnet_with_return_address(&mut self, remote_address: RemoteAddress) {
+        let req = Request::new_connect(self.connection_id, remote_address, Some(self.self_address));
+        let msg = Message::Request(req);
+
+        let input_message = InputMessage::new_regular(
+            self.service_provider,
+            msg.into_bytes(),
+            TransmissionLane::ConnectionId(self.connection_id),
+        );
+        self.input_sender
+            .send(input_message)
+            .await
+            .expect("InputMessageReceiver has stopped receiving!");
+    }
+
+    async fn send_connect_to_mixnet(&mut self, remote_address: RemoteAddress) {
+        if self.config.use_surbs_for_responses {
+            self.send_anonymous_connect_to_mixnet(remote_address).await
+        } else {
+            self.send_connect_to_mixnet_with_return_address(remote_address)
+                .await
+        }
+    }
+
     async fn run_proxy(&mut self, conn_receiver: ConnectionReceiver, remote_proxy_target: String) {
         self.send_connect_to_mixnet(remote_proxy_target.clone())
             .await;
 
         let stream = self.stream.run_proxy();
-        let local_stream_remote = stream
-            .peer_addr()
-            .expect("failed to extract peer address")
-            .to_string();
+        let peer_addr = match stream.peer_addr() {
+            Ok(peer_addr) => peer_addr,
+            Err(err) => {
+                log::error!("Unable to extract the remote peer address: {err}");
+                return;
+            }
+        };
+        let local_stream_remote = peer_addr.to_string();
+
         let connection_id = self.connection_id;
         let input_sender = self.input_sender.clone();
+        let anonymous = self.config.use_surbs_for_responses;
+        let per_request_surbs = self.config.per_request_surbs;
 
         let recipient = self.service_provider;
         let (stream, _) = ProxyRunner::new(
@@ -274,7 +366,16 @@ impl SocksClient {
             let provider_request = Request::new_send(conn_id, read_data, socket_closed);
             let provider_message = Message::Request(provider_request);
             let lane = TransmissionLane::ConnectionId(conn_id);
-            InputMessage::new_fresh(recipient, provider_message.into_bytes(), false, lane)
+            if anonymous {
+                InputMessage::new_anonymous(
+                    recipient,
+                    provider_message.into_bytes(),
+                    per_request_surbs,
+                    lane,
+                )
+            } else {
+                InputMessage::new_regular(recipient, provider_message.into_bytes(), lane)
+            }
         })
         .await
         .into_inner();
@@ -286,8 +387,17 @@ impl SocksClient {
     async fn handle_request(&mut self) -> Result<(), SocksProxyError> {
         debug!("Handling CONNECT Command");
 
-        let request = SocksRequest::from_stream(&mut self.stream).await?;
-        let remote_address = request.to_string();
+        let version = self
+            .socks_version
+            .as_ref()
+            .expect("Must read version before parsing request");
+
+        let request = match version {
+            SocksVersion::V4 => SocksRequest::from_stream_socks4(&mut self.stream).await?,
+            SocksVersion::V5 => SocksRequest::from_stream_socks5(&mut self.stream).await?,
+        };
+
+        let remote_address = request.address_string();
 
         // setup for receiving from the mixnet
         let (mix_sender, mix_receiver) = mpsc::unbounded();
@@ -296,7 +406,10 @@ impl SocksClient {
             // Use the Proxy to connect to the specified addr/port
             SocksCommand::Connect => {
                 trace!("Connecting to: {:?}", remote_address.clone());
-                self.acknowledge_socks5().await;
+                match version {
+                    SocksVersion::V4 => self.acknowledge_socks4().await,
+                    SocksVersion::V5 => self.acknowledge_socks5().await,
+                }
 
                 self.started_proxy = true;
                 self.controller_sender
@@ -319,7 +432,6 @@ impl SocksClient {
             SocksCommand::UdpAssociate => unimplemented!(), // not handled
         };
 
-        self.shutdown_listener.mark_as_success();
         Ok(())
     }
 
@@ -328,8 +440,8 @@ impl SocksClient {
     async fn acknowledge_socks5(&mut self) {
         self.stream
             .write_all(&[
-                SOCKS_VERSION,
-                ResponseCode::Success as u8,
+                SOCKS5_VERSION,
+                ResponseCodeV5::Success as u8,
                 RESERVED,
                 1,
                 127,
@@ -343,13 +455,30 @@ impl SocksClient {
             .unwrap();
     }
 
+    /// Writes a Socks4 header back to the requesting client's TCP stream,
+    async fn acknowledge_socks4(&mut self) {
+        self.stream
+            .write_all(&[
+                0, //SOCKS4_VERSION,
+                ResponseCodeV4::Granted as u8,
+                0,
+                0,
+                127,
+                0,
+                0,
+                1,
+            ])
+            .await
+            .unwrap();
+    }
+
     /// Authenticate the incoming request. Each request is checked for its
     /// authentication method. A user/password request will extract the
     /// username and password from the stream, then check with the Authenticator
     /// to see if the resulting user is allowed.
     ///
     /// A lot of this could probably be put into the `SocksRequest::from_stream()`
-    /// constructor, and/or cleaned up with tokio::codec. It's mostly just
+    /// constructor, and/or cleaned up with `tokio::codec`. It's mostly just
     /// read-a-byte-or-two. The bytes being extracted look like this:
     ///
     /// +----+------+----------+------+------------+
@@ -361,7 +490,7 @@ impl SocksClient {
     /// Pulling out the stream code into its own home, and moving the if/else logic
     /// into the Authenticator (where it'll be more easily testable)
     /// would be a good next step.
-    async fn authenticate(&mut self) -> Result<(), SocksProxyError> {
+    async fn authenticate_socks5(&mut self) -> Result<(), SocksProxyError> {
         debug!("Authenticating w/ {}", self.stream.peer_addr()?.ip());
         // Get valid auth methods
         let methods = self.get_available_methods().await?;
@@ -370,7 +499,7 @@ impl SocksClient {
         let mut response = [0u8; 2];
 
         // Set the version in the response
-        response[0] = SOCKS_VERSION;
+        response[0] = SOCKS5_VERSION;
         if methods.contains(&(AuthenticationMethods::UserPass as u8)) {
             // Set the default auth method (NO AUTH)
             response[1] = AuthenticationMethods::UserPass as u8;
@@ -406,11 +535,11 @@ impl SocksClient {
             // Authenticate passwords
             if self.authenticator.is_allowed(&user) {
                 debug!("Access Granted. User: {}", user.username);
-                let response = [1, ResponseCode::Success as u8];
+                let response = [1, ResponseCodeV5::Success as u8];
                 self.stream.write_all(&response).await?;
             } else {
                 debug!("Access Denied. User: {}", user.username);
-                let response = [1, ResponseCode::Failure as u8];
+                let response = [1, ResponseCodeV5::Failure as u8];
                 self.stream.write_all(&response).await?;
 
                 // Shutdown
@@ -429,7 +558,7 @@ impl SocksClient {
             response[1] = AuthenticationMethods::NoMethods as u8;
             self.stream.write_all(&response).await?;
             self.shutdown().await?;
-            Err(ResponseCode::Failure.into())
+            Err(ResponseCodeV5::Failure.into())
         }
     }
 
diff --git a/clients/socks5/src/socks/mixnet_responses.rs b/clients/socks5/src/socks/mixnet_responses.rs
index 430b4322da..85d0a7da86 100644
--- a/clients/socks5/src/socks/mixnet_responses.rs
+++ b/clients/socks5/src/socks/mixnet_responses.rs
@@ -9,13 +9,15 @@ use client_core::client::received_buffer::{ReceivedBufferMessage, ReceivedBuffer
 use nymsphinx::receiver::ReconstructedMessage;
 use proxy_helpers::connection_controller::{ControllerCommand, ControllerSender};
 use socks5_requests::Message;
-use task::ShutdownListener;
+use task::TaskClient;
+
+use crate::error::Socks5ClientError;
 
 pub(crate) struct MixnetResponseListener {
     buffer_requester: ReceivedBufferRequestSender,
     mix_response_receiver: ReconstructedMessagesReceiver,
     controller_sender: ControllerSender,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl Drop for MixnetResponseListener {
@@ -25,9 +27,9 @@ impl Drop for MixnetResponseListener {
             .unbounded_send(ReceivedBufferMessage::ReceiverDisconnect)
         {
             if self.shutdown.is_shutdown_poll() {
-                log::debug!("The buffer request failed: {}", err);
+                log::debug!("The buffer request failed: {err}");
             } else {
-                log::error!("The buffer request failed: {}", err);
+                log::error!("The buffer request failed: {err}");
             }
         }
     }
@@ -37,7 +39,7 @@ impl MixnetResponseListener {
     pub(crate) fn new(
         buffer_requester: ReceivedBufferRequestSender,
         controller_sender: ControllerSender,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Self {
         let (mix_response_sender, mix_response_receiver) = mpsc::unbounded();
         buffer_requester
@@ -52,20 +54,23 @@ impl MixnetResponseListener {
         }
     }
 
-    async fn on_message(&self, reconstructed_message: ReconstructedMessage) {
+    fn on_message(
+        &self,
+        reconstructed_message: ReconstructedMessage,
+    ) -> Result<(), Socks5ClientError> {
         let raw_message = reconstructed_message.message;
-        if reconstructed_message.reply_surb.is_some() {
-            warn!("this message had a surb - we didn't do anything with it");
+        if reconstructed_message.sender_tag.is_some() {
+            warn!("this message was sent anonymously - it couldn't have come from the service provider");
         }
 
         let response = match Message::try_from_bytes(&raw_message) {
             Err(err) => {
-                warn!("failed to parse received response - {:?}", err);
-                return;
+                warn!("failed to parse received response - {err}");
+                return Ok(());
             }
             Ok(Message::Request(_)) => {
                 warn!("unexpected request");
-                return;
+                return Ok(());
             }
             Ok(Message::Response(data)) => data,
             Ok(Message::NetworkRequesterResponse(r)) => {
@@ -73,7 +78,10 @@ impl MixnetResponseListener {
                     "Network requester failed on connection id {} with error: {}",
                     r.connection_id, r.network_requester_error
                 );
-                return;
+                return Err(Socks5ClientError::NetworkRequesterError {
+                    connection_id: r.connection_id,
+                    error: r.network_requester_error,
+                });
             }
         };
 
@@ -84,18 +92,21 @@ impl MixnetResponseListener {
                 response.is_closed,
             ))
             .unwrap();
+
+        Ok(())
     }
 
     pub(crate) async fn run(&mut self) {
         while !self.shutdown.is_shutdown() {
             tokio::select! {
-                received_responses = self.mix_response_receiver.next() => match received_responses {
-                    Some(received_responses) => {
+                received_responses = self.mix_response_receiver.next() => {
+                    if let Some(received_responses) = received_responses {
                         for reconstructed_message in received_responses {
-                            self.on_message(reconstructed_message).await;
+                            if let Err(err) = self.on_message(reconstructed_message) {
+                                self.shutdown.send_status_msg(Box::new(err));
+                            }
                         }
-                    },
-                    None => {
+                    } else {
                         log::trace!("MixnetResponseListener: Stopping since channel closed");
                         break;
                     }
diff --git a/clients/socks5/src/socks/mod.rs b/clients/socks5/src/socks/mod.rs
index 20dd99f125..16603839ff 100644
--- a/clients/socks5/src/socks/mod.rs
+++ b/clients/socks5/src/socks/mod.rs
@@ -1,7 +1,11 @@
 #![forbid(unsafe_code)]
 
+use std::convert::TryFrom;
+
+use self::types::SocksProxyError;
+
 pub mod authentication;
-mod client;
+pub(crate) mod client;
 pub(crate) mod mixnet_responses;
 mod request;
 pub mod server;
@@ -9,6 +13,27 @@ pub mod types;
 pub mod utils;
 
 /// Version of socks
-const SOCKS_VERSION: u8 = 0x05;
+const SOCKS4_VERSION: u8 = 0x04;
+const SOCKS5_VERSION: u8 = 0x05;
 
 const RESERVED: u8 = 0x00;
+
+#[derive(Clone, PartialEq, Eq)]
+pub enum SocksVersion {
+    V4 = 0x04,
+    V5 = 0x05,
+}
+
+pub struct InvalidSocksVersion;
+
+impl TryFrom<u8> for SocksVersion {
+    type Error = SocksProxyError;
+
+    fn try_from(version: u8) -> Result<Self, Self::Error> {
+        match version {
+            SOCKS4_VERSION => Ok(Self::V4),
+            SOCKS5_VERSION => Ok(Self::V5),
+            _ => Err(SocksProxyError::UnsupportedProxyVersion(version)),
+        }
+    }
+}
diff --git a/clients/socks5/src/socks/request.rs b/clients/socks5/src/socks/request.rs
index 92d687aa90..ecf9b656f3 100644
--- a/clients/socks5/src/socks/request.rs
+++ b/clients/socks5/src/socks/request.rs
@@ -1,5 +1,7 @@
-use super::types::{AddrType, ResponseCode, SocksProxyError};
-use super::{utils as socks_utils, SOCKS_VERSION};
+use crate::socks::SOCKS4_VERSION;
+
+use super::types::{AddrType, ResponseCodeV5, SocksProxyError};
+use super::{utils as socks_utils, SOCKS5_VERSION};
 use log::*;
 use std::fmt::{self, Display};
 use tokio::io::{AsyncRead, AsyncReadExt};
@@ -15,80 +17,114 @@ pub(crate) struct SocksRequest {
 }
 
 impl SocksRequest {
-    /// Parse a SOCKS5 request from a TcpStream
-    pub async fn from_stream<R>(stream: &mut R) -> Result<Self, SocksProxyError>
+    /// Parse a SOCKS4 request from a `TcpStream`
+    /// From documents at:
+    ///  - SOCKS4: https://www.openssh.com/txt/socks4.protocol
+    ///  - SOCKS4a: https://www.openssh.com/txt/socks4a.protocol
+    pub async fn from_stream_socks4<R>(stream: &mut R) -> Result<Self, SocksProxyError>
     where
         R: AsyncRead + Unpin,
     {
+        log::trace!("read from stream socks4");
+
+        let mut packet = [0u8; 3];
+        stream.read_exact(&mut packet).await?;
+
+        // CD (command)
+        let Some(command) = SocksCommand::from(packet[0] as usize) else {
+            log::warn!("Invalid Command");
+            return Err(ResponseCodeV5::CommandNotSupported.into());
+        };
+
+        // DSTPORT
+        let mut port = [0u8; 2];
+        port.copy_from_slice(&packet[1..]);
+        let port = merge_u8_into_u16(port[0], port[1]);
+
+        // DSTIP
+        let mut ip = [0u8; 4];
+        stream.read_exact(&mut ip).await?;
+
+        // USERID
+        let _userid = read_until_zero(stream).await;
+
+        // SOCKS4a extension
+        // https://www.openssh.com/txt/socks4a.protocol
+        // If the IP is 0.0.0.x with x nonzero, read the domain name
+        let (addr, addr_type) = if ip[..3] == [0, 0, 0] && ip[3] != 0 {
+            (read_until_zero(stream).await?, AddrType::Domain)
+        } else {
+            (ip.to_vec(), AddrType::V4)
+        };
+
+        // Return parsed request
+        Ok(SocksRequest {
+            version: SOCKS4_VERSION,
+            command,
+            addr_type,
+            addr,
+            port,
+        })
+    }
+    /// Parse a SOCKS5 request from a `TcpStream`
+    /// From: https://www.rfc-editor.org/rfc/rfc1928
+    pub async fn from_stream_socks5<R>(stream: &mut R) -> Result<Self, SocksProxyError>
+    where
+        R: AsyncRead + Unpin,
+    {
+        log::info!("read from stream socks5");
+
         let mut packet = [0u8; 4];
         // Read a byte from the stream and determine the version being requested
         stream.read_exact(&mut packet).await?;
 
-        if packet[0] != SOCKS_VERSION {
-            warn!("from_stream Unsupported version: SOCKS{}", packet[0]);
+        // VER
+        if packet[0] != SOCKS5_VERSION {
+            warn!("Unsupported version: SOCKS{}", packet[0]);
             return Err(SocksProxyError::UnsupportedProxyVersion(packet[0]));
         }
 
-        // Get command
-        let mut command: SocksCommand = SocksCommand::Connect;
-        match SocksCommand::from(packet[1] as usize) {
-            Some(com) => {
-                command = com;
-                Ok(())
-            }
-            None => {
-                warn!("Invalid Command");
-                Err(ResponseCode::CommandNotSupported)
-            }
-        }?;
+        // CMD
+        let Some(command) = SocksCommand::from(packet[1] as usize) else {
+            warn!("Invalid Command");
+            return Err(ResponseCodeV5::CommandNotSupported.into());
+        };
 
-        // DST.address
+        // RSV
+        // packet[2] is reserved
 
-        let mut addr_type: AddrType = AddrType::V6;
-        match AddrType::from(packet[3] as usize) {
-            Some(addr) => {
-                addr_type = addr;
-                Ok(())
-            }
-            None => {
-                error!("No Addr");
-                Err(ResponseCode::AddrTypeNotSupported)
-            }
-        }?;
+        // ATYP
+        let Some(addr_type) = AddrType::from(packet[3] as usize) else {
+            error!("No Addr");
+            return Err(ResponseCodeV5::AddrTypeNotSupported.into())
+        };
 
-        trace!("Getting Addr");
-        // Get Addr from addr_type and stream
-        let addr: Result<Vec<u8>, SocksProxyError> = match addr_type {
+        // DST.ADDR
+        let addr = match addr_type {
             AddrType::Domain => {
-                let mut domain_length = [0u8; 1];
+                let mut domain_length = [0u8];
                 stream.read_exact(&mut domain_length).await?;
-
                 let mut domain = vec![0u8; domain_length[0] as usize];
                 stream.read_exact(&mut domain).await?;
-
-                Ok(domain)
+                domain
             }
             AddrType::V4 => {
                 let mut addr = [0u8; 4];
                 stream.read_exact(&mut addr).await?;
-                Ok(addr.to_vec())
+                addr.to_vec()
             }
             AddrType::V6 => {
                 let mut addr = [0u8; 16];
                 stream.read_exact(&mut addr).await?;
-                Ok(addr.to_vec())
+                addr.to_vec()
             }
         };
 
-        let addr = addr?;
-
-        // read DST.port
+        // DST.PORT
         let mut port = [0u8; 2];
         stream.read_exact(&mut port).await?;
-        // Merge two u8s into u16
-        let port = (u16::from(port[0]) << 8) | u16::from(port[1]);
+        let port = merge_u8_into_u16(port[0], port[1]);
 
-        // Return parsed request
         Ok(SocksRequest {
             version: packet[0],
             command,
@@ -97,14 +133,18 @@ impl SocksRequest {
             port,
         })
     }
+
+    /// Print out the address and port to a String.
+    /// This might return domain:port, ipv6:port, or ipv4:port.
+    pub fn address_string(&self) -> String {
+        let address = socks_utils::pretty_print_addr(&self.addr_type, &self.addr);
+        format!("{}:{}", address, self.port)
+    }
 }
 
 impl Display for SocksRequest {
-    /// Print out the address and port to a String.
-    /// This might return domain:port, ipv6:port, or ipv4:port.
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let address = socks_utils::pretty_print_addr(&self.addr_type, &self.addr);
-        write!(f, "{}:{}", address, self.port)
+        write!(f, "{}", self.address_string())
     }
 }
 
@@ -127,3 +167,23 @@ impl SocksCommand {
         }
     }
 }
+
+fn merge_u8_into_u16(a: u8, b: u8) -> u16 {
+    (u16::from(a) << 8) | u16::from(b)
+}
+
+async fn read_until_zero<R>(stream: &mut R) -> Result<Vec<u8>, SocksProxyError>
+where
+    R: AsyncRead + Unpin,
+{
+    let mut result = Vec::new();
+    let mut char = [0u8];
+    loop {
+        stream.read_exact(&mut char).await?;
+        if char[0] == 0 {
+            break;
+        }
+        result.push(char[0]);
+    }
+    Ok(result)
+}
diff --git a/clients/socks5/src/socks/server.rs b/clients/socks5/src/socks/server.rs
index 551f82b788..0b193dc9d4 100644
--- a/clients/socks5/src/socks/server.rs
+++ b/clients/socks5/src/socks/server.rs
@@ -1,8 +1,9 @@
 use crate::error::Socks5ClientError;
 
-use super::authentication::Authenticator;
-use super::client::SocksClient;
-use super::{mixnet_responses::MixnetResponseListener, types::ResponseCode};
+use super::{
+    authentication::Authenticator, client::SocksClient, mixnet_responses::MixnetResponseListener,
+};
+use crate::socks::client;
 use client_connections::{ConnectionCommandSender, LaneQueueLengths};
 use client_core::client::{
     inbound_messages::InputMessageSender, received_buffer::ReceivedBufferRequestSender,
@@ -12,7 +13,7 @@ use nymsphinx::addressing::clients::Recipient;
 use proxy_helpers::connection_controller::{BroadcastActiveConnections, Controller};
 use std::net::SocketAddr;
 use tap::TapFallible;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::net::TcpListener;
 
 /// A Socks5 server that listens for connections.
@@ -21,8 +22,9 @@ pub struct SphinxSocksServer {
     listening_address: SocketAddr,
     service_provider: Recipient,
     self_address: Recipient,
+    client_config: client::Config,
     lane_queue_lengths: LaneQueueLengths,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl SphinxSocksServer {
@@ -33,7 +35,8 @@ impl SphinxSocksServer {
         service_provider: Recipient,
         self_address: Recipient,
         lane_queue_lengths: LaneQueueLengths,
-        shutdown: ShutdownListener,
+        client_config: client::Config,
+        shutdown: TaskClient,
     ) -> Self {
         // hardcode ip as we (presumably) ONLY want to listen locally. If we change it, we can
         // just modify the config
@@ -44,6 +47,7 @@ impl SphinxSocksServer {
             listening_address: format!("{}:{}", ip, port).parse().unwrap(),
             service_provider,
             self_address,
+            client_config,
             lane_queue_lengths,
             shutdown,
         }
@@ -85,47 +89,27 @@ impl SphinxSocksServer {
         loop {
             tokio::select! {
                 Ok((stream, _remote)) = listener.accept() => {
-                    // TODO Optimize this
                     let mut client = SocksClient::new(
+                        self.client_config,
                         stream,
                         self.authenticator.clone(),
                         input_sender.clone(),
-                        self.service_provider,
+                        &self.service_provider,
                         controller_sender.clone(),
-                        self.self_address,
+                        &self.self_address,
                         self.lane_queue_lengths.clone(),
                         self.shutdown.clone(),
                     );
 
                     tokio::spawn(async move {
-                        {
-                            match client.run().await {
-                                Ok(_) => {}
-                                Err(error) => {
-                                    error!("Error! {}", error);
-                                    let error_text = format!("{}", error);
-
-                                    let response: ResponseCode;
-
-                                    if error_text.contains("Host") {
-                                        response = ResponseCode::HostUnreachable;
-                                    } else if error_text.contains("Network") {
-                                        response = ResponseCode::NetworkUnreachable;
-                                    } else if error_text.contains("ttl") {
-                                        response = ResponseCode::TtlExpired
-                                    } else {
-                                        response = ResponseCode::Failure
-                                    }
-
-                                    if client.error(response).await.is_err() {
-                                        warn!("Failed to send error code");
-                                    };
-                                    if client.shutdown().await.is_err() {
-                                        warn!("Failed to shutdown TcpStream");
-                                    };
-                                }
+                        if let Err(err) = client.run().await {
+                            error!("Error! {err}");
+                            if client.send_error(err).await.is_err() {
+                                warn!("Failed to send error code");
+                            };
+                            if client.shutdown().await.is_err() {
+                                warn!("Failed to shutdown TcpStream");
                             };
-                            // client gets dropped here
                         }
                     });
                 },
diff --git a/clients/socks5/src/socks/types.rs b/clients/socks5/src/socks/types.rs
index b043da5ccc..e561d0025d 100644
--- a/clients/socks5/src/socks/types.rs
+++ b/clients/socks5/src/socks/types.rs
@@ -1,23 +1,33 @@
-use snafu::Snafu;
-#[derive(Debug, Snafu)]
+/// SOCKS4 Response codes
+#[allow(dead_code)]
+pub(crate) enum ResponseCodeV4 {
+    Granted = 0x5a,
+    RequestRejected = 0x5b,
+    CannotConnectToIdent = 0x5c,
+    DifferentUserId = 0x5d,
+}
+
 /// Possible SOCKS5 Response Codes
-pub(crate) enum ResponseCode {
+#[allow(dead_code)]
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum ResponseCodeV5 {
+    #[error("SOCKS5 Server Success")]
     Success = 0x00,
-    #[snafu(display("SOCKS5 Server Failure"))]
+    #[error("SOCKS5 Server Failure")]
     Failure = 0x01,
-    #[snafu(display("SOCKS5 Rule failure"))]
+    #[error("SOCKS5 Rule failure")]
     RuleFailure = 0x02,
-    #[snafu(display("network unreachable"))]
+    #[error("network unreachable")]
     NetworkUnreachable = 0x03,
-    #[snafu(display("host unreachable"))]
+    #[error("host unreachable")]
     HostUnreachable = 0x04,
-    #[snafu(display("connection refused"))]
+    #[error("connection refused")]
     ConnectionRefused = 0x05,
-    #[snafu(display("TTL expired"))]
+    #[error("TTL expired")]
     TtlExpired = 0x06,
-    #[snafu(display("Command not supported"))]
+    #[error("Command not supported")]
     CommandNotSupported = 0x07,
-    #[snafu(display("Addr Type not supported"))]
+    #[error("Addr Type not supported")]
     AddrTypeNotSupported = 0x08,
 }
 
@@ -30,7 +40,7 @@ pub enum SocksProxyError {
 impl std::fmt::Display for SocksProxyError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            SocksProxyError::GenericError(err) => write!(f, "GenericError - {}", err),
+            SocksProxyError::GenericError(err) => write!(f, "GenericError - {err}"),
             SocksProxyError::UnsupportedProxyVersion(version) => {
                 write!(f, "Unsupported proxy version {}", version)
             }
@@ -48,7 +58,7 @@ where
 }
 
 /// DST.addr variant types
-#[derive(PartialEq)]
+#[derive(Debug, PartialEq)]
 pub(crate) enum AddrType {
     V4 = 0x01,
     Domain = 0x03,
diff --git a/clients/validator/src/index.ts b/clients/validator/src/index.ts
index 642fc2b077..dac29371c3 100644
--- a/clients/validator/src/index.ts
+++ b/clients/validator/src/index.ts
@@ -85,8 +85,8 @@ export default class ValidatorClient implements INymClient {
 
   static async connect(
     mnemonic: string,
-    nymdUrl: string,
-    validatorApiUrl: string,
+    nyxdUrl: string,
+    nymApiUrl: string,
     prefix: string,
     mixnetContract: string,
     vestingContract: string,
@@ -94,19 +94,19 @@ export default class ValidatorClient implements INymClient {
   ): Promise<ValidatorClient> {
     const wallet = await ValidatorClient.buildWallet(mnemonic, prefix);
 
-    const signingClient = await SigningClient.connectWithNymSigner(wallet, nymdUrl, validatorApiUrl, prefix, denom);
+    const signingClient = await SigningClient.connectWithNymSigner(wallet, nyxdUrl, nymApiUrl, prefix, denom);
     return new ValidatorClient(signingClient, prefix, mixnetContract, vestingContract, denom);
   }
 
   static async connectForQuery(
-    nymdUrl: string,
-    validatorApiUrl: string,
+    nyxdUrl: string,
+    nymApiUrl: string,
     prefix: string,
     mixnetContract: string,
     vestingContract: string,
     denom: string,
   ): Promise<ValidatorClient> {
-    const queryClient = await QueryClient.connectWithNym(nymdUrl, validatorApiUrl);
+    const queryClient = await QueryClient.connectWithNym(nyxdUrl, nymApiUrl);
     return new ValidatorClient(queryClient, prefix, mixnetContract, vestingContract, denom);
   }
 
@@ -191,11 +191,11 @@ export default class ValidatorClient implements INymClient {
     return this.client.getIntervalRewardPercent(this.mixnetContract);
   }
 
-  public async getAllNymdMixnodes(): Promise<MixNodeBond[]> {
+  public async getAllNyxdMixnodes(): Promise<MixNodeBond[]> {
     let mixNodes: MixNodeBond[] = [];
     const limit = 50;
     let startAfter;
-    for (;;) {
+    for (; ;) {
       // eslint-disable-next-line no-await-in-loop
       const pagedResponse: PagedMixnodeResponse = await this.client.getMixNodesPaged(this.mixnetContract, limit);
       mixNodes = mixNodes.concat(pagedResponse.nodes);
@@ -209,11 +209,11 @@ export default class ValidatorClient implements INymClient {
     return mixNodes;
   }
 
-  public async getAllNymdGateways(): Promise<GatewayBond[]> {
+  public async getAllNyxdGateways(): Promise<GatewayBond[]> {
     let gateways: GatewayBond[] = [];
     const limit = 50;
     let startAfter;
-    for (;;) {
+    for (; ;) {
       // eslint-disable-next-line no-await-in-loop
       const pagedResponse: PagedGatewayResponse = await this.client.getGatewaysPaged(this.mixnetContract, limit);
       gateways = gateways.concat(pagedResponse.nodes);
@@ -232,11 +232,11 @@ export default class ValidatorClient implements INymClient {
    *
    * @param mixIdentity identity of the node to which the delegation was sent
    */
-  public async getAllNymdSingleMixnodeDelegations(mixIdentity: string): Promise<Delegation[]> {
+  public async getAllNyxdSingleMixnodeDelegations(mixIdentity: string): Promise<Delegation[]> {
     let delegations: Delegation[] = [];
     const limit = 250;
     let startAfter;
-    for (;;) {
+    for (; ;) {
       // eslint-disable-next-line no-await-in-loop
       const pagedResponse: PagedMixDelegationsResponse = await this.client.getMixNodeDelegationsPaged(
         this.mixnetContract,
@@ -255,11 +255,11 @@ export default class ValidatorClient implements INymClient {
     return delegations;
   }
 
-  public async getAllNymdDelegatorDelegations(delegator: string): Promise<Delegation[]> {
+  public async getAllNyxdDelegatorDelegations(delegator: string): Promise<Delegation[]> {
     let delegations: Delegation[] = [];
     const limit = 250;
     let startAfter;
-    for (;;) {
+    for (; ;) {
       // eslint-disable-next-line no-await-in-loop
       const pagedResponse: PagedDelegatorDelegationsResponse = await this.client.getDelegatorDelegationsPaged(
         this.mixnetContract,
@@ -278,11 +278,11 @@ export default class ValidatorClient implements INymClient {
     return delegations;
   }
 
-  public async getAllNymdNetworkDelegations(): Promise<Delegation[]> {
+  public async getAllNyxdNetworkDelegations(): Promise<Delegation[]> {
     let delegations: Delegation[] = [];
     const limit = 250;
     let startAfter;
-    for (;;) {
+    for (; ;) {
       // eslint-disable-next-line no-await-in-loop
       const pagedResponse: PagedAllDelegationsResponse = await this.client.getAllNetworkDelegationsPaged(
         this.mixnetContract,
diff --git a/clients/validator/src/validator-api-querier.ts b/clients/validator/src/nym-api-querier.ts
similarity index 58%
rename from clients/validator/src/validator-api-querier.ts
rename to clients/validator/src/nym-api-querier.ts
index 7c61f91bd7..3fa0471804 100644
--- a/clients/validator/src/validator-api-querier.ts
+++ b/clients/validator/src/nym-api-querier.ts
@@ -6,13 +6,13 @@
 import axios from 'axios';
 import { GatewayBond, MixNodeBond } from './types';
 
-export const VALIDATOR_API_VERSION = '/v1';
-export const VALIDATOR_API_GATEWAYS_PATH = `${VALIDATOR_API_VERSION}/gateways`;
-export const VALIDATOR_API_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes`;
-export const VALIDATOR_API_ACTIVE_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes/active`;
-export const VALIDATOR_API_REWARDED_MIXNODES_PATH = `${VALIDATOR_API_VERSION}/mixnodes/rewarded`;
+export const NYM_API_VERSION = '/v1';
+export const NYM_API_GATEWAYS_PATH = `${NYM_API_VERSION}/gateways`;
+export const NYM_API_MIXNODES_PATH = `${NYM_API_VERSION}/mixnodes`;
+export const NYM_API_ACTIVE_MIXNODES_PATH = `${NYM_API_VERSION}/mixnodes/active`;
+export const NYM_API_REWARDED_MIXNODES_PATH = `${NYM_API_VERSION}/mixnodes/rewarded`;
 
-export interface IValidatorApiQuery {
+export interface INymApiQuery {
   getCachedMixnodes(): Promise<MixNodeBond[]>;
 
   getCachedGateways(): Promise<GatewayBond[]>;
@@ -22,16 +22,16 @@ export interface IValidatorApiQuery {
   getRewardedMixnodes(): Promise<MixNodeBond[]>;
 }
 
-export default class ValidatorApiQuerier implements IValidatorApiQuery {
-  validatorApiUrl: string;
+export default class NymApiQuerier implements INymApiQuery {
+  nymApiUrl: string;
 
-  constructor(validatorApiUrl: string) {
-    this.validatorApiUrl = validatorApiUrl;
+  constructor(nymApiUrl: string) {
+    this.nymApiUrl = nymApiUrl;
   }
 
   async getCachedMixnodes(): Promise<MixNodeBond[]> {
-    const url = new URL(this.validatorApiUrl);
-    url.pathname += VALIDATOR_API_MIXNODES_PATH;
+    const url = new URL(this.nymApiUrl);
+    url.pathname += NYM_API_MIXNODES_PATH;
 
     const response = await axios.get(url.toString());
     if (response.status === 200) {
@@ -41,8 +41,8 @@ export default class ValidatorApiQuerier implements IValidatorApiQuery {
   }
 
   async getCachedGateways(): Promise<GatewayBond[]> {
-    const url = new URL(this.validatorApiUrl);
-    url.pathname += VALIDATOR_API_GATEWAYS_PATH;
+    const url = new URL(this.nymApiUrl);
+    url.pathname += NYM_API_GATEWAYS_PATH;
 
     const response = await axios.get(url.toString());
     if (response.status === 200) {
@@ -52,8 +52,8 @@ export default class ValidatorApiQuerier implements IValidatorApiQuery {
   }
 
   async getActiveMixnodes(): Promise<MixNodeBond[]> {
-    const url = new URL(this.validatorApiUrl);
-    url.pathname += VALIDATOR_API_ACTIVE_MIXNODES_PATH;
+    const url = new URL(this.nymApiUrl);
+    url.pathname += NYM_API_ACTIVE_MIXNODES_PATH;
 
     const response = await axios.get(url.toString());
     if (response.status === 200) {
@@ -63,8 +63,8 @@ export default class ValidatorApiQuerier implements IValidatorApiQuery {
   }
 
   async getRewardedMixnodes(): Promise<MixNodeBond[]> {
-    const url = new URL(this.validatorApiUrl);
-    url.pathname += VALIDATOR_API_REWARDED_MIXNODES_PATH;
+    const url = new URL(this.nymApiUrl);
+    url.pathname += NYM_API_REWARDED_MIXNODES_PATH;
 
     const response = await axios.get(url.toString());
     if (response.status === 200) {
diff --git a/clients/validator/src/nymd-querier.ts b/clients/validator/src/nyxd-querier.ts
similarity index 97%
rename from clients/validator/src/nymd-querier.ts
rename to clients/validator/src/nyxd-querier.ts
index ee2148d56d..edd791a8fe 100644
--- a/clients/validator/src/nymd-querier.ts
+++ b/clients/validator/src/nyxd-querier.ts
@@ -5,7 +5,7 @@
 
 import { JsonObject } from '@cosmjs/cosmwasm-stargate';
 // eslint-disable-next-line import/no-cycle
-import { INymdQuery } from './query-client';
+import { INyxdQuery } from './query-client';
 import {
   ContractStateParams,
   Delegation,
@@ -25,7 +25,7 @@ interface SmartContractQuery {
   queryContractSmart(address: string, queryMsg: Record<string, unknown>): Promise<JsonObject>;
 }
 
-export default class NymdQuerier implements INymdQuery {
+export default class NyxdQuerier implements INyxdQuery {
   client: SmartContractQuery;
 
   constructor(client: SmartContractQuery) {
diff --git a/clients/validator/src/query-client.ts b/clients/validator/src/query-client.ts
index 9e3937a89e..c78237cdb4 100644
--- a/clients/validator/src/query-client.ts
+++ b/clients/validator/src/query-client.ts
@@ -12,7 +12,7 @@ import {
 } from '@cosmjs/stargate';
 import { Code, CodeDetails, Contract, ContractCodeHistoryEntry } from '@cosmjs/cosmwasm-stargate/build/cosmwasmclient';
 // eslint-disable-next-line import/no-cycle
-import NymdQuerier from './nymd-querier';
+import NyxdQuerier from './nyxd-querier';
 import {
   ContractStateParams,
   Delegation,
@@ -29,7 +29,7 @@ import {
   PagedMixnodeResponse,
   RewardingStatus,
 } from './types';
-import ValidatorApiQuerier, { IValidatorApiQuery } from './validator-api-querier';
+import NymApiQuerier, { INymApiQuery as INymApiQuery } from './nym-api-querier';
 
 export interface ICosmWasmQuery {
   // methods exposed by `CosmWasmClient`
@@ -52,7 +52,7 @@ export interface ICosmWasmQuery {
   queryContractSmart(address: string, queryMsg: Record<string, unknown>): Promise<JsonObject>;
 }
 
-export interface INymdQuery {
+export interface INyxdQuery {
   // nym-specific implemented inside NymQuerier
   getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion>;
 
@@ -93,46 +93,46 @@ export interface INymdQuery {
   ): Promise<RewardingStatus>;
 }
 
-export interface IQueryClient extends ICosmWasmQuery, INymdQuery, IValidatorApiQuery {}
+export interface IQueryClient extends ICosmWasmQuery, INyxdQuery, INymApiQuery { }
 
 export default class QueryClient extends CosmWasmClient implements IQueryClient {
-  private nymdQuerier: NymdQuerier;
+  private nyxdQuerier: NyxdQuerier;
 
-  private validatorApiQuerier: ValidatorApiQuerier;
+  private nymApiQuerier: NymApiQuerier;
 
-  private constructor(tmClient: Tendermint34Client, validatorApiUrl: string) {
+  private constructor(tmClient: Tendermint34Client, nymApiUrl: string) {
     super(tmClient);
-    this.nymdQuerier = new NymdQuerier(this);
-    this.validatorApiQuerier = new ValidatorApiQuerier(validatorApiUrl);
+    this.nyxdQuerier = new NyxdQuerier(this);
+    this.nymApiQuerier = new NymApiQuerier(nymApiUrl);
   }
 
-  public static async connectWithNym(nymdUrl: string, validatorApiUrl: string): Promise<QueryClient> {
-    const tmClient = await Tendermint34Client.connect(nymdUrl);
-    return new QueryClient(tmClient, validatorApiUrl);
+  public static async connectWithNym(nyxdUrl: string, nymApiUrl: string): Promise<QueryClient> {
+    const tmClient = await Tendermint34Client.connect(nyxdUrl);
+    return new QueryClient(tmClient, nymApiUrl);
   }
 
   getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion> {
-    return this.nymdQuerier.getContractVersion(mixnetContractAddress);
+    return this.nyxdQuerier.getContractVersion(mixnetContractAddress);
   }
 
   getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse> {
-    return this.nymdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
   }
 
   getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse> {
-    return this.nymdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
   }
 
   ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse> {
-    return this.nymdQuerier.ownsMixNode(mixnetContractAddress, address);
+    return this.nyxdQuerier.ownsMixNode(mixnetContractAddress, address);
   }
 
   ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
-    return this.nymdQuerier.ownsGateway(mixnetContractAddress, address);
+    return this.nyxdQuerier.ownsGateway(mixnetContractAddress, address);
   }
 
   getStateParams(mixnetContractAddress: string): Promise<ContractStateParams> {
-    return this.nymdQuerier.getStateParams(mixnetContractAddress);
+    return this.nyxdQuerier.getStateParams(mixnetContractAddress);
   }
 
   getAllNetworkDelegationsPaged(
@@ -140,7 +140,7 @@ export default class QueryClient extends CosmWasmClient implements IQueryClient
     limit?: number,
     startAfter?: [string, string],
   ): Promise<PagedAllDelegationsResponse> {
-    return this.nymdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
   }
 
   getMixNodeDelegationsPaged(
@@ -149,7 +149,7 @@ export default class QueryClient extends CosmWasmClient implements IQueryClient
     limit?: number,
     startAfter?: string,
   ): Promise<PagedMixDelegationsResponse> {
-    return this.nymdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
+    return this.nyxdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
   }
 
   getDelegatorDelegationsPaged(
@@ -158,31 +158,31 @@ export default class QueryClient extends CosmWasmClient implements IQueryClient
     limit?: number,
     startAfter?: string,
   ): Promise<PagedDelegatorDelegationsResponse> {
-    return this.nymdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
+    return this.nyxdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
   }
 
   getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation> {
-    return this.nymdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
+    return this.nyxdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
   }
 
   getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution> {
-    return this.nymdQuerier.getLayerDistribution(mixnetContractAddress);
+    return this.nyxdQuerier.getLayerDistribution(mixnetContractAddress);
   }
 
   getRewardPool(mixnetContractAddress: string): Promise<string> {
-    return this.nymdQuerier.getRewardPool(mixnetContractAddress);
+    return this.nyxdQuerier.getRewardPool(mixnetContractAddress);
   }
 
   getCirculatingSupply(mixnetContractAddress: string): Promise<string> {
-    return this.nymdQuerier.getCirculatingSupply(mixnetContractAddress);
+    return this.nyxdQuerier.getCirculatingSupply(mixnetContractAddress);
   }
 
   getIntervalRewardPercent(mixnetContractAddress: string): Promise<number> {
-    return this.nymdQuerier.getIntervalRewardPercent(mixnetContractAddress);
+    return this.nyxdQuerier.getIntervalRewardPercent(mixnetContractAddress);
   }
 
   getSybilResistancePercent(mixnetContractAddress: string): Promise<number> {
-    return this.nymdQuerier.getSybilResistancePercent(mixnetContractAddress);
+    return this.nyxdQuerier.getSybilResistancePercent(mixnetContractAddress);
   }
 
   getRewardingStatus(
@@ -190,22 +190,22 @@ export default class QueryClient extends CosmWasmClient implements IQueryClient
     mixIdentity: string,
     rewardingIntervalNonce: number,
   ): Promise<RewardingStatus> {
-    return this.nymdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
+    return this.nyxdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
   }
 
   getCachedGateways(): Promise<GatewayBond[]> {
-    return this.validatorApiQuerier.getCachedGateways();
+    return this.nymApiQuerier.getCachedGateways();
   }
 
   getCachedMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getCachedMixnodes();
+    return this.nymApiQuerier.getCachedMixnodes();
   }
 
   getActiveMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getActiveMixnodes();
+    return this.nymApiQuerier.getActiveMixnodes();
   }
 
   getRewardedMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getRewardedMixnodes();
+    return this.nymApiQuerier.getRewardedMixnodes();
   }
 }
diff --git a/clients/validator/src/signing-client.ts b/clients/validator/src/signing-client.ts
index ef8913243d..8cb589cd0e 100644
--- a/clients/validator/src/signing-client.ts
+++ b/clients/validator/src/signing-client.ts
@@ -14,7 +14,7 @@ import { ChangeAdminResult } from '@cosmjs/cosmwasm-stargate/build/signingcosmwa
 import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
 import { nymGasPrice } from './stargate-helper';
 import { IQueryClient } from './query-client';
-import NymdQuerier from './nymd-querier';
+import NyxdQuerier from './nyxd-querier';
 import {
   ContractStateParams,
   Delegation,
@@ -33,7 +33,7 @@ import {
   PagedMixnodeResponse,
   RewardingStatus,
 } from './types';
-import ValidatorApiQuerier from './validator-api-querier';
+import NymApiQuerier from './nym-api-querier';
 
 // methods exposed by `SigningCosmWasmClient`
 export interface ICosmWasmSigning {
@@ -197,29 +197,29 @@ export interface ISigningClient extends IQueryClient, ICosmWasmSigning, INymSign
 }
 
 export default class SigningClient extends SigningCosmWasmClient implements ISigningClient {
-  private nymdQuerier: NymdQuerier;
+  private nyxdQuerier: NyxdQuerier;
 
-  private validatorApiQuerier: ValidatorApiQuerier;
+  private nymApiQuerier: NymApiQuerier;
 
   clientAddress: string;
 
   private constructor(
     clientAddress: string,
-    validatorApiUrl: string,
+    nymApiUrl: string,
     tmClient: Tendermint34Client,
     wallet: DirectSecp256k1HdWallet,
     signerOptions: SigningCosmWasmClientOptions,
   ) {
     super(tmClient, wallet, signerOptions);
     this.clientAddress = clientAddress;
-    this.nymdQuerier = new NymdQuerier(this);
-    this.validatorApiQuerier = new ValidatorApiQuerier(validatorApiUrl);
+    this.nyxdQuerier = new NyxdQuerier(this);
+    this.nymApiQuerier = new NymApiQuerier(nymApiUrl);
   }
 
   public static async connectWithNymSigner(
     wallet: DirectSecp256k1HdWallet,
-    nymdUrl: string,
-    validatorApiUrl: string,
+    nyxdUrl: string,
+    nymApiUrl: string,
     prefix: string,
     denom: string,
   ): Promise<SigningClient> {
@@ -228,34 +228,34 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
       prefix,
       gasPrice: nymGasPrice(denom),
     };
-    const tmClient = await Tendermint34Client.connect(nymdUrl);
-    return new SigningClient(address, validatorApiUrl, tmClient, wallet, signerOptions);
+    const tmClient = await Tendermint34Client.connect(nyxdUrl);
+    return new SigningClient(address, nymApiUrl, tmClient, wallet, signerOptions);
   }
 
   // query related:
 
   getContractVersion(mixnetContractAddress: string): Promise<MixnetContractVersion> {
-    return this.nymdQuerier.getContractVersion(mixnetContractAddress);
+    return this.nyxdQuerier.getContractVersion(mixnetContractAddress);
   }
 
   getMixNodesPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedMixnodeResponse> {
-    return this.nymdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getMixNodesPaged(mixnetContractAddress, limit, startAfter);
   }
 
   getGatewaysPaged(mixnetContractAddress: string, limit?: number, startAfter?: string): Promise<PagedGatewayResponse> {
-    return this.nymdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getGatewaysPaged(mixnetContractAddress, limit, startAfter);
   }
 
   ownsMixNode(mixnetContractAddress: string, address: string): Promise<MixOwnershipResponse> {
-    return this.nymdQuerier.ownsMixNode(mixnetContractAddress, address);
+    return this.nyxdQuerier.ownsMixNode(mixnetContractAddress, address);
   }
 
   ownsGateway(mixnetContractAddress: string, address: string): Promise<GatewayOwnershipResponse> {
-    return this.nymdQuerier.ownsGateway(mixnetContractAddress, address);
+    return this.nyxdQuerier.ownsGateway(mixnetContractAddress, address);
   }
 
   getStateParams(mixnetContractAddress: string): Promise<ContractStateParams> {
-    return this.nymdQuerier.getStateParams(mixnetContractAddress);
+    return this.nyxdQuerier.getStateParams(mixnetContractAddress);
   }
 
   getAllNetworkDelegationsPaged(
@@ -263,7 +263,7 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
     limit?: number,
     startAfter?: [string, string],
   ): Promise<PagedAllDelegationsResponse> {
-    return this.nymdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
+    return this.nyxdQuerier.getAllNetworkDelegationsPaged(mixnetContractAddress, limit, startAfter);
   }
 
   getMixNodeDelegationsPaged(
@@ -272,7 +272,7 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
     limit?: number,
     startAfter?: string,
   ): Promise<PagedMixDelegationsResponse> {
-    return this.nymdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
+    return this.nyxdQuerier.getMixNodeDelegationsPaged(mixnetContractAddress, mixIdentity, limit, startAfter);
   }
 
   getDelegatorDelegationsPaged(
@@ -281,31 +281,31 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
     limit?: number,
     startAfter?: string,
   ): Promise<PagedDelegatorDelegationsResponse> {
-    return this.nymdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
+    return this.nyxdQuerier.getDelegatorDelegationsPaged(mixnetContractAddress, delegator, limit, startAfter);
   }
 
   getDelegationDetails(mixnetContractAddress: string, mixIdentity: string, delegator: string): Promise<Delegation> {
-    return this.nymdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
+    return this.nyxdQuerier.getDelegationDetails(mixnetContractAddress, mixIdentity, delegator);
   }
 
   getLayerDistribution(mixnetContractAddress: string): Promise<LayerDistribution> {
-    return this.nymdQuerier.getLayerDistribution(mixnetContractAddress);
+    return this.nyxdQuerier.getLayerDistribution(mixnetContractAddress);
   }
 
   getRewardPool(mixnetContractAddress: string): Promise<string> {
-    return this.nymdQuerier.getRewardPool(mixnetContractAddress);
+    return this.nyxdQuerier.getRewardPool(mixnetContractAddress);
   }
 
   getCirculatingSupply(mixnetContractAddress: string): Promise<string> {
-    return this.nymdQuerier.getCirculatingSupply(mixnetContractAddress);
+    return this.nyxdQuerier.getCirculatingSupply(mixnetContractAddress);
   }
 
   getIntervalRewardPercent(mixnetContractAddress: string): Promise<number> {
-    return this.nymdQuerier.getIntervalRewardPercent(mixnetContractAddress);
+    return this.nyxdQuerier.getIntervalRewardPercent(mixnetContractAddress);
   }
 
   getSybilResistancePercent(mixnetContractAddress: string): Promise<number> {
-    return this.nymdQuerier.getSybilResistancePercent(mixnetContractAddress);
+    return this.nyxdQuerier.getSybilResistancePercent(mixnetContractAddress);
   }
 
   getRewardingStatus(
@@ -313,23 +313,23 @@ export default class SigningClient extends SigningCosmWasmClient implements ISig
     mixIdentity: string,
     rewardingIntervalNonce: number,
   ): Promise<RewardingStatus> {
-    return this.nymdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
+    return this.nyxdQuerier.getRewardingStatus(mixnetContractAddress, mixIdentity, rewardingIntervalNonce);
   }
 
   getCachedGateways(): Promise<GatewayBond[]> {
-    return this.validatorApiQuerier.getCachedGateways();
+    return this.nymApiQuerier.getCachedGateways();
   }
 
   getCachedMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getCachedMixnodes();
+    return this.nymApiQuerier.getCachedMixnodes();
   }
 
   getActiveMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getActiveMixnodes();
+    return this.nymApiQuerier.getActiveMixnodes();
   }
 
   getRewardedMixnodes(): Promise<MixNodeBond[]> {
-    return this.validatorApiQuerier.getRewardedMixnodes();
+    return this.nymApiQuerier.getRewardedMixnodes();
   }
 
   // signing related:
diff --git a/clients/validator/tests/query/balance.test.ts b/clients/validator/tests/query/balance.test.ts
index 254e54a745..97be47c2ce 100644
--- a/clients/validator/tests/query/balance.test.ts
+++ b/clients/validator/tests/query/balance.test.ts
@@ -1,4 +1,4 @@
-import ValidatorClient from '../../dist';
+import ValidatorClient from '../../validator/index';
 import expect from 'expect';
 
 describe('Query: balances', () => {
diff --git a/clients/webassembly/js-example/index.js b/clients/webassembly/js-example/index.js
index 4a28435219..f0890bf12e 100644
--- a/clients/webassembly/js-example/index.js
+++ b/clients/webassembly/js-example/index.js
@@ -65,7 +65,6 @@ async function main() {
  *
  * Message and recipient are taken from the values in the user interface.
  *
- * @param {Client} nymClient the nym client to use for message sending
  */
 async function sendMessageTo() {
   const message = document.getElementById('message').value;
@@ -96,10 +95,13 @@ function displaySend(message) {
 /**
  * Display received text messages in the browser. Colour them green.
  *
- * @param {string} message
+ * @param {Uint8Array} raw
  */
-function displayReceived(message) {
-  const content = message;
+function displayReceived(raw, sender_tag) {
+  const content = new TextDecoder().decode(raw);
+  if (sender_tag !== undefined) {
+    console.log("this message also contained some surbs from", sender_tag)
+  }
 
   let timestamp = new Date().toISOString().substr(11, 12);
   let receivedDiv = document.createElement('div');
@@ -116,7 +118,7 @@ function displayReceived(message) {
 /**
  * Display the nymClient's sender address in the user interface
  *
- * @param {Client} nymClient
+ * @param {String} address
  */
 function displaySenderAddress(address) {
   document.getElementById('sender').value = address;
diff --git a/clients/webassembly/js-example/package-lock.json b/clients/webassembly/js-example/package-lock.json
index ea8023655b..2e4adc6d90 100644
--- a/clients/webassembly/js-example/package-lock.json
+++ b/clients/webassembly/js-example/package-lock.json
@@ -24,8 +24,7 @@
     },
     "../pkg": {
       "name": "@nymproject/nym-client-wasm",
-      "version": "1.1.0",
-      "license": "Apache-2.0"
+      "version": "0.0.1"
     },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
@@ -455,12 +454,13 @@
       "license": "Apache-2.0"
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -636,29 +636,43 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.19.0",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.0",
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -913,30 +927,51 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/content-type": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.0",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1120,9 +1155,14 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
@@ -1172,8 +1212,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.92",
@@ -1185,7 +1224,6 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -1291,7 +1329,6 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1338,37 +1375,39 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.1",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -1384,6 +1423,44 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1468,22 +1545,32 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
+    "node_modules/finalhandler/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -1532,7 +1619,6 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1734,26 +1820,38 @@
       "license": "MIT"
     },
     "node_modules/http-errors": {
-      "version": "1.7.2",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/http-errors/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "ISC"
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/http-parser-js": {
       "version": "0.5.3",
@@ -1813,7 +1911,6 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -2175,7 +2272,6 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2242,7 +2338,6 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -2342,9 +2437,10 @@
       "license": "MIT"
     },
     "node_modules/negotiator": {
-      "version": "0.6.2",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2392,6 +2488,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-is": {
       "version": "1.1.5",
       "dev": true,
@@ -2423,9 +2528,10 @@
       "license": "MIT"
     },
     "node_modules/on-finished": {
-      "version": "2.3.0",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -2705,11 +2811,18 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.7.0",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/queue-microtask": {
@@ -2754,12 +2867,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.0",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -2768,9 +2882,10 @@
       }
     },
     "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.0",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -2960,8 +3075,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/schema-utils": {
       "version": "4.0.0",
@@ -3002,32 +3116,52 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.1",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/send/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
@@ -3089,23 +3223,25 @@
       "license": "ISC"
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+      "dev": true
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
@@ -3143,6 +3279,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -3502,9 +3652,10 @@
       }
     },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6"
       }
@@ -3514,7 +3665,6 @@
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"
@@ -3528,7 +3678,6 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -4293,11 +4442,13 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.7",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
@@ -4405,23 +4556,35 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.0",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+          "dev": true
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
           "dev": true
         }
       }
@@ -4591,10 +4754,20 @@
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "content-type": {
@@ -4604,7 +4777,9 @@
       "dev": true
     },
     "cookie": {
-      "version": "0.4.0",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true
     },
     "cookie-signature": {
@@ -4728,7 +4903,9 @@
       "dev": true
     },
     "destroy": {
-      "version": "1.0.4",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-node": {
@@ -4884,36 +5061,39 @@
       }
     },
     "express": {
-      "version": "4.17.1",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -4924,6 +5104,24 @@
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
           "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
           "dev": true
+        },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
@@ -4993,16 +5191,26 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
     "find-up": {
@@ -5168,20 +5376,28 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -5556,7 +5772,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -5588,6 +5806,12 @@
         "path-key": "^3.0.0"
       }
     },
+    "object-inspect": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "dev": true
+    },
     "object-is": {
       "version": "1.1.5",
       "dev": true,
@@ -5607,7 +5831,9 @@
       "dev": true
     },
     "on-finished": {
-      "version": "2.3.0",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "requires": {
         "ee-first": "1.1.1"
@@ -5793,8 +6019,13 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "dev": true
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "dev": true,
+      "requires": {
+        "side-channel": "^1.0.4"
+      }
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -5818,17 +6049,21 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
       "dependencies": {
         "bytes": {
-          "version": "3.1.0",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
           "dev": true
         }
       }
@@ -5978,26 +6213,42 @@
       }
     },
     "send": {
-      "version": "0.17.1",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
-          "version": "2.1.1",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -6053,17 +6304,21 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "setprototypeof": {
-      "version": "1.1.1",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "shallow-clone": {
@@ -6090,6 +6345,17 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -6325,7 +6591,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "type-is": {
diff --git a/clients/webassembly/js-example/worker.js b/clients/webassembly/js-example/worker.js
index 0cbf2fe4d6..da066d6ea2 100644
--- a/clients/webassembly/js-example/worker.js
+++ b/clients/webassembly/js-example/worker.js
@@ -17,38 +17,7 @@ importScripts('nym_client_wasm.js');
 console.log('Initializing worker');
 
 // wasm_bindgen creates a global variable (with the exports attached) that is in scope after `importScripts`
-const { default_debug, get_gateway, NymClient, set_panic_hook, Config } = wasm_bindgen;
-
-class ClientWrapper {
-  constructor(config, onMessageHandler) {
-    this.rustClient = new NymClient(config);
-    this.rustClient.set_on_message(onMessageHandler);
-    this.rustClient.set_on_gateway_connect(this.onConnect);
-  }
-
-  selfAddress = () => {
-    return this.rustClient.self_address();
-  };
-
-  onConnect = () => {
-    console.log('Established (and authenticated) gateway connection!');
-  };
-
-  start = async () => {
-    // this is current limitation of wasm in rust - for async methods you can't take self by reference...
-    // I'm trying to figure out if I can somehow hack my way around it, but for time being you have to re-assign
-    // the object (it's the same one)
-    this.rustClient = await this.rustClient.start();
-  };
-
-  sendMessage = async (recipient, message) => {
-    this.rustClient = await this.rustClient.send_message(recipient, message);
-  };
-
-  sendBinaryMessage = async (recipient, message) => {
-    this.rustClient = await this.rustClient.send_binary_message(recipient, message);
-  };
-}
+const { default_debug, NymClientBuilder, set_panic_hook, Config, GatewayEndpointConfig } = wasm_bindgen;
 
 let client = null;
 
@@ -62,11 +31,12 @@ async function main() {
   set_panic_hook();
 
   // validator server we will use to get topology from
-  const validator = 'https://validator.nymtech.net/api'; //"http://localhost:8081";
-  const preferredGateway = 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM';
-
-  const gatewayEndpoint = await get_gateway(validator, preferredGateway);
-  gatewayEndpoint.gateway_listener = "wss://gateway1.nymtech.net:443"; // this is needed if we want it to work on the web. However this gateway is a v1 gateway, we will need to change for v2 once we get there
+  const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
+  
+  const gatewayId = 'EVupP2tRUeZo5Y6RpBHAbm8kSntpgNyZNL6yCr7BDEoG';
+  const gatewayOwner = 'n1rmlew3euapuq7rs4s4j9apv00whrsazr764kl7';
+  const gatewayListener = 'ws://176.58.120.72:9000';
+  const gatewayEndpoint = new GatewayEndpointConfig(gatewayId, gatewayOwner, gatewayListener)
 
   // only really useful if you want to adjust some settings like traffic rate
   // (if not needed you can just pass a null)
@@ -94,12 +64,17 @@ async function main() {
   };
 
   console.log('Instantiating WASM client...');
-  client = new ClientWrapper(config, onMessageHandler);
+  
+  let clientBuilder = new NymClientBuilder(config, onMessageHandler)
   console.log('Web worker creating WASM client...');
-  await client.start();
+  let local_client = await clientBuilder.start_client();
   console.log('WASM client running!');
-
-  const selfAddress = client.rustClient.self_address();
+  
+  const selfAddress = local_client.self_address();
+  
+  // set the global (I guess we don't have to anymore?)
+  client = local_client;
+  
   console.log(`Client address is ${selfAddress}`);
   self.postMessage({
     kind: 'Ready',
@@ -114,7 +89,8 @@ async function main() {
       switch (event.data.kind) {
         case 'SendMessage': {
           const { message, recipient } = event.data.args;
-          await client.sendMessage(message, recipient);
+          let uint8Array = new TextEncoder().encode(message);
+          await client.send_regular_message(uint8Array, recipient);
         }
       }
     }
diff --git a/clients/webassembly/src/client/config.rs b/clients/webassembly/src/client/config.rs
index 66c6ceefe7..4efefeba21 100644
--- a/clients/webassembly/src/client/config.rs
+++ b/clients/webassembly/src/client/config.rs
@@ -17,7 +17,7 @@ pub struct Config {
     /// ID specifies the human readable ID of this particular client.
     pub(crate) id: String,
 
-    pub(crate) validator_api_url: Url,
+    pub(crate) nym_api_url: Url,
 
     pub(crate) disabled_credentials_mode: bool,
 
@@ -38,7 +38,7 @@ impl Config {
     ) -> Self {
         Config {
             id,
-            validator_api_url: validator_server
+            nym_api_url: validator_server
                 .parse()
                 .expect("provided url was malformed"),
             disabled_credentials_mode: true,
@@ -106,6 +106,34 @@ pub struct Debug {
 
     /// Controls whether the sent sphinx packet use the NON-DEFAULT bigger size.
     pub use_extended_packet_size: bool,
+
+    /// Defines the minimum number of reply surbs the client wants to keep in its storage at all times.
+    /// It can only allow to go below that value if its to request additional reply surbs.
+    pub minimum_reply_surb_storage_threshold: usize,
+
+    /// Defines the maximum number of reply surbs the client wants to keep in its storage at any times.
+    pub maximum_reply_surb_storage_threshold: usize,
+
+    /// Defines the minimum number of reply surbs the client would request.
+    pub minimum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs the client would request.
+    pub maximum_reply_surb_request_size: u32,
+
+    /// Defines the maximum number of reply surbs a remote party is allowed to request from this client at once.
+    pub maximum_allowed_reply_surb_request_size: u32,
+
+    /// Defines maximum amount of time the client is going to wait for reply surbs before explicitly asking
+    /// for more even though in theory they wouldn't need to.
+    pub maximum_reply_surb_waiting_period_ms: u64,
+
+    /// Defines maximum amount of time given reply surb is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    pub maximum_reply_surb_age_ms: u64,
+
+    /// Defines maximum amount of time given reply key is going to be valid for.
+    /// This is going to be superseded by key rotation once implemented.
+    pub maximum_reply_key_age_ms: u64,
 }
 
 impl From<Debug> for ConfigDebug {
@@ -135,6 +163,16 @@ impl From<Debug> for ConfigDebug {
             disable_main_poisson_packet_distribution: debug
                 .disable_main_poisson_packet_distribution,
             use_extended_packet_size,
+            minimum_reply_surb_storage_threshold: debug.minimum_reply_surb_storage_threshold,
+            maximum_reply_surb_storage_threshold: debug.maximum_reply_surb_storage_threshold,
+            minimum_reply_surb_request_size: debug.minimum_reply_surb_request_size,
+            maximum_reply_surb_request_size: debug.maximum_reply_surb_request_size,
+            maximum_allowed_reply_surb_request_size: debug.maximum_allowed_reply_surb_request_size,
+            maximum_reply_surb_waiting_period: Duration::from_millis(
+                debug.maximum_reply_surb_waiting_period_ms,
+            ),
+            maximum_reply_surb_age: Duration::from_millis(debug.maximum_reply_surb_age_ms),
+            maximum_reply_key_age: Duration::from_millis(debug.maximum_reply_key_age_ms),
         }
     }
 }
@@ -157,6 +195,16 @@ impl From<ConfigDebug> for Debug {
             disable_main_poisson_packet_distribution: debug
                 .disable_main_poisson_packet_distribution,
             use_extended_packet_size: debug.use_extended_packet_size.is_some(),
+            minimum_reply_surb_storage_threshold: debug.minimum_reply_surb_storage_threshold,
+            maximum_reply_surb_storage_threshold: debug.maximum_reply_surb_storage_threshold,
+            minimum_reply_surb_request_size: debug.minimum_reply_surb_request_size,
+            maximum_reply_surb_request_size: debug.maximum_reply_surb_request_size,
+            maximum_allowed_reply_surb_request_size: debug.maximum_allowed_reply_surb_request_size,
+            maximum_reply_surb_waiting_period_ms: debug
+                .maximum_reply_surb_waiting_period
+                .as_millis() as u64,
+            maximum_reply_surb_age_ms: debug.maximum_reply_surb_age.as_millis() as u64,
+            maximum_reply_key_age_ms: debug.maximum_reply_key_age.as_millis() as u64,
         }
     }
 }
diff --git a/clients/webassembly/src/client/helpers.rs b/clients/webassembly/src/client/helpers.rs
new file mode 100644
index 0000000000..4349fd5f78
--- /dev/null
+++ b/clients/webassembly/src/client/helpers.rs
@@ -0,0 +1,30 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use client_core::client::base_client::ClientInput;
+use client_core::client::inbound_messages::InputMessage;
+use js_sys::Promise;
+use std::sync::Arc;
+use wasm_bindgen::JsValue;
+use wasm_bindgen_futures::future_to_promise;
+
+// defining helper trait as we could directly call the method on the wrapper
+pub(crate) trait InputSender {
+    fn send_message(&self, message: InputMessage) -> Promise;
+}
+
+impl InputSender for Arc<ClientInput> {
+    fn send_message(&self, message: InputMessage) -> Promise {
+        let this = Arc::clone(self);
+        future_to_promise(async move {
+            match this.input_sender.send(message).await {
+                Ok(_) => Ok(JsValue::null()),
+                Err(_) => {
+                    let js_error =
+                        js_sys::Error::new("InputMessageReceiver has stopped receiving!");
+                    Err(JsValue::from(js_error))
+                }
+            }
+        })
+    }
+}
diff --git a/clients/webassembly/src/client/mod.rs b/clients/webassembly/src/client/mod.rs
index 68a40cf99b..bd9ceab576 100644
--- a/clients/webassembly/src/client/mod.rs
+++ b/clients/webassembly/src/client/mod.rs
@@ -2,59 +2,65 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use self::config::Config;
+use crate::client::helpers::InputSender;
 use crate::client::response_pusher::ResponsePusher;
 use client_connections::TransmissionLane;
 use client_core::client::base_client::{BaseClientBuilder, ClientInput, ClientOutput};
+use client_core::client::replies::reply_storage::browser_backend;
 use client_core::client::{inbound_messages::InputMessage, key_manager::KeyManager};
-use crypto::asymmetric::identity;
+use gateway_client::bandwidth::BandwidthController;
+use js_sys::Promise;
 use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use rand::rngs::OsRng;
-use task::ShutdownNotifier;
+use std::sync::Arc;
+use task::TaskManager;
 use wasm_bindgen::prelude::*;
+use wasm_bindgen_futures::future_to_promise;
 use wasm_utils::{console_error, console_log};
 
 pub mod config;
+mod helpers;
 mod response_pusher;
 
 #[wasm_bindgen]
 pub struct NymClient {
-    config: Config,
-
-    /// KeyManager object containing smart pointers to all relevant keys used by the client.
-    // due to disgusting workaround I had to wrap the key_manager in an Option
-    // so that the interface wouldn't change (i.e. both `start` and `new` would still return a `NymClient`)
-    key_manager: Option<KeyManager>,
-    self_address: Option<String>,
-
-    // TODO: this should be stored somewhere persistently
-    // received_keys: HashSet<SURBEncryptionKey>,
-    /// Channel used for transforming 'raw' messages into sphinx packets and sending them
-    /// through the mix network.
-    client_input: Option<ClientInput>,
-
-    // callbacks
-    on_message: Option<js_sys::Function>,
-    on_binary_message: Option<js_sys::Function>,
-    on_gateway_connect: Option<js_sys::Function>,
+    self_address: String,
+    client_input: Arc<ClientInput>,
 
     // even though we don't use graceful shutdowns, other components rely on existence of this struct
     // and if it's dropped, everything will start going offline
-    _shutdown: Option<ShutdownNotifier>,
+    _task_manager: TaskManager,
 }
 
 #[wasm_bindgen]
-impl NymClient {
+pub struct NymClientBuilder {
+    config: Config,
+
+    /// KeyManager object containing smart pointers to all relevant keys used by the client.
+    key_manager: KeyManager,
+
+    reply_surb_storage_backend: browser_backend::Backend,
+
+    on_message: js_sys::Function,
+
+    // unimplemented:
+    bandwidth_controller: Option<BandwidthController>,
+    disabled_credentials: bool,
+}
+
+#[wasm_bindgen]
+impl NymClientBuilder {
     #[wasm_bindgen(constructor)]
-    pub fn new(config: Config) -> Self {
-        Self {
+    pub fn new(config: Config, on_message: js_sys::Function) -> Self {
+        //, key_manager: Option<KeyManager>) {
+        NymClientBuilder {
+            reply_surb_storage_backend: Self::setup_reply_surb_storage_backend(&config),
             config,
-            key_manager: Some(Self::setup_key_manager()),
-            on_message: None,
-            on_binary_message: None,
-            on_gateway_connect: None,
-            client_input: None,
-            self_address: None,
-            _shutdown: None,
+            key_manager: Self::setup_key_manager(),
+            on_message,
+            bandwidth_controller: None,
+            disabled_credentials: true,
         }
     }
 
@@ -69,117 +75,154 @@ impl NymClient {
         KeyManager::new(&mut rng)
     }
 
-    pub fn set_on_message(&mut self, on_message: js_sys::Function) {
-        self.on_message = Some(on_message);
-    }
-
-    pub fn set_on_binary_message(&mut self, on_binary_message: js_sys::Function) {
-        self.on_binary_message = Some(on_binary_message);
-    }
-
-    pub fn set_on_gateway_connect(&mut self, on_connect: js_sys::Function) {
-        self.on_gateway_connect = Some(on_connect)
-    }
-
-    fn as_mix_recipient(&self) -> Recipient {
-        // another disgusting (and hopefully temporary) workaround
-        let key_manager_ref = self
-            .key_manager
-            .as_ref()
-            .expect("attempting to call 'as_mix_recipient' after 'start'");
-
-        Recipient::new(
-            *key_manager_ref.identity_keypair().public_key(),
-            *key_manager_ref.encryption_keypair().public_key(),
-            identity::PublicKey::from_base58_string(&self.config.gateway_endpoint.gateway_id)
-                .expect("no gateway has been selected"),
+    // don't get too excited about the name, under the hood it's just a big fat placeholder
+    // with no persistence
+    fn setup_reply_surb_storage_backend(config: &Config) -> browser_backend::Backend {
+        browser_backend::Backend::new(
+            config.debug.minimum_reply_surb_storage_threshold,
+            config.debug.maximum_reply_surb_storage_threshold,
         )
     }
 
+    fn start_reconstructed_pusher(client_output: ClientOutput, on_message: js_sys::Function) {
+        ResponsePusher::new(client_output, on_message).start()
+    }
+
+    pub async fn start_client(self) -> Promise {
+        future_to_promise(async move {
+            console_log!("Starting the wasm client");
+
+            let base_builder = BaseClientBuilder::new(
+                &self.config.gateway_endpoint,
+                &self.config.debug,
+                self.key_manager,
+                self.bandwidth_controller,
+                self.reply_surb_storage_backend,
+                self.disabled_credentials,
+                vec![self.config.nym_api_url.clone()],
+            );
+
+            let self_address = base_builder.as_mix_recipient().to_string();
+            let mut started_client = match base_builder.start_base().await {
+                Ok(base_client) => base_client,
+                Err(err) => {
+                    let error_msg = format!("failed to start the base client components - {err}");
+                    console_error!("{}", error_msg);
+                    let js_error = js_sys::Error::new(&error_msg);
+                    return Err(JsValue::from(js_error));
+                }
+            };
+
+            let client_input = started_client.client_input.register_producer();
+            let client_output = started_client.client_output.register_consumer();
+
+            Self::start_reconstructed_pusher(client_output, self.on_message);
+
+            Ok(JsValue::from(NymClient {
+                self_address,
+                client_input: Arc::new(client_input),
+                _task_manager: started_client.task_manager,
+            }))
+        })
+    }
+}
+
+#[wasm_bindgen]
+impl NymClient {
     pub fn self_address(&self) -> String {
-        if let Some(address) = &self.self_address {
-            address.clone()
-        } else {
-            self.as_mix_recipient().to_string()
+        self.self_address.clone()
+    }
+
+    fn parse_recipient(recipient: &str) -> Result<Recipient, JsValue> {
+        match Recipient::try_from_base58_string(recipient) {
+            Ok(recipient) => Ok(recipient),
+            Err(err) => {
+                let error_msg = format!("{recipient} is not a valid Nym network recipient - {err}");
+                console_error!("{}", error_msg);
+                let js_error = js_sys::Error::new(&error_msg);
+                Err(JsValue::from(js_error))
+            }
         }
     }
 
-    // Right now it's impossible to have async exported functions to take `&mut self` rather than mut self
-    // TODO: try Rc<RefCell<Self>> approach?
-    pub async fn send_message(self, message: String, recipient: String) -> Self {
-        console_log!("Sending {} to {}", message, recipient);
-
-        let message_bytes = message.into_bytes();
-        self.send_binary_message(message_bytes, recipient).await
+    fn parse_sender_tag(tag: &str) -> Result<AnonymousSenderTag, JsValue> {
+        match AnonymousSenderTag::try_from_base58_string(tag) {
+            Ok(tag) => Ok(tag),
+            Err(err) => {
+                let error_msg = format!("{tag} is not a valid Nym AnonymousSenderTag - {err}");
+                console_error!("{}", error_msg);
+                let js_error = js_sys::Error::new(&error_msg);
+                Err(JsValue::from(js_error))
+            }
+        }
     }
 
-    pub async fn send_binary_message(self, message: Vec<u8>, recipient: String) -> Self {
-        console_log!("Sending {} bytes to {}", message.len(), recipient);
-
-        let recipient = Recipient::try_from_base58_string(recipient).unwrap();
-        let lane = TransmissionLane::General;
-
-        let input_msg = InputMessage::new_fresh(recipient, message, false, lane);
-
-        self.client_input
-            .as_ref()
-            .expect("start method was not called before!")
-            .input_sender
-            .send(input_msg)
-            .await
-            .expect("InputMessageReceiver has stopped receiving!");
-
-        self
-    }
-
-    fn start_reconstructed_pusher(
-        client_output: ClientOutput,
-        on_message: Option<js_sys::Function>,
-        on_binary_message: Option<js_sys::Function>,
-    ) {
-        ResponsePusher::new(client_output, on_message, on_binary_message).start()
-    }
-
-    pub async fn start(mut self) -> NymClient {
-        console_log!("Starting the wasm client");
-
-        let base_builder = BaseClientBuilder::new(
-            &self.config.gateway_endpoint,
-            &self.config.debug,
-            self.key_manager.take().unwrap(),
-            None,
-            true,
-            vec![self.config.validator_api_url.clone()],
+    /// The simplest message variant where no additional information is attached.
+    /// You're simply sending your `data` to specified `recipient` without any tagging.
+    ///
+    /// Ends up with `NymMessage::Plain` variant
+    pub fn send_regular_message(&self, message: Vec<u8>, recipient: String) -> Promise {
+        console_log!(
+            "Attempting to send {:.2} kiB message to {recipient}",
+            message.len() as f64 / 1024.0
         );
 
-        self.self_address = Some(base_builder.as_mix_recipient().to_string());
-        let mut started_client = match base_builder.start_base().await {
-            Ok(base_client) => base_client,
-            Err(err) => {
-                console_error!("failed to start base client components - {}", err);
-                // proper error handling is left here as an exercise for the reader (hi Mark : ))
-                panic!("failed to start base client components - {err}")
-            }
+        let recipient = match Self::parse_recipient(&recipient) {
+            Ok(recipient) => recipient,
+            Err(err) => return Promise::reject(&err),
         };
-        match self.on_gateway_connect.as_ref() {
-            Some(callback) => {
-                callback
-                    .call0(&JsValue::null())
-                    .expect("on connect callback failed!");
-            }
-            None => console_log!("Gateway connection established - no callback specified"),
+        let lane = TransmissionLane::General;
+
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
+        self.client_input.send_message(input_msg)
+    }
+
+    /// Creates a message used for a duplex anonymous communication where the recipient
+    /// will never learn of our true identity. This is achieved by carefully sending `reply_surbs`.
+    ///
+    /// Note that if reply_surbs is set to zero then
+    /// this variant requires the client having sent some reply_surbs in the past
+    /// (and thus the recipient also knowing our sender tag).
+    ///
+    /// Ends up with `NymMessage::Repliable` variant
+    pub fn send_anonymous_message(
+        &self,
+        message: Vec<u8>,
+        recipient: String,
+        reply_surbs: u32,
+    ) -> Promise {
+        console_log!(
+            "Attempting to anonymously send {:.2} kiB message to {recipient} while attaching {reply_surbs} replySURBs.",
+            message.len() as f64 / 1024.0
+        );
+
+        let recipient = match Self::parse_recipient(&recipient) {
+            Ok(recipient) => recipient,
+            Err(err) => return Promise::reject(&err),
         };
+        let lane = TransmissionLane::General;
 
-        // those should be moved to a completely different struct, but I don't want to break compatibility for now
-        let client_input = started_client.client_input.register_producer();
-        let client_output = started_client.client_output.register_consumer();
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
+        self.client_input.send_message(input_msg)
+    }
 
-        let on_message = self.on_message.take();
-        let on_binary_message = self.on_binary_message.take();
-        Self::start_reconstructed_pusher(client_output, on_message, on_binary_message);
-        self.client_input = Some(client_input);
-        self._shutdown = Some(started_client.shutdown_notifier);
+    /// Attempt to use our internally received and stored `ReplySurb` to send the message back
+    /// to specified recipient whilst not knowing its full identity (or even gateway).
+    ///
+    /// Ends up with `NymMessage::Reply` variant
+    pub fn send_reply(&self, message: Vec<u8>, recipient_tag: String) -> Promise {
+        console_log!(
+            "Attempting to send {:.2} kiB reply message to {recipient_tag}",
+            message.len() as f64 / 1024.0
+        );
 
-        self
+        let sender_tag = match Self::parse_sender_tag(&recipient_tag) {
+            Ok(recipient) => recipient,
+            Err(err) => return Promise::reject(&err),
+        };
+        let lane = TransmissionLane::General;
+
+        let input_msg = InputMessage::new_reply(sender_tag, message, lane);
+        self.client_input.send_message(input_msg)
     }
 }
diff --git a/clients/webassembly/src/client/response_pusher.rs b/clients/webassembly/src/client/response_pusher.rs
index c5717a9bc3..fbe04c66ed 100644
--- a/clients/webassembly/src/client/response_pusher.rs
+++ b/clients/webassembly/src/client/response_pusher.rs
@@ -5,27 +5,18 @@ use client_core::client::base_client::ClientOutput;
 use client_core::client::received_buffer::{ReceivedBufferMessage, ReconstructedMessagesReceiver};
 use futures::channel::mpsc;
 use futures::StreamExt;
+use js_sys::Uint8Array;
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::spawn_local;
-use wasm_utils::console_log;
+use wasm_utils::console_error;
 
 pub(crate) struct ResponsePusher {
     reconstructed_receiver: ReconstructedMessagesReceiver,
-    on_message: Option<js_sys::Function>,
-    on_binary_message: Option<js_sys::Function>,
+    on_message: js_sys::Function,
 }
 
 impl ResponsePusher {
-    pub(crate) fn new(
-        client_output: ClientOutput,
-        on_message: Option<js_sys::Function>,
-        on_binary_message: Option<js_sys::Function>,
-    ) -> Self {
-        if on_message.is_none() && on_binary_message.is_none() {
-            // exercise for the reader : )
-            panic!("neither 'on_message' nor 'on_binary_message' was set!")
-        }
-
+    pub(crate) fn new(client_output: ClientOutput, on_message: js_sys::Function) -> Self {
         // register our output
         let (reconstructed_sender, reconstructed_receiver) = mpsc::unbounded();
 
@@ -40,7 +31,6 @@ impl ResponsePusher {
         ResponsePusher {
             reconstructed_receiver,
             on_message,
-            on_binary_message,
         }
     }
 
@@ -49,23 +39,20 @@ impl ResponsePusher {
             let this = JsValue::null();
 
             while let Some(reconstructed) = self.reconstructed_receiver.next().await {
-                for msg in reconstructed {
-                    if let Some(ref callback_binary) = self.on_binary_message {
-                        let arg1 = serde_wasm_bindgen::to_value(&msg.message).unwrap();
-                        callback_binary
-                            .call1(&this, &arg1)
-                            .expect("on binary message failed!");
-                    }
-                    if let Some(ref callback) = self.on_message {
-                        if msg.reply_surb.is_some() {
-                            console_log!("the received message contained a reply-surb that we do not know how to handle (yet)")
-                        }
-                        let stringified = String::from_utf8_lossy(&msg.message).into_owned();
-                        let arg1 = serde_wasm_bindgen::to_value(&stringified).unwrap();
-                        callback.call1(&this, &arg1).expect("on message failed!");
-                    }
+                for reconstructed_msg in reconstructed {
+                    let (msg, tag) = reconstructed_msg.into_inner();
+
+                    let msg_slice: &[u8] = &msg;
+                    let array = Uint8Array::from(msg_slice);
+                    let arg1 = JsValue::from(array);
+                    let arg2 = JsValue::from(tag);
+                    self.on_message
+                        .call2(&this, &arg1, &arg2)
+                        .expect("on binary message failed!");
                 }
             }
+
+            console_error!("we stopped receiving reconstructed messages!")
         })
     }
 }
diff --git a/clients/webassembly/src/gateway_selector.rs b/clients/webassembly/src/gateway_selector.rs
index 77f5a5c6f7..d92ac987c3 100644
--- a/clients/webassembly/src/gateway_selector.rs
+++ b/clients/webassembly/src/gateway_selector.rs
@@ -6,7 +6,7 @@ use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]
 pub async fn get_gateway(api_server: String, preferred: Option<String>) -> GatewayEndpointConfig {
-    let validator_client = validator_client::client::ApiClient::new(api_server.parse().unwrap());
+    let validator_client = validator_client::client::NymApiClient::new(api_server.parse().unwrap());
 
     let gateways = match validator_client.get_cached_gateways().await {
         Err(err) => panic!("failed to obtain list of all gateways - {err}"),
diff --git a/common/build-information/Cargo.toml b/common/build-information/Cargo.toml
new file mode 100644
index 0000000000..0f56bec7f1
--- /dev/null
+++ b/common/build-information/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "build-information"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+[build-dependencies]
+vergen = { version = "7", default-features = false, features = ["build", "git", "rustc", "cargo"] }
diff --git a/clients/native/build.rs b/common/build-information/build.rs
similarity index 71%
rename from clients/native/build.rs
rename to common/build-information/build.rs
index 01b3a20dc6..b909ce42c4 100644
--- a/clients/native/build.rs
+++ b/common/build-information/build.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use vergen::{vergen, Config};
diff --git a/common/build-information/src/lib.rs b/common/build-information/src/lib.rs
new file mode 100644
index 0000000000..f2060154f0
--- /dev/null
+++ b/common/build-information/src/lib.rs
@@ -0,0 +1,86 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+// TODO: at a later date this crate should probably also expose `ContractBuildInformation`
+// and be used by our smart contracts
+
+pub struct BinaryBuildInformation {
+    // VERGEN_BUILD_TIMESTAMP
+    /// Provides the build timestamp, for example `2021-02-23T20:14:46.558472672+00:00`.
+    pub build_timestamp: &'static str,
+
+    // VERGEN_BUILD_SEMVER
+    /// Provides the build version, for example `0.1.0-9-g46f83e1`.
+    pub build_version: &'static str,
+
+    // VERGEN_GIT_SHA
+    /// Provides the hash of the commit that was used for the build, for example `46f83e112520533338245862d366f6a02cef07d4`.
+    pub commit_sha: &'static str,
+
+    // VERGEN_GIT_COMMIT_TIMESTAMP
+    /// Provides the timestamp of the commit that was used for the build, for example `2021-02-23T08:08:02-05:00`.
+    pub commit_timestamp: &'static str,
+
+    // VERGEN_GIT_BRANCH
+    /// Provides the name of the git branch that was used for the build, for example `master`.
+    pub commit_branch: &'static str,
+
+    // VERGEN_RUSTC_SEMVER
+    /// Provides the rustc version that was used for the build, for example `1.52.0-nightly`.
+    pub rustc_version: &'static str,
+
+    // VERGEN_RUSTC_CHANNEL
+    /// Provides the rustc channel that was used for the build, for example `nightly`.
+    pub rustc_channel: &'static str,
+
+    // VERGEN_CARGO_PROFILE
+    /// Provides the cargo profile that was used for the build, for example `debug`.
+    pub cargo_profile: &'static str,
+}
+
+impl BinaryBuildInformation {
+    // explicitly require the build_version to be passed as it's binary specific
+    pub const fn new(build_version: &'static str) -> Self {
+        BinaryBuildInformation {
+            build_timestamp: env!("VERGEN_BUILD_TIMESTAMP"),
+            build_version,
+            commit_sha: env!("VERGEN_GIT_SHA"),
+            commit_timestamp: env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
+            commit_branch: env!("VERGEN_GIT_BRANCH"),
+            rustc_version: env!("VERGEN_RUSTC_SEMVER"),
+            rustc_channel: env!("VERGEN_RUSTC_CHANNEL"),
+            cargo_profile: env!("VERGEN_CARGO_PROFILE"),
+        }
+    }
+
+    pub fn pretty_print(&self) -> String {
+        format!(
+            r#"
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+{:<20}{}
+"#,
+            "Build Timestamp:",
+            self.build_timestamp,
+            "Build Version:",
+            self.build_version,
+            "Commit SHA:",
+            self.commit_sha,
+            "Commit Date:",
+            self.commit_timestamp,
+            "Commit Branch:",
+            self.commit_branch,
+            "rustc Version:",
+            self.rustc_version,
+            "rustc Channel:",
+            self.rustc_channel,
+            "cargo Profile:",
+            self.cargo_profile,
+        )
+    }
+}
diff --git a/common/client-connections/src/lib.rs b/common/client-connections/src/lib.rs
index 515938ed54..b10963da79 100644
--- a/common/client-connections/src/lib.rs
+++ b/common/client-connections/src/lib.rs
@@ -1,18 +1,19 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::HashMap;
-
 use futures::channel::mpsc;
+use std::collections::HashMap;
 
 pub type ConnectionId = u64;
 
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
 pub enum TransmissionLane {
     General,
-    Reply,
+    // we need to treat surb-related requests and responses at higher priority
+    // so that the rest of underlying communication could actually continue
+    ReplySurbRequest,
+    AdditionalReplySurbs,
     Retransmission,
-    Control,
     ConnectionId(ConnectionId),
 }
 
diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml
index d1ea2abf1e..a9c14adc70 100644
--- a/common/client-libs/gateway-client/Cargo.toml
+++ b/common/client-libs/gateway-client/Cargo.toml
@@ -27,6 +27,7 @@ nymsphinx = { path = "../../nymsphinx" }
 pemstore = { path = "../../pemstore" }
 validator-client = { path = "../validator-client", optional = true }
 task = { path = "../../task" }
+serde = { version = "1.0", features = ["derive"]}
 
 
 [dependencies.tungstenite]
@@ -57,6 +58,7 @@ version = "0.4"
 
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils]
 path = "../../wasm-utils"
+features = ["websocket"]
 
 # only import it in wasm. Prefer proper tokio timer in non-wasm
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-timer]
diff --git a/common/client-libs/gateway-client/src/bandwidth.rs b/common/client-libs/gateway-client/src/bandwidth.rs
index 00db2b1180..d6d1cb04f0 100644
--- a/common/client-libs/gateway-client/src/bandwidth.rs
+++ b/common/client-libs/gateway-client/src/bandwidth.rs
@@ -61,7 +61,7 @@ where
     #[cfg(feature = "coconut")]
     pub async fn prepare_coconut_credential(
         &self,
-    ) -> Result<coconut_interface::Credential, GatewayClientError> {
+    ) -> Result<(coconut_interface::Credential, i64), GatewayClientError> {
         let verification_key = obtain_aggregate_verification_key(&self.coconut_api_clients).await?;
         let bandwidth_credential = self.storage.get_next_coconut_credential().await?;
         let voucher_value = u64::from_str(&bandwidth_credential.voucher_value)
@@ -75,13 +75,21 @@ where
             coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?;
 
         // the below would only be executed once we know where we want to spend it (i.e. which gateway and stuff)
-        Ok(prepare_for_spending(
-            voucher_value,
-            voucher_info,
-            serial_number,
-            binding_number,
-            &signature,
-            &verification_key,
-        )?)
+        Ok((
+            prepare_for_spending(
+                voucher_value,
+                voucher_info,
+                serial_number,
+                binding_number,
+                &signature,
+                &verification_key,
+            )?,
+            bandwidth_credential.id,
+        ))
+    }
+
+    #[cfg(feature = "coconut")]
+    pub async fn consume_credential(&self, id: i64) -> Result<(), GatewayClientError> {
+        Ok(self.storage.consume_coconut_credential(id).await?)
     }
 }
diff --git a/common/client-libs/gateway-client/src/client.rs b/common/client-libs/gateway-client/src/client.rs
index 56ff03737a..23cae7e4a6 100644
--- a/common/client-libs/gateway-client/src/client.rs
+++ b/common/client-libs/gateway-client/src/client.rs
@@ -10,7 +10,7 @@ pub use crate::packet_router::{
 use crate::socket_state::{PartiallyDelegated, SocketState};
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use crypto::asymmetric::identity;
-use futures::{FutureExt, SinkExt, StreamExt};
+use futures::{SinkExt, StreamExt};
 use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use gateway_requests::iv::IV;
 use gateway_requests::registration::handshake::{client_handshake, SharedKeys};
@@ -22,7 +22,7 @@ use rand::rngs::OsRng;
 use std::convert::TryFrom;
 use std::sync::Arc;
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 use tungstenite::protocol::Message;
 
 #[cfg(feature = "coconut")]
@@ -67,9 +67,7 @@ pub struct GatewayClient {
     reconnection_backoff: Duration,
 
     /// Listen to shutdown messages.
-    // TODO: fix this
-    #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
-    shutdown: Option<ShutdownListener>,
+    shutdown: TaskClient,
 }
 
 impl GatewayClient {
@@ -85,7 +83,7 @@ impl GatewayClient {
         ack_sender: AcknowledgementSender,
         response_timeout_duration: Duration,
         bandwidth_controller: Option<BandwidthController<PersistentStorage>>,
-        shutdown: Option<ShutdownListener>,
+        shutdown: TaskClient,
     ) -> Self {
         GatewayClient {
             authenticated: false,
@@ -130,7 +128,6 @@ impl GatewayClient {
         gateway_owner: String,
         local_identity: Arc<identity::KeyPair>,
         response_timeout_duration: Duration,
-        shutdown: Option<ShutdownListener>,
     ) -> Self {
         use futures::channel::mpsc;
 
@@ -138,6 +135,7 @@ impl GatewayClient {
         // perfectly fine here, because it's not meant to be used
         let (ack_tx, _) = mpsc::unbounded();
         let (mix_tx, _) = mpsc::unbounded();
+        let shutdown = TaskClient::dummy();
         let packet_router = PacketRouter::new(ack_tx, mix_tx, shutdown.clone());
 
         GatewayClient {
@@ -283,44 +281,19 @@ impl GatewayClient {
         // technically the `wasm_timer` also works outside wasm, but unless required,
         // I really prefer to just stick to tokio
         #[cfg(target_arch = "wasm32")]
-        let timeout = wasm_timer::Delay::new(self.response_timeout_duration);
-
-        let mut fused_timeout = timeout.fuse();
-        let mut fused_stream = conn.fuse();
-
-        // Bit of an ugly workaround for selecting on an `Option` without having access to
-        // `tokio::select`
-        #[cfg(not(target_arch = "wasm32"))]
-        let shutdown = {
-            let m_shutdown = self.shutdown.clone();
-            async {
-                if let Some(mut s) = m_shutdown {
-                    // TODO: fix this by marking as success _after_ the select
-                    s.mark_as_success();
-                    s.recv().await
-                } else {
-                    std::future::pending::<()>().await
-                }
-            }
-            .fuse()
-        };
-        #[cfg(not(target_arch = "wasm32"))]
-        tokio::pin!(shutdown);
-
-        #[cfg(target_arch = "wasm32")]
-        let mut shutdown = std::future::pending::<()>().fuse();
+        let mut timeout = wasm_timer::Delay::new(self.response_timeout_duration);
 
         loop {
-            futures::select! {
-                _ = shutdown => {
+            tokio::select! {
+                _ = self.shutdown.recv() => {
                     log::trace!("GatewayClient control response: Received shutdown");
                     log::debug!("GatewayClient control response: Exiting");
                     break Err(GatewayClientError::ConnectionClosedGatewayShutdown);
                 }
-                _ = &mut fused_timeout => {
+                _ = &mut timeout => {
                     break Err(GatewayClientError::Timeout);
                 }
-                msg = fused_stream.next() => {
+                msg = conn.next() => {
                     let ws_msg = match cleanup_socket_message(msg) {
                         Err(err) => break Err(err),
                         Ok(msg) => msg
@@ -332,11 +305,11 @@ impl GatewayClient {
                             if let Some(shared_keys) = &self.shared_key {
                                 if let Some(plaintext) = try_decrypt_binary_message(bin_msg, shared_keys) {
                                     if let Err(err) = self.packet_router.route_received(vec![plaintext]) {
-                                        log::warn!("Route received failed: {:?}", err);
+                                        log::warn!("Route received failed: {err}");
                                     }
                                 }
                             } else if let Err(err) = self.packet_router.route_received(vec![bin_msg]) {
-                                log::warn!("Route received failed: {:?}", err);
+                                log::warn!("Route received failed: {err}");
                             }
                         }
                         Message::Text(txt_msg) => {
@@ -437,7 +410,7 @@ impl GatewayClient {
         match gateway_protocol {
             None => {
                 warn!("the gateway we're connected to has not specified its protocol version. It's probably running version < 1.1.X, but that's still fine for now. It will become a hard error in 1.2.0");
-                // note: in 1.2.0 we will have to return a hard error here
+                // note: in +1.2.0 we will have to return a hard error here
                 Ok(())
             }
             Some(v) if v != PROTOCOL_VERSION => {
@@ -614,7 +587,7 @@ impl GatewayClient {
         let _gateway_owner = self.gateway_owner.clone();
 
         #[cfg(feature = "coconut")]
-        let credential = self
+        let (credential, credential_id) = self
             .bandwidth_controller
             .as_ref()
             .unwrap()
@@ -624,7 +597,15 @@ impl GatewayClient {
         return self.try_claim_testnet_bandwidth().await;
 
         #[cfg(feature = "coconut")]
-        return self.claim_coconut_bandwidth(credential).await;
+        {
+            self.claim_coconut_bandwidth(credential).await?;
+            self.bandwidth_controller
+                .as_ref()
+                .unwrap()
+                .consume_credential(credential_id)
+                .await?;
+            Ok(())
+        }
     }
 
     fn estimate_required_bandwidth(&self, packets: &[MixPacket]) -> i64 {
@@ -770,7 +751,6 @@ impl GatewayClient {
                                 .as_ref()
                                 .expect("no shared key present even though we're authenticated!"),
                         ),
-                        #[cfg(not(target_arch = "wasm32"))]
                         self.shutdown.clone(),
                     )
                 }
diff --git a/common/client-libs/gateway-client/src/lib.rs b/common/client-libs/gateway-client/src/lib.rs
index 8671a7363b..ac209f0920 100644
--- a/common/client-libs/gateway-client/src/lib.rs
+++ b/common/client-libs/gateway-client/src/lib.rs
@@ -16,7 +16,7 @@ pub mod client;
 pub mod error;
 pub mod packet_router;
 pub mod socket_state;
-#[cfg(feature = "wasm")]
+#[cfg(target_arch = "wasm32")]
 mod wasm_storage;
 
 /// Helper method for reading from websocket stream. Helps to flatten the structure.
diff --git a/common/client-libs/gateway-client/src/packet_router.rs b/common/client-libs/gateway-client/src/packet_router.rs
index 59d1d8add1..daeac0e548 100644
--- a/common/client-libs/gateway-client/src/packet_router.rs
+++ b/common/client-libs/gateway-client/src/packet_router.rs
@@ -9,7 +9,7 @@ use futures::channel::mpsc;
 use log::*;
 use nymsphinx::addressing::nodes::MAX_NODE_ADDRESS_UNPADDED_LEN;
 use nymsphinx::params::packet_sizes::PacketSize;
-use task::ShutdownListener;
+use task::TaskClient;
 
 pub type MixnetMessageSender = mpsc::UnboundedSender<Vec<Vec<u8>>>;
 pub type MixnetMessageReceiver = mpsc::UnboundedReceiver<Vec<Vec<u8>>>;
@@ -21,14 +21,14 @@ pub type AcknowledgementReceiver = mpsc::UnboundedReceiver<Vec<Vec<u8>>>;
 pub struct PacketRouter {
     ack_sender: AcknowledgementSender,
     mixnet_message_sender: MixnetMessageSender,
-    shutdown: Option<ShutdownListener>,
+    shutdown: TaskClient,
 }
 
 impl PacketRouter {
     pub fn new(
         ack_sender: AcknowledgementSender,
         mixnet_message_sender: MixnetMessageSender,
-        shutdown: Option<ShutdownListener>,
+        shutdown: TaskClient,
     ) -> Self {
         PacketRouter {
             ack_sender,
@@ -82,23 +82,21 @@ impl PacketRouter {
         if !received_messages.is_empty() {
             trace!("routing 'real'");
             if let Err(err) = self.mixnet_message_sender.unbounded_send(received_messages) {
-                if let Some(shutdown) = &mut self.shutdown {
-                    if shutdown.is_shutdown_poll() {
-                        // This should ideally not happen, but it's ok
-                        log::warn!("Failed to send mixnet message due to receiver task shutdown");
-                        return Err(GatewayClientError::MixnetMsgSenderFailedToSend);
-                    }
+                if self.shutdown.is_shutdown_poll() || self.shutdown.is_dummy() {
+                    // This should ideally not happen, but it's ok
+                    log::warn!("Failed to send mixnet message due to receiver task shutdown");
+                    return Err(GatewayClientError::MixnetMsgSenderFailedToSend);
                 }
                 // This should never happen during ordinary operation the way it's currently used.
                 // Abort to be on the safe side
-                panic!("Failed to send mixnet message: {:?}", err);
+                panic!("Failed to send mixnet message: {err}");
             }
         }
 
         if !received_acks.is_empty() {
             trace!("routing acks");
-            if let Err(e) = self.ack_sender.unbounded_send(received_acks) {
-                error!("failed to send ack: {:?}", e);
+            if let Err(err) = self.ack_sender.unbounded_send(received_acks) {
+                error!("failed to send ack: {err}");
             };
         }
         Ok(())
diff --git a/common/client-libs/gateway-client/src/socket_state.rs b/common/client-libs/gateway-client/src/socket_state.rs
index 2d66e782e8..2bedf1e8ed 100644
--- a/common/client-libs/gateway-client/src/socket_state.rs
+++ b/common/client-libs/gateway-client/src/socket_state.rs
@@ -10,8 +10,7 @@ use futures::{SinkExt, StreamExt};
 use gateway_requests::registration::handshake::SharedKeys;
 use log::*;
 use std::sync::Arc;
-#[cfg(not(target_arch = "wasm32"))]
-use task::ShutdownListener;
+use task::TaskClient;
 use tungstenite::Message;
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -85,7 +84,7 @@ impl PartiallyDelegated {
         conn: WsConn,
         packet_router: PacketRouter,
         shared_key: Arc<SharedKeys>,
-        #[cfg(not(target_arch = "wasm32"))] shutdown: Option<ShutdownListener>,
+        mut shutdown: TaskClient,
     ) -> Self {
         // when called for, it NEEDS TO yield back the stream so that we could merge it and
         // read control request responses.
@@ -99,27 +98,9 @@ impl PartiallyDelegated {
             let mut chunk_stream = (&mut stream).ready_chunks(8);
             let mut packet_router = packet_router;
 
-            // Bit of an ugly workaround for selecting on an `Option` without having access to
-            // `tokio::select`
-            #[cfg(not(target_arch = "wasm32"))]
-            let shutdown = {
-                async {
-                    if let Some(mut s) = shutdown {
-                        s.recv().await
-                    } else {
-                        std::future::pending::<()>().await
-                    }
-                }
-            };
-            #[cfg(not(target_arch = "wasm32"))]
-            tokio::pin!(shutdown);
-
-            #[cfg(target_arch = "wasm32")]
-            let mut shutdown = std::future::pending::<()>();
-
             let ret_err = loop {
                 tokio::select! {
-                    _ = &mut shutdown => {
+                    _ = shutdown.recv() => {
                         log::trace!("GatewayClient listener: Received shutdown");
                         log::debug!("GatewayClient listener: Exiting");
                         return;
@@ -134,7 +115,7 @@ impl PartiallyDelegated {
                         };
 
                         if let Err(err) = Self::route_socket_messages(ws_msgs, &mut packet_router, shared_key.as_ref()) {
-                            log::warn!("Route socket messages failed: {:?}", err);
+                            log::warn!("Route socket messages failed: {err}");
                         }
                     }
                 };
@@ -142,7 +123,10 @@ impl PartiallyDelegated {
 
             if match ret_err {
                 Err(err) => stream_sender.send(Err(err)),
-                Ok(_) => stream_sender.send(Ok(stream)),
+                Ok(_) => {
+                    shutdown.mark_as_success();
+                    stream_sender.send(Ok(stream))
+                }
             }
             .is_err()
             {
diff --git a/common/client-libs/gateway-client/src/wasm_storage.rs b/common/client-libs/gateway-client/src/wasm_storage.rs
index 53a9a1b30e..644560b9ca 100644
--- a/common/client-libs/gateway-client/src/wasm_storage.rs
+++ b/common/client-libs/gateway-client/src/wasm_storage.rs
@@ -39,7 +39,7 @@ pub trait Storage: Send + Sync {
 
     async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError>;
 
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
+    async fn consume_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
 }
 
 #[async_trait]
@@ -59,7 +59,7 @@ impl Storage for PersistentStorage {
         Err(StorageError::WasmNotSupported)
     }
 
-    async fn remove_coconut_credential(&self, _id: i64) -> Result<(), StorageError> {
+    async fn consume_coconut_credential(&self, _id: i64) -> Result<(), StorageError> {
         Err(StorageError::WasmNotSupported)
     }
 }
diff --git a/common/client-libs/mixnet-client/src/client.rs b/common/client-libs/mixnet-client/src/client.rs
index 600268b69b..f3a04f1099 100644
--- a/common/client-libs/mixnet-client/src/client.rs
+++ b/common/client-libs/mixnet-client/src/client.rs
@@ -122,7 +122,7 @@ impl Client {
         // We could have as well used conn.send_all(receiver.map(Ok)), but considering we don't care
         // about neither receiver nor the connection, it doesn't matter which one gets consumed
         if let Err(err) = receiver.map(Ok).forward(conn).await {
-            warn!("Failed to forward packets to {} - {:?}", address, err);
+            warn!("Failed to forward packets to {} - {err}", address);
         }
 
         debug!(
diff --git a/common/client-libs/mixnet-client/src/forwarder.rs b/common/client-libs/mixnet-client/src/forwarder.rs
index d92f6ad790..1aa68be8da 100644
--- a/common/client-libs/mixnet-client/src/forwarder.rs
+++ b/common/client-libs/mixnet-client/src/forwarder.rs
@@ -59,7 +59,7 @@ impl PacketForwarder {
                 self.mixnet_client
                     .send_without_response(next_hop, sphinx_packet, packet_mode)
             {
-                debug!("failed to forward the packet - {}", err)
+                debug!("failed to forward the packet - {err}")
             }
         }
     }
diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml
index ec842828e7..0527db6954 100644
--- a/common/client-libs/validator-client/Cargo.toml
+++ b/common/client-libs/validator-client/Cargo.toml
@@ -29,9 +29,9 @@ futures = "0.3"
 
 coconut-interface = { path = "../../coconut-interface" }
 network-defaults = { path = "../../network-defaults" }
-validator-api-requests = { path = "../../../validator-api/validator-api-requests", features = ["coconut"] }
+nym-api-requests = { path = "../../../nym-api/nym-api-requests", features = ["coconut"] }
 
-# required for nymd-client
+# required for nyxd-client
 # at some point it might be possible to make it wasm-compatible
 # perhaps after https://github.com/cosmos/cosmos-rust/pull/97 is resolved (and tendermint-rs is updated)
 async-trait = { version = "0.1.51", optional = true }
@@ -50,7 +50,7 @@ execute = { path = "../../execute" }
 ts-rs = "6.1.2"
 
 [features]
-nymd-client = [
+nyxd-client = [
     "async-trait",
     "bip39",
     "config",
diff --git a/common/client-libs/validator-client/src/client.rs b/common/client-libs/validator-client/src/client.rs
index 8ddce33a4f..9ba5e6319b 100644
--- a/common/client-libs/validator-client/src/client.rs
+++ b/common/client-libs/validator-client/src/client.rs
@@ -1,54 +1,55 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{validator_api, ValidatorClientError};
+use crate::{nym_api, ValidatorClientError};
 use coconut_dkg_common::types::NodeIndex;
-#[cfg(feature = "nymd-client")]
-use coconut_dkg_common::{
-    dealer::ContractDealing, types::DealerDetails, verification_key::ContractVKShare,
-};
-#[cfg(feature = "nymd-client")]
-use coconut_interface::Base58;
 use coconut_interface::VerificationKey;
 use mixnet_contract_common::mixnode::MixNodeDetails;
 use mixnet_contract_common::MixId;
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef};
-#[cfg(feature = "nymd-client")]
-use std::str::FromStr;
-use validator_api_requests::coconut::{
+use nym_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
-use validator_api_requests::models::{
+use nym_api_requests::models::{
     GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
     RewardEstimationResponse, StakeSaturationResponse,
 };
 
-#[cfg(feature = "nymd-client")]
-use crate::nymd::traits::{DkgQueryClient, MixnetQueryClient, MultisigQueryClient};
-#[cfg(feature = "nymd-client")]
-use crate::nymd::{self, CosmWasmClient, NymdClient, QueryNymdClient, SigningNymdClient};
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
+use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient, MultisigQueryClient};
+#[cfg(feature = "nyxd-client")]
+use crate::nyxd::{self, CosmWasmClient, NyxdClient, QueryNyxdClient, SigningNyxdClient};
+#[cfg(feature = "nyxd-client")]
+use coconut_dkg_common::{
+    dealer::ContractDealing, types::DealerDetails, verification_key::ContractVKShare,
+};
+#[cfg(feature = "nyxd-client")]
+use coconut_interface::Base58;
+#[cfg(feature = "nyxd-client")]
 use cw3::ProposalResponse;
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 use mixnet_contract_common::{
+    families::{Family, FamilyHead},
     mixnode::MixNodeBond,
     pending_events::{PendingEpochEvent, PendingIntervalEvent},
-    Delegation, RewardedSetNodeStatus, UnbondedMixnode,
+    Delegation, IdentityKey, RewardedSetNodeStatus, UnbondedMixnode,
 };
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 use network_defaults::NymNetworkDetails;
+#[cfg(feature = "nyxd-client")]
+use nym_api_requests::models::MixNodeBondAnnotated;
+#[cfg(feature = "nyxd-client")]
+use std::str::FromStr;
 use url::Url;
-#[cfg(feature = "nymd-client")]
-use validator_api_requests::models::MixNodeBondAnnotated;
 
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 #[must_use]
 #[derive(Debug, Clone)]
 pub struct Config {
     api_url: Url,
-    nymd_url: Url,
+    nyxd_url: Url,
 
-    nymd_config: nymd::Config,
+    nyxd_config: nyxd::Config,
 
     mixnode_page_limit: Option<u32>,
     gateway_page_limit: Option<u32>,
@@ -59,7 +60,7 @@ pub struct Config {
     proposals_page_limit: Option<u32>,
 }
 
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 impl Config {
     pub fn try_from_nym_network_details(
         details: &NymNetworkDetails,
@@ -77,11 +78,11 @@ impl Config {
 
         Ok(Config {
             api_url: api_url.pop().unwrap(),
-            nymd_url: details.endpoints[0]
-                .nymd_url
+            nyxd_url: details.endpoints[0]
+                .nyxd_url
                 .parse()
                 .map_err(ValidatorClientError::MalformedUrlProvided)?,
-            nymd_config: nymd::Config::try_from_nym_network_details(details)?,
+            nyxd_config: nyxd::Config::try_from_nym_network_details(details)?,
             mixnode_page_limit: None,
             gateway_page_limit: None,
             mixnode_delegations_page_limit: None,
@@ -94,14 +95,14 @@ impl Config {
 
     // TODO: this method shouldn't really exist as all information should be included immediately
     // via `from_nym_network_details`, but it's here for, you guessed it, legacy compatibility
-    pub fn with_urls(mut self, nymd_url: Url, api_url: Url) -> Self {
-        self.nymd_url = nymd_url;
+    pub fn with_urls(mut self, nyxd_url: Url, api_url: Url) -> Self {
+        self.nyxd_url = nyxd_url;
         self.api_url = api_url;
         self
     }
 
-    pub fn with_nymd_url(mut self, nymd_url: Url) -> Self {
-        self.nymd_url = nymd_url;
+    pub fn with_nyxd_url(mut self, nyxd_url: Url) -> Self {
+        self.nyxd_url = nyxd_url;
         self
     }
 
@@ -126,7 +127,7 @@ impl Config {
     }
 }
 
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 pub struct Client<C> {
     // TODO: we really shouldn't be storing a mnemonic here, but removing it would be
     // non-trivial amount of work and it's out of scope of the current branch
@@ -141,20 +142,20 @@ pub struct Client<C> {
     proposals_page_limit: Option<u32>,
 
     // ideally they would have been read-only, but unfortunately rust doesn't have such features
-    pub validator_api: validator_api::Client,
-    pub nymd: NymdClient<C>,
+    pub nym_api: nym_api::Client,
+    pub nyxd: NyxdClient<C>,
 }
 
-#[cfg(feature = "nymd-client")]
-impl Client<SigningNymdClient> {
+#[cfg(feature = "nyxd-client")]
+impl Client<SigningNyxdClient> {
     pub fn new_signing(
         config: Config,
         mnemonic: bip39::Mnemonic,
-    ) -> Result<Client<SigningNymdClient>, ValidatorClientError> {
-        let validator_api_client = validator_api::Client::new(config.api_url.clone());
-        let nymd_client = NymdClient::connect_with_mnemonic(
-            config.nymd_config.clone(),
-            config.nymd_url.as_str(),
+    ) -> Result<Client<SigningNyxdClient>, ValidatorClientError> {
+        let nym_api_client = nym_api::Client::new(config.api_url.clone());
+        let nyxd_client = NyxdClient::connect_with_mnemonic(
+            config.nyxd_config.clone(),
+            config.nyxd_url.as_str(),
             mnemonic.clone(),
             None,
         )?;
@@ -168,14 +169,14 @@ impl Client<SigningNymdClient> {
             dealers_page_limit: config.dealers_page_limit,
             verification_key_page_limit: config.verification_key_page_limit,
             proposals_page_limit: config.proposals_page_limit,
-            validator_api: validator_api_client,
-            nymd: nymd_client,
+            nym_api: nym_api_client,
+            nyxd: nyxd_client,
         })
     }
 
-    pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
-        self.nymd = NymdClient::connect_with_mnemonic(
-            self.nymd.current_config().clone(),
+    pub fn change_nyxd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
+        self.nyxd = NyxdClient::connect_with_mnemonic(
+            self.nyxd.current_config().clone(),
             new_endpoint.as_ref(),
             self.mnemonic.clone().unwrap(),
             None,
@@ -183,17 +184,17 @@ impl Client<SigningNymdClient> {
         Ok(())
     }
 
-    pub fn set_nymd_simulated_gas_multiplier(&mut self, multiplier: f32) {
-        self.nymd.set_simulated_gas_multiplier(multiplier)
+    pub fn set_nyxd_simulated_gas_multiplier(&mut self, multiplier: f32) {
+        self.nyxd.set_simulated_gas_multiplier(multiplier)
     }
 }
 
-#[cfg(feature = "nymd-client")]
-impl Client<QueryNymdClient> {
-    pub fn new_query(config: Config) -> Result<Client<QueryNymdClient>, ValidatorClientError> {
-        let validator_api_client = validator_api::Client::new(config.api_url.clone());
-        let nymd_client =
-            NymdClient::connect(config.nymd_config.clone(), config.nymd_url.as_str())?;
+#[cfg(feature = "nyxd-client")]
+impl Client<QueryNyxdClient> {
+    pub fn new_query(config: Config) -> Result<Client<QueryNyxdClient>, ValidatorClientError> {
+        let nym_api_client = nym_api::Client::new(config.api_url.clone());
+        let nyxd_client =
+            NyxdClient::connect(config.nyxd_config.clone(), config.nyxd_url.as_str())?;
 
         Ok(Client {
             mnemonic: None,
@@ -204,33 +205,84 @@ impl Client<QueryNymdClient> {
             dealers_page_limit: config.dealers_page_limit,
             verification_key_page_limit: config.verification_key_page_limit,
             proposals_page_limit: config.proposals_page_limit,
-            validator_api: validator_api_client,
-            nymd: nymd_client,
+            nym_api: nym_api_client,
+            nyxd: nyxd_client,
         })
     }
 
-    pub fn change_nymd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
-        self.nymd = NymdClient::connect(self.nymd.current_config().clone(), new_endpoint.as_ref())?;
+    pub fn change_nyxd(&mut self, new_endpoint: Url) -> Result<(), ValidatorClientError> {
+        self.nyxd = NyxdClient::connect(self.nyxd.current_config().clone(), new_endpoint.as_ref())?;
         Ok(())
     }
 }
 
-// nymd wrappers
-#[cfg(feature = "nymd-client")]
+// nyxd wrappers
+#[cfg(feature = "nyxd-client")]
 impl<C> Client<C> {
     // use case: somebody initialised client without a contract in order to upload and initialise one
     // and now they want to actually use it without making new client
+
     pub fn set_mixnet_contract_address(&mut self, mixnet_contract_address: cosmrs::AccountId) {
-        self.nymd
+        self.nyxd
             .set_mixnet_contract_address(mixnet_contract_address)
     }
 
     pub fn get_mixnet_contract_address(&self) -> cosmrs::AccountId {
-        self.nymd.mixnet_contract_address().clone()
+        self.nyxd.mixnet_contract_address().clone()
+    }
+
+    pub async fn get_all_node_families(&self) -> Result<Vec<Family>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        let mut families = Vec::new();
+        let mut start_after = None;
+
+        loop {
+            let paged_response = self
+                .nyxd
+                .get_all_node_families_paged(start_after.take(), None)
+                .await?;
+            families.extend(paged_response.families);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res)
+            } else {
+                break;
+            }
+        }
+
+        Ok(families)
+    }
+
+    pub async fn get_all_family_members(
+        &self,
+    ) -> Result<Vec<(IdentityKey, FamilyHead)>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        let mut members = Vec::new();
+        let mut start_after = None;
+
+        loop {
+            let paged_response = self
+                .nyxd
+                .get_all_family_members_paged(start_after.take(), None)
+                .await?;
+            members.extend(paged_response.members);
+
+            if let Some(start_after_res) = paged_response.start_next_after {
+                start_after = Some(start_after_res)
+            } else {
+                break;
+            }
+        }
+
+        Ok(members)
     }
 
     // basically handles paging for us
-    pub async fn get_all_nymd_rewarded_set_mixnodes(
+    pub async fn get_all_nyxd_rewarded_set_mixnodes(
         &self,
     ) -> Result<Vec<(MixId, RewardedSetNodeStatus)>, ValidatorClientError>
     where
@@ -241,7 +293,7 @@ impl<C> Client<C> {
 
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_rewarded_set_paged(start_after.take(), self.rewarded_set_page_limit)
                 .await?;
             identities.append(&mut paged_response.nodes);
@@ -256,7 +308,7 @@ impl<C> Client<C> {
         Ok(identities)
     }
 
-    pub async fn get_all_nymd_mixnode_bonds(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError>
+    pub async fn get_all_nyxd_mixnode_bonds(&self) -> Result<Vec<MixNodeBond>, ValidatorClientError>
     where
         C: CosmWasmClient + Sync + Send,
     {
@@ -264,7 +316,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_mixnode_bonds_paged(self.mixnode_page_limit, start_after.take())
                 .await?;
             mixnodes.append(&mut paged_response.nodes);
@@ -279,7 +331,7 @@ impl<C> Client<C> {
         Ok(mixnodes)
     }
 
-    pub async fn get_all_nymd_mixnodes_detailed(
+    pub async fn get_all_nyxd_mixnodes_detailed(
         &self,
     ) -> Result<Vec<MixNodeDetails>, ValidatorClientError>
     where
@@ -289,7 +341,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_mixnodes_detailed_paged(self.mixnode_page_limit, start_after.take())
                 .await?;
             mixnodes.append(&mut paged_response.nodes);
@@ -304,7 +356,7 @@ impl<C> Client<C> {
         Ok(mixnodes)
     }
 
-    pub async fn get_all_nymd_unbonded_mixnodes(
+    pub async fn get_all_nyxd_unbonded_mixnodes(
         &self,
     ) -> Result<Vec<(MixId, UnbondedMixnode)>, ValidatorClientError>
     where
@@ -314,7 +366,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_unbonded_paged(self.mixnode_page_limit, start_after.take())
                 .await?;
             mixnodes.append(&mut paged_response.nodes);
@@ -329,7 +381,7 @@ impl<C> Client<C> {
         Ok(mixnodes)
     }
 
-    pub async fn get_all_nymd_unbonded_mixnodes_by_owner(
+    pub async fn get_all_nyxd_unbonded_mixnodes_by_owner(
         &self,
         owner: &cosmrs::AccountId,
     ) -> Result<Vec<(MixId, UnbondedMixnode)>, ValidatorClientError>
@@ -340,7 +392,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_unbonded_by_owner_paged(owner, self.mixnode_page_limit, start_after.take())
                 .await?;
             mixnodes.append(&mut paged_response.nodes);
@@ -355,7 +407,7 @@ impl<C> Client<C> {
         Ok(mixnodes)
     }
 
-    pub async fn get_all_nymd_unbonded_mixnodes_by_identity(
+    pub async fn get_all_nyxd_unbonded_mixnodes_by_identity(
         &self,
         identity_key: String,
     ) -> Result<Vec<(MixId, UnbondedMixnode)>, ValidatorClientError>
@@ -366,7 +418,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_unbonded_by_identity_paged(
                     identity_key.clone(),
                     self.mixnode_page_limit,
@@ -385,7 +437,7 @@ impl<C> Client<C> {
         Ok(mixnodes)
     }
 
-    pub async fn get_all_nymd_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError>
+    pub async fn get_all_nyxd_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError>
     where
         C: CosmWasmClient + Sync + Send,
     {
@@ -393,7 +445,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_gateways_paged(start_after.take(), self.gateway_page_limit)
                 .await?;
             gateways.append(&mut paged_response.nodes);
@@ -408,7 +460,7 @@ impl<C> Client<C> {
         Ok(gateways)
     }
 
-    pub async fn get_all_nymd_single_mixnode_delegations(
+    pub async fn get_all_nyxd_single_mixnode_delegations(
         &self,
         mix_id: MixId,
     ) -> Result<Vec<Delegation>, ValidatorClientError>
@@ -419,7 +471,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_mixnode_delegations_paged(
                     mix_id,
                     start_after.take(),
@@ -449,7 +501,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_delegator_delegations_paged(
                     delegation_owner.to_string(),
                     start_after.take(),
@@ -476,7 +528,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_all_network_delegations_paged(
                     start_after.take(),
                     self.mixnode_delegations_page_limit,
@@ -494,7 +546,7 @@ impl<C> Client<C> {
         Ok(delegations)
     }
 
-    pub async fn get_all_nymd_pending_epoch_events(
+    pub async fn get_all_nyxd_pending_epoch_events(
         &self,
     ) -> Result<Vec<PendingEpochEvent>, ValidatorClientError>
     where
@@ -505,7 +557,7 @@ impl<C> Client<C> {
 
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_pending_epoch_events_paged(start_after.take(), self.rewarded_set_page_limit)
                 .await?;
             events.append(&mut paged_response.events);
@@ -520,7 +572,7 @@ impl<C> Client<C> {
         Ok(events)
     }
 
-    pub async fn get_all_nymd_pending_interval_events(
+    pub async fn get_all_nyxd_pending_interval_events(
         &self,
     ) -> Result<Vec<PendingIntervalEvent>, ValidatorClientError>
     where
@@ -531,7 +583,7 @@ impl<C> Client<C> {
 
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_pending_interval_events_paged(start_after.take(), self.rewarded_set_page_limit)
                 .await?;
             events.append(&mut paged_response.events);
@@ -546,7 +598,7 @@ impl<C> Client<C> {
         Ok(events)
     }
 
-    pub async fn get_all_nymd_current_dealers(
+    pub async fn get_all_nyxd_current_dealers(
         &self,
     ) -> Result<Vec<DealerDetails>, ValidatorClientError>
     where
@@ -556,7 +608,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_current_dealers_paged(start_after.take(), self.dealers_page_limit)
                 .await?;
             dealers.append(&mut paged_response.dealers);
@@ -571,7 +623,7 @@ impl<C> Client<C> {
         Ok(dealers)
     }
 
-    pub async fn get_all_nymd_past_dealers(
+    pub async fn get_all_nyxd_past_dealers(
         &self,
     ) -> Result<Vec<DealerDetails>, ValidatorClientError>
     where
@@ -581,7 +633,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_past_dealers_paged(start_after.take(), self.dealers_page_limit)
                 .await?;
             dealers.append(&mut paged_response.dealers);
@@ -596,7 +648,7 @@ impl<C> Client<C> {
         Ok(dealers)
     }
 
-    pub async fn get_all_nymd_epoch_dealings(
+    pub async fn get_all_nyxd_epoch_dealings(
         &self,
         idx: usize,
     ) -> Result<Vec<ContractDealing>, ValidatorClientError>
@@ -607,7 +659,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_dealings_paged(idx, start_after.take(), self.dealers_page_limit)
                 .await?;
             dealings.append(&mut paged_response.dealings);
@@ -622,7 +674,7 @@ impl<C> Client<C> {
         Ok(dealings)
     }
 
-    pub async fn get_all_nymd_verification_key_shares(
+    pub async fn get_all_nyxd_verification_key_shares(
         &self,
     ) -> Result<Vec<ContractVKShare>, ValidatorClientError>
     where
@@ -632,7 +684,7 @@ impl<C> Client<C> {
         let mut start_after = None;
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .get_vk_shares_paged(start_after.take(), self.verification_key_page_limit)
                 .await?;
             shares.append(&mut paged_response.shares);
@@ -647,7 +699,7 @@ impl<C> Client<C> {
         Ok(shares)
     }
 
-    pub async fn get_all_nymd_proposals(
+    pub async fn get_all_nyxd_proposals(
         &self,
     ) -> Result<Vec<ProposalResponse>, ValidatorClientError>
     where
@@ -658,7 +710,7 @@ impl<C> Client<C> {
 
         loop {
             let mut paged_response = self
-                .nymd
+                .nyxd
                 .list_proposals(start_after.take(), self.proposals_page_limit)
                 .await?;
 
@@ -677,77 +729,77 @@ impl<C> Client<C> {
 }
 
 // validator-api wrappers
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 impl<C> Client<C> {
-    pub fn change_validator_api(&mut self, new_endpoint: Url) {
-        self.validator_api.change_url(new_endpoint)
+    pub fn change_nym_api(&mut self, new_endpoint: Url) {
+        self.nym_api.change_url(new_endpoint)
     }
 
     pub async fn get_cached_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnodes().await?)
+        Ok(self.nym_api.get_mixnodes().await?)
     }
 
     pub async fn get_cached_mixnodes_detailed(
         &self,
     ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnodes_detailed().await?)
+        Ok(self.nym_api.get_mixnodes_detailed().await?)
     }
 
     pub async fn get_cached_rewarded_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_rewarded_mixnodes().await?)
+        Ok(self.nym_api.get_rewarded_mixnodes().await?)
     }
 
     pub async fn get_cached_rewarded_mixnodes_detailed(
         &self,
     ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_rewarded_mixnodes_detailed().await?)
+        Ok(self.nym_api.get_rewarded_mixnodes_detailed().await?)
     }
 
     pub async fn get_cached_active_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_mixnodes().await?)
+        Ok(self.nym_api.get_active_mixnodes().await?)
     }
 
     pub async fn get_cached_active_mixnodes_detailed(
         &self,
     ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_mixnodes_detailed().await?)
+        Ok(self.nym_api.get_active_mixnodes_detailed().await?)
     }
 
     pub async fn get_cached_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError> {
-        Ok(self.validator_api.get_gateways().await?)
+        Ok(self.nym_api.get_gateways().await?)
     }
 
     pub async fn blind_sign(
         &self,
         request_body: &BlindSignRequestBody,
     ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
-        Ok(self.validator_api.blind_sign(request_body).await?)
+        Ok(self.nym_api.blind_sign(request_body).await?)
     }
 }
 
 #[derive(Clone)]
 pub struct CoconutApiClient {
-    pub api_client: ApiClient,
+    pub api_client: NymApiClient,
     pub verification_key: VerificationKey,
     pub node_id: NodeIndex,
-    #[cfg(feature = "nymd-client")]
+    #[cfg(feature = "nyxd-client")]
     pub cosmos_address: cosmrs::AccountId,
 }
 
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 impl CoconutApiClient {
     pub async fn all_coconut_api_clients<C>(
-        nymd_client: &Client<C>,
+        nyxd_client: &Client<C>,
     ) -> Result<Vec<Self>, ValidatorClientError>
     where
         C: CosmWasmClient + Sync + Send,
     {
-        Ok(nymd_client
-            .get_all_nymd_verification_key_shares()
+        Ok(nyxd_client
+            .get_all_nyxd_verification_key_shares()
             .await?
             .into_iter()
             .filter_map(Self::try_from)
@@ -760,7 +812,7 @@ impl CoconutApiClient {
                 if let Ok(verification_key) = VerificationKey::try_from_bs58(&share.share) {
                     if let Ok(cosmos_address) = cosmrs::AccountId::from_str(share.owner.as_str()) {
                         return Some(CoconutApiClient {
-                            api_client: ApiClient::new(url_address),
+                            api_client: NymApiClient::new(url_address),
                             verification_key,
                             node_id: share.node_index,
                             cosmos_address,
@@ -774,43 +826,41 @@ impl CoconutApiClient {
 }
 
 #[derive(Clone)]
-pub struct ApiClient {
-    pub validator_api: validator_api::Client,
+pub struct NymApiClient {
+    pub nym_api_client: nym_api::Client,
     // TODO: perhaps if we really need it at some (currently I don't see any reasons for it)
     // we could re-implement the communication with the REST API on port 1317
 }
 
-impl ApiClient {
+impl NymApiClient {
     pub fn new(api_url: Url) -> Self {
-        let validator_api_client = validator_api::Client::new(api_url);
+        let nym_api_client = nym_api::Client::new(api_url);
 
-        ApiClient {
-            validator_api: validator_api_client,
-        }
+        NymApiClient { nym_api_client }
     }
 
-    pub fn change_validator_api(&mut self, new_endpoint: Url) {
-        self.validator_api.change_url(new_endpoint);
+    pub fn change_nym_api(&mut self, new_endpoint: Url) {
+        self.nym_api_client.change_url(new_endpoint);
     }
 
     pub async fn get_cached_active_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_active_mixnodes().await?)
+        Ok(self.nym_api_client.get_active_mixnodes().await?)
     }
 
     pub async fn get_cached_rewarded_mixnodes(
         &self,
     ) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_rewarded_mixnodes().await?)
+        Ok(self.nym_api_client.get_rewarded_mixnodes().await?)
     }
 
     pub async fn get_cached_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnodes().await?)
+        Ok(self.nym_api_client.get_mixnodes().await?)
     }
 
     pub async fn get_cached_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError> {
-        Ok(self.validator_api.get_gateways().await?)
+        Ok(self.nym_api_client.get_gateways().await?)
     }
 
     pub async fn get_gateway_core_status_count(
@@ -819,7 +869,7 @@ impl ApiClient {
         since: Option<i64>,
     ) -> Result<GatewayCoreStatusResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .get_gateway_core_status_count(identity, since)
             .await?)
     }
@@ -830,7 +880,7 @@ impl ApiClient {
         since: Option<i64>,
     ) -> Result<MixnodeCoreStatusResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .get_mixnode_core_status_count(mix_id, since)
             .await?)
     }
@@ -839,7 +889,7 @@ impl ApiClient {
         &self,
         mix_id: MixId,
     ) -> Result<MixnodeStatusResponse, ValidatorClientError> {
-        Ok(self.validator_api.get_mixnode_status(mix_id).await?)
+        Ok(self.nym_api_client.get_mixnode_status(mix_id).await?)
     }
 
     pub async fn get_mixnode_reward_estimation(
@@ -847,7 +897,7 @@ impl ApiClient {
         mix_id: MixId,
     ) -> Result<RewardEstimationResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .get_mixnode_reward_estimation(mix_id)
             .await?)
     }
@@ -857,7 +907,7 @@ impl ApiClient {
         mix_id: MixId,
     ) -> Result<StakeSaturationResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .get_mixnode_stake_saturation(mix_id)
             .await?)
     }
@@ -866,7 +916,7 @@ impl ApiClient {
         &self,
         request_body: &BlindSignRequestBody,
     ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
-        Ok(self.validator_api.blind_sign(request_body).await?)
+        Ok(self.nym_api_client.blind_sign(request_body).await?)
     }
 
     pub async fn partial_bandwidth_credential(
@@ -874,7 +924,7 @@ impl ApiClient {
         request_body: &str,
     ) -> Result<BlindedSignatureResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .partial_bandwidth_credential(request_body)
             .await?)
     }
@@ -884,7 +934,7 @@ impl ApiClient {
         request_body: &VerifyCredentialBody,
     ) -> Result<VerifyCredentialResponse, ValidatorClientError> {
         Ok(self
-            .validator_api
+            .nym_api_client
             .verify_bandwidth_credential(request_body)
             .await?)
     }
diff --git a/common/client-libs/validator-client/src/connection_tester.rs b/common/client-libs/validator-client/src/connection_tester.rs
index dc1acb8cd9..14f365639a 100644
--- a/common/client-libs/validator-client/src/connection_tester.rs
+++ b/common/client-libs/validator-client/src/connection_tester.rs
@@ -1,8 +1,8 @@
-use crate::nymd::error::NymdError;
-use crate::nymd::{Config as ClientConfig, NymdClient, QueryNymdClient};
-use crate::ApiClient;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Config as ClientConfig, NyxdClient, QueryNyxdClient};
+use crate::NymApiClient;
 
-use crate::nymd::traits::MixnetQueryClient;
+use crate::nyxd::traits::MixnetQueryClient;
 use colored::Colorize;
 use core::fmt;
 use itertools::Itertools;
@@ -16,9 +16,9 @@ use url::Url;
 const MAX_URLS_TESTED: usize = 200;
 const CONNECTION_TEST_TIMEOUT_SEC: u64 = 2;
 
-// Run connection tests for all specified nymd and api urls. These are all run concurrently.
+/// Run connection tests for all specified nyxd and api urls. These are all run concurrently.
 pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
-    nymd_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
+    nyxd_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
     api_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
     mixnet_contract_address: HashMap<NymNetworkDetails, cosmrs::AccountId, H>,
 ) -> (
@@ -27,7 +27,7 @@ pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
 ) {
     // Setup all the clients for the connection tests
     let connection_test_clients =
-        setup_connection_tests(nymd_urls, api_urls, mixnet_contract_address);
+        setup_connection_tests(nyxd_urls, api_urls, mixnet_contract_address);
 
     // Run all tests concurrently
     let connection_results = futures::future::join_all(
@@ -40,28 +40,28 @@ pub async fn run_validator_connection_test<H: BuildHasher + 'static>(
 
     // Seperate and collect results into HashMaps
     (
-        extract_and_collect_results_into_map(&connection_results, &UrlType::Nymd),
-        extract_and_collect_results_into_map(&connection_results, &UrlType::Api),
+        extract_and_collect_results_into_map(&connection_results, &UrlType::Nyxd),
+        extract_and_collect_results_into_map(&connection_results, &UrlType::NymApi),
     )
 }
 
 fn setup_connection_tests<H: BuildHasher + 'static>(
-    nymd_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
+    nyxd_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
     api_urls: impl Iterator<Item = (NymNetworkDetails, Url)>,
     mixnet_contract_address: HashMap<NymNetworkDetails, cosmrs::AccountId, H>,
 ) -> impl Iterator<Item = ClientForConnectionTest> {
-    let nymd_connection_test_clients = nymd_urls.filter_map(move |(network, url)| {
+    let nyxd_connection_test_clients = nyxd_urls.filter_map(move |(network, url)| {
         let address = mixnet_contract_address
             .get(&network)
             .expect("No configured contract address")
             .clone();
         let config = ClientConfig::try_from_nym_network_details(&network)
-            .expect("failed to create valid nymd client config");
+            .expect("failed to create valid nyxd client config");
 
-        if let Ok(mut client) = NymdClient::<QueryNymdClient>::connect(config, url.as_str()) {
+        if let Ok(mut client) = NyxdClient::<QueryNyxdClient>::connect(config, url.as_str()) {
             // possibly redundant, but lets just leave it here
             client.set_mixnet_contract_address(address);
-            Some(ClientForConnectionTest::Nymd(
+            Some(ClientForConnectionTest::Nyxd(
                 network,
                 url,
                 Box::new(client),
@@ -72,10 +72,10 @@ fn setup_connection_tests<H: BuildHasher + 'static>(
     });
 
     let api_connection_test_clients = api_urls.map(|(network, url)| {
-        ClientForConnectionTest::Api(network, url.clone(), ApiClient::new(url))
+        ClientForConnectionTest::Api(network, url.clone(), NymApiClient::new(url))
     });
 
-    nymd_connection_test_clients.chain(api_connection_test_clients)
+    nyxd_connection_test_clients.chain(api_connection_test_clients)
 }
 
 fn extract_and_collect_results_into_map(
@@ -92,10 +92,10 @@ fn extract_and_collect_results_into_map(
         .into_group_map()
 }
 
-async fn test_nymd_connection(
+async fn test_nyxd_connection(
     network: NymNetworkDetails,
     url: &Url,
-    client: &NymdClient<QueryNymdClient>,
+    client: &NyxdClient<QueryNyxdClient>,
 ) -> ConnectionResult {
     let result = match timeout(
         Duration::from_secs(CONNECTION_TEST_TIMEOUT_SEC),
@@ -103,48 +103,48 @@ async fn test_nymd_connection(
     )
     .await
     {
-        Ok(Err(NymdError::TendermintError(e))) => {
+        Ok(Err(NyxdError::TendermintError(e))) => {
             // If we get a tendermint-rpc error, we classify the node as not contactable
-            log::debug!("Checking: nymd_url: {url}: {}: {}", "failed".red(), e);
+            log::debug!("Checking: nyxd url: {url}: {}: {}", "failed".red(), e);
             false
         }
-        Ok(Err(NymdError::AbciError(code, log))) => {
+        Ok(Err(NyxdError::AbciError { code, log, .. })) => {
             // We accept the mixnet contract not found as ok from a connection standpoint. This happens
             // for example on a pre-launch network.
             log::debug!(
-                "Checking: nymd_url: {url}: {}, but with abci error: {code}: {log}",
+                "Checking: nyxd url: {url}: {}, but with abci error: {code}: {log}",
                 "success".green()
             );
             code == 18
         }
-        Ok(Err(error @ NymdError::NoContractAddressAvailable)) => {
-            log::debug!("Checking: nymd_url: {url}: {}: {error}", "failed".red());
+        Ok(Err(error @ NyxdError::NoContractAddressAvailable)) => {
+            log::debug!("Checking: nyxd url: {url}: {}: {error}", "failed".red());
             false
         }
         Ok(Err(e)) => {
             // For any other error, we're optimistic and just try anyway.
             log::debug!(
-                "Checking: nymd_url: {url}: {}, but with error: {e}",
+                "Checking: nyxd_url: {url}: {}, but with error: {e}",
                 "success".green()
             );
             true
         }
         Ok(Ok(_)) => {
-            log::debug!("Checking: nymd_url: {url}: {}", "success".green());
+            log::debug!("Checking: nyxd_url: {url}: {}", "success".green());
             true
         }
         Err(e) => {
-            log::debug!("Checking: nymd_url: {url}: {}: {e}", "failed".red());
+            log::debug!("Checking: nyxd_url: {url}: {}: {e}", "failed".red());
             false
         }
     };
-    ConnectionResult::Nymd(network, url.clone(), result)
+    ConnectionResult::Nyxd(network, url.clone(), result)
 }
 
-async fn test_api_connection(
+async fn test_nym_api_connection(
     network: NymNetworkDetails,
     url: &Url,
-    client: &ApiClient,
+    client: &NymApiClient,
 ) -> ConnectionResult {
     let result = match timeout(
         Duration::from_secs(CONNECTION_TEST_TIMEOUT_SEC),
@@ -169,18 +169,18 @@ async fn test_api_connection(
 }
 
 enum ClientForConnectionTest {
-    Nymd(NymNetworkDetails, Url, Box<NymdClient<QueryNymdClient>>),
-    Api(NymNetworkDetails, Url, ApiClient),
+    Nyxd(NymNetworkDetails, Url, Box<NyxdClient<QueryNyxdClient>>),
+    Api(NymNetworkDetails, Url, NymApiClient),
 }
 
 impl ClientForConnectionTest {
     async fn run_connection_check(self) -> ConnectionResult {
         match self {
-            ClientForConnectionTest::Nymd(network, ref url, ref client) => {
-                test_nymd_connection(network, url, client).await
+            ClientForConnectionTest::Nyxd(network, ref url, ref client) => {
+                test_nyxd_connection(network, url, client).await
             }
             ClientForConnectionTest::Api(network, ref url, ref client) => {
-                test_api_connection(network, url, client).await
+                test_nym_api_connection(network, url, client).await
             }
         }
     }
@@ -188,37 +188,37 @@ impl ClientForConnectionTest {
 
 #[derive(Debug, PartialEq, Eq)]
 enum UrlType {
-    Nymd,
-    Api,
+    Nyxd,
+    NymApi,
 }
 
 impl fmt::Display for UrlType {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            UrlType::Nymd => write!(f, "nymd"),
-            UrlType::Api => write!(f, "api"),
+            UrlType::Nyxd => write!(f, "nyxd"),
+            UrlType::NymApi => write!(f, "api"),
         }
     }
 }
 
 #[derive(Debug)]
 enum ConnectionResult {
-    Nymd(NymNetworkDetails, Url, bool),
+    Nyxd(NymNetworkDetails, Url, bool),
     Api(NymNetworkDetails, Url, bool),
 }
 
 impl ConnectionResult {
     fn result(&self) -> (&NymNetworkDetails, &Url, &bool) {
         match self {
-            ConnectionResult::Nymd(network, url, result)
+            ConnectionResult::Nyxd(network, url, result)
             | ConnectionResult::Api(network, url, result) => (network, url, result),
         }
     }
 
     fn url_type(&self) -> UrlType {
         match self {
-            ConnectionResult::Nymd(..) => UrlType::Nymd,
-            ConnectionResult::Api(..) => UrlType::Api,
+            ConnectionResult::Nyxd(..) => UrlType::Nyxd,
+            ConnectionResult::Api(..) => UrlType::NymApi,
         }
     }
 }
diff --git a/common/client-libs/validator-client/src/error.rs b/common/client-libs/validator-client/src/error.rs
index e832b12618..7b37ed6a14 100644
--- a/common/client-libs/validator-client/src/error.rs
+++ b/common/client-libs/validator-client/src/error.rs
@@ -1,23 +1,23 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::validator_api;
+use crate::nym_api;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum ValidatorClientError {
     #[error("There was an issue with the validator api request - {source}")]
-    ValidatorAPIError {
+    NymAPIError {
         #[from]
-        source: validator_api::error::ValidatorAPIError,
+        source: nym_api::error::NymAPIError,
     },
 
     #[error("One of the provided URLs was malformed - {0}")]
     MalformedUrlProvided(#[from] url::ParseError),
 
-    #[cfg(feature = "nymd-client")]
-    #[error("There was an issue with the Nymd client - {0}")]
-    NymdError(#[from] crate::nymd::error::NymdError),
+    #[cfg(feature = "nyxd-client")]
+    #[error("There was an issue with the Nyxd client - {0}")]
+    NyxdError(#[from] crate::nyxd::error::NyxdError),
 
     #[error("No validator API url has been provided")]
     NoAPIUrlAvailable,
diff --git a/common/client-libs/validator-client/src/lib.rs b/common/client-libs/validator-client/src/lib.rs
index 2a5e010338..1c1c3a344c 100644
--- a/common/client-libs/validator-client/src/lib.rs
+++ b/common/client-libs/validator-client/src/lib.rs
@@ -2,17 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod client;
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 pub mod connection_tester;
 mod error;
-#[cfg(feature = "nymd-client")]
-pub mod nymd;
-pub mod validator_api;
+pub mod nym_api;
+#[cfg(feature = "nyxd-client")]
+pub mod nyxd;
 
-#[cfg(feature = "nymd-client")]
-pub use crate::client::{ApiClient, CoconutApiClient};
+#[cfg(feature = "nyxd-client")]
+pub use crate::client::{CoconutApiClient, NymApiClient};
 pub use crate::error::ValidatorClientError;
-pub use validator_api_requests::*;
+pub use nym_api_requests::*;
 
-#[cfg(feature = "nymd-client")]
+#[cfg(feature = "nyxd-client")]
 pub use client::{Client, Config};
diff --git a/common/client-libs/validator-client/src/validator_api/error.rs b/common/client-libs/validator-client/src/nym_api/error.rs
similarity index 60%
rename from common/client-libs/validator-client/src/validator_api/error.rs
rename to common/client-libs/validator-client/src/nym_api/error.rs
index 9d7cd1d50d..1c3f7b11a4 100644
--- a/common/client-libs/validator-client/src/validator_api/error.rs
+++ b/common/client-libs/validator-client/src/nym_api/error.rs
@@ -1,8 +1,8 @@
+use nym_api_requests::models::RequestError;
 use thiserror::Error;
-use validator_api_requests::models::RequestError;
 
 #[derive(Error, Debug)]
-pub enum ValidatorAPIError {
+pub enum NymAPIError {
     #[error("There was an issue with the REST request - {source}")]
     ReqwestClientError {
         #[from]
@@ -12,6 +12,6 @@ pub enum ValidatorAPIError {
     #[error("Request failed with error message - {0}")]
     GenericRequestFailure(String),
 
-    #[error("The validator API has failed to resolve our request. It returned status code {status} and additional error message: {}", error.message())]
+    #[error("The nym API has failed to resolve our request. It returned status code {status} and additional error message: {}", error.message())]
     ApiRequestFailure { status: u16, error: RequestError },
 }
diff --git a/common/client-libs/validator-client/src/validator_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs
similarity index 77%
rename from common/client-libs/validator-client/src/validator_api/mod.rs
rename to common/client-libs/validator-client/src/nym_api/mod.rs
index 4a7b7af3cd..e1d65959c6 100644
--- a/common/client-libs/validator-client/src/validator_api/mod.rs
+++ b/common/client-libs/validator-client/src/nym_api/mod.rs
@@ -1,22 +1,23 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::validator_api::error::ValidatorAPIError;
-use crate::validator_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
+use crate::nym_api::error::NymAPIError;
+use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
 use mixnet_contract_common::mixnode::MixNodeDetails;
 use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
+use nym_api_requests::coconut::{
+    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
+};
+use nym_api_requests::models::{
+    ComputeRewardEstParam, GatewayCoreStatusResponse, GatewayStatusReportResponse,
+    GatewayUptimeHistoryResponse, InclusionProbabilityResponse, MixNodeBondAnnotated,
+    MixnodeCoreStatusResponse, MixnodeStatusReportResponse, MixnodeStatusResponse,
+    MixnodeUptimeHistoryResponse, RequestError, RewardEstimationResponse, StakeSaturationResponse,
+    UptimeResponse,
+};
 use reqwest::Response;
 use serde::{Deserialize, Serialize};
 use url::Url;
-use validator_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
-};
-use validator_api_requests::models::{
-    GatewayCoreStatusResponse, GatewayStatusReportResponse, GatewayUptimeHistoryResponse,
-    InclusionProbabilityResponse, MixNodeBondAnnotated, MixnodeCoreStatusResponse,
-    MixnodeStatusReportResponse, MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RequestError,
-    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
-};
 
 pub mod error;
 pub mod routes;
@@ -53,7 +54,7 @@ impl Client {
         &self,
         path: PathSegments<'_>,
         params: Params<'_, K, V>,
-    ) -> Result<Response, ValidatorAPIError>
+    ) -> Result<Response, NymAPIError>
     where
         K: AsRef<str>,
         V: AsRef<str>,
@@ -62,11 +63,11 @@ impl Client {
         Ok(self.reqwest_client.get(url).send().await?)
     }
 
-    async fn query_validator_api<T, K, V>(
+    async fn query_nym_api<T, K, V>(
         &self,
         path: PathSegments<'_>,
         params: Params<'_, K, V>,
-    ) -> Result<T, ValidatorAPIError>
+    ) -> Result<T, NymAPIError>
     where
         for<'a> T: Deserialize<'a>,
         K: AsRef<str>,
@@ -76,16 +77,16 @@ impl Client {
         if res.status().is_success() {
             Ok(res.json().await?)
         } else {
-            Err(ValidatorAPIError::GenericRequestFailure(res.text().await?))
+            Err(NymAPIError::GenericRequestFailure(res.text().await?))
         }
     }
 
     // This works for endpoints returning Result<Json<T>, ErrorResponse>
-    async fn query_validator_api_fallible<T, K, V>(
+    async fn query_nym_api_fallible<T, K, V>(
         &self,
         path: PathSegments<'_>,
         params: Params<'_, K, V>,
-    ) -> Result<T, ValidatorAPIError>
+    ) -> Result<T, NymAPIError>
     where
         for<'a> T: Deserialize<'a>,
         K: AsRef<str>,
@@ -97,19 +98,19 @@ impl Client {
             Ok(res.json().await?)
         } else {
             let request_error: RequestError = res.json().await?;
-            Err(ValidatorAPIError::ApiRequestFailure {
+            Err(NymAPIError::ApiRequestFailure {
                 status: status.as_u16(),
                 error: request_error,
             })
         }
     }
 
-    async fn post_validator_api<B, T, K, V>(
+    async fn post_nym_api<B, T, K, V>(
         &self,
         path: PathSegments<'_>,
         params: Params<'_, K, V>,
         json_body: &B,
-    ) -> Result<T, ValidatorAPIError>
+    ) -> Result<T, NymAPIError>
     where
         B: Serialize + ?Sized,
         for<'a> T: Deserialize<'a>,
@@ -121,34 +122,35 @@ impl Client {
         if response.status().is_success() {
             Ok(response.json().await?)
         } else {
-            Err(ValidatorAPIError::GenericRequestFailure(
-                response.text().await?,
-            ))
+            Err(NymAPIError::GenericRequestFailure(response.text().await?))
         }
     }
 
-    pub async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorAPIError> {
-        self.query_validator_api(&[routes::API_VERSION, routes::MIXNODES], NO_PARAMS)
+    pub async fn get_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(&[routes::API_VERSION, routes::MIXNODES], NO_PARAMS)
             .await
     }
 
-    pub async fn get_mixnodes_detailed(
-        &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
-            &[routes::API_VERSION, routes::MIXNODES, routes::DETAILED],
+    pub async fn get_mixnodes_detailed(&self) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
+            &[
+                routes::API_VERSION,
+                routes::STATUS,
+                routes::MIXNODES,
+                routes::DETAILED,
+            ],
             NO_PARAMS,
         )
         .await
     }
 
-    pub async fn get_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorAPIError> {
-        self.query_validator_api(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
+    pub async fn get_gateways(&self) -> Result<Vec<GatewayBond>, NymAPIError> {
+        self.query_nym_api(&[routes::API_VERSION, routes::GATEWAYS], NO_PARAMS)
             .await
     }
 
-    pub async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorAPIError> {
-        self.query_validator_api(
+    pub async fn get_active_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(
             &[routes::API_VERSION, routes::MIXNODES, routes::ACTIVE],
             NO_PARAMS,
         )
@@ -157,10 +159,11 @@ impl Client {
 
     pub async fn get_active_mixnodes_detailed(
         &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
+                routes::STATUS,
                 routes::MIXNODES,
                 routes::ACTIVE,
                 routes::DETAILED,
@@ -170,8 +173,8 @@ impl Client {
         .await
     }
 
-    pub async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeDetails>, ValidatorAPIError> {
-        self.query_validator_api(
+    pub async fn get_rewarded_mixnodes(&self) -> Result<Vec<MixNodeDetails>, NymAPIError> {
+        self.query_nym_api(
             &[routes::API_VERSION, routes::MIXNODES, routes::REWARDED],
             NO_PARAMS,
         )
@@ -181,8 +184,8 @@ impl Client {
     pub async fn get_mixnode_report(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeStatusReportResponse, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<MixnodeStatusReportResponse, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
                 routes::STATUS,
@@ -198,8 +201,8 @@ impl Client {
     pub async fn get_gateway_report(
         &self,
         identity: IdentityKeyRef<'_>,
-    ) -> Result<GatewayStatusReportResponse, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<GatewayStatusReportResponse, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
                 routes::STATUS,
@@ -215,8 +218,8 @@ impl Client {
     pub async fn get_mixnode_history(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeUptimeHistoryResponse, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<MixnodeUptimeHistoryResponse, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
                 routes::STATUS,
@@ -232,8 +235,8 @@ impl Client {
     pub async fn get_gateway_history(
         &self,
         identity: IdentityKeyRef<'_>,
-    ) -> Result<GatewayUptimeHistoryResponse, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<GatewayUptimeHistoryResponse, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
                 routes::STATUS,
@@ -248,10 +251,11 @@ impl Client {
 
     pub async fn get_rewarded_mixnodes_detailed(
         &self,
-    ) -> Result<Vec<MixNodeBondAnnotated>, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<Vec<MixNodeBondAnnotated>, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
+                routes::STATUS,
                 routes::MIXNODES,
                 routes::REWARDED,
                 routes::DETAILED,
@@ -265,9 +269,9 @@ impl Client {
         &self,
         identity: IdentityKeyRef<'_>,
         since: Option<i64>,
-    ) -> Result<GatewayCoreStatusResponse, ValidatorAPIError> {
+    ) -> Result<GatewayCoreStatusResponse, NymAPIError> {
         if let Some(since) = since {
-            self.query_validator_api(
+            self.query_nym_api(
                 &[
                     routes::API_VERSION,
                     routes::STATUS_ROUTES,
@@ -279,7 +283,7 @@ impl Client {
             )
             .await
         } else {
-            self.query_validator_api(
+            self.query_nym_api(
                 &[
                     routes::API_VERSION,
                     routes::STATUS_ROUTES,
@@ -296,9 +300,9 @@ impl Client {
         &self,
         mix_id: MixId,
         since: Option<i64>,
-    ) -> Result<MixnodeCoreStatusResponse, ValidatorAPIError> {
+    ) -> Result<MixnodeCoreStatusResponse, NymAPIError> {
         if let Some(since) = since {
-            self.query_validator_api(
+            self.query_nym_api(
                 &[
                     routes::API_VERSION,
                     routes::STATUS_ROUTES,
@@ -310,7 +314,7 @@ impl Client {
             )
             .await
         } else {
-            self.query_validator_api(
+            self.query_nym_api(
                 &[
                     routes::API_VERSION,
                     routes::STATUS_ROUTES,
@@ -327,8 +331,8 @@ impl Client {
     pub async fn get_mixnode_status(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeStatusResponse, ValidatorAPIError> {
-        self.query_validator_api(
+    ) -> Result<MixnodeStatusResponse, NymAPIError> {
+        self.query_nym_api(
             &[
                 routes::API_VERSION,
                 routes::STATUS_ROUTES,
@@ -344,8 +348,8 @@ impl Client {
     pub async fn get_mixnode_reward_estimation(
         &self,
         mix_id: MixId,
-    ) -> Result<RewardEstimationResponse, ValidatorAPIError> {
-        self.query_validator_api_fallible(
+    ) -> Result<RewardEstimationResponse, NymAPIError> {
+        self.query_nym_api_fallible(
             &[
                 routes::API_VERSION,
                 routes::STATUS_ROUTES,
@@ -358,11 +362,30 @@ impl Client {
         .await
     }
 
+    pub async fn compute_mixnode_reward_estimation(
+        &self,
+        mix_id: MixId,
+        request_body: &ComputeRewardEstParam,
+    ) -> Result<RewardEstimationResponse, NymAPIError> {
+        self.post_nym_api(
+            &[
+                routes::API_VERSION,
+                routes::STATUS_ROUTES,
+                routes::MIXNODE,
+                &mix_id.to_string(),
+                routes::COMPUTE_REWARD_ESTIMATION,
+            ],
+            NO_PARAMS,
+            request_body,
+        )
+        .await
+    }
+
     pub async fn get_mixnode_stake_saturation(
         &self,
         mix_id: MixId,
-    ) -> Result<StakeSaturationResponse, ValidatorAPIError> {
-        self.query_validator_api_fallible(
+    ) -> Result<StakeSaturationResponse, NymAPIError> {
+        self.query_nym_api_fallible(
             &[
                 routes::API_VERSION,
                 routes::STATUS_ROUTES,
@@ -378,8 +401,8 @@ impl Client {
     pub async fn get_mixnode_inclusion_probability(
         &self,
         mix_id: MixId,
-    ) -> Result<InclusionProbabilityResponse, ValidatorAPIError> {
-        self.query_validator_api_fallible(
+    ) -> Result<InclusionProbabilityResponse, NymAPIError> {
+        self.query_nym_api_fallible(
             &[
                 routes::API_VERSION,
                 routes::STATUS_ROUTES,
@@ -395,8 +418,8 @@ impl Client {
     pub async fn get_mixnode_avg_uptime(
         &self,
         mix_id: MixId,
-    ) -> Result<UptimeResponse, ValidatorAPIError> {
-        self.query_validator_api_fallible(
+    ) -> Result<UptimeResponse, NymAPIError> {
+        self.query_nym_api_fallible(
             &[
                 routes::API_VERSION,
                 routes::STATUS_ROUTES,
@@ -412,8 +435,8 @@ impl Client {
     pub async fn blind_sign(
         &self,
         request_body: &BlindSignRequestBody,
-    ) -> Result<BlindedSignatureResponse, ValidatorAPIError> {
-        self.post_validator_api(
+    ) -> Result<BlindedSignatureResponse, NymAPIError> {
+        self.post_nym_api(
             &[
                 routes::API_VERSION,
                 routes::COCONUT_ROUTES,
@@ -429,8 +452,8 @@ impl Client {
     pub async fn partial_bandwidth_credential(
         &self,
         request_body: &str,
-    ) -> Result<BlindedSignatureResponse, ValidatorAPIError> {
-        self.post_validator_api(
+    ) -> Result<BlindedSignatureResponse, NymAPIError> {
+        self.post_nym_api(
             &[
                 routes::API_VERSION,
                 routes::COCONUT_ROUTES,
@@ -446,8 +469,8 @@ impl Client {
     pub async fn verify_bandwidth_credential(
         &self,
         request_body: &VerifyCredentialBody,
-    ) -> Result<VerifyCredentialResponse, ValidatorAPIError> {
-        self.post_validator_api(
+    ) -> Result<VerifyCredentialResponse, NymAPIError> {
+        self.post_nym_api(
             &[
                 routes::API_VERSION,
                 routes::COCONUT_ROUTES,
diff --git a/common/client-libs/validator-client/src/validator_api/routes.rs b/common/client-libs/validator-client/src/nym_api/routes.rs
similarity index 87%
rename from common/client-libs/validator-client/src/validator_api/routes.rs
rename to common/client-libs/validator-client/src/nym_api/routes.rs
index 66a822b4fd..cd8a16047a 100644
--- a/common/client-libs/validator-client/src/validator_api/routes.rs
+++ b/common/client-libs/validator-client/src/nym_api/routes.rs
@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use network_defaults::VALIDATOR_API_VERSION;
+use network_defaults::NYM_API_VERSION;
 
-pub const API_VERSION: &str = VALIDATOR_API_VERSION;
+pub const API_VERSION: &str = NYM_API_VERSION;
 pub const MIXNODES: &str = "mixnodes";
 pub const GATEWAYS: &str = "gateways";
 
@@ -28,6 +28,7 @@ pub const STATUS: &str = "status";
 pub const REPORT: &str = "report";
 pub const HISTORY: &str = "history";
 pub const REWARD_ESTIMATION: &str = "reward-estimation";
+pub const COMPUTE_REWARD_ESTIMATION: &str = "compute-reward-estimation";
 pub const AVG_UPTIME: &str = "avg_uptime";
 pub const STAKE_SATURATION: &str = "stake-saturation";
 pub const INCLUSION_CHANCE: &str = "inclusion-probability";
diff --git a/common/client-libs/validator-client/src/nymd/coin.rs b/common/client-libs/validator-client/src/nyxd/coin.rs
similarity index 100%
rename from common/client-libs/validator-client/src/nymd/coin.rs
rename to common/client-libs/validator-client/src/nyxd/coin.rs
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/client.rs
similarity index 88%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/client.rs
index 8da9d3192c..9be833c68b 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/client.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/client.rs
@@ -1,13 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::coin::Coin;
-use crate::nymd::cosmwasm_client::helpers::{create_pagination, next_page_key};
-use crate::nymd::cosmwasm_client::types::{
+use crate::nyxd;
+use crate::nyxd::coin::Coin;
+use crate::nyxd::cosmwasm_client::helpers::{create_pagination, next_page_key};
+use crate::nyxd::cosmwasm_client::types::{
     Account, Code, CodeDetails, Contract, ContractCodeHistoryEntry, ContractCodeId,
     SequenceResponse, SimulateResponse,
 };
-use crate::nymd::error::NymdError;
+use crate::nyxd::error::NyxdError;
 use async_trait::async_trait;
 use cosmrs::proto::cosmos::auth::v1beta1::{QueryAccountRequest, QueryAccountResponse};
 use cosmrs::proto::cosmos::bank::v1beta1::{
@@ -23,7 +24,6 @@ use cosmrs::rpc::endpoint::broadcast;
 use cosmrs::rpc::endpoint::tx::Response as TxResponse;
 use cosmrs::rpc::query::Query;
 use cosmrs::rpc::{self, HttpClient, Order};
-use cosmrs::tendermint::abci::Code as AbciCode;
 use cosmrs::tendermint::abci::Transaction;
 use cosmrs::tendermint::{abci, block, chain};
 use cosmrs::{tx, AccountId, Coin as CosmosCoin, Tx};
@@ -57,7 +57,7 @@ pub trait CosmWasmClient: rpc::Client {
         &self,
         path: Option<abci::Path>,
         req: Req,
-    ) -> Result<Res, NymdError>
+    ) -> Result<Res, NyxdError>
     where
         Req: Message,
         Res: Message + Default,
@@ -66,25 +66,21 @@ pub trait CosmWasmClient: rpc::Client {
         req.encode(&mut buf)?;
 
         let res = self.abci_query(path, buf, None, false).await?;
+        let res_success = nyxd::error::parse_abci_query_result(res)?;
 
-        match res.code {
-            AbciCode::Err(code) => return Err(NymdError::AbciError(code, res.log)),
-            AbciCode::Ok => (),
-        }
-
-        Ok(Res::decode(res.value.as_ref())?)
+        Ok(Res::decode(res_success.value.as_ref())?)
     }
 
-    async fn get_chain_id(&self) -> Result<chain::Id, NymdError> {
+    async fn get_chain_id(&self) -> Result<chain::Id, NyxdError> {
         Ok(self.status().await?.node_info.network)
     }
 
-    async fn get_height(&self) -> Result<block::Height, NymdError> {
+    async fn get_height(&self) -> Result<block::Height, NyxdError> {
         Ok(self.status().await?.sync_info.latest_block_height)
     }
 
     // TODO: the return type should probably be changed to a non-proto, type-safe Account alternative
-    async fn get_account(&self, address: &AccountId) -> Result<Option<Account>, NymdError> {
+    async fn get_account(&self, address: &AccountId) -> Result<Option<Account>, NyxdError> {
         let path = Some("/cosmos.auth.v1beta1.Query/Account".parse().unwrap());
 
         let req = QueryAccountRequest {
@@ -98,11 +94,11 @@ pub trait CosmWasmClient: rpc::Client {
         res.account.map(TryFrom::try_from).transpose()
     }
 
-    async fn get_sequence(&self, address: &AccountId) -> Result<SequenceResponse, NymdError> {
+    async fn get_sequence(&self, address: &AccountId) -> Result<SequenceResponse, NyxdError> {
         let account = self
             .get_account(address)
             .await?
-            .ok_or_else(|| NymdError::NonExistentAccountError(address.clone()))?;
+            .ok_or_else(|| NyxdError::NonExistentAccountError(address.clone()))?;
         let base_account = account.try_get_base_account()?;
 
         Ok(SequenceResponse {
@@ -111,7 +107,7 @@ pub trait CosmWasmClient: rpc::Client {
         })
     }
 
-    async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NymdError> {
+    async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NyxdError> {
         match height {
             Some(height) => self.block(height).await.map_err(|err| err.into()),
             None => self.latest_block().await.map_err(|err| err.into()),
@@ -122,7 +118,7 @@ pub trait CosmWasmClient: rpc::Client {
         &self,
         address: &AccountId,
         search_denom: String,
-    ) -> Result<Option<Coin>, NymdError> {
+    ) -> Result<Option<Coin>, NyxdError> {
         let path = Some("/cosmos.bank.v1beta1.Query/Balance".parse().unwrap());
 
         let req = QueryBalanceRequest {
@@ -137,10 +133,10 @@ pub trait CosmWasmClient: rpc::Client {
         res.balance
             .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
             .transpose()
-            .map_err(|_| NymdError::SerializationError("Coin".to_owned()))
+            .map_err(|_| NyxdError::SerializationError("Coin".to_owned()))
     }
 
-    async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NymdError> {
+    async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NyxdError> {
         let path = Some("/cosmos.bank.v1beta1.Query/AllBalances".parse().unwrap());
 
         let mut raw_balances = Vec::new();
@@ -168,10 +164,10 @@ pub trait CosmWasmClient: rpc::Client {
             .into_iter()
             .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
             .collect::<Result<_, _>>()
-            .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
+            .map_err(|_| NyxdError::SerializationError("Coins".to_owned()))
     }
 
-    async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError> {
+    async fn get_total_supply(&self) -> Result<Vec<Coin>, NyxdError> {
         let path = Some("/cosmos.bank.v1beta1.Query/TotalSupply".parse().unwrap());
 
         let mut supply = Vec::new();
@@ -196,14 +192,14 @@ pub trait CosmWasmClient: rpc::Client {
             .into_iter()
             .map(|proto| CosmosCoin::try_from(proto).map(Into::into))
             .collect::<Result<_, _>>()
-            .map_err(|_| NymdError::SerializationError("Coins".to_owned()))
+            .map_err(|_| NyxdError::SerializationError("Coins".to_owned()))
     }
 
-    async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NymdError> {
+    async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NyxdError> {
         Ok(self.tx(id, false).await?)
     }
 
-    async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NymdError> {
+    async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NyxdError> {
         // according to https://docs.tendermint.com/master/rpc/#/Info/tx_search
         // the maximum entries per page is 100 and the default is 30
         // so let's attempt to use the maximum
@@ -238,7 +234,7 @@ pub trait CosmWasmClient: rpc::Client {
     async fn broadcast_tx_async(
         &self,
         tx: Transaction,
-    ) -> Result<broadcast::tx_async::Response, NymdError> {
+    ) -> Result<broadcast::tx_async::Response, NyxdError> {
         Ok(rpc::Client::broadcast_tx_async(self, tx).await?)
     }
 
@@ -246,7 +242,7 @@ pub trait CosmWasmClient: rpc::Client {
     async fn broadcast_tx_sync(
         &self,
         tx: Transaction,
-    ) -> Result<broadcast::tx_sync::Response, NymdError> {
+    ) -> Result<broadcast::tx_sync::Response, NyxdError> {
         Ok(rpc::Client::broadcast_tx_sync(self, tx).await?)
     }
 
@@ -254,16 +250,16 @@ pub trait CosmWasmClient: rpc::Client {
     async fn broadcast_tx_commit(
         &self,
         tx: Transaction,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<broadcast::tx_commit::Response, NyxdError> {
         Ok(rpc::Client::broadcast_tx_commit(self, tx).await?)
     }
 
-    async fn broadcast_tx(&self, tx: Transaction) -> Result<TxResponse, NymdError> {
+    async fn broadcast_tx(&self, tx: Transaction) -> Result<TxResponse, NyxdError> {
         let broadcasted = CosmWasmClient::broadcast_tx_sync(self, tx).await?;
 
         if broadcasted.code.is_err() {
             let code_val = broadcasted.code.value();
-            return Err(NymdError::BroadcastTxErrorDeliverTx {
+            return Err(NyxdError::BroadcastTxErrorDeliverTx {
                 hash: broadcasted.hash,
                 height: None,
                 code: code_val,
@@ -280,7 +276,7 @@ pub trait CosmWasmClient: rpc::Client {
                 broadcasted.hash
             );
             if tokio::time::Instant::now().duration_since(start) >= self.broadcast_timeout() {
-                return Err(NymdError::BroadcastTimeout {
+                return Err(NyxdError::BroadcastTimeout {
                     hash: tx_hash,
                     timeout: self.broadcast_timeout(),
                 });
@@ -294,7 +290,7 @@ pub trait CosmWasmClient: rpc::Client {
         }
     }
 
-    async fn get_codes(&self) -> Result<Vec<Code>, NymdError> {
+    async fn get_codes(&self) -> Result<Vec<Code>, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/Codes".parse().unwrap());
 
         let mut raw_codes = Vec::new();
@@ -321,7 +317,7 @@ pub trait CosmWasmClient: rpc::Client {
             .collect::<Result<_, _>>()
     }
 
-    async fn get_code_details(&self, code_id: ContractCodeId) -> Result<CodeDetails, NymdError> {
+    async fn get_code_details(&self, code_id: ContractCodeId) -> Result<CodeDetails, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/Code".parse().unwrap());
 
         let req = QueryCodeRequest { code_id };
@@ -333,10 +329,10 @@ pub trait CosmWasmClient: rpc::Client {
         if let Some(code_info) = res.code_info {
             Ok(CodeDetails::new(code_info.try_into()?, res.data))
         } else {
-            Err(NymdError::NoCodeInformation(code_id))
+            Err(NyxdError::NoCodeInformation(code_id))
         }
     }
-    async fn get_contracts(&self, code_id: ContractCodeId) -> Result<Vec<AccountId>, NymdError> {
+    async fn get_contracts(&self, code_id: ContractCodeId) -> Result<Vec<AccountId>, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/ContractsByCode".parse().unwrap());
 
         let mut raw_contracts = Vec::new();
@@ -364,10 +360,10 @@ pub trait CosmWasmClient: rpc::Client {
             .iter()
             .map(|raw| raw.parse())
             .collect::<Result<_, _>>()
-            .map_err(|_| NymdError::DeserializationError("Contract addresses".to_owned()))
+            .map_err(|_| NyxdError::DeserializationError("Contract addresses".to_owned()))
     }
 
-    async fn get_contract(&self, address: &AccountId) -> Result<Contract, NymdError> {
+    async fn get_contract(&self, address: &AccountId) -> Result<Contract, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/ContractInfo".parse().unwrap());
 
         let req = QueryContractInfoRequest {
@@ -382,17 +378,17 @@ pub trait CosmWasmClient: rpc::Client {
         if let Some(contract_info) = res.contract_info {
             let address = response_address
                 .parse()
-                .map_err(|_| NymdError::MalformedAccountAddress(response_address))?;
+                .map_err(|_| NyxdError::MalformedAccountAddress(response_address))?;
             Ok(Contract::new(address, contract_info.try_into()?))
         } else {
-            Err(NymdError::NoContractInformation(address.clone()))
+            Err(NyxdError::NoContractInformation(address.clone()))
         }
     }
 
     async fn get_contract_code_history(
         &self,
         address: &AccountId,
-    ) -> Result<Vec<ContractCodeHistoryEntry>, NymdError> {
+    ) -> Result<Vec<ContractCodeHistoryEntry>, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/ContractHistory".parse().unwrap());
 
         let mut raw_entries = Vec::new();
@@ -426,7 +422,7 @@ pub trait CosmWasmClient: rpc::Client {
         &self,
         address: &AccountId,
         query_data: Vec<u8>,
-    ) -> Result<Vec<u8>, NymdError> {
+    ) -> Result<Vec<u8>, NyxdError> {
         let path = Some("/cosmwasm.wasm.v1.Query/RawContractState".parse().unwrap());
 
         let req = QueryRawContractStateRequest {
@@ -445,7 +441,7 @@ pub trait CosmWasmClient: rpc::Client {
         &self,
         address: &AccountId,
         query_msg: &M,
-    ) -> Result<T, NymdError>
+    ) -> Result<T, NyxdError>
     where
         M: ?Sized + Serialize + Sync,
         for<'a> T: Deserialize<'a>,
@@ -482,7 +478,7 @@ pub trait CosmWasmClient: rpc::Client {
         &self,
         tx: Option<Tx>,
         tx_bytes: Vec<u8>,
-    ) -> Result<SimulateResponse, NymdError> {
+    ) -> Result<SimulateResponse, NyxdError> {
         let path = Some("/cosmos.tx.v1beta1.Service/Simulate".parse().unwrap());
 
         let req = SimulateRequest {
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/helpers.rs
similarity index 78%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/helpers.rs
index ce1e93dcdb..0dd7f98ead 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/helpers.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/helpers.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
+use crate::nyxd::error::NyxdError;
 use cosmrs::proto::cosmos::base::query::v1beta1::{PageRequest, PageResponse};
 use cosmrs::proto::cosmos::base::v1beta1::Coin as ProtoCoin;
 use cosmrs::rpc::endpoint::broadcast;
@@ -11,13 +11,13 @@ use flate2::Compression;
 use std::io::Write;
 
 pub(crate) trait CheckResponse: Sized {
-    fn check_response(self) -> Result<Self, NymdError>;
+    fn check_response(self) -> Result<Self, NyxdError>;
 }
 
 impl CheckResponse for broadcast::tx_commit::Response {
-    fn check_response(self) -> Result<Self, NymdError> {
+    fn check_response(self) -> Result<Self, NyxdError> {
         if self.check_tx.code.is_err() {
-            return Err(NymdError::BroadcastTxErrorCheckTx {
+            return Err(NyxdError::BroadcastTxErrorCheckTx {
                 hash: self.hash,
                 height: Some(self.height),
                 code: self.check_tx.code.value(),
@@ -26,7 +26,7 @@ impl CheckResponse for broadcast::tx_commit::Response {
         }
 
         if self.deliver_tx.code.is_err() {
-            return Err(NymdError::BroadcastTxErrorDeliverTx {
+            return Err(NyxdError::BroadcastTxErrorDeliverTx {
                 hash: self.hash,
                 height: Some(self.height),
                 code: self.deliver_tx.code.value(),
@@ -38,10 +38,10 @@ impl CheckResponse for broadcast::tx_commit::Response {
     }
 }
 
-impl CheckResponse for crate::nymd::TxResponse {
-    fn check_response(self) -> Result<Self, NymdError> {
+impl CheckResponse for crate::nyxd::TxResponse {
+    fn check_response(self) -> Result<Self, NyxdError> {
         if self.tx_result.code.is_err() {
-            return Err(NymdError::BroadcastTxErrorDeliverTx {
+            return Err(NyxdError::BroadcastTxErrorDeliverTx {
                 hash: self.hash,
                 height: Some(self.height),
                 code: self.tx_result.code.value(),
@@ -53,13 +53,13 @@ impl CheckResponse for crate::nymd::TxResponse {
     }
 }
 
-pub(crate) fn compress_wasm_code(code: &[u8]) -> Result<Vec<u8>, NymdError> {
+pub(crate) fn compress_wasm_code(code: &[u8]) -> Result<Vec<u8>, NyxdError> {
     // using compression level 9, same as cosmjs, that optimises for size
     let mut encoder = GzEncoder::new(Vec::new(), Compression::best());
     encoder
         .write_all(code)
-        .map_err(NymdError::WasmCompressionError)?;
-    encoder.finish().map_err(NymdError::WasmCompressionError)
+        .map_err(NyxdError::WasmCompressionError)?;
+    encoder.finish().map_err(NyxdError::WasmCompressionError)
 }
 
 pub(crate) fn create_pagination(key: Vec<u8>) -> PageRequest {
@@ -84,11 +84,11 @@ pub(crate) fn next_page_key(pagination_info: Option<PageResponse>) -> Option<Vec
     None
 }
 
-pub(crate) fn parse_proto_coin_vec(value: Vec<ProtoCoin>) -> Result<Vec<Coin>, NymdError> {
+pub(crate) fn parse_proto_coin_vec(value: Vec<ProtoCoin>) -> Result<Vec<Coin>, NyxdError> {
     value
         .into_iter()
         .map(|proto_coin| {
-            Coin::try_from(&proto_coin).map_err(|_| NymdError::MalformedCoin {
+            Coin::try_from(&proto_coin).map_err(|_| NyxdError::MalformedCoin {
                 coin_representation: format!("{:?}", proto_coin),
             })
         })
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/logs.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs
similarity index 93%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/logs.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs
index 6c68c306f6..fd196cf6e7 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/logs.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
+use crate::nyxd::error::NyxdError;
 use cosmrs::tendermint::abci;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
@@ -15,12 +15,12 @@ pub use coconut_dkg_common::event_attributes::*;
 pub struct Log {
     #[serde(default)]
     // weird thing is that the first msg_index seems to always be undefined on the raw logs
-    msg_index: usize,
+    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,
-    events: Vec<cosmwasm_std::Event>,
+    pub events: Vec<cosmwasm_std::Event>,
 }
 
 /// Searches in logs for the first event of the given event type and in that event
@@ -39,17 +39,17 @@ pub fn find_attribute<'a>(
 }
 
 // those two functions were separated so that the internal logic could actually be tested
-fn parse_raw_str_logs(raw: &str) -> Result<Vec<Log>, NymdError> {
-    let logs: Vec<Log> = serde_json::from_str(raw).map_err(|_| NymdError::MalformedLogString)?;
+fn parse_raw_str_logs(raw: &str) -> Result<Vec<Log>, NyxdError> {
+    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
         // the fact the first entry does not seem to have `msg_index` defined on it.
-        return Err(NymdError::MalformedLogString);
+        return Err(NyxdError::MalformedLogString);
     }
     Ok(logs)
 }
 
-pub fn parse_raw_logs(raw: abci::Log) -> Result<Vec<Log>, NymdError> {
+pub fn parse_raw_logs(raw: abci::Log) -> Result<Vec<Log>, NyxdError> {
     parse_raw_str_logs(raw.as_ref())
 }
 
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/mod.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
similarity index 77%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/mod.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
index 2af7b52704..ef8bcdc5d7 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/mod.rs
@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
-use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::GasPrice;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::wallet::DirectSecp256k1HdWallet;
+use crate::nyxd::GasPrice;
 use cosmrs::rpc::{Error as TendermintRpcError, HttpClient, HttpClientUrl};
 use std::convert::TryInto;
 
@@ -13,7 +13,7 @@ pub mod logs;
 pub mod signing_client;
 pub mod types;
 
-pub fn connect<U>(endpoint: U) -> Result<HttpClient, NymdError>
+pub fn connect<U>(endpoint: U) -> Result<HttpClient, NyxdError>
 where
     U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
 {
@@ -25,7 +25,7 @@ pub fn connect_with_signer<U: Clone>(
     endpoint: U,
     signer: DirectSecp256k1HdWallet,
     gas_price: GasPrice,
-) -> Result<signing_client::Client, NymdError>
+) -> Result<signing_client::Client, NyxdError>
 where
     U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
 {
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/signing_client.rs
similarity index 89%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/signing_client.rs
index b1646f663e..6fbe2cec44 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/signing_client.rs
@@ -1,14 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
-use crate::nymd::cosmwasm_client::logs::{self, parse_raw_logs};
-use crate::nymd::cosmwasm_client::types::*;
-use crate::nymd::error::NymdError;
-use crate::nymd::fee::{Fee, DEFAULT_SIMULATED_GAS_MULTIPLIER};
-use crate::nymd::wallet::DirectSecp256k1HdWallet;
-use crate::nymd::{Coin, GasAdjustable, GasPrice, TxResponse};
+use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
+use crate::nyxd::cosmwasm_client::helpers::{compress_wasm_code, CheckResponse};
+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};
+use crate::nyxd::wallet::DirectSecp256k1HdWallet;
+use crate::nyxd::{Coin, GasAdjustable, GasPrice, TxResponse};
 use async_trait::async_trait;
 use cosmrs::bank::MsgSend;
 use cosmrs::distribution::MsgWithdrawDelegatorReward;
@@ -74,7 +74,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         signer_address: &AccountId,
         messages: Vec<Any>,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<SimulateResponse, NymdError> {
+    ) -> Result<SimulateResponse, NyxdError> {
         let public_key = self.signer_public_key(signer_address);
         let sequence_response = self.get_sequence(signer_address).await?;
 
@@ -102,7 +102,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         wasm_code: Vec<u8>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<UploadResult, NymdError> {
+    ) -> Result<UploadResult, NyxdError> {
         let compressed = compress_wasm_code(&wasm_code)?;
         let compressed_size = compressed.len();
         let compressed_checksum = Sha256::digest(&compressed).to_vec();
@@ -115,7 +115,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             instantiate_permission: Default::default(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgStoreCode".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgStoreCode".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![upload_msg], fee, memo)
@@ -161,7 +161,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
         mut options: Option<InstantiateOptions>,
-    ) -> Result<InstantiateResult, NymdError>
+    ) -> Result<InstantiateResult, NyxdError>
     where
         M: ?Sized + Serialize + Sync,
     {
@@ -176,7 +176,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             funds: options.map(|options| options.funds).unwrap_or_default(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgInstantiateContract".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgInstantiateContract".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![init_msg], fee, memo)
@@ -211,14 +211,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         new_admin: &AccountId,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<ChangeAdminResult, NymdError> {
+    ) -> Result<ChangeAdminResult, NyxdError> {
         let change_admin_msg = cosmwasm::MsgUpdateAdmin {
             sender: sender_address.clone(),
             new_admin: new_admin.clone(),
             contract: contract_address.clone(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgUpdateAdmin".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgUpdateAdmin".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![change_admin_msg], fee, memo)
@@ -240,13 +240,13 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         contract_address: &AccountId,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<ChangeAdminResult, NymdError> {
+    ) -> Result<ChangeAdminResult, NyxdError> {
         let change_admin_msg = cosmwasm::MsgClearAdmin {
             sender: sender_address.clone(),
             contract: contract_address.clone(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgClearAdmin".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgClearAdmin".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![change_admin_msg], fee, memo)
@@ -270,7 +270,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         fee: Fee,
         msg: &M,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<MigrateResult, NymdError>
+    ) -> Result<MigrateResult, NyxdError>
     where
         M: ?Sized + Serialize + Sync,
     {
@@ -281,7 +281,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             msg: serde_json::to_vec(msg)?,
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgMigrateContract".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgMigrateContract".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![migrate_msg], fee, memo)
@@ -305,7 +305,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError>
+    ) -> Result<ExecuteResult, NyxdError>
     where
         M: ?Sized + Serialize + Sync,
     {
@@ -316,7 +316,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             funds: funds.into_iter().map(Into::into).collect(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgExecuteContract".to_owned()))?;
 
         let tx_res = self
             .sign_and_broadcast(sender_address, vec![execute_msg], fee, memo)
@@ -340,7 +340,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         msgs: I,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<ExecuteResult, NymdError>
+    ) -> Result<ExecuteResult, NyxdError>
     where
         I: IntoIterator<Item = (M, Vec<Coin>)> + Send,
         M: Serialize,
@@ -355,7 +355,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                     funds: funds.into_iter().map(Into::into).collect(),
                 }
                 .to_any()
-                .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
+                .map_err(|_| NyxdError::SerializationError("MsgExecuteContract".to_owned()))
             })
             .collect::<Result<_, _>>()?;
 
@@ -381,14 +381,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Vec<Coin>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let send_msg = MsgSend {
             from_address: sender_address.clone(),
             to_address: recipient_address.clone(),
             amount: amount.into_iter().map(Into::into).collect(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgSend".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgSend".to_owned()))?;
 
         self.sign_and_broadcast(sender_address, vec![send_msg], fee, memo)
             .await?
@@ -401,7 +401,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         msgs: I,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError>
+    ) -> Result<TxResponse, NyxdError>
     where
         I: IntoIterator<Item = (AccountId, Vec<Coin>)> + Send,
     {
@@ -414,7 +414,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                     amount: amount.into_iter().map(Into::into).collect(),
                 }
                 .to_any()
-                .map_err(|_| NymdError::SerializationError("MsgExecuteContract".to_owned()))
+                .map_err(|_| NyxdError::SerializationError("MsgExecuteContract".to_owned()))
             })
             .collect::<Result<_, _>>()?;
 
@@ -433,20 +433,20 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         allowed_messages: Vec<String>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let basic_allowance = BasicAllowance {
             spend_limit: spend_limit.into_iter().map(Into::into).collect(),
             expiration,
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("BasicAllowance".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("BasicAllowance".to_owned()))?;
 
         let allowed_msg_allowance = AllowedMsgAllowance {
             allowance: Some(basic_allowance),
             allowed_messages,
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("AllowedMsgAllowance".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("AllowedMsgAllowance".to_owned()))?;
 
         let grant_allowance_msg = MsgGrantAllowance {
             granter: granter.to_owned(),
@@ -454,7 +454,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             allowance: Some(allowed_msg_allowance),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgGrantAllowance".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgGrantAllowance".to_owned()))?;
 
         self.sign_and_broadcast(granter, vec![grant_allowance_msg], fee, memo)
             .await?
@@ -467,13 +467,13 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         grantee: &AccountId,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let revoke_allowance_msg = MsgRevokeAllowance {
             granter: granter.to_owned(),
             grantee: grantee.to_owned(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgRevokeAllowance".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgRevokeAllowance".to_owned()))?;
 
         self.sign_and_broadcast(granter, vec![revoke_allowance_msg], fee, memo)
             .await?
@@ -487,14 +487,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Coin,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let delegate_msg = MsgDelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
             amount: amount.into(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgDelegate".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgDelegate".to_owned()))?;
 
         self.sign_and_broadcast(delegator_address, vec![delegate_msg], fee, memo)
             .await?
@@ -508,14 +508,14 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         amount: Coin,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let undelegate_msg = MsgUndelegate {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
             amount: amount.into(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgUndelegate".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgUndelegate".to_owned()))?;
 
         self.sign_and_broadcast(delegator_address, vec![undelegate_msg], fee, memo)
             .await?
@@ -528,13 +528,13 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         validator_address: &AccountId,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let withdraw_msg = MsgWithdrawDelegatorReward {
             delegator_address: delegator_address.to_owned(),
             validator_address: validator_address.to_owned(),
         }
         .to_any()
-        .map_err(|_| NymdError::SerializationError("MsgWithdrawDelegatorReward".to_owned()))?;
+        .map_err(|_| NyxdError::SerializationError("MsgWithdrawDelegatorReward".to_owned()))?;
 
         self.sign_and_broadcast(delegator_address, vec![withdraw_msg], fee, memo)
             .await?
@@ -549,7 +549,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: &[Any],
         fee: Fee,
         memo: &String,
-    ) -> Result<tx::Fee, NymdError> {
+    ) -> Result<tx::Fee, NyxdError> {
         let auto_fee = |multiplier: Option<f32>| async move {
             debug!("Trying to simulate gas costs...");
             // from what I've seen in manual testing, gas estimation does not exist if transaction
@@ -558,7 +558,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
                 .simulate(signer_address, messages.to_vec(), memo.clone())
                 .await?
                 .gas_info
-                .ok_or(NymdError::GasEstimationFailure)?
+                .ok_or(NyxdError::GasEstimationFailure)?
                 .gas_used;
 
             let multiplier = multiplier.unwrap_or(DEFAULT_SIMULATED_GAS_MULTIPLIER);
@@ -569,7 +569,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             debug!("Final gas limit used: {}", gas);
 
             let fee = self.gas_price() * gas;
-            Ok::<tx::Fee, NymdError>(tx::Fee::from_amount_and_gas(fee, gas))
+            Ok::<tx::Fee, NyxdError>(tx::Fee::from_amount_and_gas(fee, gas))
         };
         let fee = match fee {
             Fee::Manual(fee) => fee,
@@ -592,7 +592,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: Vec<Any>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_async::Response, NymdError> {
+    ) -> Result<broadcast::tx_async::Response, NyxdError> {
         let memo = memo.into();
         let fee = self
             .determine_transaction_fee(signer_address, &messages, fee, &memo)
@@ -600,7 +600,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let tx_raw = self.sign(signer_address, messages, fee, memo).await?;
         let tx_bytes = tx_raw
             .to_bytes()
-            .map_err(|_| NymdError::SerializationError("Tx".to_owned()))?;
+            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;
 
         CosmWasmClient::broadcast_tx_async(self, tx_bytes.into()).await
     }
@@ -612,7 +612,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: Vec<Any>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_sync::Response, NymdError> {
+    ) -> Result<broadcast::tx_sync::Response, NyxdError> {
         let memo = memo.into();
         let fee = self
             .determine_transaction_fee(signer_address, &messages, fee, &memo)
@@ -620,7 +620,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let tx_raw = self.sign(signer_address, messages, fee, memo).await?;
         let tx_bytes = tx_raw
             .to_bytes()
-            .map_err(|_| NymdError::SerializationError("Tx".to_owned()))?;
+            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;
 
         CosmWasmClient::broadcast_tx_sync(self, tx_bytes.into()).await
     }
@@ -632,7 +632,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: Vec<Any>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<broadcast::tx_commit::Response, NymdError> {
+    ) -> Result<broadcast::tx_commit::Response, NyxdError> {
         let memo = memo.into();
         let fee = self
             .determine_transaction_fee(signer_address, &messages, fee, &memo)
@@ -641,7 +641,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let tx_raw = self.sign(signer_address, messages, fee, memo).await?;
         let tx_bytes = tx_raw
             .to_bytes()
-            .map_err(|_| NymdError::SerializationError("Tx".to_owned()))?;
+            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;
 
         CosmWasmClient::broadcast_tx_commit(self, tx_bytes.into()).await
     }
@@ -653,7 +653,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: Vec<Any>,
         fee: Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<TxResponse, NymdError> {
+    ) -> Result<TxResponse, NyxdError> {
         let memo = memo.into();
         let fee = self
             .determine_transaction_fee(signer_address, &messages, fee, &memo)
@@ -662,7 +662,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         let tx_raw = self.sign(signer_address, messages, fee, memo).await?;
         let tx_bytes = tx_raw
             .to_bytes()
-            .map_err(|_| NymdError::SerializationError("Tx".to_owned()))?;
+            .map_err(|_| NyxdError::SerializationError("Tx".to_owned()))?;
 
         self.broadcast_tx(tx_bytes.into()).await
     }
@@ -674,12 +674,12 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         fee: tx::Fee,
         memo: impl Into<String> + Send + 'static,
         signer_data: SignerData,
-    ) -> Result<tx::Raw, NymdError> {
+    ) -> Result<tx::Raw, NyxdError> {
         let signer_accounts = self.signer().try_derive_accounts()?;
         let account_from_signer = signer_accounts
             .iter()
             .find(|account| &account.address == signer_address)
-            .ok_or_else(|| NymdError::SigningAccountNotFound(signer_address.clone()))?;
+            .ok_or_else(|| NyxdError::SigningAccountNotFound(signer_address.clone()))?;
 
         // TODO: WTF HOW IS TIMEOUT_HEIGHT SUPPOSED TO GET DETERMINED?
         // IT DOESNT EXIST IN COSMJS!!
@@ -691,7 +691,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             SignerInfo::single_direct(Some(account_from_signer.public_key), signer_data.sequence);
         let auth_info = signer_info.auth_info(fee);
 
-        // ideally I'd prefer to have the entire error put into the NymdError::SigningFailure
+        // ideally I'd prefer to have the entire error put into the NyxdError::SigningFailure
         // but I'm super hesitant to trying to downcast the eyre::Report to cosmrs::error::Error
         let sign_doc = SignDoc::new(
             &tx_body,
@@ -699,7 +699,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
             &signer_data.chain_id,
             signer_data.account_number,
         )
-        .map_err(|_| NymdError::SigningFailure)?;
+        .map_err(|_| NyxdError::SigningFailure)?;
 
         self.signer()
             .sign_direct_with_account(account_from_signer, sign_doc)
@@ -711,7 +711,7 @@ pub trait SigningCosmWasmClient: CosmWasmClient {
         messages: Vec<Any>,
         fee: tx::Fee,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<tx::Raw, NymdError> {
+    ) -> Result<tx::Raw, NyxdError> {
         // TODO: Future optimisation: rather than grabbing current account_number and sequence
         // on every sign request -> just keep them cached on the struct and increment as required
         let sequence_response = self.get_sequence(signer_address).await?;
@@ -742,7 +742,7 @@ impl Client {
         endpoint: U,
         signer: DirectSecp256k1HdWallet,
         gas_price: GasPrice,
-    ) -> Result<Self, NymdError>
+    ) -> Result<Self, NyxdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
diff --git a/common/client-libs/validator-client/src/nymd/cosmwasm_client/types.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs
similarity index 92%
rename from common/client-libs/validator-client/src/nymd/cosmwasm_client/types.rs
rename to common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs
index b680a1a8f4..96260c3bd8 100644
--- a/common/client-libs/validator-client/src/nymd/cosmwasm_client/types.rs
+++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/types.rs
@@ -3,9 +3,9 @@
 
 // TODO: There's a significant argument to pull those out of the package and make a PR on https://github.com/cosmos/cosmos-rust/
 
-use crate::nymd::cosmwasm_client::helpers::parse_proto_coin_vec;
-use crate::nymd::cosmwasm_client::logs::Log;
-use crate::nymd::error::NymdError;
+use crate::nyxd::cosmwasm_client::helpers::parse_proto_coin_vec;
+use crate::nyxd::cosmwasm_client::logs::Log;
+use crate::nyxd::error::NyxdError;
 use cosmrs::crypto::PublicKey;
 use cosmrs::proto::cosmos::auth::v1beta1::{
     BaseAccount as ProtoBaseAccount, ModuleAccount as ProtoModuleAccount,
@@ -57,19 +57,19 @@ pub struct BaseAccount {
 }
 
 impl TryFrom<ProtoBaseAccount> for BaseAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoBaseAccount) -> Result<Self, Self::Error> {
         let address: AccountId = value
             .address
             .parse()
-            .map_err(|_| NymdError::MalformedAccountAddress(value.address.clone()))?;
+            .map_err(|_| NyxdError::MalformedAccountAddress(value.address.clone()))?;
 
         let pubkey = value
             .pub_key
             .map(PublicKey::try_from)
             .transpose()
-            .map_err(|_| NymdError::InvalidPublicKey(address.clone()))?;
+            .map_err(|_| NyxdError::InvalidPublicKey(address.clone()))?;
 
         Ok(BaseAccount {
             address,
@@ -89,7 +89,7 @@ pub struct ModuleAccount {
 }
 
 impl TryFrom<ProtoModuleAccount> for ModuleAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoModuleAccount) -> Result<Self, Self::Error> {
         let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
@@ -114,7 +114,7 @@ pub struct BaseVestingAccount {
 }
 
 impl TryFrom<ProtoBaseVestingAccount> for BaseVestingAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoBaseVestingAccount) -> Result<Self, Self::Error> {
         let base_account = value.base_account.map(TryFrom::try_from).transpose()?;
@@ -142,7 +142,7 @@ pub struct ContinuousVestingAccount {
 }
 
 impl TryFrom<ProtoContinuousVestingAccount> for ContinuousVestingAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoContinuousVestingAccount) -> Result<Self, Self::Error> {
         let base_vesting_account = value
@@ -166,7 +166,7 @@ pub struct DelayedVestingAccount {
 }
 
 impl TryFrom<ProtoDelayedVestingAccount> for DelayedVestingAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoDelayedVestingAccount) -> Result<Self, Self::Error> {
         let base_vesting_account = value
@@ -188,7 +188,7 @@ pub struct Period {
 }
 
 impl TryFrom<ProtoPeriod> for Period {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoPeriod) -> Result<Self, Self::Error> {
         Ok(Period {
@@ -208,7 +208,7 @@ pub struct PeriodicVestingAccount {
 }
 
 impl TryFrom<ProtoPeriodicVestingAccount> for PeriodicVestingAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoPeriodicVestingAccount) -> Result<Self, Self::Error> {
         let base_vesting_account = value
@@ -239,7 +239,7 @@ pub struct PermanentLockedAccount {
 }
 
 impl TryFrom<ProtoPermanentLockedAccount> for PermanentLockedAccount {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoPermanentLockedAccount) -> Result<Self, Self::Error> {
         let base_vesting_account = value
@@ -265,43 +265,43 @@ pub enum Account {
 }
 
 impl Account {
-    pub fn try_get_base_account(&self) -> Result<&BaseAccount, NymdError> {
+    pub fn try_get_base_account(&self) -> Result<&BaseAccount, NyxdError> {
         match self {
             Account::Base(acc) => Ok(acc),
             Account::Module(acc) => acc
                 .base_account
                 .as_ref()
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
             Account::BaseVesting(acc) => acc
                 .base_account
                 .as_ref()
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
             Account::ContinuousVesting(acc) => acc
                 .base_vesting_account
                 .as_ref()
                 .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
             Account::DelayedVesting(acc) => acc
                 .base_vesting_account
                 .as_ref()
                 .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
             Account::PeriodicVesting(acc) => acc
                 .base_vesting_account
                 .as_ref()
                 .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
             Account::PermanentLockedVesting(acc) => acc
                 .base_vesting_account
                 .as_ref()
                 .and_then(|vesting_acc| vesting_acc.base_account.as_ref())
-                .ok_or(NymdError::NoBaseAccountInformationAvailable),
+                .ok_or(NyxdError::NoBaseAccountInformationAvailable),
         }
     }
 }
 
 impl TryFrom<Any> for Account {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(raw_account: Any) -> Result<Self, Self::Error> {
         match raw_account.type_url.as_ref() {
@@ -328,7 +328,7 @@ impl TryFrom<Any> for Account {
                     ProtoPermanentLockedAccount::decode(raw_account.value.as_ref())?.try_into()?,
                 ))
             }
-            _ => Err(NymdError::UnsupportedAccountType {
+            _ => Err(NyxdError::UnsupportedAccountType {
                 type_url: raw_account.type_url,
             }),
         }
@@ -347,7 +347,7 @@ pub struct Code {
 }
 
 impl TryFrom<CodeInfoResponse> for Code {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: CodeInfoResponse) -> Result<Self, Self::Error> {
         let CodeInfoResponse {
@@ -358,7 +358,7 @@ impl TryFrom<CodeInfoResponse> for Code {
 
         let creator = creator
             .parse()
-            .map_err(|_| NymdError::MalformedAccountAddress(creator))?;
+            .map_err(|_| NyxdError::MalformedAccountAddress(creator))?;
 
         Ok(Code {
             code_id,
@@ -391,7 +391,7 @@ pub(crate) struct ContractInfo {
 }
 
 impl TryFrom<ProtoContractInfo> for ContractInfo {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoContractInfo) -> Result<Self, Self::Error> {
         let ProtoContractInfo {
@@ -408,7 +408,7 @@ impl TryFrom<ProtoContractInfo> for ContractInfo {
             Some(
                 admin
                     .parse()
-                    .map_err(|_| NymdError::MalformedAccountAddress(admin))?,
+                    .map_err(|_| NyxdError::MalformedAccountAddress(admin))?,
             )
         };
 
@@ -416,7 +416,7 @@ impl TryFrom<ProtoContractInfo> for ContractInfo {
             code_id,
             creator: creator
                 .parse()
-                .map_err(|_| NymdError::MalformedAccountAddress(creator))?,
+                .map_err(|_| NyxdError::MalformedAccountAddress(creator))?,
             admin,
             label,
         })
@@ -466,14 +466,14 @@ pub struct ContractCodeHistoryEntry {
 }
 
 impl TryFrom<ProtoContractCodeHistoryEntry> for ContractCodeHistoryEntry {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoContractCodeHistoryEntry) -> Result<Self, Self::Error> {
         let operation = match ContractCodeHistoryOperationType::from_i32(value.operation)
-            .ok_or(NymdError::InvalidContractHistoryOperation)?
+            .ok_or(NyxdError::InvalidContractHistoryOperation)?
         {
             ContractCodeHistoryOperationType::Unspecified => {
-                return Err(NymdError::InvalidContractHistoryOperation)
+                return Err(NyxdError::InvalidContractHistoryOperation)
             }
             ContractCodeHistoryOperationType::Init => ContractCodeHistoryEntryOperation::Init,
             ContractCodeHistoryOperationType::Genesis => ContractCodeHistoryEntryOperation::Genesis,
@@ -484,7 +484,7 @@ impl TryFrom<ProtoContractCodeHistoryEntry> for ContractCodeHistoryEntry {
             operation,
             code_id: value.code_id,
             msg_json: String::from_utf8(value.msg)
-                .map_err(|_| NymdError::DeserializationError("Contract history msg".to_owned()))?,
+                .map_err(|_| NyxdError::DeserializationError("Contract history msg".to_owned()))?,
         })
     }
 }
@@ -532,7 +532,7 @@ pub struct AbciResult {
 }
 
 impl TryFrom<ProtoAbciResult> for AbciResult {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoAbciResult) -> Result<Self, Self::Error> {
         let mut events = Vec::with_capacity(value.events.len());
@@ -543,9 +543,9 @@ impl TryFrom<ProtoAbciResult> for AbciResult {
             let mut attributes = Vec::with_capacity(proto_event.attributes.len());
             for proto_attribute in proto_event.attributes.into_iter() {
                 let stringified_ked = String::from_utf8(proto_attribute.key)
-                    .map_err(|_| NymdError::DeserializationError("EventAttributeKey".to_owned()))?;
+                    .map_err(|_| NyxdError::DeserializationError("EventAttributeKey".to_owned()))?;
                 let stringified_value = String::from_utf8(proto_attribute.value)
-                    .map_err(|_| NymdError::DeserializationError("EventAttributeKey".to_owned()))?;
+                    .map_err(|_| NyxdError::DeserializationError("EventAttributeKey".to_owned()))?;
 
                 attributes.push(abci::tag::Tag {
                     key: stringified_ked.parse().unwrap(),
@@ -574,7 +574,7 @@ pub struct SimulateResponse {
 }
 
 impl TryFrom<ProtoSimulateResponse> for SimulateResponse {
-    type Error = NymdError;
+    type Error = NyxdError;
 
     fn try_from(value: ProtoSimulateResponse) -> Result<Self, Self::Error> {
         Ok(SimulateResponse {
diff --git a/common/client-libs/validator-client/src/nymd/error.rs b/common/client-libs/validator-client/src/nyxd/error.rs
similarity index 78%
rename from common/client-libs/validator-client/src/nymd/error.rs
rename to common/client-libs/validator-client/src/nyxd/error.rs
index 0b6dcfe22b..846cfd13c4 100644
--- a/common/client-libs/validator-client/src/nymd/error.rs
+++ b/common/client-libs/validator-client/src/nyxd/error.rs
@@ -1,20 +1,27 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::types::ContractCodeId;
-use cosmrs::tendermint::{abci, block};
-use cosmrs::{bip32, tx, AccountId};
-use std::io;
-use std::time::Duration;
+use crate::nyxd::cosmwasm_client::types::ContractCodeId;
+use cosmrs::{
+    bip32,
+    rpc::endpoint::abci_query::AbciQuery,
+    tendermint::{
+        abci::{self, Code as AbciCode},
+        block,
+    },
+    tx, AccountId,
+};
 use thiserror::Error;
 
-pub use cosmrs::rpc::error::{
-    Error as TendermintRpcError, ErrorDetail as TendermintRpcErrorDetail,
+use std::{io, time::Duration};
+
+pub use cosmrs::rpc::{
+    error::{Error as TendermintRpcError, ErrorDetail as TendermintRpcErrorDetail},
+    response_error::{Code, ResponseError},
 };
-pub use cosmrs::rpc::response_error::{Code, ResponseError};
 
 #[derive(Debug, Error)]
-pub enum NymdError {
+pub enum NyxdError {
     #[error("No contract address is available to perform the call")]
     NoContractAddressAvailable,
 
@@ -110,8 +117,12 @@ pub enum NymdError {
     #[error("Failed to estimate gas price for the transaction")]
     GasEstimationFailure,
 
-    #[error("Abci query failed with code {0} - {1}")]
-    AbciError(u32, abci::Log),
+    #[error("Abci query failed with code {code} - {log}")]
+    AbciError {
+        code: u32,
+        log: abci::Log,
+        pretty_log: Option<String>,
+    },
 
     #[error("Unsupported account type: {type_url}")]
     UnsupportedAccountType { type_url: String },
@@ -135,10 +146,36 @@ pub enum NymdError {
     UnexpectedBech32Prefix { got: String, expected: String },
 }
 
-impl NymdError {
+// The purpose of parsing the abci query result is that we want to generate the `pretty_log` if
+// possible.
+pub fn parse_abci_query_result(query_result: AbciQuery) -> Result<AbciQuery, NyxdError> {
+    match query_result.code {
+        AbciCode::Ok => Ok(query_result),
+        AbciCode::Err(code) => Err(NyxdError::AbciError {
+            code,
+            log: query_result.log.clone(),
+            pretty_log: try_parse_abci_log(&query_result.log),
+        }),
+    }
+}
+
+// Some of the error strings returned by the query are a bit too technical to present to the
+// enduser. So we special case some commonly encountered errors.
+fn try_parse_abci_log(log: &abci::Log) -> Option<String> {
+    if log
+        .value()
+        .contains("Maximum amount of locked coins has already been pledged")
+    {
+        Some("Maximum amount of locked tokens has alredy been used. You can only use up to 10% of your locked tokens for bonding and delegating.".to_string())
+    } else {
+        None
+    }
+}
+
+impl NyxdError {
     pub fn is_tendermint_response_timeout(&self) -> bool {
         match &self {
-            NymdError::TendermintError(TendermintRpcError(
+            NyxdError::TendermintError(TendermintRpcError(
                 TendermintRpcErrorDetail::Response(err),
                 _,
             )) => {
@@ -165,7 +202,7 @@ impl NymdError {
 
     pub fn is_tendermint_response_duplicate(&self) -> bool {
         match &self {
-            NymdError::TendermintError(TendermintRpcError(
+            NyxdError::TendermintError(TendermintRpcError(
                 TendermintRpcErrorDetail::Response(err),
                 _,
             )) => {
diff --git a/common/client-libs/validator-client/src/nymd/fee/gas_price.rs b/common/client-libs/validator-client/src/nyxd/fee/gas_price.rs
similarity index 96%
rename from common/client-libs/validator-client/src/nymd/fee/gas_price.rs
rename to common/client-libs/validator-client/src/nyxd/fee/gas_price.rs
index c79015ff22..13cffc92fc 100644
--- a/common/client-libs/validator-client/src/nymd/fee/gas_price.rs
+++ b/common/client-libs/validator-client/src/nyxd/fee/gas_price.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
+use crate::nyxd::error::NyxdError;
 use config::defaults;
 use cosmrs::tx::Gas;
 use cosmrs::Coin;
@@ -55,7 +55,7 @@ impl<'a> Mul<Gas> for &'a GasPrice {
 }
 
 impl FromStr for GasPrice {
-    type Err = NymdError;
+    type Err = NyxdError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let possible_amount = s
@@ -65,7 +65,7 @@ impl FromStr for GasPrice {
         let amount_len = possible_amount.len();
         let amount = possible_amount
             .parse()
-            .map_err(|_| NymdError::MalformedGasPrice)?;
+            .map_err(|_| NyxdError::MalformedGasPrice)?;
         let possible_denom = s.chars().skip(amount_len).collect::<String>();
         let denom = possible_denom.trim().to_string();
 
@@ -74,7 +74,7 @@ impl FromStr for GasPrice {
 }
 
 impl GasPrice {
-    pub fn new_with_default_price(denom: &str) -> Result<Self, NymdError> {
+    pub fn new_with_default_price(denom: &str) -> Result<Self, NyxdError> {
         format!("{}{}", defaults::GAS_PRICE_AMOUNT, denom).parse()
     }
 }
diff --git a/common/client-libs/validator-client/src/nymd/fee/mod.rs b/common/client-libs/validator-client/src/nyxd/fee/mod.rs
similarity index 99%
rename from common/client-libs/validator-client/src/nymd/fee/mod.rs
rename to common/client-libs/validator-client/src/nyxd/fee/mod.rs
index 411cac2365..b887c08128 100644
--- a/common/client-libs/validator-client/src/nymd/fee/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/fee/mod.rs
@@ -1,8 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::Coin;
-use crate::nymd::Gas;
+use crate::nyxd::Coin;
+use crate::nyxd::Gas;
 use cosmrs::{tx, AccountId};
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
diff --git a/common/client-libs/validator-client/src/nymd/mod.rs b/common/client-libs/validator-client/src/nyxd/mod.rs
similarity index 89%
rename from common/client-libs/validator-client/src/nymd/mod.rs
rename to common/client-libs/validator-client/src/nyxd/mod.rs
index 49d237ddd2..abdbc61a03 100644
--- a/common/client-libs/validator-client/src/nymd/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/mod.rs
@@ -1,14 +1,14 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::signing_client;
-use crate::nymd::cosmwasm_client::types::{
+use crate::nyxd::cosmwasm_client::signing_client;
+use crate::nyxd::cosmwasm_client::types::{
     Account, ChangeAdminResult, ContractCodeId, ExecuteResult, InstantiateOptions,
     InstantiateResult, MigrateResult, SequenceResponse, SimulateResponse, UploadResult,
 };
-use crate::nymd::error::NymdError;
-use crate::nymd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER;
-use crate::nymd::wallet::DirectSecp256k1HdWallet;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::fee::DEFAULT_SIMULATED_GAS_MULTIPLIER;
+use crate::nyxd::wallet::DirectSecp256k1HdWallet;
 use cosmrs::cosmwasm;
 use cosmrs::rpc::endpoint::block::Response as BlockResponse;
 use cosmrs::rpc::query::Query;
@@ -23,14 +23,14 @@ use std::convert::TryInto;
 use std::time::SystemTime;
 use vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
 
-pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-pub use crate::nymd::fee::Fee;
+pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
+pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
+pub use crate::nyxd::fee::Fee;
 pub use coin::Coin;
 pub use cosmrs::bank::MsgSend;
 pub use cosmrs::rpc::endpoint::tx::Response as TxResponse;
 pub use cosmrs::rpc::endpoint::validators::Response as ValidatorResponse;
-pub use cosmrs::rpc::HttpClient as QueryNymdClient;
+pub use cosmrs::rpc::HttpClient as QueryNyxdClient;
 pub use cosmrs::rpc::Paging;
 pub use cosmrs::tendermint::abci::responses::{DeliverTx, Event};
 pub use cosmrs::tendermint::abci::tag::Tag;
@@ -44,7 +44,7 @@ pub use cosmrs::{bip32, AccountId, Decimal, Denom};
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};
 use mixnet_contract_common::MixId;
-pub use signing_client::Client as SigningNymdClient;
+pub use signing_client::Client as SigningNyxdClient;
 pub use traits::{VestingQueryClient, VestingSigningClient};
 use vesting_contract_common::PledgeCap;
 
@@ -75,7 +75,7 @@ impl Config {
     fn parse_optional_account(
         raw: Option<&String>,
         expected_prefix: &str,
-    ) -> Result<Option<AccountId>, NymdError> {
+    ) -> Result<Option<AccountId>, NyxdError> {
         if let Some(address) = raw {
             debug!("Raw address:{:?}", raw);
             debug!("Expected prefix:{:?}", expected_prefix);
@@ -84,7 +84,7 @@ impl Config {
                 .map_err(|_| NymdError::MalformedAccountAddress(address.clone()))?;
             debug!("Parsed prefix:{:?}", parsed);
             if parsed.prefix() != expected_prefix {
-                Err(NymdError::UnexpectedBech32Prefix {
+                Err(NyxdError::UnexpectedBech32Prefix {
                     got: parsed.prefix().into(),
                     expected: expected_prefix.into(),
                 })
@@ -96,7 +96,7 @@ impl Config {
         }
     }
 
-    pub fn try_from_nym_network_details(details: &NymNetworkDetails) -> Result<Self, NymdError> {
+    pub fn try_from_nym_network_details(details: &NymNetworkDetails) -> Result<Self, NyxdError> {
         let prefix = &details.chain_details.bech32_account_prefix;
         Ok(Config {
             chain_details: details.chain_details.clone(),
@@ -132,20 +132,20 @@ impl Config {
 }
 
 #[derive(Debug)]
-pub struct NymdClient<C> {
+pub struct NyxdClient<C> {
     client: C,
     config: Config,
     client_address: Option<Vec<AccountId>>,
     simulated_gas_multiplier: f32,
 }
 
-impl NymdClient<QueryNymdClient> {
-    pub fn connect<U>(config: Config, endpoint: U) -> Result<NymdClient<QueryNymdClient>, NymdError>
+impl NyxdClient<QueryNyxdClient> {
+    pub fn connect<U>(config: Config, endpoint: U) -> Result<NyxdClient<QueryNyxdClient>, NyxdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
-        Ok(NymdClient {
-            client: QueryNymdClient::new(endpoint)?,
+        Ok(NyxdClient {
+            client: QueryNyxdClient::new(endpoint)?,
             config,
             client_address: None,
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
@@ -153,7 +153,7 @@ impl NymdClient<QueryNymdClient> {
     }
 }
 
-impl NymdClient<SigningNymdClient> {
+impl NyxdClient<SigningNyxdClient> {
     // maybe the wallet could be made into a generic, but for now, let's just have this one implementation
     pub fn connect_with_signer<U: Clone>(
         config: Config,
@@ -161,7 +161,7 @@ impl NymdClient<SigningNymdClient> {
         endpoint: U,
         signer: DirectSecp256k1HdWallet,
         gas_price: Option<GasPrice>,
-    ) -> Result<NymdClient<SigningNymdClient>, NymdError>
+    ) -> Result<NyxdClient<SigningNyxdClient>, NyxdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
@@ -173,8 +173,8 @@ impl NymdClient<SigningNymdClient> {
             .collect();
         let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(&denom)?);
 
-        Ok(NymdClient {
-            client: SigningNymdClient::connect_with_signer(endpoint, signer, gas_price)?,
+        Ok(NyxdClient {
+            client: SigningNyxdClient::connect_with_signer(endpoint, signer, gas_price)?,
             config,
             client_address: Some(client_address),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
@@ -186,7 +186,7 @@ impl NymdClient<SigningNymdClient> {
         endpoint: U,
         mnemonic: bip39::Mnemonic,
         gas_price: Option<GasPrice>,
-    ) -> Result<NymdClient<SigningNymdClient>, NymdError>
+    ) -> Result<NyxdClient<SigningNyxdClient>, NyxdError>
     where
         U: TryInto<HttpClientUrl, Error = TendermintRpcError>,
     {
@@ -200,8 +200,8 @@ impl NymdClient<SigningNymdClient> {
             .collect();
         let gas_price = gas_price.unwrap_or(GasPrice::new_with_default_price(denom)?);
 
-        Ok(NymdClient {
-            client: SigningNymdClient::connect_with_signer(endpoint, wallet, gas_price)?,
+        Ok(NyxdClient {
+            client: SigningNyxdClient::connect_with_signer(endpoint, wallet, gas_price)?,
             config,
             client_address: Some(client_address),
             simulated_gas_multiplier: DEFAULT_SIMULATED_GAS_MULTIPLIER,
@@ -209,7 +209,7 @@ impl NymdClient<SigningNymdClient> {
     }
 }
 
-impl<C> NymdClient<C> {
+impl<C> NyxdClient<C> {
     pub fn current_config(&self) -> &Config {
         &self.config
     }
@@ -238,7 +238,7 @@ impl<C> NymdClient<C> {
         self.config.multisig_contract_address = Some(address);
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -246,7 +246,7 @@ impl<C> NymdClient<C> {
         self.config.mixnet_contract_address.as_ref().unwrap()
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -254,7 +254,7 @@ impl<C> NymdClient<C> {
         self.config.vesting_contract_address.as_ref().unwrap()
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -265,7 +265,7 @@ impl<C> NymdClient<C> {
             .unwrap()
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -276,7 +276,7 @@ impl<C> NymdClient<C> {
             .unwrap()
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -284,7 +284,7 @@ impl<C> NymdClient<C> {
         self.config.multisig_contract_address.as_ref().unwrap()
     }
 
-    // TODO: this should get changed into Result<&AccountId, NymdError> (or Option<&AccountId> in future commits
+    // TODO: this should get changed into Result<&AccountId, NyxdError> (or Option<&AccountId> in future commits
     // note: what unwrap is doing here is just moving a failure that would have normally
     // occurred in `connect` when attempting to parse an empty address,
     // so it's not introducing new source of failure (just moves it)
@@ -300,7 +300,7 @@ impl<C> NymdClient<C> {
         &self,
         contract: &AccountId,
         query_msg: &M,
-    ) -> Result<T, NymdError>
+    ) -> Result<T, NyxdError>
     where
         C: CosmWasmClient + Sync,
         M: ?Sized + Serialize + Sync,
@@ -313,7 +313,7 @@ impl<C> NymdClient<C> {
         &self,
         contract: &AccountId,
         query_data: Vec<u8>,
-    ) -> Result<Vec<u8>, NymdError>
+    ) -> Result<Vec<u8>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -325,7 +325,7 @@ impl<C> NymdClient<C> {
         contract_address: &AccountId,
         msg: &M,
         funds: Vec<Coin>,
-    ) -> Result<cosmwasm::MsgExecuteContract, NymdError>
+    ) -> Result<cosmwasm::MsgExecuteContract, NyxdError>
     where
         C: SigningCosmWasmClient,
         M: ?Sized + Serialize,
@@ -370,7 +370,7 @@ impl<C> NymdClient<C> {
 
     // CHAIN QUERIES
 
-    pub async fn account_sequence(&self) -> Result<SequenceResponse, NymdError>
+    pub async fn account_sequence(&self) -> Result<SequenceResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -380,7 +380,7 @@ impl<C> NymdClient<C> {
     pub async fn get_account_details(
         &self,
         address: &AccountId,
-    ) -> Result<Option<Account>, NymdError>
+    ) -> Result<Option<Account>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -390,7 +390,7 @@ impl<C> NymdClient<C> {
     pub async fn get_account_public_key(
         &self,
         address: &AccountId,
-    ) -> Result<Option<cosmrs::crypto::PublicKey>, NymdError>
+    ) -> Result<Option<cosmrs::crypto::PublicKey>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -402,7 +402,7 @@ impl<C> NymdClient<C> {
         Ok(None)
     }
 
-    pub async fn get_current_block_timestamp(&self) -> Result<TendermintTime, NymdError>
+    pub async fn get_current_block_timestamp(&self) -> Result<TendermintTime, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -412,21 +412,21 @@ impl<C> NymdClient<C> {
     pub async fn get_block_timestamp(
         &self,
         height: Option<u32>,
-    ) -> Result<TendermintTime, NymdError>
+    ) -> Result<TendermintTime, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         Ok(self.client.get_block(height).await?.block.header.time)
     }
 
-    pub async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NymdError>
+    pub async fn get_block(&self, height: Option<u32>) -> Result<BlockResponse, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.get_block(height).await
     }
 
-    pub async fn get_current_block_height(&self) -> Result<Height, NymdError>
+    pub async fn get_current_block_height(&self) -> Result<Height, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -438,7 +438,7 @@ impl<C> NymdClient<C> {
     /// # Arguments
     ///
     /// * `height`: height of the block for which we want to obtain the hash.
-    pub async fn get_block_hash(&self, height: u32) -> Result<hash::Hash, NymdError>
+    pub async fn get_block_hash(&self, height: u32) -> Result<hash::Hash, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -452,7 +452,7 @@ impl<C> NymdClient<C> {
         &self,
         height: u64,
         paging: Paging,
-    ) -> Result<ValidatorResponse, NymdError>
+    ) -> Result<ValidatorResponse, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
@@ -463,42 +463,42 @@ impl<C> NymdClient<C> {
         &self,
         address: &AccountId,
         denom: String,
-    ) -> Result<Option<Coin>, NymdError>
+    ) -> Result<Option<Coin>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.get_balance(address, denom).await
     }
 
-    pub async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NymdError>
+    pub async fn get_all_balances(&self, address: &AccountId) -> Result<Vec<Coin>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.get_all_balances(address).await
     }
 
-    pub async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NymdError>
+    pub async fn get_tx(&self, id: tx::Hash) -> Result<TxResponse, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.get_tx(id).await
     }
 
-    pub async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NymdError>
+    pub async fn search_tx(&self, query: Query) -> Result<Vec<TxResponse>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.search_tx(query).await
     }
 
-    pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NymdError>
+    pub async fn get_total_supply(&self) -> Result<Vec<Coin>, NyxdError>
     where
         C: CosmWasmClient + Sync,
     {
         self.client.get_total_supply().await
     }
 
-    pub async fn simulate<I, M>(&self, messages: I) -> Result<SimulateResponse, NymdError>
+    pub async fn simulate<I, M>(&self, messages: I) -> Result<SimulateResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
         I: IntoIterator<Item = M> + Send,
@@ -512,7 +512,7 @@ impl<C> NymdClient<C> {
                     .map(|msg| msg.into_any())
                     .collect::<Result<Vec<_>, _>>()
                     .map_err(|_| {
-                        NymdError::SerializationError("custom simulate messages".to_owned())
+                        NyxdError::SerializationError("custom simulate messages".to_owned())
                     })?,
                 "simulating execution of transactions",
             )
@@ -526,7 +526,7 @@ impl<C> NymdClient<C> {
         amount: Vec<Coin>,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
+    ) -> Result<TxResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -542,7 +542,7 @@ impl<C> NymdClient<C> {
         msgs: Vec<(AccountId, Vec<Coin>)>,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
+    ) -> Result<TxResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -561,7 +561,7 @@ impl<C> NymdClient<C> {
         allowed_messages: Vec<String>,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
+    ) -> Result<TxResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -585,7 +585,7 @@ impl<C> NymdClient<C> {
         grantee: &AccountId,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<TxResponse, NymdError>
+    ) -> Result<TxResponse, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -602,7 +602,7 @@ impl<C> NymdClient<C> {
         fee: Option<Fee>,
         memo: impl Into<String> + Send + 'static,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError>
+    ) -> Result<ExecuteResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
         M: ?Sized + Serialize + Sync,
@@ -619,7 +619,7 @@ impl<C> NymdClient<C> {
         msgs: I,
         fee: Option<Fee>,
         memo: impl Into<String> + Send + 'static,
-    ) -> Result<ExecuteResult, NymdError>
+    ) -> Result<ExecuteResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
         I: IntoIterator<Item = (M, Vec<Coin>)> + Send,
@@ -636,7 +636,7 @@ impl<C> NymdClient<C> {
         wasm_code: Vec<u8>,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<UploadResult, NymdError>
+    ) -> Result<UploadResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -654,7 +654,7 @@ impl<C> NymdClient<C> {
         memo: impl Into<String> + Send + 'static,
         options: Option<InstantiateOptions>,
         fee: Option<Fee>,
-    ) -> Result<InstantiateResult, NymdError>
+    ) -> Result<InstantiateResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
         M: ?Sized + Serialize + Sync,
@@ -671,7 +671,7 @@ impl<C> NymdClient<C> {
         new_admin: &AccountId,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<ChangeAdminResult, NymdError>
+    ) -> Result<ChangeAdminResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -686,7 +686,7 @@ impl<C> NymdClient<C> {
         contract_address: &AccountId,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<ChangeAdminResult, NymdError>
+    ) -> Result<ChangeAdminResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
     {
@@ -703,7 +703,7 @@ impl<C> NymdClient<C> {
         msg: &M,
         memo: impl Into<String> + Send + 'static,
         fee: Option<Fee>,
-    ) -> Result<MigrateResult, NymdError>
+    ) -> Result<MigrateResult, NyxdError>
     where
         C: SigningCosmWasmClient + Sync,
         M: ?Sized + Serialize + Sync,
diff --git a/common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs
similarity index 79%
rename from common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_query_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs
index b2e38e12a5..73c13d9d41 100644
--- a/common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs
@@ -1,8 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
-use crate::nymd::{CosmWasmClient, NymdClient};
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{CosmWasmClient, NyxdClient};
 
 use coconut_bandwidth_contract_common::msg::QueryMsg;
 use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
@@ -14,15 +14,15 @@ pub trait CoconutBandwidthQueryClient {
     async fn get_spent_credential(
         &self,
         blinded_serial_number: String,
-    ) -> Result<SpendCredentialResponse, NymdError>;
+    ) -> Result<SpendCredentialResponse, NyxdError>;
 }
 
 #[async_trait]
-impl<C: CosmWasmClient + Sync + Send> CoconutBandwidthQueryClient for NymdClient<C> {
+impl<C: CosmWasmClient + Sync + Send> CoconutBandwidthQueryClient for NyxdClient<C> {
     async fn get_spent_credential(
         &self,
         blinded_serial_number: String,
-    ) -> Result<SpendCredentialResponse, NymdError> {
+    ) -> Result<SpendCredentialResponse, NyxdError> {
         let request = QueryMsg::GetSpentCredential {
             blinded_serial_number,
         };
diff --git a/common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs
similarity index 84%
rename from common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs
index 0fc0d0e126..0d0e11e9e8 100644
--- a/common/client-libs/validator-client/src/nymd/traits/coconut_bandwidth_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs
@@ -1,10 +1,10 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
+pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Coin, Fee, NyxdClient};
 use coconut_bandwidth_contract_common::spend_credential::SpendCredentialData;
 use coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg};
 
@@ -19,18 +19,18 @@ pub trait CoconutBandwidthSigningClient {
         verification_key: String,
         encryption_key: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
     async fn spend_credential(
         &self,
         funds: Coin,
         blinded_serial_number: String,
         gateway_cosmos_address: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 }
 
 #[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for NymdClient<C> {
+impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for NyxdClient<C> {
     async fn deposit(
         &self,
         amount: Coin,
@@ -38,7 +38,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for N
         verification_key: String,
         encryption_key: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = ExecuteMsg::DepositFunds {
             data: DepositData::new(info.to_string(), verification_key, encryption_key),
@@ -60,7 +60,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> CoconutBandwidthSigningClient for N
         blinded_serial_number: String,
         gateway_cosmos_address: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = ExecuteMsg::SpendCredential {
             data: SpendCredentialData::new(
diff --git a/common/client-libs/validator-client/src/nymd/traits/dkg_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs
similarity index 72%
rename from common/client-libs/validator-client/src/nymd/traits/dkg_query_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs
index 561b9f44ef..c9477fedd6 100644
--- a/common/client-libs/validator-client/src/nymd/traits/dkg_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs
@@ -1,63 +1,70 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
-use crate::nymd::{CosmWasmClient, NymdClient};
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{CosmWasmClient, NyxdClient};
 use async_trait::async_trait;
 use coconut_dkg_common::dealer::{
     DealerDetailsResponse, PagedDealerResponse, PagedDealingsResponse,
 };
 use coconut_dkg_common::msg::QueryMsg as DkgQueryMsg;
-use coconut_dkg_common::types::EpochState;
+use coconut_dkg_common::types::Epoch;
 use coconut_dkg_common::verification_key::PagedVKSharesResponse;
 use cosmrs::AccountId;
 
 #[async_trait]
 pub trait DkgQueryClient {
-    async fn get_current_epoch_state(&self) -> Result<EpochState, NymdError>;
+    async fn get_current_epoch(&self) -> Result<Epoch, NyxdError>;
+    async fn get_current_epoch_threshold(&self) -> Result<Option<u64>, NyxdError>;
     async fn get_dealer_details(
         &self,
         address: &AccountId,
-    ) -> Result<DealerDetailsResponse, NymdError>;
+    ) -> Result<DealerDetailsResponse, NyxdError>;
     async fn get_current_dealers_paged(
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealerResponse, NymdError>;
+    ) -> Result<PagedDealerResponse, NyxdError>;
     async fn get_past_dealers_paged(
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealerResponse, NymdError>;
+    ) -> Result<PagedDealerResponse, NyxdError>;
 
     async fn get_dealings_paged(
         &self,
         idx: usize,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealingsResponse, NymdError>;
+    ) -> Result<PagedDealingsResponse, NyxdError>;
     async fn get_vk_shares_paged(
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedVKSharesResponse, NymdError>;
+    ) -> Result<PagedVKSharesResponse, NyxdError>;
 }
 
 #[async_trait]
-impl<C> DkgQueryClient for NymdClient<C>
+impl<C> DkgQueryClient for NyxdClient<C>
 where
     C: CosmWasmClient + Send + Sync,
 {
-    async fn get_current_epoch_state(&self) -> Result<EpochState, NymdError> {
+    async fn get_current_epoch(&self) -> Result<Epoch, NyxdError> {
         let request = DkgQueryMsg::GetCurrentEpochState {};
         self.client
             .query_contract_smart(self.coconut_dkg_contract_address(), &request)
             .await
     }
+    async fn get_current_epoch_threshold(&self) -> Result<Option<u64>, NyxdError> {
+        let request = DkgQueryMsg::GetCurrentEpochThreshold {};
+        self.client
+            .query_contract_smart(self.coconut_dkg_contract_address(), &request)
+            .await
+    }
     async fn get_dealer_details(
         &self,
         address: &AccountId,
-    ) -> Result<DealerDetailsResponse, NymdError> {
+    ) -> Result<DealerDetailsResponse, NyxdError> {
         let request = DkgQueryMsg::GetDealerDetails {
             dealer_address: address.to_string(),
         };
@@ -70,7 +77,7 @@ where
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealerResponse, NymdError> {
+    ) -> Result<PagedDealerResponse, NyxdError> {
         let request = DkgQueryMsg::GetCurrentDealers {
             start_after,
             limit: page_limit,
@@ -84,7 +91,7 @@ where
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealerResponse, NymdError> {
+    ) -> Result<PagedDealerResponse, NyxdError> {
         let request = DkgQueryMsg::GetPastDealers {
             start_after,
             limit: page_limit,
@@ -99,7 +106,7 @@ where
         idx: usize,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedDealingsResponse, NymdError> {
+    ) -> Result<PagedDealingsResponse, NyxdError> {
         let request = DkgQueryMsg::GetDealing {
             idx: idx as u64,
             limit: page_limit,
@@ -114,7 +121,7 @@ where
         &self,
         start_after: Option<String>,
         page_limit: Option<u32>,
-    ) -> Result<PagedVKSharesResponse, NymdError> {
+    ) -> Result<PagedVKSharesResponse, NyxdError> {
         let request = DkgQueryMsg::GetVerificationKeys {
             limit: page_limit,
             start_after,
diff --git a/common/client-libs/validator-client/src/nymd/traits/dkg_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs
similarity index 71%
rename from common/client-libs/validator-client/src/nymd/traits/dkg_signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs
index b0d1dfaf08..f04730adb1 100644
--- a/common/client-libs/validator-client/src/nymd/traits/dkg_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs
@@ -1,9 +1,9 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Fee, NymdClient, SigningCosmWasmClient};
+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
 use async_trait::async_trait;
 use coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg;
 use coconut_dkg_common::types::EncodedBTEPublicKeyWithProof;
@@ -12,37 +12,53 @@ use contracts_common::dealings::ContractSafeBytes;
 
 #[async_trait]
 pub trait DkgSigningClient {
+    async fn advance_dkg_epoch_state(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError>;
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
         announce_address: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn submit_dealing_bytes(
         &self,
         commitment: ContractSafeBytes,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn submit_verification_key_share(
         &self,
         share: VerificationKeyShare,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 }
 
 #[async_trait]
-impl<C> DkgSigningClient for NymdClient<C>
+impl<C> DkgSigningClient for NyxdClient<C>
 where
     C: SigningCosmWasmClient + Send + Sync,
 {
+    async fn advance_dkg_epoch_state(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
+        let req = DkgExecuteMsg::AdvanceEpochState {};
+
+        self.client
+            .execute(
+                self.address(),
+                self.coconut_dkg_contract_address(),
+                &req,
+                fee.unwrap_or_default(),
+                "advancing DKG state",
+                vec![],
+            )
+            .await
+    }
+
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
         announce_address: String,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::RegisterDealer {
             bte_key_with_proof: bte_key,
             announce_address,
@@ -64,7 +80,7 @@ where
         &self,
         dealing_bytes: ContractSafeBytes,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::CommitDealing { dealing_bytes };
 
         self.client
@@ -83,7 +99,7 @@ where
         &self,
         share: VerificationKeyShare,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let req = DkgExecuteMsg::CommitVerificationKeyShare { share };
 
         self.client
diff --git a/common/client-libs/validator-client/src/nymd/traits/mixnet_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/mixnet_query_client.rs
similarity index 76%
rename from common/client-libs/validator-client/src/nymd/traits/mixnet_query_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/mixnet_query_client.rs
index 675c15c5d1..e589719fa3 100644
--- a/common/client-libs/validator-client/src/nymd/traits/mixnet_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/mixnet_query_client.rs
@@ -1,12 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::error::NymdError;
-use crate::nymd::NymdClient;
+pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
 use mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
+use mixnet_contract_common::families::Family;
 use mixnet_contract_common::mixnode::{
     MixNodeDetails, MixnodeRewardingDetailsResponse, PagedMixnodesDetailsResponse,
     PagedUnbondedMixnodesResponse, StakeSaturationResponse, UnbondedMixnodeResponse,
@@ -20,46 +21,46 @@ use mixnet_contract_common::{
     CurrentIntervalResponse, EpochEventId, GatewayBondResponse, GatewayOwnershipResponse,
     IdentityKey, IntervalEventId, LayerDistribution, MixId, MixOwnershipResponse,
     MixnodeDetailsResponse, PagedAllDelegationsResponse, PagedDelegatorDelegationsResponse,
-    PagedGatewayResponse, PagedMixNodeDelegationsResponse, PagedMixnodeBondsResponse,
-    PagedRewardedSetResponse, PendingEpochEventsResponse, PendingIntervalEventsResponse,
-    QueryMsg as MixnetQueryMsg,
+    PagedFamiliesResponse, PagedGatewayResponse, PagedMembersResponse,
+    PagedMixNodeDelegationsResponse, PagedMixnodeBondsResponse, PagedRewardedSetResponse,
+    PendingEpochEventsResponse, PendingIntervalEventsResponse, QueryMsg as MixnetQueryMsg,
 };
 use serde::Deserialize;
 
 #[async_trait]
 pub trait MixnetQueryClient {
-    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NymdError>
+    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NyxdError>
     where
         for<'a> T: Deserialize<'a>;
 
     // state/sys-params-related
 
-    async fn get_mixnet_contract_version(&self) -> Result<ContractBuildInformation, NymdError> {
+    async fn get_mixnet_contract_version(&self) -> Result<ContractBuildInformation, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetContractVersion {})
             .await
     }
 
-    async fn get_rewarding_validator_address(&self) -> Result<AccountId, NymdError> {
+    async fn get_rewarding_validator_address(&self) -> Result<AccountId, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetRewardingValidatorAddress {})
             .await
     }
 
-    async fn get_mixnet_contract_settings(&self) -> Result<ContractStateParams, NymdError> {
+    async fn get_mixnet_contract_settings(&self) -> Result<ContractStateParams, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetStateParams {})
             .await
     }
 
-    async fn get_mixnet_contract_state(&self) -> Result<ContractState, NymdError> {
+    async fn get_mixnet_contract_state(&self) -> Result<ContractState, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetState {})
             .await
     }
 
-    async fn get_rewarding_parameters(&self) -> Result<RewardingParams, NymdError> {
+    async fn get_rewarding_parameters(&self) -> Result<RewardingParams, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetRewardingParams {})
             .await
     }
 
-    async fn get_current_interval_details(&self) -> Result<CurrentIntervalResponse, NymdError> {
+    async fn get_current_interval_details(&self) -> Result<CurrentIntervalResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetCurrentIntervalDetails {})
             .await
     }
@@ -68,18 +69,36 @@ pub trait MixnetQueryClient {
         &self,
         start_after: Option<MixId>,
         limit: Option<u32>,
-    ) -> Result<PagedRewardedSetResponse, NymdError> {
+    ) -> Result<PagedRewardedSetResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetRewardedSet { limit, start_after })
             .await
     }
 
+    async fn get_all_node_families_paged(
+        &self,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    ) -> Result<PagedFamiliesResponse, NyxdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetAllFamiliesPaged { limit, start_after })
+            .await
+    }
+
+    async fn get_all_family_members_paged(
+        &self,
+        start_after: Option<String>,
+        limit: Option<u32>,
+    ) -> Result<PagedMembersResponse, NyxdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetAllMembersPaged { limit, start_after })
+            .await
+    }
+
     // mixnode-related:
 
     async fn get_mixnode_bonds_paged(
         &self,
         limit: Option<u32>,
         start_after: Option<MixId>,
-    ) -> Result<PagedMixnodeBondsResponse, NymdError> {
+    ) -> Result<PagedMixnodeBondsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetMixNodeBonds { limit, start_after })
             .await
     }
@@ -88,7 +107,7 @@ pub trait MixnetQueryClient {
         &self,
         limit: Option<u32>,
         start_after: Option<MixId>,
-    ) -> Result<PagedMixnodesDetailsResponse, NymdError> {
+    ) -> Result<PagedMixnodesDetailsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetMixNodesDetailed { limit, start_after })
             .await
     }
@@ -97,7 +116,7 @@ pub trait MixnetQueryClient {
         &self,
         limit: Option<u32>,
         start_after: Option<MixId>,
-    ) -> Result<PagedUnbondedMixnodesResponse, NymdError> {
+    ) -> Result<PagedUnbondedMixnodesResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetUnbondedMixNodes { limit, start_after })
             .await
     }
@@ -107,7 +126,7 @@ pub trait MixnetQueryClient {
         owner: &AccountId,
         limit: Option<u32>,
         start_after: Option<MixId>,
-    ) -> Result<PagedUnbondedMixnodesResponse, NymdError> {
+    ) -> Result<PagedUnbondedMixnodesResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetUnbondedMixNodesByOwner {
             owner: owner.to_string(),
             limit,
@@ -121,7 +140,7 @@ pub trait MixnetQueryClient {
         identity_key: String,
         limit: Option<u32>,
         start_after: Option<MixId>,
-    ) -> Result<PagedUnbondedMixnodesResponse, NymdError> {
+    ) -> Result<PagedUnbondedMixnodesResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetUnbondedMixNodesByIdentityKey {
             identity_key,
             limit,
@@ -133,7 +152,7 @@ pub trait MixnetQueryClient {
     async fn get_owned_mixnode(
         &self,
         address: &AccountId,
-    ) -> Result<MixOwnershipResponse, NymdError> {
+    ) -> Result<MixOwnershipResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetOwnedMixnode {
             address: address.to_string(),
         })
@@ -143,7 +162,7 @@ pub trait MixnetQueryClient {
     async fn get_mixnode_details(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeDetailsResponse, NymdError> {
+    ) -> Result<MixnodeDetailsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetMixnodeDetails { mix_id })
             .await
     }
@@ -151,7 +170,7 @@ pub trait MixnetQueryClient {
     async fn get_mixnode_rewarding_details(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeRewardingDetailsResponse, NymdError> {
+    ) -> Result<MixnodeRewardingDetailsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetMixnodeRewardingDetails { mix_id })
             .await
     }
@@ -159,7 +178,7 @@ pub trait MixnetQueryClient {
     async fn get_mixnode_stake_saturation(
         &self,
         mix_id: MixId,
-    ) -> Result<StakeSaturationResponse, NymdError> {
+    ) -> Result<StakeSaturationResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetStakeSaturation { mix_id })
             .await
     }
@@ -167,12 +186,12 @@ pub trait MixnetQueryClient {
     async fn get_unbonded_mixnode_information(
         &self,
         mix_id: MixId,
-    ) -> Result<UnbondedMixnodeResponse, NymdError> {
+    ) -> Result<UnbondedMixnodeResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetUnbondedMixNodeInformation { mix_id })
             .await
     }
 
-    async fn get_layer_distribution(&self) -> Result<LayerDistribution, NymdError> {
+    async fn get_layer_distribution(&self) -> Result<LayerDistribution, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetLayerDistribution {})
             .await
     }
@@ -183,7 +202,7 @@ pub trait MixnetQueryClient {
         &self,
         start_after: Option<IdentityKey>,
         limit: Option<u32>,
-    ) -> Result<PagedGatewayResponse, NymdError> {
+    ) -> Result<PagedGatewayResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetGateways { start_after, limit })
             .await
     }
@@ -192,7 +211,7 @@ pub trait MixnetQueryClient {
     async fn get_gateway_bond(
         &self,
         identity: IdentityKey,
-    ) -> Result<GatewayBondResponse, NymdError> {
+    ) -> Result<GatewayBondResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetGatewayBond { identity })
             .await
     }
@@ -201,7 +220,7 @@ pub trait MixnetQueryClient {
     async fn get_owned_gateway(
         &self,
         address: &AccountId,
-    ) -> Result<GatewayOwnershipResponse, NymdError> {
+    ) -> Result<GatewayOwnershipResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetOwnedGateway {
             address: address.to_string(),
         })
@@ -216,7 +235,7 @@ pub trait MixnetQueryClient {
         mix_id: MixId,
         start_after: Option<String>,
         limit: Option<u32>,
-    ) -> Result<PagedMixNodeDelegationsResponse, NymdError> {
+    ) -> Result<PagedMixNodeDelegationsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetMixnodeDelegations {
             mix_id,
             start_after,
@@ -231,7 +250,7 @@ pub trait MixnetQueryClient {
         delegator: String,
         start_after: Option<(MixId, OwnerProxySubKey)>,
         limit: Option<u32>,
-    ) -> Result<PagedDelegatorDelegationsResponse, NymdError> {
+    ) -> Result<PagedDelegatorDelegationsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetDelegatorDelegations {
             delegator,
             start_after,
@@ -246,7 +265,7 @@ pub trait MixnetQueryClient {
         mix_id: MixId,
         delegator: &AccountId,
         proxy: Option<String>,
-    ) -> Result<MixNodeDelegationResponse, NymdError> {
+    ) -> Result<MixNodeDelegationResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetDelegationDetails {
             mix_id,
             delegator: delegator.to_string(),
@@ -260,7 +279,7 @@ pub trait MixnetQueryClient {
         &self,
         start_after: Option<delegation::StorageKey>,
         limit: Option<u32>,
-    ) -> Result<PagedAllDelegationsResponse, NymdError> {
+    ) -> Result<PagedAllDelegationsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetAllDelegations { start_after, limit })
             .await
     }
@@ -269,7 +288,7 @@ pub trait MixnetQueryClient {
     async fn get_pending_operator_reward(
         &self,
         operator: &AccountId,
-    ) -> Result<PendingRewardResponse, NymdError> {
+    ) -> Result<PendingRewardResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetPendingOperatorReward {
             address: operator.to_string(),
         })
@@ -279,7 +298,7 @@ pub trait MixnetQueryClient {
     async fn get_pending_mixnode_operator_reward(
         &self,
         mix_id: MixId,
-    ) -> Result<PendingRewardResponse, NymdError> {
+    ) -> Result<PendingRewardResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetPendingMixNodeOperatorReward { mix_id })
             .await
     }
@@ -289,7 +308,7 @@ pub trait MixnetQueryClient {
         delegator: &AccountId,
         mix_id: MixId,
         proxy: Option<String>,
-    ) -> Result<PendingRewardResponse, NymdError> {
+    ) -> Result<PendingRewardResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetPendingDelegatorReward {
             address: delegator.to_string(),
             mix_id,
@@ -303,7 +322,7 @@ pub trait MixnetQueryClient {
         &self,
         mix_id: MixId,
         estimated_performance: Performance,
-    ) -> Result<EstimatedCurrentEpochRewardResponse, NymdError> {
+    ) -> Result<EstimatedCurrentEpochRewardResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetEstimatedCurrentEpochOperatorReward {
             mix_id,
             estimated_performance,
@@ -318,7 +337,7 @@ pub trait MixnetQueryClient {
         mix_id: MixId,
         proxy: Option<String>,
         estimated_performance: Performance,
-    ) -> Result<EstimatedCurrentEpochRewardResponse, NymdError> {
+    ) -> Result<EstimatedCurrentEpochRewardResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetEstimatedCurrentEpochDelegatorReward {
             address: delegator.to_string(),
             mix_id,
@@ -334,7 +353,7 @@ pub trait MixnetQueryClient {
         &self,
         start_after: Option<EpochEventId>,
         limit: Option<u32>,
-    ) -> Result<PendingEpochEventsResponse, NymdError> {
+    ) -> Result<PendingEpochEventsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetPendingEpochEvents { start_after, limit })
             .await
     }
@@ -343,7 +362,7 @@ pub trait MixnetQueryClient {
         &self,
         start_after: Option<IntervalEventId>,
         limit: Option<u32>,
-    ) -> Result<PendingIntervalEventsResponse, NymdError> {
+    ) -> Result<PendingIntervalEventsResponse, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetPendingIntervalEvents { start_after, limit })
             .await
     }
@@ -351,20 +370,34 @@ pub trait MixnetQueryClient {
     async fn get_mixnode_details_by_identity(
         &self,
         mix_identity: IdentityKey,
-    ) -> Result<Option<MixNodeDetails>, NymdError> {
+    ) -> Result<Option<MixNodeDetails>, NyxdError> {
         self.query_mixnet_contract(MixnetQueryMsg::GetBondedMixnodeDetailsByIdentity {
             mix_identity,
         })
         .await
     }
+
+    async fn get_node_family_by_label(&self, label: &str) -> Result<Option<Family>, NyxdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetFamilyByLabel {
+            label: label.to_string(),
+        })
+        .await
+    }
+
+    async fn get_node_family_by_head(&self, head: &str) -> Result<Option<Family>, NyxdError> {
+        self.query_mixnet_contract(MixnetQueryMsg::GetFamilyByHead {
+            head: head.to_string(),
+        })
+        .await
+    }
 }
 
 #[async_trait]
-impl<C> MixnetQueryClient for NymdClient<C>
+impl<C> MixnetQueryClient for NyxdClient<C>
 where
     C: CosmWasmClient + Sync + Send,
 {
-    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NymdError>
+    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NyxdError>
     where
         for<'a> T: Deserialize<'a>,
     {
@@ -379,10 +412,10 @@ impl<C> MixnetQueryClient for crate::Client<C>
 where
     C: CosmWasmClient + Sync + Send,
 {
-    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NymdError>
+    async fn query_mixnet_contract<T>(&self, query: MixnetQueryMsg) -> Result<T, NyxdError>
     where
         for<'a> T: Deserialize<'a>,
     {
-        self.nymd.query_mixnet_contract(query).await
+        self.nyxd.query_mixnet_contract(query).await
     }
 }
diff --git a/common/client-libs/validator-client/src/nymd/traits/mixnet_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/mixnet_signing_client.rs
similarity index 65%
rename from common/client-libs/validator-client/src/nymd/traits/mixnet_signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/mixnet_signing_client.rs
index 41fa7818a8..f059674683 100644
--- a/common/client-libs/validator-client/src/nymd/traits/mixnet_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/mixnet_signing_client.rs
@@ -1,17 +1,17 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::coin::Coin;
-pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Fee, NymdClient, SigningCosmWasmClient};
+use crate::nyxd::coin::Coin;
+pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
 use async_trait::async_trait;
 use cosmrs::AccountId;
 use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
 use mixnet_contract_common::{
-    ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, MixId, MixNode,
+    ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, LayerAssignment, MixId, MixNode,
 };
 
 #[async_trait]
@@ -21,7 +21,7 @@ pub trait MixnetSigningClient {
         fee: Option<Fee>,
         msg: MixnetExecuteMsg,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     // state/sys-params-related
 
@@ -29,7 +29,7 @@ pub trait MixnetSigningClient {
         &self,
         address: AccountId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateRewardingValidatorAddress {
@@ -44,7 +44,7 @@ pub trait MixnetSigningClient {
         &self,
         updated_parameters: ContractStateParams,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateContractStateParams { updated_parameters },
@@ -58,7 +58,7 @@ pub trait MixnetSigningClient {
         active_set_size: u32,
         force_immediately: bool,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateActiveSetSize {
@@ -75,7 +75,7 @@ pub trait MixnetSigningClient {
         updated_params: IntervalRewardingParamsUpdate,
         force_immediately: bool,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateRewardingParams {
@@ -93,7 +93,7 @@ pub trait MixnetSigningClient {
         epoch_duration_secs: u64,
         force_immediately: bool,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateIntervalConfig {
@@ -108,10 +108,10 @@ pub trait MixnetSigningClient {
 
     async fn advance_current_epoch(
         &self,
-        new_rewarded_set: Vec<MixId>,
+        new_rewarded_set: Vec<LayerAssignment>,
         expected_active_set_size: u32,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::AdvanceCurrentEpoch {
@@ -127,7 +127,7 @@ pub trait MixnetSigningClient {
         &self,
         limit: Option<u32>,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::ReconcileEpochEvents { limit },
@@ -136,6 +136,147 @@ pub trait MixnetSigningClient {
         .await
     }
 
+    // family related
+    async fn create_family(
+        &self,
+        owner_signature: String,
+        label: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::CreateFamily {
+                owner_signature,
+                label,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn create_family_on_behalf(
+        &self,
+        owner_address: String,
+        owner_signature: String,
+        label: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::CreateFamilyOnBehalf {
+                owner_address,
+                owner_signature,
+                label,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn join_family(
+        &self,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::JoinFamily {
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn join_family_on_behalf(
+        &self,
+        member_address: String,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::JoinFamilyOnBehalf {
+                member_address,
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn leave_family(
+        &self,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::LeaveFamily {
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn leave_family_on_behalf(
+        &self,
+        member_address: String,
+        signature: String,
+        family_head: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::LeaveFamilyOnBehalf {
+                member_address,
+                signature,
+                family_head,
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn kick_family_member(
+        &self,
+        signature: String,
+        member: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::KickFamilyMember { signature, member },
+            vec![],
+        )
+        .await
+    }
+
+    async fn kick_family_member_on_behalf(
+        &self,
+        head_address: String,
+        signature: String,
+        member: String,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::KickFamilyMemberOnBehalf {
+                head_address,
+                signature,
+                member,
+            },
+            vec![],
+        )
+        .await
+    }
     // mixnode-related:
 
     async fn bond_mixnode(
@@ -145,7 +286,7 @@ pub trait MixnetSigningClient {
         owner_signature: String,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::BondMixnode {
@@ -166,7 +307,7 @@ pub trait MixnetSigningClient {
         owner_signature: String,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::BondMixnodeOnBehalf {
@@ -180,7 +321,36 @@ pub trait MixnetSigningClient {
         .await
     }
 
-    async fn unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
+    async fn pledge_more(
+        &self,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::PledgeMore {},
+            vec![additional_pledge],
+        )
+        .await
+    }
+
+    async fn pledge_more_on_behalf(
+        &self,
+        owner: AccountId,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_mixnet_contract(
+            fee,
+            MixnetExecuteMsg::PledgeMoreOnBehalf {
+                owner: owner.to_string(),
+            },
+            vec![additional_pledge],
+        )
+        .await
+    }
+
+    async fn unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(fee, MixnetExecuteMsg::UnbondMixnode {}, vec![])
             .await
     }
@@ -189,7 +359,7 @@ pub trait MixnetSigningClient {
         &self,
         owner: AccountId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UnbondMixnodeOnBehalf {
@@ -204,7 +374,7 @@ pub trait MixnetSigningClient {
         &self,
         new_costs: MixNodeCostParams,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateMixnodeCostParams { new_costs },
@@ -218,7 +388,7 @@ pub trait MixnetSigningClient {
         owner: AccountId,
         new_costs: MixNodeCostParams,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateMixnodeCostParamsOnBehalf {
@@ -234,7 +404,7 @@ pub trait MixnetSigningClient {
         &self,
         new_config: MixNodeConfigUpdate,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateMixnodeConfig { new_config },
@@ -248,7 +418,7 @@ pub trait MixnetSigningClient {
         owner: AccountId,
         new_config: MixNodeConfigUpdate,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UpdateMixnodeConfigOnBehalf {
@@ -268,7 +438,7 @@ pub trait MixnetSigningClient {
         owner_signature: String,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::BondGateway {
@@ -287,7 +457,7 @@ pub trait MixnetSigningClient {
         owner_signature: String,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::BondGatewayOnBehalf {
@@ -300,7 +470,7 @@ pub trait MixnetSigningClient {
         .await
     }
 
-    async fn unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
+    async fn unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(fee, MixnetExecuteMsg::UnbondGateway {}, vec![])
             .await
     }
@@ -309,7 +479,7 @@ pub trait MixnetSigningClient {
         &self,
         owner: AccountId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UnbondGatewayOnBehalf {
@@ -327,7 +497,7 @@ pub trait MixnetSigningClient {
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::DelegateToMixnode { mix_id },
@@ -342,7 +512,7 @@ pub trait MixnetSigningClient {
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::DelegateToMixnodeOnBehalf {
@@ -358,7 +528,7 @@ pub trait MixnetSigningClient {
         &self,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UndelegateFromMixnode { mix_id },
@@ -372,7 +542,7 @@ pub trait MixnetSigningClient {
         delegate: AccountId,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::UndelegateFromMixnodeOnBehalf {
@@ -391,7 +561,7 @@ pub trait MixnetSigningClient {
         mix_id: MixId,
         performance: Performance,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::RewardMixnode {
@@ -403,7 +573,7 @@ pub trait MixnetSigningClient {
         .await
     }
 
-    async fn withdraw_operator_reward(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
+    async fn withdraw_operator_reward(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(fee, MixnetExecuteMsg::WithdrawOperatorReward {}, vec![])
             .await
     }
@@ -412,7 +582,7 @@ pub trait MixnetSigningClient {
         &self,
         owner: AccountId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::WithdrawOperatorRewardOnBehalf {
@@ -427,7 +597,7 @@ pub trait MixnetSigningClient {
         &self,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::WithdrawDelegatorReward { mix_id },
@@ -441,7 +611,7 @@ pub trait MixnetSigningClient {
         owner: AccountId,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_mixnet_contract(
             fee,
             MixnetExecuteMsg::WithdrawDelegatorRewardOnBehalf {
@@ -455,7 +625,7 @@ pub trait MixnetSigningClient {
 }
 
 #[async_trait]
-impl<C> MixnetSigningClient for NymdClient<C>
+impl<C> MixnetSigningClient for NyxdClient<C>
 where
     C: SigningCosmWasmClient + Sync + Send,
 {
@@ -464,7 +634,7 @@ where
         fee: Option<Fee>,
         msg: MixnetExecuteMsg,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let memo = msg.default_memo();
         self.client
@@ -490,7 +660,7 @@ where
         fee: Option<Fee>,
         msg: MixnetExecuteMsg,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError> {
-        self.nymd.execute_mixnet_contract(fee, msg, funds).await
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.nyxd.execute_mixnet_contract(fee, msg, funds).await
     }
 }
diff --git a/common/client-libs/validator-client/src/nymd/traits/mod.rs b/common/client-libs/validator-client/src/nyxd/traits/mod.rs
similarity index 100%
rename from common/client-libs/validator-client/src/nymd/traits/mod.rs
rename to common/client-libs/validator-client/src/nyxd/traits/mod.rs
diff --git a/common/client-libs/validator-client/src/nymd/traits/multisig_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs
similarity index 81%
rename from common/client-libs/validator-client/src/nymd/traits/multisig_query_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs
index 89643e8136..51eac0532b 100644
--- a/common/client-libs/validator-client/src/nymd/traits/multisig_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs
@@ -1,8 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
-use crate::nymd::{CosmWasmClient, NymdClient};
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{CosmWasmClient, NyxdClient};
 
 use cw3::{ProposalListResponse, ProposalResponse};
 use multisig_contract_common::msg::QueryMsg;
@@ -11,17 +11,17 @@ use async_trait::async_trait;
 
 #[async_trait]
 pub trait MultisigQueryClient {
-    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NymdError>;
+    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NyxdError>;
     async fn list_proposals(
         &self,
         start_after: Option<u64>,
         limit: Option<u32>,
-    ) -> Result<ProposalListResponse, NymdError>;
+    ) -> Result<ProposalListResponse, NyxdError>;
 }
 
 #[async_trait]
-impl<C: CosmWasmClient + Sync + Send> MultisigQueryClient for NymdClient<C> {
-    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NymdError> {
+impl<C: CosmWasmClient + Sync + Send> MultisigQueryClient for NyxdClient<C> {
+    async fn get_proposal(&self, proposal_id: u64) -> Result<ProposalResponse, NyxdError> {
         let request = QueryMsg::Proposal { proposal_id };
         self.client
             .query_contract_smart(self.multisig_contract_address(), &request)
@@ -32,7 +32,7 @@ impl<C: CosmWasmClient + Sync + Send> MultisigQueryClient for NymdClient<C> {
         &self,
         start_after: Option<u64>,
         limit: Option<u32>,
-    ) -> Result<ProposalListResponse, NymdError> {
+    ) -> Result<ProposalListResponse, NyxdError> {
         let request = QueryMsg::ListProposals { start_after, limit };
         self.client
             .query_contract_smart(self.multisig_contract_address(), &request)
diff --git a/common/client-libs/validator-client/src/nymd/traits/multisig_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs
similarity index 86%
rename from common/client-libs/validator-client/src/nymd/traits/multisig_signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs
index a715c85075..9051cfa79d 100644
--- a/common/client-libs/validator-client/src/nymd/traits/multisig_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs
@@ -1,10 +1,10 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Fee, NymdClient};
+pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Fee, NyxdClient};
 
 use coconut_bandwidth_contract_common::msg::ExecuteMsg as CoconutBandwidthExecuteMsg;
 use cw3::Vote;
@@ -21,31 +21,31 @@ pub trait MultisigSigningClient {
         blinded_serial_number: String,
         voucher_value: u128,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vote_proposal(
         &self,
         proposal_id: u64,
         yes: bool,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn execute_proposal(
         &self,
         proposal_id: u64,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 }
 
 #[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClient<C> {
+impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NyxdClient<C> {
     async fn propose_release_funds(
         &self,
         title: String,
         blinded_serial_number: String,
         voucher_value: u128,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let release_funds_req = CoconutBandwidthExecuteMsg::ReleaseFunds {
             funds: Coin::new(
@@ -81,7 +81,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClien
         proposal_id: u64,
         vote_yes: bool,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let vote = if vote_yes { Vote::Yes } else { Vote::No };
         let req = ExecuteMsg::Vote { proposal_id, vote };
@@ -101,7 +101,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> MultisigSigningClient for NymdClien
         &self,
         proposal_id: u64,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = ExecuteMsg::Execute { proposal_id };
         self.client
diff --git a/common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/vesting_query_client.rs
similarity index 85%
rename from common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/vesting_query_client.rs
index 598818197a..5aadd0a608 100644
--- a/common/client-libs/validator-client/src/nymd/traits/vesting_query_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/vesting_query_client.rs
@@ -1,10 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::coin::Coin;
-pub use crate::nymd::cosmwasm_client::client::CosmWasmClient;
-use crate::nymd::error::NymdError;
-use crate::nymd::NymdClient;
+use crate::nyxd::coin::Coin;
+pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
 use contracts_common::ContractBuildInformation;
 use cosmwasm_std::{Coin as CosmWasmCoin, Timestamp};
@@ -18,11 +18,11 @@ use vesting_contract_common::{
 
 #[async_trait]
 pub trait VestingQueryClient {
-    async fn query_vesting_contract<T>(&self, query: VestingQueryMsg) -> Result<T, NymdError>
+    async fn query_vesting_contract<T>(&self, query: VestingQueryMsg) -> Result<T, NyxdError>
     where
         for<'a> T: Deserialize<'a>;
 
-    async fn get_vesting_contract_version(&self) -> Result<ContractBuildInformation, NymdError> {
+    async fn get_vesting_contract_version(&self) -> Result<ContractBuildInformation, NyxdError> {
         self.query_vesting_contract(VestingQueryMsg::GetContractVersion {})
             .await
     }
@@ -31,72 +31,72 @@ pub trait VestingQueryClient {
         &self,
         address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
     async fn spendable_coins(
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
     async fn vested_coins(
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
     async fn vesting_coins(
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
     async fn vesting_start_time(
         &self,
         vesting_account_address: &str,
-    ) -> Result<Timestamp, NymdError>;
+    ) -> Result<Timestamp, NyxdError>;
 
     async fn vesting_end_time(&self, vesting_account_address: &str)
-        -> Result<Timestamp, NymdError>;
+        -> Result<Timestamp, NyxdError>;
 
     async fn original_vesting(
         &self,
         vesting_account_address: &str,
-    ) -> Result<OriginalVestingResponse, NymdError>;
+    ) -> Result<OriginalVestingResponse, NyxdError>;
 
     async fn delegated_free(
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
     async fn delegated_vesting(
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError>;
+    ) -> Result<Coin, NyxdError>;
 
-    async fn get_account(&self, address: &str) -> Result<Account, NymdError>;
-    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError>;
-    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError>;
+    async fn get_account(&self, address: &str) -> Result<Account, NyxdError>;
+    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NyxdError>;
+    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NyxdError>;
     async fn get_current_vesting_period(
         &self,
         vesting_account_address: &str,
-    ) -> Result<Period, NymdError>;
+    ) -> Result<Period, NyxdError>;
 
     async fn get_delegation_timestamps(
         &self,
         address: &str,
         mix_id: MixId,
-    ) -> Result<DelegationTimesResponse, NymdError>;
+    ) -> Result<DelegationTimesResponse, NyxdError>;
 
     async fn get_all_vesting_delegations_paged(
         &self,
         start_after: Option<(u32, MixId, u64)>,
         limit: Option<u32>,
-    ) -> Result<AllDelegationsResponse, NymdError>;
+    ) -> Result<AllDelegationsResponse, NyxdError>;
 
-    async fn get_all_vesting_delegations(&self) -> Result<Vec<VestingDelegation>, NymdError> {
+    async fn get_all_vesting_delegations(&self) -> Result<Vec<VestingDelegation>, NyxdError> {
         let mut delegations = Vec::new();
         let mut start_after = None;
         loop {
@@ -117,8 +117,8 @@ pub trait VestingQueryClient {
 }
 
 #[async_trait]
-impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
-    async fn query_vesting_contract<T>(&self, query: VestingQueryMsg) -> Result<T, NymdError>
+impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NyxdClient<C> {
+    async fn query_vesting_contract<T>(&self, query: VestingQueryMsg) -> Result<T, NyxdError>
     where
         for<'a> T: Deserialize<'a>,
     {
@@ -131,7 +131,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::LockedCoins {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -146,7 +146,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::SpendableCoins {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -160,7 +160,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::GetVestedCoins {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -174,7 +174,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::GetVestingCoins {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -188,7 +188,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
     async fn vesting_start_time(
         &self,
         vesting_account_address: &str,
-    ) -> Result<Timestamp, NymdError> {
+    ) -> Result<Timestamp, NyxdError> {
         let request = VestingQueryMsg::GetStartTime {
             vesting_account_address: vesting_account_address.to_string(),
         };
@@ -200,7 +200,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
     async fn vesting_end_time(
         &self,
         vesting_account_address: &str,
-    ) -> Result<Timestamp, NymdError> {
+    ) -> Result<Timestamp, NyxdError> {
         let request = VestingQueryMsg::GetEndTime {
             vesting_account_address: vesting_account_address.to_string(),
         };
@@ -212,7 +212,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
     async fn original_vesting(
         &self,
         vesting_account_address: &str,
-    ) -> Result<OriginalVestingResponse, NymdError> {
+    ) -> Result<OriginalVestingResponse, NyxdError> {
         let request = VestingQueryMsg::GetOriginalVesting {
             vesting_account_address: vesting_account_address.to_string(),
         };
@@ -225,7 +225,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::GetDelegatedFree {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -241,7 +241,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         vesting_account_address: &str,
         block_time: Option<Timestamp>,
-    ) -> Result<Coin, NymdError> {
+    ) -> Result<Coin, NyxdError> {
         let request = VestingQueryMsg::GetDelegatedVesting {
             vesting_account_address: vesting_account_address.to_string(),
             block_time,
@@ -252,7 +252,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .map(Into::into)
     }
 
-    async fn get_account(&self, address: &str) -> Result<Account, NymdError> {
+    async fn get_account(&self, address: &str) -> Result<Account, NyxdError> {
         let request = VestingQueryMsg::GetAccount {
             address: address.to_string(),
         };
@@ -260,7 +260,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .query_contract_smart(self.vesting_contract_address(), &request)
             .await
     }
-    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
+    async fn get_mixnode_pledge(&self, address: &str) -> Result<Option<PledgeData>, NyxdError> {
         let request = VestingQueryMsg::GetMixnode {
             address: address.to_string(),
         };
@@ -268,7 +268,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .query_contract_smart(self.vesting_contract_address(), &request)
             .await
     }
-    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NymdError> {
+    async fn get_gateway_pledge(&self, address: &str) -> Result<Option<PledgeData>, NyxdError> {
         let request = VestingQueryMsg::GetGateway {
             address: address.to_string(),
         };
@@ -277,7 +277,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
             .await
     }
 
-    async fn get_current_vesting_period(&self, address: &str) -> Result<Period, NymdError> {
+    async fn get_current_vesting_period(&self, address: &str) -> Result<Period, NyxdError> {
         let request = VestingQueryMsg::GetCurrentVestingPeriod {
             address: address.to_string(),
         };
@@ -290,7 +290,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         address: &str,
         mix_id: MixId,
-    ) -> Result<DelegationTimesResponse, NymdError> {
+    ) -> Result<DelegationTimesResponse, NyxdError> {
         let request = VestingQueryMsg::GetDelegationTimes {
             address: address.to_string(),
             mix_id,
@@ -304,7 +304,7 @@ impl<C: CosmWasmClient + Sync + Send> VestingQueryClient for NymdClient<C> {
         &self,
         start_after: Option<(u32, MixId, u64)>,
         limit: Option<u32>,
-    ) -> Result<AllDelegationsResponse, NymdError> {
+    ) -> Result<AllDelegationsResponse, NyxdError> {
         let request = VestingQueryMsg::GetAllDelegations { start_after, limit };
         self.client
             .query_contract_smart(self.vesting_contract_address(), &request)
diff --git a/common/client-libs/validator-client/src/nymd/traits/vesting_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/vesting_signing_client.rs
similarity index 84%
rename from common/client-libs/validator-client/src/nymd/traits/vesting_signing_client.rs
rename to common/client-libs/validator-client/src/nyxd/traits/vesting_signing_client.rs
index eebf0adfa3..68b4bcc53a 100644
--- a/common/client-libs/validator-client/src/nymd/traits/vesting_signing_client.rs
+++ b/common/client-libs/validator-client/src/nyxd/traits/vesting_signing_client.rs
@@ -1,10 +1,10 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub use crate::nymd::cosmwasm_client::signing_client::SigningCosmWasmClient;
-use crate::nymd::cosmwasm_client::types::ExecuteResult;
-use crate::nymd::error::NymdError;
-use crate::nymd::{Coin, Fee, NymdClient};
+pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;
+use crate::nyxd::cosmwasm_client::types::ExecuteResult;
+use crate::nyxd::error::NyxdError;
+use crate::nyxd::{Coin, Fee, NyxdClient};
 use async_trait::async_trait;
 use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use mixnet_contract_common::{Gateway, MixId, MixNode};
@@ -18,25 +18,25 @@ pub trait VestingSigningClient {
         fee: Option<Fee>,
         msg: VestingExecuteMsg,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_update_mixnode_cost_params(
         &self,
         new_costs: MixNodeCostParams,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_update_mixnode_config(
         &self,
         new_config: MixNodeConfigUpdate,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn update_mixnet_address(
         &self,
         address: &str,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_bond_gateway(
         &self,
@@ -44,16 +44,16 @@ pub trait VestingSigningClient {
         owner_signature: &str,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_track_unbond_gateway(
         &self,
         owner: &str,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_bond_mixnode(
         &self,
@@ -62,22 +62,37 @@ pub trait VestingSigningClient {
         owner_signature: &str,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError>;
+    async fn vesting_pledge_more(
+        &self,
+        additional_pledge: Coin,
+        fee: Option<Fee>,
+    ) -> Result<ExecuteResult, NyxdError> {
+        self.execute_vesting_contract(
+            fee,
+            VestingExecuteMsg::PledgeMore {
+                amount: additional_pledge.into(),
+            },
+            vec![],
+        )
+        .await
+    }
+
+    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_track_unbond_mixnode(
         &self,
         owner: &str,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn withdraw_vested_coins(
         &self,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_track_undelegation(
         &self,
@@ -85,20 +100,20 @@ pub trait VestingSigningClient {
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_delegate_to_mixnode(
         &self,
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn vesting_undelegate_from_mixnode(
         &self,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 
     async fn create_periodic_vesting_account(
         &self,
@@ -108,17 +123,17 @@ pub trait VestingSigningClient {
         amount: Coin,
         cap: Option<PledgeCap>,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError>;
+    ) -> Result<ExecuteResult, NyxdError>;
 }
 
 #[async_trait]
-impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient<C> {
+impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NyxdClient<C> {
     async fn execute_vesting_contract(
         &self,
         fee: Option<Fee>,
         msg: VestingExecuteMsg,
         funds: Vec<Coin>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let memo = msg.name().to_string();
         self.client
@@ -137,7 +152,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         new_costs: MixNodeCostParams,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_vesting_contract(
             fee,
             VestingExecuteMsg::UpdateMixnodeCostParams { new_costs },
@@ -150,7 +165,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         new_config: MixNodeConfigUpdate,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::UpdateMixnodeConfig { new_config };
         self.client
@@ -169,7 +184,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         address: &str,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::UpdateMixnetAddress {
             address: address.to_string(),
@@ -192,7 +207,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         owner_signature: &str,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::BondGateway {
             gateway,
@@ -211,7 +226,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
             .await
     }
 
-    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
+    async fn vesting_unbond_gateway(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::UnbondGateway {};
         self.client
@@ -231,7 +246,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         owner: &str,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::TrackUnbondGateway {
             owner: owner.to_string(),
@@ -256,7 +271,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         owner_signature: &str,
         pledge: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_vesting_contract(
             fee,
             VestingExecuteMsg::BondMixnode {
@@ -270,7 +285,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         .await
     }
 
-    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NymdError> {
+    async fn vesting_unbond_mixnode(&self, fee: Option<Fee>) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::UnbondMixnode {};
         self.client
@@ -290,7 +305,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         owner: &str,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::TrackUnbondMixnode {
             owner: owner.to_string(),
@@ -312,7 +327,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::WithdrawVestedCoins {
             amount: amount.into(),
@@ -335,7 +350,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_vesting_contract(
             fee,
             VestingExecuteMsg::TrackUndelegation {
@@ -353,7 +368,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         mix_id: MixId,
         amount: Coin,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_vesting_contract(
             fee,
             VestingExecuteMsg::DelegateToMixnode {
@@ -369,7 +384,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         &self,
         mix_id: MixId,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         self.execute_vesting_contract(
             fee,
             VestingExecuteMsg::UndelegateFromMixnode { mix_id },
@@ -386,7 +401,7 @@ impl<C: SigningCosmWasmClient + Sync + Send> VestingSigningClient for NymdClient
         amount: Coin,
         cap: Option<PledgeCap>,
         fee: Option<Fee>,
-    ) -> Result<ExecuteResult, NymdError> {
+    ) -> Result<ExecuteResult, NyxdError> {
         let fee = fee.unwrap_or(Fee::Auto(Some(self.simulated_gas_multiplier)));
         let req = VestingExecuteMsg::CreateAccount {
             owner_address: owner_address.to_string(),
diff --git a/common/client-libs/validator-client/src/nymd/wallet/mod.rs b/common/client-libs/validator-client/src/nyxd/wallet/mod.rs
similarity index 92%
rename from common/client-libs/validator-client/src/nymd/wallet/mod.rs
rename to common/client-libs/validator-client/src/nyxd/wallet/mod.rs
index c78aacde70..8983176692 100644
--- a/common/client-libs/validator-client/src/nymd/wallet/mod.rs
+++ b/common/client-libs/validator-client/src/nyxd/wallet/mod.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd::error::NymdError;
+use crate::nyxd::error::NyxdError;
 use config::defaults;
 use cosmrs::bip32::{DerivationPath, XPrv};
 use cosmrs::crypto::secp256k1::{Signature, SigningKey};
@@ -62,16 +62,16 @@ impl DirectSecp256k1HdWallet {
     }
 
     /// Restores a wallet from the given BIP39 mnemonic using default options.
-    pub fn from_mnemonic(prefix: &str, mnemonic: bip39::Mnemonic) -> Result<Self, NymdError> {
+    pub fn from_mnemonic(prefix: &str, mnemonic: bip39::Mnemonic) -> Result<Self, NyxdError> {
         DirectSecp256k1HdWalletBuilder::new(prefix).build(mnemonic)
     }
 
-    pub fn generate(prefix: &str, word_count: usize) -> Result<Self, NymdError> {
+    pub fn generate(prefix: &str, word_count: usize) -> Result<Self, NyxdError> {
         let mneomonic = bip39::Mnemonic::generate(word_count)?;
         Self::from_mnemonic(prefix, mneomonic)
     }
 
-    fn derive_keypair(&self, hd_path: &DerivationPath) -> Result<Secp256k1Keypair, NymdError> {
+    fn derive_keypair(&self, hd_path: &DerivationPath) -> Result<Secp256k1Keypair, NyxdError> {
         let extended_private_key = XPrv::derive_from_path(self.seed, hd_path)?;
 
         let private_key: SigningKey = extended_private_key.into();
@@ -80,7 +80,7 @@ impl DirectSecp256k1HdWallet {
         Ok((private_key, public_key))
     }
 
-    pub fn try_derive_accounts(&self) -> Result<Vec<AccountData>, NymdError> {
+    pub fn try_derive_accounts(&self) -> Result<Vec<AccountData>, NyxdError> {
         let mut accounts = Vec::with_capacity(self.accounts.len());
         for derivation_info in &self.accounts {
             let keypair = self.derive_keypair(&derivation_info.hd_path)?;
@@ -89,7 +89,7 @@ impl DirectSecp256k1HdWallet {
             let address = keypair
                 .1
                 .account_id(&derivation_info.prefix)
-                .map_err(|_| NymdError::AccountDerivationError)?;
+                .map_err(|_| NyxdError::AccountDerivationError)?;
 
             accounts.push(AccountData {
                 address,
@@ -109,36 +109,36 @@ impl DirectSecp256k1HdWallet {
         &self,
         signer: &AccountData,
         message: &[u8],
-    ) -> Result<Signature, NymdError> {
+    ) -> Result<Signature, NyxdError> {
         signer
             .private_key
             .sign(message)
-            .map_err(|_| NymdError::SigningFailure)
+            .map_err(|_| NyxdError::SigningFailure)
     }
 
     pub fn sign_direct_with_account(
         &self,
         signer: &AccountData,
         sign_doc: SignDoc,
-    ) -> Result<tx::Raw, NymdError> {
-        // ideally I'd prefer to have the entire error put into the NymdError::SigningFailure
+    ) -> Result<tx::Raw, NyxdError> {
+        // ideally I'd prefer to have the entire error put into the NyxdError::SigningFailure
         // but I'm super hesitant to trying to downcast the eyre::Report to cosmrs::error::Error
         sign_doc
             .sign(&signer.private_key)
-            .map_err(|_| NymdError::SigningFailure)
+            .map_err(|_| NyxdError::SigningFailure)
     }
 
     pub fn sign_direct(
         &self,
         signer_address: &AccountId,
         sign_doc: SignDoc,
-    ) -> Result<tx::Raw, NymdError> {
+    ) -> Result<tx::Raw, NyxdError> {
         // I hate deriving accounts at every sign here so much : (
         let accounts = self.try_derive_accounts()?;
         let account = accounts
             .iter()
             .find(|account| &account.address == signer_address)
-            .ok_or_else(|| NymdError::SigningAccountNotFound(signer_address.clone()))?;
+            .ok_or_else(|| NyxdError::SigningAccountNotFound(signer_address.clone()))?;
 
         self.sign_direct_with_account(account, sign_doc)
     }
@@ -185,7 +185,7 @@ impl DirectSecp256k1HdWalletBuilder {
         self
     }
 
-    pub fn build(self, mnemonic: bip39::Mnemonic) -> Result<DirectSecp256k1HdWallet, NymdError> {
+    pub fn build(self, mnemonic: bip39::Mnemonic) -> Result<DirectSecp256k1HdWallet, NyxdError> {
         let seed = mnemonic.to_seed(&self.bip39_password);
         let prefix = self.prefix;
         let accounts = self
diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml
index 21a1534c5d..084f3956cd 100644
--- a/common/commands/Cargo.toml
+++ b/common/commands/Cargo.toml
@@ -10,7 +10,7 @@ bip39 = "1.0.1"
 bs58 = "0.4"
 comfy-table = "6.0.0"
 cfg-if = "1.0.0"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 cw-utils = { version = "0.13.4" }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
@@ -28,7 +28,7 @@ tap = "1"
 cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 cosmwasm-std = { version = "1.0.0" }
 
-validator-client = { path = "../client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
 network-defaults = { path = "../network-defaults" }
 mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" }
diff --git a/common/commands/src/context/errors.rs b/common/commands/src/context/errors.rs
index 44a99f49ed..c385e96626 100644
--- a/common/commands/src/context/errors.rs
+++ b/common/commands/src/context/errors.rs
@@ -11,14 +11,14 @@ pub enum ContextError {
     #[error("failed to parse mnemonic - {0}")]
     Bip39Error(#[from] bip39::Error),
 
-    // there are lots of error that can occur in the nymd client, so just pass through their display details
+    // there are lots of error that can occur in the nyxd client, so just pass through their display details
     // TODO: improve this to return known errors
     #[error("failed to create client - {0}")]
-    NymdError(String),
+    NyxdError(String),
 
-    #[error("{0}")]
-    NymdErrorPassthrough(#[from] validator_client::nymd::error::NymdError),
+    #[error(transparent)]
+    NyxdErrorPassthrough(#[from] validator_client::nyxd::error::NyxdError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     ValidatorClientError(#[from] validator_client::ValidatorClientError),
 }
diff --git a/common/commands/src/context/mod.rs b/common/commands/src/context/mod.rs
index 4f55aa1847..ff0656e2f4 100644
--- a/common/commands/src/context/mod.rs
+++ b/common/commands/src/context/mod.rs
@@ -3,27 +3,27 @@
 
 use network_defaults::{
     setup_env,
-    var_names::{API_VALIDATOR, MIXNET_CONTRACT_ADDRESS, NYMD_VALIDATOR, VESTING_CONTRACT_ADDRESS},
+    var_names::{MIXNET_CONTRACT_ADDRESS, NYM_API, NYXD, VESTING_CONTRACT_ADDRESS},
     NymNetworkDetails,
 };
 use tap::prelude::*;
-use validator_client::nymd::{self, AccountId, NymdClient, QueryNymdClient, SigningNymdClient};
-pub use validator_client::validator_api::Client as ValidatorApiClient;
+pub use validator_client::nym_api::Client as NymApiClient;
+use validator_client::nyxd::{self, AccountId, NyxdClient, QueryNyxdClient, SigningNyxdClient};
 
 use crate::context::errors::ContextError;
 
 pub mod errors;
 
-pub type SigningClient = validator_client::nymd::NymdClient<SigningNymdClient>;
-pub type QueryClient = validator_client::nymd::NymdClient<QueryNymdClient>;
-pub type SigningClientWithValidatorAPI = validator_client::Client<SigningNymdClient>;
-pub type QueryClientWithValidatorAPI = validator_client::Client<QueryNymdClient>;
+pub type SigningClient = validator_client::nyxd::NyxdClient<SigningNyxdClient>;
+pub type QueryClient = validator_client::nyxd::NyxdClient<QueryNyxdClient>;
+pub type SigningClientWithNyxd = validator_client::Client<SigningNyxdClient>;
+pub type QueryClientWithNyxd = validator_client::Client<QueryNyxdClient>;
 
 #[derive(Debug)]
 pub struct ClientArgs {
     pub config_env_file: Option<std::path::PathBuf>,
-    pub nymd_url: Option<String>,
-    pub validator_api_url: Option<String>,
+    pub nyxd_url: Option<String>,
+    pub nym_api_url: Option<String>,
     pub mnemonic: Option<bip39::Mnemonic>,
     pub mixnet_contract_address: Option<AccountId>,
     pub vesting_contract_address: Option<AccountId>,
@@ -32,14 +32,14 @@ pub struct ClientArgs {
 pub fn get_network_details(args: &ClientArgs) -> Result<NymNetworkDetails, ContextError> {
     // let the network defaults crate handle setting up the env vars if the file arg is set, otherwise
     // it will default to what is already in env vars, falling back to mainnet
-    setup_env(args.config_env_file.clone());
+    setup_env(args.config_env_file.as_ref());
 
     // override the env vars with user supplied arguments, if set
-    if let Some(nymd_url) = args.nymd_url.as_ref() {
-        std::env::set_var(NYMD_VALIDATOR, nymd_url);
+    if let Some(nyxd_url) = args.nyxd_url.as_ref() {
+        std::env::set_var(NYXD, nyxd_url);
     }
-    if let Some(validator_api_url) = args.validator_api_url.as_ref() {
-        std::env::set_var(API_VALIDATOR, validator_api_url);
+    if let Some(nym_api_url) = args.nym_api_url.as_ref() {
+        std::env::set_var(NYM_API, nym_api_url);
     }
     if let Some(mixnet_contract_address) = args.mixnet_contract_address.as_ref() {
         std::env::set_var(MIXNET_CONTRACT_ADDRESS, mixnet_contract_address.to_string());
@@ -58,8 +58,8 @@ pub fn create_signing_client(
     args: ClientArgs,
     network_details: &NymNetworkDetails,
 ) -> Result<SigningClient, ContextError> {
-    let client_config = nymd::Config::try_from_nym_network_details(network_details)
-        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;
+    let client_config = nyxd::Config::try_from_nym_network_details(network_details)
+        .tap_err(|err| log::error!("Failed to get client config - {err}"))?;
 
     // get mnemonic
     let mnemonic = match std::env::var("MNEMONIC") {
@@ -71,44 +71,44 @@ pub fn create_signing_client(
         },
     };
 
-    let nymd_url = network_details
+    let nyxd_url = network_details
         .endpoints
         .first()
         .expect("network details are not defined")
-        .nymd_url
+        .nyxd_url
         .as_str();
 
-    match NymdClient::connect_with_mnemonic(client_config, nymd_url, mnemonic, None) {
+    match NyxdClient::connect_with_mnemonic(client_config, nyxd_url, mnemonic, None) {
         Ok(client) => Ok(client),
-        Err(e) => Err(ContextError::NymdError(format!("{:?}", e))),
+        Err(e) => Err(ContextError::NyxdError(format!("{:?}", e))),
     }
 }
 
 pub fn create_query_client(
     network_details: &NymNetworkDetails,
 ) -> Result<QueryClient, ContextError> {
-    let client_config = nymd::Config::try_from_nym_network_details(network_details)
-        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;
+    let client_config = nyxd::Config::try_from_nym_network_details(network_details)
+        .tap_err(|err| log::error!("Failed to get client config - {err}"))?;
 
-    let nymd_url = network_details
+    let nyxd_url = network_details
         .endpoints
         .first()
         .expect("network details are not defined")
-        .nymd_url
+        .nyxd_url
         .as_str();
 
-    match NymdClient::connect(client_config, nymd_url) {
+    match NyxdClient::connect(client_config, nyxd_url) {
         Ok(client) => Ok(client),
-        Err(e) => Err(ContextError::NymdError(format!("{:?}", e))),
+        Err(e) => Err(ContextError::NyxdError(format!("{:?}", e))),
     }
 }
 
-pub fn create_signing_client_with_validator_api(
+pub fn create_signing_client_with_nym_api(
     args: ClientArgs,
     network_details: &NymNetworkDetails,
-) -> Result<SigningClientWithValidatorAPI, ContextError> {
+) -> Result<SigningClientWithNyxd, ContextError> {
     let client_config = validator_client::Config::try_from_nym_network_details(network_details)
-        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;
+        .tap_err(|err| log::error!("Failed to get client config - {err}"))?;
 
     // get mnemonic
     let mnemonic = match std::env::var("MNEMONIC") {
@@ -122,18 +122,18 @@ pub fn create_signing_client_with_validator_api(
 
     match validator_client::client::Client::new_signing(client_config, mnemonic) {
         Ok(client) => Ok(client),
-        Err(e) => Err(ContextError::NymdError(format!("{:?}", e))),
+        Err(e) => Err(ContextError::NyxdError(format!("{:?}", e))),
     }
 }
 
-pub fn create_query_client_with_validator_api(
+pub fn create_query_client_with_nym_api(
     network_details: &NymNetworkDetails,
-) -> Result<QueryClientWithValidatorAPI, ContextError> {
+) -> Result<QueryClientWithNyxd, ContextError> {
     let client_config = validator_client::Config::try_from_nym_network_details(network_details)
-        .tap_err(|e| log::error!("Failed to get client config - {:?}", e))?;
+        .tap_err(|err| log::error!("Failed to get client config - {err}"))?;
 
     match validator_client::client::Client::new_query(client_config) {
         Ok(client) => Ok(client),
-        Err(e) => Err(ContextError::NymdError(format!("{:?}", e))),
+        Err(e) => Err(ContextError::NyxdError(format!("{:?}", e))),
     }
 }
diff --git a/common/commands/src/utils.rs b/common/commands/src/utils.rs
index 2e042da300..59fee99f4e 100644
--- a/common/commands/src/utils.rs
+++ b/common/commands/src/utils.rs
@@ -6,7 +6,7 @@ use std::fmt::Display;
 
 use cosmwasm_std::{Coin as CosmWasmCoin, Decimal};
 use log::error;
-use validator_client::nymd::Coin;
+use validator_client::nyxd::Coin;
 
 pub fn pretty_coin(coin: &Coin) -> String {
     let amount = Decimal::from_ratio(coin.amount, 1_000_000u128);
diff --git a/common/commands/src/validator/account/balance.rs b/common/commands/src/validator/account/balance.rs
index eb8e2dfa8f..3f926891a5 100644
--- a/common/commands/src/validator/account/balance.rs
+++ b/common/commands/src/validator/account/balance.rs
@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::{error, info};
 
-use validator_client::nymd::AccountId;
+use validator_client::nyxd::AccountId;
 
 use crate::context::QueryClient;
 use crate::utils::{pretty_coin, show_error};
diff --git a/common/commands/src/validator/account/create.rs b/common/commands/src/validator/account/create.rs
index 3003b9a9d5..e321d5b41d 100644
--- a/common/commands/src/validator/account/create.rs
+++ b/common/commands/src/validator/account/create.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::Parser;
-use validator_client::nymd::wallet::DirectSecp256k1HdWallet;
+use validator_client::nyxd::wallet::DirectSecp256k1HdWallet;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/account/pubkey.rs b/common/commands/src/validator/account/pubkey.rs
index 83d15f25e3..8ecf98c406 100644
--- a/common/commands/src/validator/account/pubkey.rs
+++ b/common/commands/src/validator/account/pubkey.rs
@@ -4,8 +4,8 @@
 use clap::Parser;
 use log::{error, info};
 
-use validator_client::nymd::wallet::DirectSecp256k1HdWallet;
-use validator_client::nymd::AccountId;
+use validator_client::nyxd::wallet::DirectSecp256k1HdWallet;
+use validator_client::nyxd::AccountId;
 
 use crate::context::QueryClient;
 use crate::utils::show_error;
diff --git a/common/commands/src/validator/account/send.rs b/common/commands/src/validator/account/send.rs
index 90816258bd..ac80de8169 100644
--- a/common/commands/src/validator/account/send.rs
+++ b/common/commands/src/validator/account/send.rs
@@ -5,7 +5,7 @@ use clap::Parser;
 use log::info;
 use serde_json::json;
 
-use validator_client::nymd::{AccountId, Coin};
+use validator_client::nyxd::{AccountId, Coin};
 
 use crate::context::SigningClient;
 
diff --git a/common/commands/src/validator/cosmwasm/execute_contract.rs b/common/commands/src/validator/cosmwasm/execute_contract.rs
index f387b83903..d271121a49 100644
--- a/common/commands/src/validator/cosmwasm/execute_contract.rs
+++ b/common/commands/src/validator/cosmwasm/execute_contract.rs
@@ -6,7 +6,7 @@ use clap::Parser;
 use cosmrs::AccountId;
 use log::{error, info};
 use serde_json::{json, Value};
-use validator_client::nymd::Coin;
+use validator_client::nyxd::Coin;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/cosmwasm/init_contract.rs b/common/commands/src/validator/cosmwasm/init_contract.rs
index c624a81a94..6ee55b7791 100644
--- a/common/commands/src/validator/cosmwasm/init_contract.rs
+++ b/common/commands/src/validator/cosmwasm/init_contract.rs
@@ -6,8 +6,8 @@ use clap::Parser;
 use cosmrs::{AccountId, Coin as CosmosCoin};
 use log::info;
 use network_defaults::NymNetworkDetails;
-use validator_client::nymd::cosmwasm_client::types::{ContractCodeId, InstantiateOptions};
-use validator_client::nymd::Coin;
+use validator_client::nyxd::cosmwasm_client::types::{ContractCodeId, InstantiateOptions};
+use validator_client::nyxd::Coin;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/cosmwasm/migrate_contract.rs b/common/commands/src/validator/cosmwasm/migrate_contract.rs
index fa21062ee7..4abf101ae8 100644
--- a/common/commands/src/validator/cosmwasm/migrate_contract.rs
+++ b/common/commands/src/validator/cosmwasm/migrate_contract.rs
@@ -6,7 +6,7 @@ use crate::utils::show_error_passthrough;
 use clap::Parser;
 use cosmrs::AccountId;
 use log::info;
-use validator_client::nymd::cosmwasm_client::types::{ContractCodeId, EmptyMsg};
+use validator_client::nyxd::cosmwasm_client::types::{ContractCodeId, EmptyMsg};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/delegators/delegate_to_mixnode.rs b/common/commands/src/validator/mixnet/delegators/delegate_to_mixnode.rs
index 50b4880c6e..696a2e977d 100644
--- a/common/commands/src/validator/mixnet/delegators/delegate_to_mixnode.rs
+++ b/common/commands/src/validator/mixnet/delegators/delegate_to_mixnode.rs
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::{Coin, MixId};
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/delegators/query_for_delegations.rs b/common/commands/src/validator/mixnet/delegators/query_for_delegations.rs
index d816e65a0c..68a347a1fc 100644
--- a/common/commands/src/validator/mixnet/delegators/query_for_delegations.rs
+++ b/common/commands/src/validator/mixnet/delegators/query_for_delegations.rs
@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::info;
 
-use crate::context::SigningClientWithValidatorAPI;
+use crate::context::SigningClientWithNyxd;
 use crate::utils::{pretty_cosmwasm_coin, show_error_passthrough};
 
 use comfy_table::Table;
@@ -14,19 +14,19 @@ use mixnet_contract_common::{Delegation, PendingEpochEvent, PendingEpochEventKin
 #[derive(Debug, Parser)]
 pub struct Args {}
 
-pub async fn execute(_args: Args, client: SigningClientWithValidatorAPI) {
+pub async fn execute(_args: Args, client: SigningClientWithNyxd) {
     info!(
         "Getting delegations for account {}...",
-        client.nymd.address()
+        client.nyxd.address()
     );
 
     let delegations = client
-        .get_all_delegator_delegations(client.nymd.address())
+        .get_all_delegator_delegations(client.nyxd.address())
         .await
         .map_err(show_error_passthrough);
 
     let mixnet_contract_events = client
-        .get_all_nymd_pending_epoch_events()
+        .get_all_nyxd_pending_epoch_events()
         .await
         .map_err(show_error_passthrough);
 
@@ -48,14 +48,14 @@ pub async fn execute(_args: Args, client: SigningClientWithValidatorAPI) {
     }
 }
 
-async fn to_iso_timestamp(block_height: u32, client: &SigningClientWithValidatorAPI) -> String {
-    match client.nymd.get_block_timestamp(Some(block_height)).await {
+async fn to_iso_timestamp(block_height: u32, client: &SigningClientWithNyxd) -> String {
+    match client.nyxd.get_block_timestamp(Some(block_height)).await {
         Ok(res) => res.to_rfc3339(),
         Err(_e) => "-".to_string(),
     }
 }
 
-async fn print_delegations(delegations: Vec<Delegation>, client: &SigningClientWithValidatorAPI) {
+async fn print_delegations(delegations: Vec<Delegation>, client: &SigningClientWithNyxd) {
     let mut table = Table::new();
 
     table.set_header(vec!["Timestamp", "Mix Id", "Delegation", "Proxy"]);
@@ -75,10 +75,7 @@ async fn print_delegations(delegations: Vec<Delegation>, client: &SigningClientW
     println!("{table}");
 }
 
-async fn print_delegation_events(
-    events: Vec<PendingEpochEvent>,
-    client: &SigningClientWithValidatorAPI,
-) {
+async fn print_delegation_events(events: Vec<PendingEpochEvent>, client: &SigningClientWithNyxd) {
     let mut table = Table::new();
 
     table.set_header(vec![
@@ -97,7 +94,7 @@ async fn print_delegation_events(
                 amount,
                 proxy,
             } => {
-                if owner.as_str() == client.nymd.address().as_ref() {
+                if owner.as_str() == client.nyxd.address().as_ref() {
                     table.add_row(vec![
                         "not-sure-if-applicable".into(),
                         mix_id.to_string(),
@@ -112,7 +109,7 @@ async fn print_delegation_events(
                 mix_id,
                 proxy,
             } => {
-                if owner.as_str() == client.nymd.address().as_ref() {
+                if owner.as_str() == client.nyxd.address().as_ref() {
                     table.add_row(vec![
                         "not-sure-if-applicable".into(),
                         mix_id.to_string(),
diff --git a/common/commands/src/validator/mixnet/delegators/rewards/claim_delegator_reward.rs b/common/commands/src/validator/mixnet/delegators/rewards/claim_delegator_reward.rs
index 1858b7cebb..474d6d4233 100644
--- a/common/commands/src/validator/mixnet/delegators/rewards/claim_delegator_reward.rs
+++ b/common/commands/src/validator/mixnet/delegators/rewards/claim_delegator_reward.rs
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixId;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/delegators/rewards/vesting_claim_delegator_reward.rs b/common/commands/src/validator/mixnet/delegators/rewards/vesting_claim_delegator_reward.rs
index 6eca5cbf7a..a3a9fbc385 100644
--- a/common/commands/src/validator/mixnet/delegators/rewards/vesting_claim_delegator_reward.rs
+++ b/common/commands/src/validator/mixnet/delegators/rewards/vesting_claim_delegator_reward.rs
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixId;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/delegators/undelegate_from_mixnode.rs b/common/commands/src/validator/mixnet/delegators/undelegate_from_mixnode.rs
index 063d4a523f..1bdc5f5305 100644
--- a/common/commands/src/validator/mixnet/delegators/undelegate_from_mixnode.rs
+++ b/common/commands/src/validator/mixnet/delegators/undelegate_from_mixnode.rs
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixId;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/delegators/vesting_delegate_to_mixnode.rs b/common/commands/src/validator/mixnet/delegators/vesting_delegate_to_mixnode.rs
index ba33a49037..b4cef52bf3 100644
--- a/common/commands/src/validator/mixnet/delegators/vesting_delegate_to_mixnode.rs
+++ b/common/commands/src/validator/mixnet/delegators/vesting_delegate_to_mixnode.rs
@@ -5,8 +5,8 @@ use clap::Parser;
 use log::info;
 
 use mixnet_contract_common::{Coin, MixId};
-use validator_client::nymd::traits::MixnetQueryClient;
-use validator_client::nymd::VestingSigningClient;
+use validator_client::nyxd::traits::MixnetQueryClient;
+use validator_client::nyxd::VestingSigningClient;
 
 use crate::context::SigningClient;
 
diff --git a/common/commands/src/validator/mixnet/delegators/vesting_undelegate_from_mixnode.rs b/common/commands/src/validator/mixnet/delegators/vesting_undelegate_from_mixnode.rs
index 59fb6b6c3d..29b77c8a3b 100644
--- a/common/commands/src/validator/mixnet/delegators/vesting_undelegate_from_mixnode.rs
+++ b/common/commands/src/validator/mixnet/delegators/vesting_undelegate_from_mixnode.rs
@@ -4,8 +4,8 @@
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixId;
-use validator_client::nymd::traits::MixnetQueryClient;
-use validator_client::nymd::VestingSigningClient;
+use validator_client::nyxd::traits::MixnetQueryClient;
+use validator_client::nyxd::VestingSigningClient;
 
 use crate::context::SigningClient;
 
diff --git a/common/commands/src/validator/mixnet/operators/gateway/bond_gateway.rs b/common/commands/src/validator/mixnet/operators/gateway/bond_gateway.rs
index e9482dde34..34b652a567 100644
--- a/common/commands/src/validator/mixnet/operators/gateway/bond_gateway.rs
+++ b/common/commands/src/validator/mixnet/operators/gateway/bond_gateway.rs
@@ -6,7 +6,7 @@ use clap::Parser;
 use log::{info, warn};
 use mixnet_contract_common::Coin;
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/gateway/unbond_gateway.rs b/common/commands/src/validator/mixnet/operators/gateway/unbond_gateway.rs
index 90cae1623c..e0e7ba68f1 100644
--- a/common/commands/src/validator/mixnet/operators/gateway/unbond_gateway.rs
+++ b/common/commands/src/validator/mixnet/operators/gateway/unbond_gateway.rs
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {}
diff --git a/common/commands/src/validator/mixnet/operators/gateway/vesting_bond_gateway.rs b/common/commands/src/validator/mixnet/operators/gateway/vesting_bond_gateway.rs
index 6c26b09eeb..c4e3854fd4 100644
--- a/common/commands/src/validator/mixnet/operators/gateway/vesting_bond_gateway.rs
+++ b/common/commands/src/validator/mixnet/operators/gateway/vesting_bond_gateway.rs
@@ -6,7 +6,7 @@ use clap::Parser;
 use log::{info, warn};
 use mixnet_contract_common::{Coin, Gateway};
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
-use validator_client::nymd::VestingSigningClient;
+use validator_client::nyxd::VestingSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/gateway/vesting_unbond_gateway.rs b/common/commands/src/validator/mixnet/operators/gateway/vesting_unbond_gateway.rs
index 0c0eae2fe6..c9b95a3169 100644
--- a/common/commands/src/validator/mixnet/operators/gateway/vesting_unbond_gateway.rs
+++ b/common/commands/src/validator/mixnet/operators/gateway/vesting_unbond_gateway.rs
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {}
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/bond_mixnode.rs b/common/commands/src/validator/mixnet/operators/mixnode/bond_mixnode.rs
index 4d672a5322..0c04845a15 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/bond_mixnode.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/bond_mixnode.rs
@@ -9,8 +9,8 @@ use mixnet_contract_common::{Coin, MixNodeCostParams, Percent};
 use network_defaults::{
     DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
-use validator_client::nymd::traits::MixnetSigningClient;
-use validator_client::nymd::CosmWasmCoin;
+use validator_client::nyxd::traits::MixnetSigningClient;
+use validator_client::nyxd::CosmWasmCoin;
 
 use crate::context::SigningClient;
 
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/rewards/claim_operator_reward.rs b/common/commands/src/validator/mixnet/operators/mixnode/rewards/claim_operator_reward.rs
index 773f4cb3d7..e689f91f73 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/rewards/claim_operator_reward.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/rewards/claim_operator_reward.rs
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {}
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/rewards/vesting_claim_operator_reward.rs b/common/commands/src/validator/mixnet/operators/mixnode/rewards/vesting_claim_operator_reward.rs
index d4895e83f2..f91506ad02 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/rewards/vesting_claim_operator_reward.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/rewards/vesting_claim_operator_reward.rs
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/settings/update_config.rs b/common/commands/src/validator/mixnet/operators/mixnode/settings/update_config.rs
index 84cf9f2f4e..cb793c61f5 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/settings/update_config.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/settings/update_config.rs
@@ -5,7 +5,7 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixNodeConfigUpdate;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/settings/vesting_update_config.rs b/common/commands/src/validator/mixnet/operators/mixnode/settings/vesting_update_config.rs
index bca3642c97..044764c642 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/settings/vesting_update_config.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/settings/vesting_update_config.rs
@@ -5,8 +5,8 @@ use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
 use mixnet_contract_common::MixNodeConfigUpdate;
-use validator_client::nymd::traits::MixnetQueryClient;
-use validator_client::nymd::VestingSigningClient;
+use validator_client::nyxd::traits::MixnetQueryClient;
+use validator_client::nyxd::VestingSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/unbond_mixnode.rs b/common/commands/src/validator/mixnet/operators/mixnode/unbond_mixnode.rs
index 04fa9a55cd..8f5e881048 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/unbond_mixnode.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/unbond_mixnode.rs
@@ -3,7 +3,7 @@
 
 use clap::Parser;
 use log::info;
-use validator_client::nymd::traits::MixnetSigningClient;
+use validator_client::nyxd::traits::MixnetSigningClient;
 
 use crate::context::SigningClient;
 
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/vesting_bond_mixnode.rs b/common/commands/src/validator/mixnet/operators/mixnode/vesting_bond_mixnode.rs
index 6f20996460..3aa8da5969 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/vesting_bond_mixnode.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/vesting_bond_mixnode.rs
@@ -10,7 +10,7 @@ use mixnet_contract_common::{MixNode, Percent};
 use network_defaults::{
     DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
-use validator_client::nymd::{CosmWasmCoin, VestingSigningClient};
+use validator_client::nyxd::{CosmWasmCoin, VestingSigningClient};
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/operators/mixnode/vesting_unbond_mixnode.rs b/common/commands/src/validator/mixnet/operators/mixnode/vesting_unbond_mixnode.rs
index 0824cc9342..e99c4baf83 100644
--- a/common/commands/src/validator/mixnet/operators/mixnode/vesting_unbond_mixnode.rs
+++ b/common/commands/src/validator/mixnet/operators/mixnode/vesting_unbond_mixnode.rs
@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use validator_client::nymd::VestingSigningClient;
+use validator_client::nyxd::VestingSigningClient;
 
 #[derive(Debug, Parser)]
 pub struct Args {
diff --git a/common/commands/src/validator/mixnet/query/query_all_gateways.rs b/common/commands/src/validator/mixnet/query/query_all_gateways.rs
index 679ac08bcd..17f1d4d48d 100644
--- a/common/commands/src/validator/mixnet/query/query_all_gateways.rs
+++ b/common/commands/src/validator/mixnet/query/query_all_gateways.rs
@@ -4,7 +4,7 @@
 use clap::Parser;
 use comfy_table::Table;
 
-use crate::context::QueryClientWithValidatorAPI;
+use crate::context::QueryClientWithNyxd;
 use crate::utils::{pretty_cosmwasm_coin, show_error};
 
 #[derive(Debug, Parser)]
@@ -14,8 +14,8 @@ pub struct Args {
     pub identity_key: Option<String>,
 }
 
-pub async fn query(args: Args, client: &QueryClientWithValidatorAPI) {
-    match client.validator_api.get_gateways().await {
+pub async fn query(args: Args, client: &QueryClientWithNyxd) {
+    match client.nym_api.get_gateways().await {
         Ok(res) => match args.identity_key {
             Some(identity_key) => {
                 let node = res.iter().find(|node| {
diff --git a/common/commands/src/validator/mixnet/query/query_all_mixnodes.rs b/common/commands/src/validator/mixnet/query/query_all_mixnodes.rs
index 4ec6b25b7b..3b23f2092e 100644
--- a/common/commands/src/validator/mixnet/query/query_all_mixnodes.rs
+++ b/common/commands/src/validator/mixnet/query/query_all_mixnodes.rs
@@ -4,7 +4,7 @@
 use clap::Parser;
 use comfy_table::Table;
 
-use crate::context::QueryClientWithValidatorAPI;
+use crate::context::QueryClientWithNyxd;
 use crate::utils::{pretty_decimal_with_denom, show_error};
 
 #[derive(Debug, Parser)]
@@ -14,8 +14,8 @@ pub struct Args {
     pub identity_key: Option<String>,
 }
 
-pub async fn query(args: Args, client: &QueryClientWithValidatorAPI) {
-    match client.validator_api.get_mixnodes().await {
+pub async fn query(args: Args, client: &QueryClientWithNyxd) {
+    match client.nym_api.get_mixnodes().await {
         Ok(res) => match args.identity_key {
             Some(identity_key) => {
                 let node = res.iter().find(|node| {
diff --git a/common/commands/src/validator/signature/errors.rs b/common/commands/src/validator/signature/errors.rs
index 2369e06d66..d67c3d387b 100644
--- a/common/commands/src/validator/signature/errors.rs
+++ b/common/commands/src/validator/signature/errors.rs
@@ -11,6 +11,6 @@ pub enum Errors {
     #[error("signature error - {0}")]
     SignatureError(#[from] k256::ecdsa::signature::Error),
 
-    #[error("{0}")]
+    #[error(transparent)]
     CosmrsError(#[from] cosmrs::ErrorReport),
 }
diff --git a/common/commands/src/validator/signature/sign.rs b/common/commands/src/validator/signature/sign.rs
index cd4c169ae1..87dfc0303e 100644
--- a/common/commands/src/validator/signature/sign.rs
+++ b/common/commands/src/validator/signature/sign.rs
@@ -7,7 +7,7 @@ use cosmrs::crypto::PublicKey;
 use log::error;
 use serde::Serialize;
 use serde_json::json;
-use validator_client::nymd::wallet::DirectSecp256k1HdWallet;
+use validator_client::nyxd::wallet::DirectSecp256k1HdWallet;
 
 #[derive(Debug, Serialize)]
 pub struct SignatureOutputJson {
diff --git a/common/commands/src/validator/signature/verify.rs b/common/commands/src/validator/signature/verify.rs
index b29f93ca9a..8f84251a1a 100644
--- a/common/commands/src/validator/signature/verify.rs
+++ b/common/commands/src/validator/signature/verify.rs
@@ -8,7 +8,7 @@ use cosmrs::crypto::PublicKey;
 use log::{error, info};
 use serde_json::json;
 
-use validator_client::nymd::AccountId;
+use validator_client::nyxd::AccountId;
 
 use crate::context::QueryClient;
 use crate::validator::signature::helpers::secp256k1_verify_with_public_key;
diff --git a/common/commands/src/validator/vesting/balance.rs b/common/commands/src/validator/vesting/balance.rs
index 0dff560b9f..5263d106c3 100644
--- a/common/commands/src/validator/vesting/balance.rs
+++ b/common/commands/src/validator/vesting/balance.rs
@@ -5,7 +5,7 @@ use clap::Parser;
 use cosmrs::AccountId;
 use log::{error, info};
 
-use validator_client::nymd::{Coin, VestingQueryClient};
+use validator_client::nyxd::{Coin, VestingQueryClient};
 
 use crate::context::QueryClient;
 use crate::utils::show_error;
diff --git a/common/commands/src/validator/vesting/create_vesting_schedule.rs b/common/commands/src/validator/vesting/create_vesting_schedule.rs
index c7c133673d..d022f2ce3a 100644
--- a/common/commands/src/validator/vesting/create_vesting_schedule.rs
+++ b/common/commands/src/validator/vesting/create_vesting_schedule.rs
@@ -8,9 +8,9 @@ use log::info;
 
 use mixnet_contract_common::Coin;
 use network_defaults::NymNetworkDetails;
-use validator_client::nymd::AccountId;
-use validator_client::nymd::VestingSigningClient;
-use validator_client::nymd::{CosmosCoin, Denom};
+use validator_client::nyxd::AccountId;
+use validator_client::nyxd::VestingSigningClient;
+use validator_client::nyxd::{CosmosCoin, Denom};
 use vesting_contract_common::messages::VestingSpecification;
 use vesting_contract_common::PledgeCap;
 
diff --git a/common/commands/src/validator/vesting/query_vesting_schedule.rs b/common/commands/src/validator/vesting/query_vesting_schedule.rs
index 10a4dc41d3..3d486124ef 100644
--- a/common/commands/src/validator/vesting/query_vesting_schedule.rs
+++ b/common/commands/src/validator/vesting/query_vesting_schedule.rs
@@ -6,7 +6,7 @@ use cosmrs::AccountId;
 use cosmwasm_std::Coin as CosmWasmCoin;
 use log::{error, info};
 
-use validator_client::nymd::{Coin, VestingQueryClient};
+use validator_client::nyxd::{Coin, VestingQueryClient};
 
 use crate::context::QueryClient;
 use crate::utils::show_error;
diff --git a/common/commands/src/validator/vesting/withdraw_vested.rs b/common/commands/src/validator/vesting/withdraw_vested.rs
index 972c5290d9..c203bbc63d 100644
--- a/common/commands/src/validator/vesting/withdraw_vested.rs
+++ b/common/commands/src/validator/vesting/withdraw_vested.rs
@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::info;
 
-use validator_client::nymd::{Coin, VestingQueryClient, VestingSigningClient};
+use validator_client::nyxd::{Coin, VestingQueryClient, VestingSigningClient};
 
 use crate::context::SigningClient;
 use crate::utils::show_error;
diff --git a/common/completions/Cargo.toml b/common/completions/Cargo.toml
index ace1f76e7f..53a5fa1eed 100644
--- a/common/completions/Cargo.toml
+++ b/common/completions/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "3.2", features = ["derive"] }
-clap_complete = "3.2"
-clap_complete_fig = "3.2"
\ No newline at end of file
+clap = { version = "4.0", features = ["derive"] }
+clap_complete = "4.0"
+clap_complete_fig = "4.0"
\ No newline at end of file
diff --git a/common/completions/src/lib.rs b/common/completions/src/lib.rs
index 8526c18d4f..15344ec834 100644
--- a/common/completions/src/lib.rs
+++ b/common/completions/src/lib.rs
@@ -1,5 +1,5 @@
 use clap::builder::Command;
-use clap::clap_derive::ArgEnum;
+use clap::clap_derive::ValueEnum;
 use clap::Args;
 use clap_complete::generator::generate;
 use clap_complete::Shell as ClapShell;
@@ -14,7 +14,7 @@ pub fn fig_generate(command: &mut Command, name: &str) {
     )
 }
 
-#[derive(ArgEnum, Copy, Clone)]
+#[derive(ValueEnum, Copy, Clone)]
 pub enum Shell {
     Bash,
     Elvish,
@@ -25,7 +25,7 @@ pub enum Shell {
 
 #[derive(Args, Copy, Clone)]
 pub struct ArgShell {
-    #[clap(arg_enum, value_name = "SHELL")]
+    #[clap(value_enum, value_name = "SHELL")]
     shell: Shell,
 }
 
diff --git a/common/config/src/lib.rs b/common/config/src/lib.rs
index 1f72896d9c..9e778840cd 100644
--- a/common/config/src/lib.rs
+++ b/common/config/src/lib.rs
@@ -2,15 +2,24 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use handlebars::Handlebars;
+use network_defaults::mainnet::read_var_if_not_default;
+use network_defaults::var_names::CONFIGURED;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
+use std::any::type_name;
+use std::fmt::Debug;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 use std::path::PathBuf;
+use std::str::FromStr;
 use std::{fs, io};
 
 pub mod defaults;
 
+pub const CONFIG_DIR: &str = "config";
+pub const DATA_DIR: &str = "data";
+pub const DB_FILE_NAME: &str = "db.sqlite";
+
 pub trait NymConfig: Default + Serialize + DeserializeOwned {
     fn template() -> &'static str;
 
@@ -23,17 +32,17 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     // default, most probable, implementations; can be easily overridden where required
     fn default_config_directory(id: Option<&str>) -> PathBuf {
         if let Some(id) = id {
-            Self::default_root_directory().join(id).join("config")
+            Self::default_root_directory().join(id).join(CONFIG_DIR)
         } else {
-            Self::default_root_directory().join("config")
+            Self::default_root_directory().join(CONFIG_DIR)
         }
     }
 
     fn default_data_directory(id: Option<&str>) -> PathBuf {
         if let Some(id) = id {
-            Self::default_root_directory().join(id).join("data")
+            Self::default_root_directory().join(id).join(DATA_DIR)
         } else {
-            Self::default_root_directory().join("data")
+            Self::default_root_directory().join(DATA_DIR)
         }
     }
 
@@ -47,17 +56,17 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
 
     fn try_default_config_directory(id: Option<&str>) -> Option<PathBuf> {
         if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join("config"))
+            Self::try_default_root_directory().map(|d| d.join(id).join(CONFIG_DIR))
         } else {
-            Self::try_default_root_directory().map(|d| d.join("config"))
+            Self::try_default_root_directory().map(|d| d.join(CONFIG_DIR))
         }
     }
 
     fn try_default_data_directory(id: Option<&str>) -> Option<PathBuf> {
         if let Some(id) = id {
-            Self::try_default_root_directory().map(|d| d.join(id).join("data"))
+            Self::try_default_root_directory().map(|d| d.join(id).join(DATA_DIR))
         } else {
-            Self::try_default_root_directory().map(|d| d.join("data"))
+            Self::try_default_root_directory().map(|d| d.join(DATA_DIR))
         }
     }
 
@@ -114,13 +123,78 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
     }
 }
 
-pub fn parse_validators(raw: &str) -> Vec<url::Url> {
+// this function is only used for parsing values from the network defaults and thus the "expect" there are fine
+pub fn parse_urls(raw: &str) -> Vec<url::Url> {
     raw.split(',')
-        .map(|raw_validator| {
-            raw_validator
+        .map(|raw_url| {
+            raw_url
                 .trim()
                 .parse()
-                .expect("one of the provided validator api urls is invalid")
+                .expect("one of the provided nym api urls is invalid")
         })
         .collect()
 }
+
+pub trait OptionalSet {
+    fn with_optional<F, T>(self, f: F, val: Option<T>) -> Self
+    where
+        F: Fn(Self, T) -> Self,
+        Self: Sized,
+    {
+        if let Some(val) = val {
+            f(self, val)
+        } else {
+            self
+        }
+    }
+
+    fn with_optional_env<F, T>(self, f: F, val: Option<T>, env_var: &str) -> Self
+    where
+        F: Fn(Self, T) -> Self,
+        T: FromStr,
+        <T as FromStr>::Err: Debug,
+        Self: Sized,
+    {
+        if let Some(val) = val {
+            return f(self, val);
+        } else if std::env::var(CONFIGURED).is_ok() {
+            if let Some(raw) = read_var_if_not_default(env_var) {
+                return f(
+                    self,
+                    raw.parse().unwrap_or_else(|err| {
+                        panic!(
+                            "failed to parse value of {raw} into type {}. the error was {:?}",
+                            type_name::<T>(),
+                            err
+                        )
+                    }),
+                );
+            }
+        }
+        self
+    }
+
+    fn with_optional_custom_env<F, T, G>(
+        self,
+        f: F,
+        val: Option<T>,
+        env_var: &str,
+        parser: G,
+    ) -> Self
+    where
+        F: Fn(Self, T) -> Self,
+        G: Fn(&str) -> T,
+        Self: Sized,
+    {
+        if let Some(val) = val {
+            return f(self, val);
+        } else if std::env::var(CONFIGURED).is_ok() {
+            if let Some(raw) = read_var_if_not_default(env_var) {
+                return f(self, parser(&raw));
+            }
+        }
+        self
+    }
+}
+
+impl<T> OptionalSet for T where T: NymConfig {}
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
index 357e56b968..7a85486eb0 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/msg.rs
@@ -11,7 +11,6 @@ use serde::{Deserialize, Serialize};
 pub struct InstantiateMsg {
     pub group_addr: String,
     pub multisig_addr: String,
-    pub admin: String,
     pub mix_denom: String,
 }
 
@@ -42,6 +41,7 @@ pub enum ExecuteMsg {
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
     GetCurrentEpochState {},
+    GetCurrentEpochThreshold {},
     GetDealerDetails {
         dealer_address: String,
     },
diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
index ffb1653919..4de725cebf 100644
--- a/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
+++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/types.rs
@@ -6,15 +6,48 @@ use std::fmt::{Display, Formatter};
 
 pub use crate::dealer::{DealerDetails, PagedDealerResponse};
 pub use contracts_common::dealings::ContractSafeBytes;
-pub use cosmwasm_std::{Addr, Coin};
+pub use cosmwasm_std::{Addr, Coin, Timestamp};
 
 pub type EncodedBTEPublicKeyWithProof = String;
 pub type EncodedBTEPublicKeyWithProofRef<'a> = &'a str;
 pub type NodeIndex = u64;
 
+// The time sign-up is open for dealers to join (2 minutes)
+pub const PUBLIC_KEY_SUBMISSION_TIME_SECS: u64 = 60 * 2;
+pub const DEALING_EXCHANGE_TIME_SECS: u64 = 60 * 5;
+pub const VERIFICATION_KEY_SUBMISSION_TIME_SECS: u64 = 60 * 5;
+pub const VERIFICATION_KEY_VALIDATION_TIME_SECS: u64 = 60;
+pub const VERIFICATION_KEY_FINALIZATION_TIME_SECS: u64 = 60;
+// The time an epoch lasts (2 weeks)
+pub const IN_PROGRESS_TIME_SECS: u64 = 60 * 60 * 24 * 14;
+
 // 2 public attributes, 2 private attributes, 1 fixed for coconut credential
 pub const TOTAL_DEALINGS: usize = 2 + 2 + 1;
 
+#[derive(Serialize, Deserialize, Default, Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd)]
+#[serde(rename_all = "snake_case")]
+pub struct Epoch {
+    pub state: EpochState,
+    pub finish_timestamp: Timestamp,
+}
+
+impl Epoch {
+    pub fn new(state: EpochState, current_timestamp: Timestamp) -> Self {
+        let duration = match state {
+            EpochState::PublicKeySubmission => PUBLIC_KEY_SUBMISSION_TIME_SECS,
+            EpochState::DealingExchange => DEALING_EXCHANGE_TIME_SECS,
+            EpochState::VerificationKeySubmission => VERIFICATION_KEY_SUBMISSION_TIME_SECS,
+            EpochState::VerificationKeyValidation => VERIFICATION_KEY_VALIDATION_TIME_SECS,
+            EpochState::VerificationKeyFinalization => VERIFICATION_KEY_FINALIZATION_TIME_SECS,
+            EpochState::InProgress => IN_PROGRESS_TIME_SECS,
+        };
+        Epoch {
+            state,
+            finish_timestamp: current_timestamp.plus_seconds(duration),
+        }
+    }
+}
+
 // currently (it is still extremely likely to change, we might be able to get rid of verification key-related complaints),
 // the epoch can be in the following states (in order):
 // 1. PublicKeySubmission -> potential dealers are submitting their BTE and ed25519 public keys to participate in dealing exchange
diff --git a/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs b/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
index 8beedd4a42..98e587737e 100644
--- a/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
+++ b/common/cosmwasm-smart-contracts/contracts-common/src/dealings.rs
@@ -15,7 +15,7 @@ pub const MAX_DISPLAY_SIZE: usize = 128;
 // TODO: if we are to use this for different types, it might make sense to introduce something like
 // CommitmentTypeId field on the below for distinguishing different ones. it would somehow become part of the trait
 #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, JsonSchema)]
-pub struct ContractSafeBytes(Vec<u8>);
+pub struct ContractSafeBytes(pub Vec<u8>);
 
 impl Deref for ContractSafeBytes {
     type Target = Vec<u8>;
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs
index e0d369f933..6eff27c315 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs
@@ -1,7 +1,7 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::MixId;
+use crate::{IdentityKey, MixId};
 use cosmwasm_std::{Addr, Coin, Decimal};
 use thiserror::Error;
 
@@ -133,4 +133,40 @@ pub enum MixnetContractError {
 
     #[error("Mixnode {mix_id} appears multiple times in the provided rewarded set update!")]
     DuplicateRewardedSetNode { mix_id: MixId },
+
+    #[error("Family with head {head} does not exist!")]
+    FamilyDoesNotExist { head: String },
+
+    #[error("Family with label '{0}' already exists")]
+    FamilyWithLabelExists(String),
+
+    #[error("Invalid layer expected 1, 2 or 3, got {0}")]
+    InvalidLayer(u8),
+
+    #[error("Head already has a family")]
+    FamilyCanHaveOnlyOne,
+
+    #[error("Already member of family {0}")]
+    AlreadyMemberOfFamily(String),
+
+    #[error("Can't join own family, family head {head}, member {member}")]
+    CantJoinOwnFamily {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("Can't leave own family, family head {head}, member {member}")]
+    CantLeaveOwnFamily {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("{member} is not a member of family {head}")]
+    NotAMember {
+        head: IdentityKey,
+        member: IdentityKey,
+    },
+
+    #[error("Feature is not yet implemented")]
+    NotImplemented,
 }
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs
index bba85e3ccd..f9f5de1802 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs
@@ -12,6 +12,8 @@ pub const EVENT_VERSION_PREFIX: &str = "v2_";
 
 pub enum MixnetEventType {
     MixnodeBonding,
+    PendingPledgeIncrease,
+    PledgeIncrease,
     GatewayBonding,
     GatewayUnbonding,
     PendingMixnodeUnbonding,
@@ -51,6 +53,8 @@ impl ToString for MixnetEventType {
     fn to_string(&self) -> String {
         let event_name = match self {
             MixnetEventType::MixnodeBonding => "mixnode_bonding",
+            MixnetEventType::PendingPledgeIncrease => "pending_pledge_increase",
+            MixnetEventType::PledgeIncrease => "pledge_increase",
             MixnetEventType::GatewayBonding => "gateway_bonding",
             MixnetEventType::GatewayUnbonding => "gateway_unbonding",
             MixnetEventType::PendingMixnodeUnbonding => "pending_mixnode_unbonding",
@@ -330,6 +334,19 @@ pub fn new_mixnode_bonding_event(
         .add_attribute(AMOUNT_KEY, amount.to_string())
 }
 
+pub fn new_pending_pledge_increase_event(mix_id: MixId, amount: &Coin) -> Event {
+    Event::new(MixnetEventType::PendingPledgeIncrease)
+        .add_attribute(MIX_ID_KEY, mix_id.to_string())
+        .add_attribute(AMOUNT_KEY, amount.to_string())
+}
+
+pub fn new_pledge_increase_event(created_at: BlockHeight, mix_id: MixId, amount: &Coin) -> Event {
+    Event::new(MixnetEventType::PledgeIncrease)
+        .add_attribute(EVENT_CREATION_HEIGHT_KEY, created_at.to_string())
+        .add_attribute(MIX_ID_KEY, mix_id.to_string())
+        .add_attribute(AMOUNT_KEY, amount.to_string())
+}
+
 pub fn new_mixnode_unbonding_event(created_at: BlockHeight, mix_id: MixId) -> Event {
     Event::new(MixnetEventType::MixnodeUnbonding)
         .add_attribute(EVENT_CREATION_HEIGHT_KEY, created_at.to_string())
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/families.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/families.rs
new file mode 100644
index 0000000000..0ab73f6085
--- /dev/null
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/families.rs
@@ -0,0 +1,62 @@
+use crate::{IdentityKey, IdentityKeyRef};
+use cosmwasm_std::Addr;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/NodeFamily.ts")
+)]
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, JsonSchema)]
+pub struct Family {
+    head: FamilyHead,
+    proxy: Option<String>,
+    label: String,
+}
+
+#[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
+#[cfg_attr(
+    feature = "generate-ts",
+    ts(export_to = "ts-packages/types/src/types/rust/NodeFamilyHead.ts")
+)]
+#[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq, JsonSchema)]
+pub struct FamilyHead(IdentityKey);
+
+impl FamilyHead {
+    pub fn new(identity: IdentityKeyRef<'_>) -> Self {
+        FamilyHead(identity.to_string())
+    }
+
+    pub fn identity(&self) -> IdentityKeyRef<'_> {
+        &self.0
+    }
+}
+
+impl Family {
+    pub fn new(head: FamilyHead, proxy: Option<Addr>, label: &str) -> Self {
+        Family {
+            head,
+            proxy: proxy.map(|p| p.to_string()),
+            label: label.to_string(),
+        }
+    }
+
+    #[allow(dead_code)]
+    pub fn head(&self) -> &FamilyHead {
+        &self.head
+    }
+
+    pub fn head_identity(&self) -> IdentityKeyRef<'_> {
+        self.head.identity()
+    }
+
+    #[allow(dead_code)]
+    pub fn proxy(&self) -> Option<&String> {
+        self.proxy.as_ref()
+    }
+
+    pub fn label(&self) -> &str {
+        &self.label
+    }
+}
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs
index 351828585a..adabf7de30 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/lib.rs
@@ -8,6 +8,7 @@ mod constants;
 pub mod delegation;
 pub mod error;
 pub mod events;
+pub mod families;
 pub mod gateway;
 pub mod helpers;
 mod interval;
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs
index 9bccf2d1ff..90dacbea30 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs
@@ -36,7 +36,6 @@ impl RewardedSetNodeStatus {
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDetails {
     pub bond_information: MixNodeBond,
-
     pub rewarding_details: MixNodeRewarding,
 }
 
@@ -325,6 +324,14 @@ impl MixNodeRewarding {
         Ok(())
     }
 
+    pub fn increase_operator_uint128(
+        &mut self,
+        amount: Uint128,
+    ) -> Result<(), MixnetContractError> {
+        self.operator += amount.into_base_decimal()?;
+        Ok(())
+    }
+
     pub fn increase_delegates_uint128(
         &mut self,
         amount: Uint128,
@@ -571,6 +578,29 @@ impl From<Layer> for String {
     }
 }
 
+impl TryFrom<u8> for Layer {
+    type Error = MixnetContractError;
+
+    fn try_from(i: u8) -> Result<Layer, MixnetContractError> {
+        match i {
+            1 => Ok(Layer::One),
+            2 => Ok(Layer::Two),
+            3 => Ok(Layer::Three),
+            _ => Err(MixnetContractError::InvalidLayer(i)),
+        }
+    }
+}
+
+impl From<Layer> for u8 {
+    fn from(layer: Layer) -> u8 {
+        match layer {
+            Layer::One => 1,
+            Layer::Two => 2,
+            Layer::Three => 3,
+        }
+    }
+}
+
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
     feature = "generate-ts",
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
index 1c00c64a9c..cc86757367 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs
@@ -8,7 +8,7 @@ use crate::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use crate::reward_params::{
     IntervalRewardParams, IntervalRewardingParamsUpdate, Performance, RewardingParams,
 };
-use crate::{delegation, ContractStateParams, MixId, Percent};
+use crate::{delegation, ContractStateParams, Layer, LayerAssignment, MixId, Percent};
 use crate::{Gateway, IdentityKey, MixNode};
 use cosmwasm_std::Decimal;
 use schemars::JsonSchema;
@@ -73,6 +73,51 @@ impl InitialRewardingParams {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
+    AssignNodeLayer {
+        mix_id: MixId,
+        layer: Layer,
+    },
+    // Families
+    /// Only owner of the node can crate the family with node as head
+    CreateFamily {
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMember {
+        signature: String,
+        member: IdentityKey,
+    },
+    CreateFamilyOnBehalf {
+        owner_address: String,
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamilyOnBehalf {
+        member_address: String,
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamilyOnBehalf {
+        member_address: String,
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMemberOnBehalf {
+        head_address: String,
+        signature: String,
+        member: IdentityKey,
+    },
+
     // state/sys-params-related
     UpdateRewardingValidatorAddress {
         address: String,
@@ -94,7 +139,8 @@ pub enum ExecuteMsg {
         force_immediately: bool,
     },
     AdvanceCurrentEpoch {
-        new_rewarded_set: Vec<MixId>,
+        new_rewarded_set: Vec<LayerAssignment>,
+        // families_in_layer: HashMap<String, Layer>,
         expected_active_set_size: u32,
     },
     ReconcileEpochEvents {
@@ -113,6 +159,10 @@ pub enum ExecuteMsg {
         owner_signature: String,
         owner: String,
     },
+    PledgeMore {},
+    PledgeMoreOnBehalf {
+        owner: String,
+    },
     UnbondMixnode {},
     UnbondMixnodeOnBehalf {
         owner: String,
@@ -190,6 +240,29 @@ pub enum ExecuteMsg {
 impl ExecuteMsg {
     pub fn default_memo(&self) -> String {
         match self {
+            ExecuteMsg::AssignNodeLayer { mix_id, layer } => {
+                format!("assigning mix {} for layer {:?}", mix_id, layer)
+            }
+            ExecuteMsg::CreateFamily { .. } => "crating node family with".to_string(),
+            ExecuteMsg::JoinFamily { family_head, .. } => {
+                format!("joining family {}", family_head)
+            }
+            ExecuteMsg::LeaveFamily { family_head, .. } => {
+                format!("leaving family {}", family_head)
+            }
+            ExecuteMsg::KickFamilyMember { member, .. } => {
+                format!("kicking {} from family", member)
+            }
+            ExecuteMsg::CreateFamilyOnBehalf { .. } => "crating node family with".to_string(),
+            ExecuteMsg::JoinFamilyOnBehalf { family_head, .. } => {
+                format!("joining family {}", family_head)
+            }
+            ExecuteMsg::LeaveFamilyOnBehalf { family_head, .. } => {
+                format!("leaving family {}", family_head)
+            }
+            ExecuteMsg::KickFamilyMemberOnBehalf { member, .. } => {
+                format!("kicking {} from family", member)
+            }
             ExecuteMsg::UpdateRewardingValidatorAddress { address } => {
                 format!("updating rewarding validator to {}", address)
             }
@@ -223,6 +296,8 @@ impl ExecuteMsg {
             ExecuteMsg::BondMixnodeOnBehalf { mix_node, .. } => {
                 format!("bonding mixnode {} on behalf", mix_node.identity_key)
             }
+            ExecuteMsg::PledgeMore {} => "pledging additional tokens".into(),
+            ExecuteMsg::PledgeMoreOnBehalf { .. } => "pledging additional tokens on behalf".into(),
             ExecuteMsg::UnbondMixnode { .. } => "unbonding mixnode".into(),
             ExecuteMsg::UnbondMixnodeOnBehalf { .. } => "unbonding mixnode on behalf".into(),
             ExecuteMsg::UpdateMixnodeCostParams { .. } => "updating mixnode cost parameters".into(),
@@ -280,6 +355,27 @@ impl ExecuteMsg {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
+    // families
+    GetAllFamiliesPaged {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetAllMembersPaged {
+        limit: Option<u32>,
+        start_after: Option<String>,
+    },
+    GetFamilyByHead {
+        head: String,
+    },
+    GetFamilyByLabel {
+        label: String,
+    },
+    GetFamilyMembersByHead {
+        head: String,
+    },
+    GetFamilyMembersByLabel {
+        label: String,
+    },
     // state/sys-params-related
     GetContractVersion {},
     GetRewardingValidatorAddress {},
@@ -334,7 +430,6 @@ pub enum QueryMsg {
         mix_identity: IdentityKey,
     },
     GetLayerDistribution {},
-
     // gateway-related:
     GetGateways {
         start_after: Option<IdentityKey>,
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/pending_events.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/pending_events.rs
index fce8bd8cf0..3fe817fcb6 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/pending_events.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/pending_events.rs
@@ -34,6 +34,10 @@ pub enum PendingEpochEventKind {
         mix_id: MixId,
         proxy: Option<Addr>,
     },
+    PledgeMore {
+        mix_id: MixId,
+        amount: Coin,
+    },
     UnbondMixnode {
         mix_id: MixId,
     },
@@ -78,7 +82,6 @@ pub enum PendingIntervalEventKind {
         mix_id: MixId,
         new_costs: MixNodeCostParams,
     },
-
     UpdateRewardingParams {
         update: IntervalRewardingParamsUpdate,
     },
diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs
index 09223a8e8a..c17520a2b6 100644
--- a/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs
+++ b/common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::MixnetContractError;
+use crate::families::{Family, FamilyHead};
 use crate::{Layer, RewardedSetNodeStatus};
 use cosmwasm_std::Addr;
 use cosmwasm_std::Coin;
@@ -21,6 +22,27 @@ pub type BlockHeight = u64;
 pub type EpochEventId = u32;
 pub type IntervalEventId = u32;
 
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq)]
+pub struct LayerAssignment {
+    mix_id: MixId,
+    layer: Layer,
+}
+
+impl LayerAssignment {
+    pub fn new(mix_id: MixId, layer: Layer) -> Self {
+        LayerAssignment { mix_id, layer }
+    }
+
+    pub fn mix_id(&self) -> MixId {
+        self.mix_id
+    }
+
+    pub fn layer(&self) -> Layer {
+        self.layer
+    }
+}
+
 #[derive(Debug, Default, Serialize, Deserialize, Copy, Clone, Eq, PartialEq)]
 pub struct LayerDistribution {
     pub layer1: u64,
@@ -126,3 +148,15 @@ pub struct PagedRewardedSetResponse {
     pub nodes: Vec<(MixId, RewardedSetNodeStatus)>,
     pub start_next_after: Option<MixId>,
 }
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+pub struct PagedFamiliesResponse {
+    pub families: Vec<Family>,
+    pub start_next_after: Option<String>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+pub struct PagedMembersResponse {
+    pub members: Vec<(IdentityKey, FamilyHead)>,
+    pub start_next_after: Option<String>,
+}
diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/events.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/events.rs
index 896ead2c9e..4e5809beee 100644
--- a/common/cosmwasm-smart-contracts/vesting-contract/src/events.rs
+++ b/common/cosmwasm-smart-contracts/vesting-contract/src/events.rs
@@ -14,6 +14,7 @@ pub const VESTING_UNDELEGATION_EVENT_TYPE: &str = "vesting_undelegation";
 pub const VESTING_GATEWAY_BONDING_EVENT_TYPE: &str = "vesting_gateway_bonding";
 pub const VESTING_GATEWAY_UNBONDING_EVENT_TYPE: &str = "vesting_gateway_unbonding";
 pub const VESTING_MIXNODE_BONDING_EVENT_TYPE: &str = "vesting_mixnode_bonding";
+pub const VESTING_PLEDGE_MORE_EVENT_TYPE: &str = "vesting_pledge_more";
 pub const VESTING_MIXNODE_UNBONDING_EVENT_TYPE: &str = "vesting_mixnode_unbonding";
 pub const VESTING_UPDATE_MIXNODE_CONFIG_EVENT_TYPE: &str = "vesting_update_mixnode_config";
 pub const VESTING_UPDATE_MIXNODE_COST_PARAMS_EVENT_TYPE: &str =
@@ -112,6 +113,10 @@ pub fn new_vesting_mixnode_bonding_event() -> Event {
     Event::new(VESTING_MIXNODE_BONDING_EVENT_TYPE)
 }
 
+pub fn new_vesting_pledge_more_event() -> Event {
+    Event::new(VESTING_PLEDGE_MORE_EVENT_TYPE)
+}
+
 pub fn new_vesting_update_mixnode_config_event() -> Event {
     Event::new(VESTING_UPDATE_MIXNODE_CONFIG_EVENT_TYPE)
 }
diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs
index 696df628aa..3edc6c2303 100644
--- a/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs
+++ b/common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs
@@ -1,7 +1,7 @@
 use cosmwasm_std::{Coin, Timestamp};
 use mixnet_contract_common::{
     mixnode::{MixNodeConfigUpdate, MixNodeCostParams},
-    Gateway, MixId, MixNode,
+    Gateway, IdentityKey, MixId, MixNode,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -57,6 +57,25 @@ impl VestingSpecification {
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
+    // Families
+    /// Only owner of the node can crate the family with node as head
+    CreateFamily {
+        owner_signature: String,
+        label: String,
+    },
+    /// Family head needs to sign the joining node IdentityKey
+    JoinFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    LeaveFamily {
+        signature: String,
+        family_head: IdentityKey,
+    },
+    KickFamilyMember {
+        signature: String,
+        member: IdentityKey,
+    },
     TrackReward {
         amount: Coin,
         address: String,
@@ -101,6 +120,9 @@ pub enum ExecuteMsg {
         owner_signature: String,
         amount: Coin,
     },
+    PledgeMore {
+        amount: Coin,
+    },
     UnbondMixnode {},
     TrackUnbondMixnode {
         owner: String,
@@ -131,6 +153,10 @@ pub enum ExecuteMsg {
 impl ExecuteMsg {
     pub fn name(&self) -> &str {
         match self {
+            ExecuteMsg::CreateFamily { .. } => "VestingExecuteMsg::CreateFamily",
+            ExecuteMsg::JoinFamily { .. } => "VestingExecuteMsg::JoinFamily",
+            ExecuteMsg::LeaveFamily { .. } => "VestingExecuteMsg::LeaveFamily",
+            ExecuteMsg::KickFamilyMember { .. } => "VestingExecuteMsg::KickFamilyMember",
             ExecuteMsg::TrackReward { .. } => "VestingExecuteMsg::TrackReward",
             ExecuteMsg::ClaimOperatorReward { .. } => "VestingExecuteMsg::ClaimOperatorReward",
             ExecuteMsg::ClaimDelegatorReward { .. } => "VestingExecuteMsg::ClaimDelegatorReward",
@@ -145,6 +171,7 @@ impl ExecuteMsg {
             ExecuteMsg::WithdrawVestedCoins { .. } => "VestingExecuteMsg::WithdrawVestedCoins",
             ExecuteMsg::TrackUndelegation { .. } => "VestingExecuteMsg::TrackUndelegation",
             ExecuteMsg::BondMixnode { .. } => "VestingExecuteMsg::BondMixnode",
+            ExecuteMsg::PledgeMore { .. } => "VestingExecuteMsg::PledgeMore",
             ExecuteMsg::UnbondMixnode { .. } => "VestingExecuteMsg::UnbondMixnode",
             ExecuteMsg::TrackUnbondMixnode { .. } => "VestingExecuteMsg::TrackUnbondMixnode",
             ExecuteMsg::BondGateway { .. } => "VestingExecuteMsg::BondGateway",
diff --git a/common/credential-storage/migrations/20221208120000_add_consumed_to_coconut.sql b/common/credential-storage/migrations/20221208120000_add_consumed_to_coconut.sql
new file mode 100644
index 0000000000..f3994cf2b6
--- /dev/null
+++ b/common/credential-storage/migrations/20221208120000_add_consumed_to_coconut.sql
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+DROP TABLE coconut_credentials;
+CREATE TABLE coconut_credentials
+(
+    id                  INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    voucher_value       TEXT    NOT NULL,
+    voucher_info        TEXT    NOT NULL,
+    serial_number       TEXT    NOT NULL,
+    binding_number      TEXT    NOT NULL,
+    signature           TEXT    NOT NULL UNIQUE,
+    consumed            BOOLEAN NOT NULL
+);
\ No newline at end of file
diff --git a/common/credential-storage/src/coconut.rs b/common/credential-storage/src/coconut.rs
index e6512dd7fc..103f8760d2 100644
--- a/common/credential-storage/src/coconut.rs
+++ b/common/credential-storage/src/coconut.rs
@@ -36,8 +36,8 @@ impl CoconutCredentialManager {
         signature: String,
     ) -> Result<(), sqlx::Error> {
         sqlx::query!(
-            "INSERT INTO coconut_credentials(voucher_value, voucher_info, serial_number, binding_number, signature) VALUES (?, ?, ?, ?, ?)",
-            voucher_value, voucher_info, serial_number, binding_number, signature
+            "INSERT INTO coconut_credentials(voucher_value, voucher_info, serial_number, binding_number, signature, consumed) VALUES (?, ?, ?, ?, ?, ?)",
+            voucher_value, voucher_info, serial_number, binding_number, signature, false
         )
         .execute(&self.connection_pool)
         .await?;
@@ -48,20 +48,26 @@ impl CoconutCredentialManager {
     pub(crate) async fn get_next_coconut_credential(
         &self,
     ) -> Result<CoconutCredential, sqlx::Error> {
-        sqlx::query_as!(CoconutCredential, "SELECT * FROM coconut_credentials")
-            .fetch_one(&self.connection_pool)
-            .await
+        sqlx::query_as!(
+            CoconutCredential,
+            "SELECT * FROM coconut_credentials WHERE NOT consumed"
+        )
+        .fetch_one(&self.connection_pool)
+        .await
     }
 
-    /// Removes from the database the specified credential.
+    /// Consumes in the database the specified credential.
     ///
     /// # Arguments
     ///
     /// * `id`: Database id.
-    pub(crate) async fn remove_coconut_credential(&self, id: i64) -> Result<(), sqlx::Error> {
-        sqlx::query!("DELETE FROM coconut_credentials WHERE id = ?", id)
-            .execute(&self.connection_pool)
-            .await?;
+    pub(crate) async fn consume_coconut_credential(&self, id: i64) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            "UPDATE coconut_credentials SET consumed = TRUE WHERE id = ?",
+            id
+        )
+        .execute(&self.connection_pool)
+        .await?;
         Ok(())
     }
 }
diff --git a/common/credential-storage/src/lib.rs b/common/credential-storage/src/lib.rs
index 7a4ecb5358..d0a0992894 100644
--- a/common/credential-storage/src/lib.rs
+++ b/common/credential-storage/src/lib.rs
@@ -45,13 +45,13 @@ impl PersistentStorage {
         let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
             Ok(db) => db,
             Err(err) => {
-                error!("Failed to connect to SQLx database: {}", err);
+                error!("Failed to connect to SQLx database: {err}");
                 return Err(err.into());
             }
         };
 
         if let Err(err) = sqlx::migrate!("./migrations").run(&connection_pool).await {
-            error!("Failed to perform migration on the SQLx database: {}", err);
+            error!("Failed to perform migration on the SQLx database: {err}");
             return Err(err.into());
         }
 
@@ -93,9 +93,9 @@ impl Storage for PersistentStorage {
         Ok(credential)
     }
 
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError> {
+    async fn consume_coconut_credential(&self, id: i64) -> Result<(), StorageError> {
         self.coconut_credential_manager
-            .remove_coconut_credential(id)
+            .consume_coconut_credential(id)
             .await?;
 
         Ok(())
@@ -104,7 +104,7 @@ impl Storage for PersistentStorage {
 
 pub async fn initialise_storage(path: PathBuf) -> PersistentStorage {
     match PersistentStorage::init(path).await {
-        Err(err) => panic!("failed to initialise credential storage - {}", err),
+        Err(err) => panic!("failed to initialise credential storage - {err}"),
         Ok(storage) => storage,
     }
 }
diff --git a/common/credential-storage/src/models.rs b/common/credential-storage/src/models.rs
index 9684df056f..6ce7a9dd4b 100644
--- a/common/credential-storage/src/models.rs
+++ b/common/credential-storage/src/models.rs
@@ -9,4 +9,5 @@ pub struct CoconutCredential {
     pub serial_number: String,
     pub binding_number: String,
     pub signature: String,
+    pub consumed: bool,
 }
diff --git a/common/credential-storage/src/storage.rs b/common/credential-storage/src/storage.rs
index 892e561442..77df96f4c8 100644
--- a/common/credential-storage/src/storage.rs
+++ b/common/credential-storage/src/storage.rs
@@ -25,10 +25,10 @@ pub trait Storage: Send + Sync {
     /// Tries to retrieve one of the stored, unused credentials.
     async fn get_next_coconut_credential(&self) -> Result<CoconutCredential, StorageError>;
 
-    /// Removes from the database the specified credential.
+    /// Marks as consumed in the database the specified credential.
     ///
     /// # Arguments
     ///
-    /// * `signature`: Coconut credential in the form of a signature.
-    async fn remove_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
+    /// * `id`: Id of the credential to be consumed.
+    async fn consume_coconut_credential(&self, id: i64) -> Result<(), StorageError>;
 }
diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml
index 58d43af03f..2f754253cc 100644
--- a/common/credentials/Cargo.toml
+++ b/common/credentials/Cargo.toml
@@ -13,7 +13,7 @@ thiserror = "1.0"
 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
 crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
-validator-api-requests = { path = "../../validator-api/validator-api-requests" }
+nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 validator-client = { path = "../client-libs/validator-client" }
 
 [dev-dependencies]
diff --git a/common/credentials/src/coconut/params.rs b/common/credentials/src/coconut/params.rs
index 42b9205ebb..7e2260bc10 100644
--- a/common/credentials/src/coconut/params.rs
+++ b/common/credentials/src/coconut/params.rs
@@ -9,7 +9,7 @@ type Aes128Ctr = ctr::Ctr64LE<Aes128>;
 
 /// Hashing algorithm used during hkdf for ephemeral shared key generation per blinded signature
 /// response encryption.
-pub type ValidatorApiCredentialHkdfAlgorithm = blake3::Hasher;
+pub type NymApiCredentialHkdfAlgorithm = blake3::Hasher;
 
 /// Encryption algorithm used for end-to-end encryption of blinded signature response
-pub type ValidatorApiCredentialEncryptionAlgorithm = Aes128Ctr;
+pub type NymApiCredentialEncryptionAlgorithm = Aes128Ctr;
diff --git a/common/credentials/src/coconut/utils.rs b/common/credentials/src/coconut/utils.rs
index f701938d59..53e01437af 100644
--- a/common/credentials/src/coconut/utils.rs
+++ b/common/credentials/src/coconut/utils.rs
@@ -8,13 +8,11 @@ use coconut_interface::{
 use crypto::asymmetric::encryption::PublicKey;
 use crypto::shared_key::recompute_shared_key;
 use crypto::symmetric::stream_cipher;
-use validator_api_requests::coconut::BlindSignRequestBody;
+use nym_api_requests::coconut::BlindSignRequestBody;
 use validator_client::client::CoconutApiClient;
 
 use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
-use crate::coconut::params::{
-    ValidatorApiCredentialEncryptionAlgorithm, ValidatorApiCredentialHkdfAlgorithm,
-};
+use crate::coconut::params::{NymApiCredentialEncryptionAlgorithm, NymApiCredentialHkdfAlgorithm};
 use crate::error::Error;
 
 pub async fn obtain_aggregate_verification_key(
@@ -39,7 +37,7 @@ pub async fn obtain_aggregate_verification_key(
 async fn obtain_partial_credential(
     params: &Parameters,
     attributes: &BandwidthVoucher,
-    client: &validator_client::client::ApiClient,
+    client: &validator_client::client::NymApiClient,
     validator_vk: &VerificationKey,
 ) -> Result<Signature, Error> {
     let public_attributes = attributes.get_public_attributes();
@@ -66,11 +64,11 @@ async fn obtain_partial_credential(
     let remote_key = PublicKey::from_bytes(&response.remote_key)?;
 
     let encryption_key = recompute_shared_key::<
-        ValidatorApiCredentialEncryptionAlgorithm,
-        ValidatorApiCredentialHkdfAlgorithm,
+        NymApiCredentialEncryptionAlgorithm,
+        NymApiCredentialHkdfAlgorithm,
     >(&remote_key, attributes.encryption_key());
-    let zero_iv = stream_cipher::zero_iv::<ValidatorApiCredentialEncryptionAlgorithm>();
-    let blinded_signature_bytes = stream_cipher::decrypt::<ValidatorApiCredentialEncryptionAlgorithm>(
+    let zero_iv = stream_cipher::zero_iv::<NymApiCredentialEncryptionAlgorithm>();
+    let blinded_signature_bytes = stream_cipher::decrypt::<NymApiCredentialEncryptionAlgorithm>(
         &encryption_key,
         &zero_iv,
         &encrypted_signature,
diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml
index a8e749f2e0..94d3d2820b 100644
--- a/common/crypto/Cargo.toml
+++ b/common/crypto/Cargo.toml
@@ -22,6 +22,7 @@ rand = { version = "0.7.3", features = ["wasm-bindgen"], optional = true }
 serde_bytes = { version = "0.11.6", optional = true }
 serde_crate = { version = "1.0", optional = true, default_features = false, package = "serde" }
 subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}
+thiserror = "1.0.37"
 
 # internal
 nymsphinx-types = { path = "../nymsphinx/types" }
diff --git a/common/crypto/dkg/src/bte/keys.rs b/common/crypto/dkg/src/bte/keys.rs
index 9412790db8..098e9638c7 100644
--- a/common/crypto/dkg/src/bte/keys.rs
+++ b/common/crypto/dkg/src/bte/keys.rs
@@ -53,7 +53,7 @@ impl PublicKey {
     }
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct PublicKeyWithProof {
     pub(crate) key: PublicKey,
diff --git a/common/crypto/dkg/src/bte/proof_discrete_log.rs b/common/crypto/dkg/src/bte/proof_discrete_log.rs
index 5dbdbba702..489eb13244 100644
--- a/common/crypto/dkg/src/bte/proof_discrete_log.rs
+++ b/common/crypto/dkg/src/bte/proof_discrete_log.rs
@@ -13,7 +13,7 @@ use zeroize::Zeroize;
 const DISCRETE_LOG_DOMAIN: &[u8] =
     b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_DISCRETE_LOG";
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct ProofOfDiscreteLog {
     pub(crate) rand_commitment: G1Projective,
diff --git a/common/crypto/dkg/src/dealing.rs b/common/crypto/dkg/src/dealing.rs
index 817bffdf12..d92a9ba6b4 100644
--- a/common/crypto/dkg/src/dealing.rs
+++ b/common/crypto/dkg/src/dealing.rs
@@ -9,19 +9,79 @@ use crate::interpolation::polynomial::{Polynomial, PublicCoefficients};
 use crate::interpolation::{
     perform_lagrangian_interpolation_at_origin, perform_lagrangian_interpolation_at_x,
 };
+use crate::utils::deserialize_g2;
 use crate::{NodeIndex, Share, Threshold};
 use bls12_381::{G2Projective, Scalar};
+use group::GroupEncoding;
 use rand_core::RngCore;
 use std::collections::BTreeMap;
 use zeroize::Zeroize;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct RecoveredVerificationKeys {
     pub recovered_master: G2Projective,
     pub recovered_partials: Vec<G2Projective>,
 }
 
+impl RecoveredVerificationKeys {
+    pub fn to_bytes(&self) -> Vec<u8> {
+        let partials = self.recovered_partials.len();
+        let mut bytes = Vec::with_capacity(96 + 4 + 96 * partials);
+        bytes.extend_from_slice(self.recovered_master.to_bytes().as_ref());
+        bytes.extend_from_slice(&((partials as u32).to_be_bytes()));
+        for partial in &self.recovered_partials {
+            bytes.extend_from_slice(partial.to_bytes().as_ref());
+        }
+
+        bytes
+    }
+
+    pub fn try_from_bytes(b: &[u8]) -> Result<Self, DkgError> {
+        if b.len() < 96 + 4 {
+            return Err(DkgError::new_deserialization_failure(
+                "RecoveredVerificationKeys",
+                "insufficient number of bytes provided",
+            ));
+        }
+
+        let recovered_master = deserialize_g2(&b[..96]).ok_or_else(|| {
+            DkgError::new_deserialization_failure(
+                "RecoveredVerificationKeys.recovered_master",
+                "invalid curve point",
+            )
+        })?;
+
+        let partials = u32::from_be_bytes([b[96], b[97], b[98], b[99]]) as usize;
+        let mut recovered_partials = Vec::with_capacity(partials);
+
+        if b.len() != 96 + 4 + 96 * partials {
+            return Err(DkgError::new_deserialization_failure(
+                "RecoveredVerificationKeys",
+                "insufficient number of bytes provided",
+            ));
+        }
+
+        let mut i = 96 + 4;
+        for _ in 0..partials {
+            let partial = deserialize_g2(&b[i..i + 96]).ok_or_else(|| {
+                DkgError::new_deserialization_failure(
+                    "RecoveredVerificationKeys.recovered_partials",
+                    "invalid curve point",
+                )
+            })?;
+
+            recovered_partials.push(partial);
+            i += 96;
+        }
+
+        Ok(RecoveredVerificationKeys {
+            recovered_master,
+            recovered_partials,
+        })
+    }
+}
+
 #[derive(Debug)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct Dealing {
@@ -266,11 +326,6 @@ pub fn try_recover_verification_keys(
         return Err(DkgError::MismatchedDealings);
     }
 
-    // currently we expect every dealer to also be a receiver. This restriction might be relaxed in the future
-    if dealings.len() != receivers.len() {
-        return Err(DkgError::MismatchedDealings);
-    }
-
     let indices = receivers.keys().collect::<Vec<_>>();
 
     // Compute A0, ..., A_{t-1}
@@ -355,6 +410,17 @@ mod tests {
     use crate::combine_shares;
     use rand_core::SeedableRng;
 
+    #[test]
+    fn recovered_verification_keys_serde() {
+        let keys = RecoveredVerificationKeys {
+            recovered_master: Default::default(),
+            recovered_partials: vec![Default::default(), Default::default()],
+        };
+        let bytes = keys.to_bytes();
+        let recovered_keys = RecoveredVerificationKeys::try_from_bytes(&bytes).unwrap();
+        assert_eq!(keys, recovered_keys);
+    }
+
     #[test]
     #[ignore] // expensive test
     fn recovering_partial_verification_keys() {
diff --git a/common/crypto/dkg/tests/integration.rs b/common/crypto/dkg/tests/integration.rs
index 2d25c31d40..4ac55df1c7 100644
--- a/common/crypto/dkg/tests/integration.rs
+++ b/common/crypto/dkg/tests/integration.rs
@@ -254,3 +254,125 @@ fn full_threshold_secret_resharing() {
     assert_ne!(derived_secrets, reshared_secrets);
     assert_ne!(recovered_partials, reshared_partials);
 }
+
+#[test]
+#[ignore] // expensive test
+fn full_threshold_secret_resharing_left_party() {
+    let dummy_seed = [42u8; 32];
+    let mut rng = rand_chacha::ChaCha20Rng::from_seed(dummy_seed);
+    let params = setup();
+
+    // the simplest possible case
+    let threshold = 2;
+
+    // the indices are going to get assigned externally, so for test sake, use non-consecutive ones
+    let mut node_indices = vec![15u64, 248, 33521];
+
+    let mut receivers = BTreeMap::new();
+    let mut full_keys = Vec::new();
+    for index in &node_indices {
+        let (dk, pk) = keygen(&params, &mut rng);
+        receivers.insert(*index, *pk.public_key());
+        full_keys.push((dk, pk))
+    }
+
+    let first_dealings = node_indices
+        .iter()
+        .map(|&dealer_index| {
+            Dealing::create(&mut rng, &params, dealer_index, threshold, &receivers, None).0
+        })
+        .collect::<Vec<_>>();
+
+    // recover verification keys
+    let RecoveredVerificationKeys {
+        recovered_master: public_original_master,
+        recovered_partials,
+    } = try_recover_verification_keys(&first_dealings, threshold, &receivers).unwrap();
+
+    let mut derived_secrets = Vec::new();
+    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+        let shares = first_dealings
+            .iter()
+            .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
+            .collect();
+
+        let recovered_secret =
+            combine_shares(shares, &receivers.keys().copied().collect::<Vec<_>>()).unwrap();
+
+        derived_secrets.push(recovered_secret)
+    }
+
+    let original_master = perform_lagrangian_interpolation_at_origin(&[
+        (Scalar::from(node_indices[0]), derived_secrets[0]),
+        (Scalar::from(node_indices[1]), derived_secrets[1]),
+    ])
+    .unwrap();
+
+    // one party leaves the process
+    let left_party_index = node_indices.pop().unwrap();
+    receivers.remove(&left_party_index);
+    full_keys.pop();
+    // and another one joins, but we're still over the threshold value of initial parties
+    let join_party_index = 100000;
+    let (dk, pk) = keygen(&params, &mut rng);
+    receivers.insert(join_party_index, *pk.public_key());
+    full_keys.push((dk, pk));
+
+    // only initial parties attempt to create resharing dealings!
+    let resharing_dealings = node_indices
+        .iter()
+        .zip(derived_secrets.iter().take(2))
+        .map(|(&dealer_index, prior_secret)| {
+            Dealing::create(
+                &mut rng,
+                &params,
+                dealer_index,
+                threshold,
+                &receivers,
+                Some(*prior_secret),
+            )
+            .0
+        })
+        .collect::<Vec<_>>();
+
+    for (reshared_dealing, prior_vk) in resharing_dealings
+        .iter()
+        .zip(recovered_partials.iter().take(2))
+    {
+        reshared_dealing
+            .verify(&params, threshold, &receivers, Some(*prior_vk))
+            .unwrap();
+    }
+
+    // recover verification keys
+    let RecoveredVerificationKeys {
+        recovered_master: public_reshared_master,
+        recovered_partials: reshared_partials,
+    } = try_recover_verification_keys(&resharing_dealings, threshold, &receivers).unwrap();
+
+    let mut reshared_secrets = Vec::new();
+    for (i, (ref mut dk, _)) in full_keys.iter_mut().enumerate() {
+        let shares = resharing_dealings
+            .iter()
+            .map(|dealing| decrypt_share(dk, i, &dealing.ciphertexts, None).unwrap())
+            .collect();
+
+        let recovered_secret = combine_shares(shares, &node_indices).unwrap();
+
+        reshared_secrets.push(recovered_secret)
+    }
+
+    let reshared_master = perform_lagrangian_interpolation_at_origin(&[
+        (Scalar::from(node_indices[0]), reshared_secrets[0]),
+        (Scalar::from(join_party_index), reshared_secrets[2]),
+    ])
+    .unwrap();
+
+    // the master secret and public values didn't change
+    assert_eq!(original_master, reshared_master);
+    assert_eq!(public_original_master, public_reshared_master);
+
+    // but partials did
+    assert_ne!(derived_secrets, reshared_secrets);
+    assert_ne!(recovered_partials, reshared_partials);
+}
diff --git a/common/crypto/src/asymmetric/encryption/mod.rs b/common/crypto/src/asymmetric/encryption/mod.rs
index 5c7b5398ad..28ff92c07e 100644
--- a/common/crypto/src/asymmetric/encryption/mod.rs
+++ b/common/crypto/src/asymmetric/encryption/mod.rs
@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use std::fmt::{self, Display, Formatter};
+use thiserror::Error;
+
 #[cfg(feature = "rand")]
 use rand::{CryptoRng, RngCore};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::fmt::{self, Display, Formatter};
 
 /// Size of a X25519 private key
 pub const PRIVATE_KEY_SIZE: usize = 32;
@@ -17,31 +19,26 @@ pub const PUBLIC_KEY_SIZE: usize = 32;
 /// Size of a X25519 shared secret
 pub const SHARED_SECRET_SIZE: usize = 32;
 
-#[derive(Clone, Copy, Eq, PartialEq, Debug)]
+#[derive(Clone, Eq, PartialEq, Debug, Error)]
 pub enum KeyRecoveryError {
-    InvalidPublicKeyBytes,
-    InvalidPrivateKeyBytes,
-    MalformedString(bs58::decode::Error),
-}
+    #[error("received public key of invalid size. Got: {received}, expected: {expected}")]
+    InvalidSizePublicKey { received: usize, expected: usize },
 
-impl From<bs58::decode::Error> for KeyRecoveryError {
-    fn from(err: bs58::decode::Error) -> Self {
-        KeyRecoveryError::MalformedString(err)
-    }
-}
+    #[error("received private key of invalid size. Got: {received}, expected: {expected}")]
+    InvalidSizePrivateKey { received: usize, expected: usize },
 
-// required for std::error::Error
-impl Display for KeyRecoveryError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            KeyRecoveryError::InvalidPrivateKeyBytes => write!(f, "Invalid private key bytes"),
-            KeyRecoveryError::InvalidPublicKeyBytes => write!(f, "Invalid public key bytes"),
-            KeyRecoveryError::MalformedString(err) => write!(f, "malformed string - {}", err),
-        }
-    }
-}
+    #[error("the base58 representation of the public key was malformed - {source}")]
+    MalformedPublicKeyString {
+        #[source]
+        source: bs58::decode::Error,
+    },
 
-impl std::error::Error for KeyRecoveryError {}
+    #[error("the base58 representation of the private key was malformed - {source}")]
+    MalformedPrivateKeyString {
+        #[source]
+        source: bs58::decode::Error,
+    },
+}
 
 pub struct KeyPair {
     pub(crate) private_key: PrivateKey,
@@ -112,7 +109,10 @@ impl PublicKey {
 
     pub fn from_bytes(b: &[u8]) -> Result<Self, KeyRecoveryError> {
         if b.len() != PUBLIC_KEY_SIZE {
-            return Err(KeyRecoveryError::InvalidPublicKeyBytes);
+            return Err(KeyRecoveryError::InvalidSizePublicKey {
+                received: b.len(),
+                expected: PUBLIC_KEY_SIZE,
+            });
         }
         let mut bytes = [0; PUBLIC_KEY_SIZE];
         bytes.copy_from_slice(&b[..PUBLIC_KEY_SIZE]);
@@ -124,7 +124,9 @@ impl PublicKey {
     }
 
     pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, KeyRecoveryError> {
-        let bytes = bs58::decode(val).into_vec()?;
+        let bytes = bs58::decode(val)
+            .into_vec()
+            .map_err(|source| KeyRecoveryError::MalformedPublicKeyString { source })?;
         Self::from_bytes(&bytes)
     }
 }
@@ -188,7 +190,10 @@ impl PrivateKey {
 
     pub fn from_bytes(b: &[u8]) -> Result<Self, KeyRecoveryError> {
         if b.len() != PRIVATE_KEY_SIZE {
-            return Err(KeyRecoveryError::InvalidPrivateKeyBytes);
+            return Err(KeyRecoveryError::InvalidSizePrivateKey {
+                received: b.len(),
+                expected: PRIVATE_KEY_SIZE,
+            });
         }
         let mut bytes = [0; 32];
         bytes.copy_from_slice(&b[..PRIVATE_KEY_SIZE]);
@@ -200,7 +205,9 @@ impl PrivateKey {
     }
 
     pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, KeyRecoveryError> {
-        let bytes = bs58::decode(val).into_vec()?;
+        let bytes = bs58::decode(val)
+            .into_vec()
+            .map_err(|source| KeyRecoveryError::MalformedPrivateKeyString { source })?;
         Self::from_bytes(&bytes)
     }
 
diff --git a/common/crypto/src/asymmetric/identity/mod.rs b/common/crypto/src/asymmetric/identity/mod.rs
index 8ba1de8ec6..d8f6e2983c 100644
--- a/common/crypto/src/asymmetric/identity/mod.rs
+++ b/common/crypto/src/asymmetric/identity/mod.rs
@@ -6,10 +6,12 @@ pub use ed25519_dalek::SignatureError;
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
 use nymsphinx_types::{DestinationAddressBytes, DESTINATION_ADDRESS_LENGTH};
 use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use std::fmt::{self, Display, Formatter};
+use std::str::FromStr;
+use thiserror::Error;
+
 #[cfg(feature = "rand")]
 use rand::{CryptoRng, RngCore};
-use std::fmt::{self, Display, Formatter};
-
 #[cfg(feature = "serde")]
 use serde::de::Error as SerdeError;
 #[cfg(feature = "serde")]
@@ -17,35 +19,30 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(feature = "serde")]
 use serde_bytes::{ByteBuf as SerdeByteBuf, Bytes as SerdeBytes};
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum Ed25519RecoveryError {
-    MalformedBytes(SignatureError),
-    MalformedString(bs58::decode::Error),
-}
+    #[error(transparent)]
+    MalformedBytes(#[from] SignatureError),
 
-impl From<SignatureError> for Ed25519RecoveryError {
-    fn from(err: SignatureError) -> Self {
-        Ed25519RecoveryError::MalformedBytes(err)
-    }
-}
+    #[error("the base58 representation of the public key was malformed - {source}")]
+    MalformedPublicKeyString {
+        #[source]
+        source: bs58::decode::Error,
+    },
 
-impl From<bs58::decode::Error> for Ed25519RecoveryError {
-    fn from(err: bs58::decode::Error) -> Self {
-        Ed25519RecoveryError::MalformedString(err)
-    }
-}
+    #[error("the base58 representation of the private key was malformed - {source}")]
+    MalformedPrivateKeyString {
+        #[source]
+        source: bs58::decode::Error,
+    },
 
-impl fmt::Display for Ed25519RecoveryError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            Ed25519RecoveryError::MalformedBytes(err) => write!(f, "malformed bytes - {}", err),
-            Ed25519RecoveryError::MalformedString(err) => write!(f, "malformed string - {}", err),
-        }
-    }
+    #[error("the base58 representation of the signature was malformed - {source}")]
+    MalformedSignatureString {
+        #[source]
+        source: bs58::decode::Error,
+    },
 }
 
-impl std::error::Error for Ed25519RecoveryError {}
-
 /// Keypair for usage in ed25519 EdDSA.
 #[derive(Debug)]
 pub struct KeyPair {
@@ -134,7 +131,9 @@ impl PublicKey {
     }
 
     pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, Ed25519RecoveryError> {
-        let bytes = bs58::decode(val).into_vec()?;
+        let bytes = bs58::decode(val)
+            .into_vec()
+            .map_err(|source| Ed25519RecoveryError::MalformedPublicKeyString { source })?;
         Self::from_bytes(&bytes)
     }
 
@@ -143,6 +142,14 @@ impl PublicKey {
     }
 }
 
+impl FromStr for PublicKey {
+    type Err = Ed25519RecoveryError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        PublicKey::from_base58_string(s)
+    }
+}
+
 #[cfg(feature = "serde")]
 impl Serialize for PublicKey {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -211,7 +218,9 @@ impl PrivateKey {
     }
 
     pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, Ed25519RecoveryError> {
-        let bytes = bs58::decode(val).into_vec()?;
+        let bytes = bs58::decode(val)
+            .into_vec()
+            .map_err(|source| Ed25519RecoveryError::MalformedPrivateKeyString { source })?;
         Self::from_bytes(&bytes)
     }
 
@@ -277,7 +286,9 @@ impl Signature {
     }
 
     pub fn from_base58_string<I: AsRef<[u8]>>(val: I) -> Result<Self, Ed25519RecoveryError> {
-        let bytes = bs58::decode(val).into_vec()?;
+        let bytes = bs58::decode(val)
+            .into_vec()
+            .map_err(|source| Ed25519RecoveryError::MalformedSignatureString { source })?;
         Self::from_bytes(&bytes)
     }
 
diff --git a/common/execute/src/lib.rs b/common/execute/src/lib.rs
index 795a72822d..c05a2e8748 100644
--- a/common/execute/src/lib.rs
+++ b/common/execute/src/lib.rs
@@ -53,13 +53,13 @@ pub fn execute(attr: TokenStream, item: TokenStream) -> TokenStream {
     );
 
     let execute_output = quote! {
-        -> Result<ExecuteResult, NymdError>
+        -> Result<ExecuteResult, NyxdError>
     };
     let o_ts = proc_macro::TokenStream::from(execute_output);
     execute_f.sig.output = parse_macro_input!(o_ts as ReturnType);
 
     let simulate_output = quote! {
-        -> Result<SimulateResponse, NymdError>
+        -> Result<SimulateResponse, NyxdError>
     };
     let o_ts = proc_macro::TokenStream::from(simulate_output);
     simulate_f.sig.output = parse_macro_input!(o_ts as ReturnType);
diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml
index 53676023af..d2e20ef29d 100644
--- a/common/mixnode-common/Cargo.toml
+++ b/common/mixnode-common/Cargo.toml
@@ -16,6 +16,7 @@ serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1.21.2", features = ["time", "macros", "rt", "net", "io-util"] }
 tokio-util = { version = "0.7.3", features = ["codec"] }
 url = "2.2"
+thiserror = "1.0.37"
 
 crypto =  { path = "../crypto" }
 nymsphinx-acknowledgements = { path = "../nymsphinx/acknowledgements" }
@@ -25,5 +26,5 @@ nymsphinx-framing = { path = "../nymsphinx/framing" }
 nymsphinx-params = { path = "../nymsphinx/params" }
 nymsphinx-types = { path = "../nymsphinx/types" }
 task = { path = "../task" }
-validator-client = { path = "../client-libs/validator-client" }
+validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"]}
 version-checker = { path = "../version-checker" }
diff --git a/common/mixnode-common/src/packet_processor/error.rs b/common/mixnode-common/src/packet_processor/error.rs
index 38be92079d..084ce708a8 100644
--- a/common/mixnode-common/src/packet_processor/error.rs
+++ b/common/mixnode-common/src/packet_processor/error.rs
@@ -4,63 +4,22 @@
 use nymsphinx_acknowledgements::surb_ack::SurbAckRecoveryError;
 use nymsphinx_addressing::nodes::NymNodeRoutingAddressError;
 use nymsphinx_types::Error as SphinxError;
-use std::fmt::{self, Display, Formatter};
+use thiserror::Error;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum MixProcessingError {
-    SphinxProcessingError(SphinxError),
-    InvalidHopAddress(NymNodeRoutingAddressError),
-    NoSurbAckInFinalHop,
-    MalformedSurbAck(SurbAckRecoveryError),
+    #[error("failed to process received packet: {0}")]
+    SphinxProcessingError(#[from] SphinxError),
 
+    #[error("the forward hop address was malformed: {0}")]
+    InvalidForwardHopAddress(#[from] NymNodeRoutingAddressError),
+
+    #[error("the final hop did not contain a SURB-Ack")]
+    NoSurbAckInFinalHop,
+
+    #[error("failed to recover the expected SURB-Ack packet: {0}")]
+    MalformedSurbAck(#[from] SurbAckRecoveryError),
+
+    #[error("the received packet was set to use the very old and very much deprecated 'VPN' mode")]
     ReceivedOldTypeVpnPacket,
 }
-
-impl From<SphinxError> for MixProcessingError {
-    // for the time being just have a single error instance for all possible results of SphinxError
-    fn from(err: SphinxError) -> Self {
-        use MixProcessingError::*;
-
-        SphinxProcessingError(err)
-    }
-}
-
-impl From<NymNodeRoutingAddressError> for MixProcessingError {
-    fn from(err: NymNodeRoutingAddressError) -> Self {
-        use MixProcessingError::*;
-
-        InvalidHopAddress(err)
-    }
-}
-
-impl From<SurbAckRecoveryError> for MixProcessingError {
-    fn from(err: SurbAckRecoveryError) -> Self {
-        use MixProcessingError::*;
-
-        MalformedSurbAck(err)
-    }
-}
-
-impl Display for MixProcessingError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            MixProcessingError::SphinxProcessingError(sphinx_err) => {
-                write!(f, "Sphinx Processing Error - {}", sphinx_err)
-            }
-            MixProcessingError::InvalidHopAddress(address_err) => {
-                write!(f, "Invalid Hop Address - {:?}", address_err)
-            }
-            MixProcessingError::NoSurbAckInFinalHop => {
-                write!(f, "No SURBAck present in the final hop data")
-            }
-            MixProcessingError::MalformedSurbAck(surb_ack_err) => {
-                write!(f, "Malformed SURBAck - {:?}", surb_ack_err)
-            }
-            MixProcessingError::ReceivedOldTypeVpnPacket => {
-                write!(f, "Received an old-type unsafe 'VPN' mode packet")
-            }
-        }
-    }
-}
-
-impl std::error::Error for MixProcessingError {}
diff --git a/common/mixnode-common/src/packet_processor/processor.rs b/common/mixnode-common/src/packet_processor/processor.rs
index 918e001fec..84e543d8bd 100644
--- a/common/mixnode-common/src/packet_processor/processor.rs
+++ b/common/mixnode-common/src/packet_processor/processor.rs
@@ -51,7 +51,7 @@ impl SphinxPacketProcessor {
         packet: SphinxPacket,
     ) -> Result<ProcessedPacket, MixProcessingError> {
         packet.process(&self.sphinx_key).map_err(|err| {
-            debug!("Failed to unwrap Sphinx packet: {:?}", err);
+            debug!("Failed to unwrap Sphinx packet: {err}");
             MixProcessingError::SphinxProcessingError(err)
         })
     }
@@ -161,7 +161,7 @@ impl SphinxPacketProcessor {
     ) -> Result<MixProcessingResult, MixProcessingError> {
         match packet {
             ProcessedPacket::ForwardHop(packet, address, delay) => {
-                self.process_forward_hop(packet, address, delay, packet_mode)
+                self.process_forward_hop(*packet, address, delay, packet_mode)
             }
             // right now there's no use for the surb_id included in the header - probably it should get removed from the
             // sphinx all together?
diff --git a/common/mixnode-common/src/verloc/error.rs b/common/mixnode-common/src/verloc/error.rs
index 44a408c77a..0268059d7c 100644
--- a/common/mixnode-common/src/verloc/error.rs
+++ b/common/mixnode-common/src/verloc/error.rs
@@ -53,13 +53,13 @@ impl Display for RttError {
                 write!(f, "The received reply packet had invalid signature")
             }
             RttError::UnreachableNode(id, err) => {
-                write!(f, "Could not establish connection to {} - {}", id, err)
+                write!(f, "Could not establish connection to {} - {err}", id)
             }
             RttError::UnexpectedConnectionFailureWrite(id, err) => {
-                write!(f, "Failed to write echo packet to {} - {}", id, err)
+                write!(f, "Failed to write echo packet to {} - {err}", id)
             }
             RttError::UnexpectedConnectionFailureRead(id, err) => {
-                write!(f, "Failed to read reply packet from {} - {}", id, err)
+                write!(f, "Failed to read reply packet from {} - {err}", id)
             }
             RttError::ConnectionReadTimeout(id) => {
                 write!(f, "Timed out while trying to read reply packet from {}", id)
diff --git a/common/mixnode-common/src/verloc/listener.rs b/common/mixnode-common/src/verloc/listener.rs
index 8f49779130..812358e330 100644
--- a/common/mixnode-common/src/verloc/listener.rs
+++ b/common/mixnode-common/src/verloc/listener.rs
@@ -11,7 +11,7 @@ use std::fmt::{Display, Formatter};
 use std::net::SocketAddr;
 use std::sync::Arc;
 use std::{fmt, io, process};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::io::AsyncWriteExt;
 use tokio::net::{TcpListener, TcpStream};
 use tokio_util::codec::{Decoder, Encoder, Framed};
@@ -19,14 +19,14 @@ use tokio_util::codec::{Decoder, Encoder, Framed};
 pub(crate) struct PacketListener {
     address: SocketAddr,
     connection_handler: Arc<ConnectionHandler>,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl PacketListener {
     pub(crate) fn new(
         address: SocketAddr,
         identity: Arc<identity::KeyPair>,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Self {
         PacketListener {
             address,
@@ -66,7 +66,7 @@ impl PacketListener {
 
                             tokio::spawn(connection_handler.handle_connection(socket, remote_addr, handler_shutdown_listener));
                         }
-                        Err(err) => warn!("Failed to accept incoming connection - {:?}", err),
+                        Err(err) => warn!("Failed to accept incoming connection - {err}"),
                     }
                 },
                 _ = shutdown_listener.recv() => {
@@ -91,7 +91,7 @@ impl ConnectionHandler {
         self: Arc<Self>,
         conn: TcpStream,
         remote: SocketAddr,
-        mut shutdown_listener: ShutdownListener,
+        mut shutdown_listener: TaskClient,
     ) {
         debug!("Starting connection handler for {:?}", remote);
 
@@ -141,9 +141,9 @@ enum EchoPacketCodecError {
 impl Display for EchoPacketCodecError {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            EchoPacketCodecError::IoError(err) => write!(f, "encountered io error - {}", err),
+            EchoPacketCodecError::IoError(err) => write!(f, "encountered io error - {err}"),
             EchoPacketCodecError::PacketRecoveryError(err) => {
-                write!(f, "failed to correctly decode an echo packet - {}", err)
+                write!(f, "failed to correctly decode an echo packet - {err}")
             }
         }
     }
diff --git a/common/mixnode-common/src/verloc/mod.rs b/common/mixnode-common/src/verloc/mod.rs
index 48e9a7b483..07fc80b4ba 100644
--- a/common/mixnode-common/src/verloc/mod.rs
+++ b/common/mixnode-common/src/verloc/mod.rs
@@ -9,10 +9,11 @@ use futures::StreamExt;
 use log::*;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
-use std::net::{SocketAddr, ToSocketAddrs};
+use std::net::SocketAddr;
+use std::net::ToSocketAddrs;
 use std::sync::Arc;
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use url::Url;
@@ -69,8 +70,8 @@ pub struct Config {
     /// due to being unable to get the list of nodes.
     retry_timeout: Duration,
 
-    /// URLs to the validator apis for obtaining network topology.
-    validator_api_urls: Vec<Url>,
+    /// URLs to the nym apis for obtaining network topology.
+    nym_api_urls: Vec<Url>,
 }
 
 impl Config {
@@ -132,15 +133,15 @@ impl ConfigBuilder {
         self
     }
 
-    pub fn validator_api_urls(mut self, validator_api_urls: Vec<Url>) -> Self {
-        self.0.validator_api_urls = validator_api_urls;
+    pub fn nym_api_urls(mut self, nym_api_urls: Vec<Url>) -> Self {
+        self.0.nym_api_urls = nym_api_urls;
         self
     }
 
     pub fn build(self) -> Config {
         // panics here are fine as those are only ever constructed at the initial setup
         assert!(
-            !self.0.validator_api_urls.is_empty(),
+            !self.0.nym_api_urls.is_empty(),
             "at least one validator endpoint must be provided",
         );
         self.0
@@ -159,7 +160,7 @@ impl Default for ConfigBuilder {
             tested_nodes_batch_size: DEFAULT_BATCH_SIZE,
             testing_interval: DEFAULT_TESTING_INTERVAL,
             retry_timeout: DEFAULT_RETRY_TIMEOUT,
-            validator_api_urls: vec![],
+            nym_api_urls: vec![],
         })
     }
 }
@@ -168,7 +169,7 @@ pub struct VerlocMeasurer {
     config: Config,
     packet_sender: Arc<PacketSender>,
     packet_listener: Arc<PacketListener>,
-    shutdown_listener: ShutdownListener,
+    shutdown_listener: TaskClient,
 
     currently_used_api: usize,
 
@@ -176,7 +177,7 @@ pub struct VerlocMeasurer {
     // It only does bunch of REST queries. If we update it at some point to a more sophisticated (maybe signing) client,
     // then it definitely cannot be constructed here and probably will need to be passed from outside,
     // as mixnodes/gateways would already be using an instance of said client.
-    validator_client: validator_client::ApiClient,
+    validator_client: validator_client::NymApiClient,
     results: AtomicVerlocResult,
 }
 
@@ -184,9 +185,9 @@ impl VerlocMeasurer {
     pub fn new(
         mut config: Config,
         identity: Arc<identity::KeyPair>,
-        shutdown_listener: ShutdownListener,
+        shutdown_listener: TaskClient,
     ) -> Self {
-        config.validator_api_urls.shuffle(&mut thread_rng());
+        config.nym_api_urls.shuffle(&mut thread_rng());
 
         VerlocMeasurer {
             packet_sender: Arc::new(PacketSender::new(
@@ -204,24 +205,21 @@ impl VerlocMeasurer {
             )),
             shutdown_listener,
             currently_used_api: 0,
-            validator_client: validator_client::ApiClient::new(
-                config.validator_api_urls[0].clone(),
-            ),
+            validator_client: validator_client::NymApiClient::new(config.nym_api_urls[0].clone()),
             config,
             results: AtomicVerlocResult::new(),
         }
     }
 
-    fn use_next_validator_api(&mut self) {
-        if self.config.validator_api_urls.len() == 1 {
+    fn use_next_nym_api(&mut self) {
+        if self.config.nym_api_urls.len() == 1 {
             warn!("There's only a single validator API available - it won't be possible to use a different one");
             return;
         }
 
-        self.currently_used_api =
-            (self.currently_used_api + 1) % self.config.validator_api_urls.len();
+        self.currently_used_api = (self.currently_used_api + 1) % self.config.nym_api_urls.len();
         self.validator_client
-            .change_validator_api(self.config.validator_api_urls[self.currently_used_api].clone())
+            .change_nym_api(self.config.nym_api_urls[self.currently_used_api].clone())
     }
 
     pub fn get_verloc_results_pointer(&self) -> AtomicVerlocResult {
@@ -308,7 +306,7 @@ impl VerlocMeasurer {
                         "failed to obtain list of mixnodes from the validator - {}. Going to attempt to use another validator API in the next run",
                         err
                     );
-                    self.use_next_validator_api();
+                    self.use_next_nym_api();
                     sleep(self.config.retry_timeout).await;
                     continue;
                 }
diff --git a/common/mixnode-common/src/verloc/sender.rs b/common/mixnode-common/src/verloc/sender.rs
index bed34f4474..91f7ee9974 100644
--- a/common/mixnode-common/src/verloc/sender.rs
+++ b/common/mixnode-common/src/verloc/sender.rs
@@ -11,7 +11,7 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fmt, io};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio::time::sleep;
@@ -45,7 +45,7 @@ pub(crate) struct PacketSender {
     packet_timeout: Duration,
     connection_timeout: Duration,
     delay_between_packets: Duration,
-    shutdown_listener: ShutdownListener,
+    shutdown_listener: TaskClient,
 }
 
 impl PacketSender {
@@ -55,7 +55,7 @@ impl PacketSender {
         packet_timeout: Duration,
         connection_timeout: Duration,
         delay_between_packets: Duration,
-        shutdown_listener: ShutdownListener,
+        shutdown_listener: TaskClient,
     ) -> Self {
         PacketSender {
             identity,
diff --git a/common/network-defaults/src/lib.rs b/common/network-defaults/src/lib.rs
index d7b01622b1..dd16eb18d7 100644
--- a/common/network-defaults/src/lib.rs
+++ b/common/network-defaults/src/lib.rs
@@ -1,6 +1,7 @@
 // Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::var_names::{DEPRECATED_API_VALIDATOR, DEPRECATED_NYMD_VALIDATOR, NYM_API, NYXD};
 use serde::{Deserialize, Serialize};
 use std::{env::var, ops::Not, path::PathBuf};
 use url::Url;
@@ -77,8 +78,8 @@ impl NymNetworkDetails {
                     .expect("denomination exponent is not u32"),
             })
             .with_validator_endpoint(ValidatorDetails::new(
-                var(var_names::NYMD_VALIDATOR).expect("nymd validator not set"),
-                Some(var(var_names::API_VALIDATOR).expect("api validator not set")),
+                var(var_names::NYXD).expect("nyxd validator not set"),
+                Some(var(var_names::NYM_API).expect("nym api not set")),
             ))
             .with_mixnet_contract(Some(
                 var(var_names::MIXNET_CONTRACT_ADDRESS).expect("mixnet contract not set"),
@@ -254,7 +255,7 @@ impl DenomDetailsOwned {
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct ValidatorDetails {
     // it is assumed those values are always valid since they're being provided in our defaults file
-    pub nymd_url: String,
+    pub nyxd_url: String,
     // Right now api_url is optional as we are not running the api reliably on all validators
     // however, later on it should be a mandatory field
     pub api_url: Option<String>,
@@ -262,24 +263,24 @@ pub struct ValidatorDetails {
 }
 
 impl ValidatorDetails {
-    pub fn new<S: Into<String>>(nymd_url: S, api_url: Option<S>) -> Self {
+    pub fn new<S: Into<String>>(nyxd_url: S, api_url: Option<S>) -> Self {
         ValidatorDetails {
-            nymd_url: nymd_url.into(),
+            nyxd_url: nyxd_url.into(),
             api_url: api_url.map(Into::into),
         }
     }
 
-    pub fn new_nymd_only<S: Into<String>>(nymd_url: S) -> Self {
+    pub fn new_nyxd_only<S: Into<String>>(nyxd_url: S) -> Self {
         ValidatorDetails {
-            nymd_url: nymd_url.into(),
+            nyxd_url: nyxd_url.into(),
             api_url: None,
         }
     }
 
-    pub fn nymd_url(&self) -> Url {
-        self.nymd_url
+    pub fn nyxd_url(&self) -> Url {
+        self.nyxd_url
             .parse()
-            .expect("the provided nymd url is invalid!")
+            .expect("the provided nyxd url is invalid!")
     }
 
     pub fn api_url(&self) -> Option<Url> {
@@ -289,13 +290,28 @@ impl ValidatorDetails {
     }
 }
 
-pub fn setup_env(config_env_file: Option<PathBuf>) {
+fn fix_deprecated_environmental_variables() {
+    // if we're using the outdated environmental variables, set the updated ones to preserve compatibility
+    if let Ok(nyxd) = std::env::var(DEPRECATED_NYMD_VALIDATOR) {
+        if std::env::var(NYXD).is_err() {
+            std::env::set_var(NYXD, nyxd)
+        }
+    }
+    if let Ok(nym_apis) = std::env::var(DEPRECATED_API_VALIDATOR) {
+        if std::env::var(NYM_API).is_err() {
+            std::env::set_var(NYM_API, nym_apis)
+        }
+    }
+}
+
+pub fn setup_env(config_env_file: Option<&PathBuf>) {
     match std::env::var(var_names::CONFIGURED) {
         // if the configuration is not already set in the env vars
         Err(std::env::VarError::NotPresent) => {
             if let Some(config_env_file) = config_env_file {
                 dotenv::from_path(config_env_file)
                     .expect("Invalid path to environment configuration file");
+                fix_deprecated_environmental_variables();
             } else {
                 // if nothing is set, the use mainnet defaults
                 // if the user has not set `CONFIGURED`, then even if they set any of the env variables,
@@ -304,7 +320,9 @@ pub fn setup_env(config_env_file: Option<PathBuf>) {
             }
         }
         Err(_) => crate::mainnet::export_to_env(),
-        _ => {}
+        _ => {
+            fix_deprecated_environmental_variables();
+        }
     }
 
     // if we haven't explicitly defined any of the constants, fallback to defaults
@@ -355,14 +373,14 @@ pub const DEFAULT_WEBSOCKET_LISTENING_PORT: u16 = 1977;
 // 'SOCKS5' CLIENT
 pub const DEFAULT_SOCKS5_LISTENING_PORT: u16 = 1080;
 
-// VALIDATOR-API
-pub const DEFAULT_VALIDATOR_API_PORT: u16 = 8080;
+// NYM-API
+pub const DEFAULT_NYM_API_PORT: u16 = 8080;
 
-pub const VALIDATOR_API_VERSION: &str = "v1";
+pub const NYM_API_VERSION: &str = "v1";
 
 // REWARDING
 
-/// We'll be assuming a few more things, profit margin and cost function. Since we don't have relialable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate interval costs to Nyms. We'll also assume a cost of 40$ per interval(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
+/// We'll be assuming a few more things, profit margin and cost function. Since we don't have reliable package measurement, we'll be using uptime. We'll also set the value of 1 Nym to 1 $, to be able to translate interval costs to Nyms. We'll also assume a cost of 40$ per interval(month), converting that to Nym at our 1$ rate translates to 40_000_000 uNyms
 // pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 40_000_000; // 40$/(30 days) at 1 Nym == 1$
 // pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 55_556; // 40$/1hr at 1 Nym == 1$
 // pub const DEFAULT_OPERATOR_INTERVAL_COST: u64 = 9259; // 40$/1hr/6 at 1 Nym == 1$
diff --git a/common/network-defaults/src/mainnet.rs b/common/network-defaults/src/mainnet.rs
index 59242376f9..4f8352c1c6 100644
--- a/common/network-defaults/src/mainnet.rs
+++ b/common/network-defaults/src/mainnet.rs
@@ -9,7 +9,7 @@ pub(crate) const BECH32_PREFIX: &str = "n";
 pub const MIX_DENOM: DenomDetails = DenomDetails::new("unym", "nym", 6);
 pub const STAKE_DENOM: DenomDetails = DenomDetails::new("unyx", "nyx", 6);
 
-pub(crate) const MIXNET_CONTRACT_ADDRESS: &str =
+pub const MIXNET_CONTRACT_ADDRESS: &str =
     "n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr";
 pub(crate) const VESTING_CONTRACT_ADDRESS: &str =
     "n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw";
@@ -25,11 +25,11 @@ pub(crate) const _ETH_ERC20_CONTRACT_ADDRESS: [u8; 20] =
     hex_literal::hex!("0000000000000000000000000000000000000000");
 pub(crate) const REWARDING_VALIDATOR_ADDRESS: &str = "n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy";
 
-pub(crate) const STATISTICS_SERVICE_DOMAIN_ADDRESS: &str = "https://mainnet-stats.nymte.ch:8090/";
-pub const NYMD_VALIDATOR: &str = "https://rpc.nymtech.net";
-pub const API_VALIDATOR: &str = "https://validator.nymtech.net/api/";
+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(crate) fn validators() -> Vec<ValidatorDetails> {
-    vec![ValidatorDetails::new(NYMD_VALIDATOR, Some(API_VALIDATOR))]
+    vec![ValidatorDetails::new(NYXD_URL, Some(NYM_API))]
 }
 
 const DEFAULT_SUFFIX: &str = "_MAINNET_DEFAULT";
@@ -97,8 +97,8 @@ pub fn export_to_env() {
         var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
         STATISTICS_SERVICE_DOMAIN_ADDRESS,
     );
-    set_var_to_default(var_names::NYMD_VALIDATOR, NYMD_VALIDATOR);
-    set_var_to_default(var_names::API_VALIDATOR, API_VALIDATOR);
+    set_var_to_default(var_names::NYXD, NYXD_URL);
+    set_var_to_default(var_names::NYM_API, NYM_API);
 }
 
 pub fn export_to_env_if_not_set() {
@@ -141,6 +141,6 @@ pub fn export_to_env_if_not_set() {
         var_names::STATISTICS_SERVICE_DOMAIN_ADDRESS,
         STATISTICS_SERVICE_DOMAIN_ADDRESS,
     );
-    set_var_conditionally_to_default(var_names::NYMD_VALIDATOR, NYMD_VALIDATOR);
-    set_var_conditionally_to_default(var_names::API_VALIDATOR, API_VALIDATOR);
+    set_var_conditionally_to_default(var_names::NYXD, NYXD_URL);
+    set_var_conditionally_to_default(var_names::NYM_API, NYM_API);
 }
diff --git a/common/network-defaults/src/var_names.rs b/common/network-defaults/src/var_names.rs
index 4e62e444cc..c6e4a450a2 100644
--- a/common/network-defaults/src/var_names.rs
+++ b/common/network-defaults/src/var_names.rs
@@ -18,5 +18,9 @@ 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 NYMD_VALIDATOR: &str = "NYMD_VALIDATOR";
-pub const API_VALIDATOR: &str = "API_VALIDATOR";
+pub const NYXD: &str = "NYXD";
+pub const NYM_API: &str = "NYM_API";
+
+// we don't want to explicitly tag those with `#[deprecated]` because then our CI would be red and sad : (
+pub const DEPRECATED_NYMD_VALIDATOR: &str = "NYMD_VALIDATOR";
+pub const DEPRECATED_API_VALIDATOR: &str = "API_VALIDATOR";
diff --git a/common/nymcoconut/src/tests/e2e.rs b/common/nymcoconut/src/tests/e2e.rs
index 235b2adbab..db950d0c3f 100644
--- a/common/nymcoconut/src/tests/e2e.rs
+++ b/common/nymcoconut/src/tests/e2e.rs
@@ -45,6 +45,7 @@ fn keygen() -> Result<(), CoconutError> {
 }
 
 #[test]
+#[ignore] // expensive test
 fn dkg() -> Result<(), CoconutError> {
     let params = setup(5)?;
     let node_indices = vec![15u64, 248, 33521];
diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml
index f0f24ac665..d9d81aecd4 100644
--- a/common/nymsphinx/Cargo.toml
+++ b/common/nymsphinx/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
 [dependencies]
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 rand_distr = "0.3"
+thiserror = "1.0.37"
 
 nymsphinx-acknowledgements = { path = "acknowledgements" }
 nymsphinx-addressing = { path = "addressing" }
diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml
index f105e0c544..c05976ade7 100644
--- a/common/nymsphinx/acknowledgements/Cargo.toml
+++ b/common/nymsphinx/acknowledgements/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 
 [dependencies]
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+thiserror = "1.0.37"
 
 crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
 nymsphinx-addressing = { path = "../addressing" }
diff --git a/common/nymsphinx/acknowledgements/src/surb_ack.rs b/common/nymsphinx/acknowledgements/src/surb_ack.rs
index 22bd4bc468..912ed4bc32 100644
--- a/common/nymsphinx/acknowledgements/src/surb_ack.rs
+++ b/common/nymsphinx/acknowledgements/src/surb_ack.rs
@@ -4,10 +4,13 @@
 use crate::identifier::prepare_identifier;
 use crate::AckKey;
 use nymsphinx_addressing::clients::Recipient;
-use nymsphinx_addressing::nodes::{NymNodeRoutingAddress, MAX_NODE_ADDRESS_UNPADDED_LEN};
+use nymsphinx_addressing::nodes::{
+    NymNodeRoutingAddress, NymNodeRoutingAddressError, MAX_NODE_ADDRESS_UNPADDED_LEN,
+};
 use nymsphinx_params::packet_sizes::PacketSize;
 use nymsphinx_params::DEFAULT_NUM_MIX_HOPS;
 use nymsphinx_types::builder::SphinxPacketBuilder;
+use nymsphinx_types::Error as SphinxError;
 use nymsphinx_types::{
     delays::{self, Delay},
     SphinxPacket,
@@ -15,6 +18,7 @@ use nymsphinx_types::{
 use rand::{CryptoRng, RngCore};
 use std::convert::TryFrom;
 use std::time;
+use thiserror::Error;
 use topology::{NymTopology, NymTopologyError};
 
 pub struct SurbAck {
@@ -23,11 +27,16 @@ pub struct SurbAck {
     expected_total_delay: Delay,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum SurbAckRecoveryError {
-    InvalidPacketSize,
-    InvalidAddress,
-    InvalidSphinxPacket,
+    #[error("received an invalid number of bytes to deserialize the SURB-Ack. Got {received}, expected {expected}")]
+    InvalidPacketSize { received: usize, expected: usize },
+
+    #[error("could not extract first hop address information - {0}")]
+    InvalidAddress(#[from] NymNodeRoutingAddressError),
+
+    #[error("the contained sphinx packet was not correctly formed - {0}")]
+    InvalidSphinxPacket(#[from] SphinxError),
 }
 
 impl SurbAck {
@@ -72,6 +81,10 @@ impl SurbAck {
         PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN
     }
 
+    pub fn expected_total_delay(&self) -> Delay {
+        self.expected_total_delay
+    }
+
     pub fn prepare_for_sending(self) -> (Delay, Vec<u8>) {
         // SURB_FIRST_HOP || SURB_ACK
         let surb_bytes: Vec<_> = self
@@ -88,20 +101,17 @@ impl SurbAck {
         b: &[u8],
     ) -> Result<(NymNodeRoutingAddress, SphinxPacket), SurbAckRecoveryError> {
         if b.len() != Self::len() {
-            Err(SurbAckRecoveryError::InvalidPacketSize)
+            Err(SurbAckRecoveryError::InvalidPacketSize {
+                received: b.len(),
+                expected: Self::len(),
+            })
         } else {
-            let address = match NymNodeRoutingAddress::try_from_bytes(b) {
-                Ok(address) => address,
-                Err(_) => return Err(SurbAckRecoveryError::InvalidAddress),
-            };
+            let address = NymNodeRoutingAddress::try_from_bytes(b)?;
 
             // TODO: this will be variable once/if we decide to introduce optimization described
             // in common/nymsphinx/chunking/src/lib.rs:available_plaintext_size()
             let address_offset = MAX_NODE_ADDRESS_UNPADDED_LEN;
-            let packet = match SphinxPacket::from_bytes(&b[address_offset..]) {
-                Ok(packet) => packet,
-                Err(_) => return Err(SurbAckRecoveryError::InvalidSphinxPacket),
-            };
+            let packet = SphinxPacket::from_bytes(&b[address_offset..])?;
 
             Ok((address, packet))
         }
diff --git a/common/nymsphinx/addressing/Cargo.toml b/common/nymsphinx/addressing/Cargo.toml
index a67849b128..7a85486e4f 100644
--- a/common/nymsphinx/addressing/Cargo.toml
+++ b/common/nymsphinx/addressing/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2021"
 crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
 nymsphinx-types = { path = "../types" } # we need to be able to refer to some types defined inside sphinx crate
 serde = "1.0" # implementing serialization/deserialization for some types, like `Recipient`
+thiserror = "1.0.37"
 
 [dev-dependencies]
 rand = "0.7"
diff --git a/common/nymsphinx/addressing/src/clients.rs b/common/nymsphinx/addressing/src/clients.rs
index 819f272efd..29f7051c6c 100644
--- a/common/nymsphinx/addressing/src/clients.rs
+++ b/common/nymsphinx/addressing/src/clients.rs
@@ -10,6 +10,8 @@ use nymsphinx_types::Destination;
 use serde::de::{Error as SerdeError, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::fmt::{self, Formatter};
+use std::str::FromStr;
+use thiserror::Error;
 
 // Not entirely sure whether this is the correct place for those, but let's see how it's going
 // to work out
@@ -19,46 +21,25 @@ const CLIENT_ENCRYPTION_KEY_SIZE: usize = encryption::PUBLIC_KEY_SIZE;
 pub type ClientIdentity = identity::PublicKey;
 const CLIENT_IDENTITY_SIZE: usize = identity::PUBLIC_KEY_LENGTH;
 
-#[derive(Debug)]
+pub type RecipientBytes = [u8; Recipient::LEN];
+
+#[derive(Debug, Error)]
 pub enum RecipientFormattingError {
-    MalformedRecipientError,
+    #[error("recipient is malformed - {reason} ")]
+    MalformedRecipientError { reason: String },
+
+    #[error("recipient's identity key is malformed: {0}")]
     MalformedIdentityError(identity::Ed25519RecoveryError),
-    MalformedEncryptionKeyError(encryption::KeyRecoveryError),
+
+    #[error("recipient's encryption key is malformed: {0}")]
+    MalformedEncryptionKeyError(#[from] encryption::KeyRecoveryError),
+
+    #[error("recipient gateway's identity key is malformed: {0}")]
     MalformedGatewayError(identity::Ed25519RecoveryError),
 }
 
-impl fmt::Display for RecipientFormattingError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            RecipientFormattingError::MalformedRecipientError => {
-                write!(f, "recipient is malformed")
-            }
-            RecipientFormattingError::MalformedIdentityError(id_err) => {
-                write!(f, "recipient's identity key is malformed: {}", id_err)
-            }
-            RecipientFormattingError::MalformedEncryptionKeyError(enc_err) => {
-                write!(f, "recipient's encryption key is malformed: {}", enc_err)
-            }
-            RecipientFormattingError::MalformedGatewayError(id_err) => write!(
-                f,
-                "recipient gateway's identity key is malformed: {}",
-                id_err
-            ),
-        }
-    }
-}
-
-// since we have Debug and Display might as well slap Error on top of it too
-impl std::error::Error for RecipientFormattingError {}
-
-impl From<encryption::KeyRecoveryError> for RecipientFormattingError {
-    fn from(err: encryption::KeyRecoveryError) -> Self {
-        RecipientFormattingError::MalformedEncryptionKeyError(err)
-    }
-}
-
 // TODO: this should a different home... somewhere, but where?
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct Recipient {
     client_identity: ClientIdentity,
     client_encryption_key: ClientEncryptionKey,
@@ -154,7 +135,7 @@ impl Recipient {
         &self.gateway
     }
 
-    pub fn to_bytes(self) -> [u8; Self::LEN] {
+    pub fn to_bytes(self) -> RecipientBytes {
         let mut out = [0u8; Self::LEN];
         out[..CLIENT_IDENTITY_SIZE].copy_from_slice(&self.client_identity.to_bytes());
         out[CLIENT_IDENTITY_SIZE..CLIENT_IDENTITY_SIZE + CLIENT_ENCRYPTION_KEY_SIZE]
@@ -165,7 +146,7 @@ impl Recipient {
         out
     }
 
-    pub fn try_from_bytes(bytes: [u8; Self::LEN]) -> Result<Self, RecipientFormattingError> {
+    pub fn try_from_bytes(bytes: RecipientBytes) -> Result<Self, RecipientFormattingError> {
         let identity_bytes = &bytes[..CLIENT_IDENTITY_SIZE];
         let enc_key_bytes =
             &bytes[CLIENT_IDENTITY_SIZE..CLIENT_IDENTITY_SIZE + CLIENT_ENCRYPTION_KEY_SIZE];
@@ -196,14 +177,20 @@ impl Recipient {
         let string_address = full_address.into();
         let split: Vec<_> = string_address.split('@').collect();
         if split.len() != 2 {
-            return Err(RecipientFormattingError::MalformedRecipientError);
+            return Err(RecipientFormattingError::MalformedRecipientError {
+                reason: "the string address does not contain exactly a single '@' character"
+                    .to_string(),
+            });
         }
         let client_half = split[0];
         let gateway_half = split[1];
 
         let split_client: Vec<_> = client_half.split('.').collect();
         if split_client.len() != 2 {
-            return Err(RecipientFormattingError::MalformedRecipientError);
+            return Err(RecipientFormattingError::MalformedRecipientError {
+                reason: "the string address does not contain exactly a single '.' character"
+                    .to_string(),
+            });
         }
 
         let client_identity = match ClientIdentity::from_base58_string(split_client[0]) {
@@ -239,6 +226,14 @@ impl std::fmt::Display for Recipient {
     }
 }
 
+impl FromStr for Recipient {
+    type Err = RecipientFormattingError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Recipient::try_from_base58_string(s)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/common/nymsphinx/addressing/src/nodes.rs b/common/nymsphinx/addressing/src/nodes.rs
index a01f7202bd..cf43625c5a 100644
--- a/common/nymsphinx/addressing/src/nodes.rs
+++ b/common/nymsphinx/addressing/src/nodes.rs
@@ -5,6 +5,7 @@ use crypto::asymmetric::identity;
 use nymsphinx_types::{NodeAddressBytes, NODE_ADDRESS_LENGTH};
 use std::convert::{TryFrom, TryInto};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
+use thiserror::Error;
 
 // Not entirely sure whether this is the correct place for those, but let's see how it's going
 // to work out
@@ -20,10 +21,23 @@ pub const NODE_IDENTITY_SIZE: usize = identity::PUBLIC_KEY_LENGTH;
 /// In this case it's an ipv6 socket address (with version prefix)
 pub const MAX_NODE_ADDRESS_UNPADDED_LEN: usize = 19;
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum NymNodeRoutingAddressError {
-    InsufficientNumberOfBytesAvailableError,
-    InvalidIpVersion,
+    #[error("Attempted to deserialize NymNodeRoutingAddress without providing any bytes")]
+    NoBytesProvided,
+
+    #[error("Provided insufficient amount of few bytes to deserialize a valid NymNodeRoutingAddress for IPv{protocol_version} variant. Received {received} and required {required}")]
+    TooFewBytesProvided {
+        protocol_version: u8,
+        received: usize,
+        required: usize,
+    },
+
+    #[error("{received} is not a valid version of the Internet Protocol (IP). Expected either '4' or '6'")]
+    InvalidIpVersion { received: u8 },
+
+    #[error("Could not serialize NymNodeRoutingAddress into NodeAddressBytes as that requires using at least {required} bytes and only {NODE_ADDRESS_LENGTH} are available")]
+    TooSmallBytesRepresentation { required: usize },
 }
 
 /// Current representation of Node routing information used in Nym system.
@@ -84,28 +98,39 @@ impl NymNodeRoutingAddress {
     /// Tries to recover `Self` from a bytes slice.
     /// Does not care if it's zero-padded or not.
     pub fn try_from_bytes(b: &[u8]) -> Result<Self, NymNodeRoutingAddressError> {
-        // the bare minimum to represent `Self` is 7 bytes (for the shorter V4 version)
-        if b.len() < 7 {
-            return Err(NymNodeRoutingAddressError::InsufficientNumberOfBytesAvailableError);
+        if b.is_empty() {
+            return Err(NymNodeRoutingAddressError::NoBytesProvided);
         }
 
         let ip_version = b[0];
-        let port: u16 = u16::from_be_bytes([b[1], b[2]]);
         let ip = match ip_version {
-            4 => IpAddr::V4(Ipv4Addr::new(b[3], b[4], b[5], b[6])),
+            4 => {
+                if b.len() < 7 {
+                    return Err(NymNodeRoutingAddressError::TooFewBytesProvided {
+                        protocol_version: 4,
+                        received: b.len(),
+                        required: 7,
+                    });
+                }
+                IpAddr::V4(Ipv4Addr::new(b[3], b[4], b[5], b[6]))
+            }
             6 => {
                 if b.len() < 19 {
-                    return Err(
-                        NymNodeRoutingAddressError::InsufficientNumberOfBytesAvailableError,
-                    );
+                    return Err(NymNodeRoutingAddressError::TooFewBytesProvided {
+                        protocol_version: 6,
+                        received: b.len(),
+                        required: 19,
+                    });
                 }
                 let mut address_octets = [0u8; 16];
                 address_octets.copy_from_slice(&b[3..19]);
                 IpAddr::V6(Ipv6Addr::from(address_octets))
             }
-            _ => return Err(NymNodeRoutingAddressError::InvalidIpVersion),
+            v => return Err(NymNodeRoutingAddressError::InvalidIpVersion { received: v }),
         };
 
+        let port: u16 = u16::from_be_bytes([b[1], b[2]]);
+
         Ok(Self(SocketAddr::new(ip, port)))
     }
 
@@ -148,7 +173,9 @@ impl TryInto<NodeAddressBytes> for NymNodeRoutingAddress {
     fn try_into(self) -> Result<NodeAddressBytes, Self::Error> {
         // first check if we have enough bytes to represent `self`:
         if self.bytes_min_len() > NODE_ADDRESS_LENGTH {
-            return Err(NymNodeRoutingAddressError::InsufficientNumberOfBytesAvailableError);
+            return Err(NymNodeRoutingAddressError::TooSmallBytesRepresentation {
+                required: self.bytes_min_len(),
+            });
         }
 
         let padded_address = self.as_zero_padded_bytes(NODE_ADDRESS_LENGTH);
diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml
index 246f6de509..5ddb069e19 100644
--- a/common/nymsphinx/anonymous-replies/Cargo.toml
+++ b/common/nymsphinx/anonymous-replies/Cargo.toml
@@ -7,12 +7,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = {version = "0.7.3", features = ["wasm-bindgen"]}
+rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 bs58 = "0.4"
 serde = "1.0"
+thiserror = "1"
 
 crypto = { path = "../../crypto" }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-types = { path = "../types" }
 topology = { path = "../../topology" }
+
+[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
+version = "0.2.83"
\ No newline at end of file
diff --git a/common/nymsphinx/anonymous-replies/src/encryption_key.rs b/common/nymsphinx/anonymous-replies/src/encryption_key.rs
index b52b8cea60..7a6689f4a7 100644
--- a/common/nymsphinx/anonymous-replies/src/encryption_key.rs
+++ b/common/nymsphinx/anonymous-replies/src/encryption_key.rs
@@ -16,7 +16,7 @@ pub type EncryptionKeyDigest =
 
 pub type SurbEncryptionKeySize = <ReplySurbEncryptionAlgorithm as KeySizeUser>::KeySize;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct SurbEncryptionKey(CipherKey<ReplySurbEncryptionAlgorithm>);
 
 #[derive(Debug)]
diff --git a/common/nymsphinx/anonymous-replies/src/lib.rs b/common/nymsphinx/anonymous-replies/src/lib.rs
index ce93c4099b..3e48d0ea1b 100644
--- a/common/nymsphinx/anonymous-replies/src/lib.rs
+++ b/common/nymsphinx/anonymous-replies/src/lib.rs
@@ -3,6 +3,7 @@
 
 pub mod encryption_key;
 pub mod reply_surb;
+pub mod requests;
 
 pub use encryption_key::{SurbEncryptionKey, SurbEncryptionKeySize};
 pub use reply_surb::{ReplySurb, ReplySurbError};
diff --git a/common/nymsphinx/anonymous-replies/src/reply_surb.rs b/common/nymsphinx/anonymous-replies/src/reply_surb.rs
index b8b8ec04cf..1fb29b2910 100644
--- a/common/nymsphinx/anonymous-replies/src/reply_surb.rs
+++ b/common/nymsphinx/anonymous-replies/src/reply_surb.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::encryption_key::{SurbEncryptionKey, SurbEncryptionKeyError, SurbEncryptionKeySize};
@@ -14,44 +14,22 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::convert::TryFrom;
 use std::fmt::{self, Formatter};
 use std::time;
+use thiserror::Error;
 use topology::{NymTopology, NymTopologyError};
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum ReplySurbError {
+    #[error("tried to use reply SURB with an unpadded message")]
     UnpaddedMessageError,
-    MalformedStringError(bs58::decode::Error),
-    RecoveryError(SphinxError),
-    InvalidEncryptionKeyData(SurbEncryptionKeyError),
-}
 
-impl fmt::Display for ReplySurbError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            ReplySurbError::UnpaddedMessageError => {
-                write!(f, "tried to use reply SURB with an unpadded message")
-            }
-            ReplySurbError::MalformedStringError(decode_err) => {
-                write!(f, "reply SURB is incorrectly formatted: {}", decode_err)
-            }
-            ReplySurbError::RecoveryError(sphinx_err) => {
-                write!(f, "failed to recover reply SURB from bytes: {}", sphinx_err)
-            }
-            ReplySurbError::InvalidEncryptionKeyData(surb_key_err) => write!(
-                f,
-                "failed to recover reply SURB encryption key from bytes: {}",
-                surb_key_err
-            ),
-        }
-    }
-}
+    #[error("reply SURB is incorrectly formatted: {0}")]
+    MalformedStringError(#[from] bs58::decode::Error),
 
-// since we have Debug and Display might as well slap Error on top of it too
-impl std::error::Error for ReplySurbError {}
+    #[error("failed to recover reply SURB from bytes: {0}")]
+    RecoveryError(#[from] SphinxError),
 
-impl From<SurbEncryptionKeyError> for ReplySurbError {
-    fn from(err: SurbEncryptionKeyError) -> Self {
-        ReplySurbError::InvalidEncryptionKeyData(err)
-    }
+    #[error("failed to recover reply SURB encryption key from bytes: {0}")]
+    InvalidEncryptionKeyData(#[from] SurbEncryptionKeyError),
 }
 
 #[derive(Debug)]
@@ -157,6 +135,8 @@ impl ReplySurb {
     }
 
     pub fn from_bytes(bytes: &[u8]) -> Result<Self, ReplySurbError> {
+        // TODO: introduce bound checks to guard us against out of bound reads
+
         let encryption_key =
             SurbEncryptionKey::try_from_bytes(&bytes[..SurbEncryptionKeySize::USIZE])?;
 
@@ -189,21 +169,22 @@ impl ReplySurb {
     // - surb-ack
     // - key digest
     // - encrypted plaintext with padding to constant length
-    pub fn apply_surb(
+    pub fn apply_surb<M: AsRef<[u8]>>(
         self,
-        message: &[u8],
+        message: M,
         packet_size: Option<PacketSize>,
     ) -> Result<(SphinxPacket, NymNodeRoutingAddress), ReplySurbError> {
         let packet_size = packet_size.unwrap_or_default();
 
-        if message.len() != packet_size.plaintext_size() {
+        let message_bytes = message.as_ref();
+        if message_bytes.len() != packet_size.plaintext_size() {
             return Err(ReplySurbError::UnpaddedMessageError);
         }
 
         // this can realistically only fail on too long messages and we just checked for that
         let (packet, first_hop) = self
             .surb
-            .use_surb(message, packet_size.payload_size())
+            .use_surb(message_bytes, packet_size.payload_size())
             .expect("this error indicates inconsistent message length checking - it shouldn't have happened!");
 
         let first_hop_address = NymNodeRoutingAddress::try_from(first_hop).unwrap();
diff --git a/common/nymsphinx/anonymous-replies/src/requests.rs b/common/nymsphinx/anonymous-replies/src/requests.rs
new file mode 100644
index 0000000000..686f65aa79
--- /dev/null
+++ b/common/nymsphinx/anonymous-replies/src/requests.rs
@@ -0,0 +1,476 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{ReplySurb, ReplySurbError};
+use nymsphinx_addressing::clients::{Recipient, RecipientFormattingError};
+use rand::{CryptoRng, RngCore};
+use std::fmt::{Display, Formatter};
+use std::mem;
+use thiserror::Error;
+
+#[cfg(target_arch = "wasm32")]
+use wasm_bindgen::prelude::*;
+
+pub const SENDER_TAG_SIZE: usize = 16;
+
+#[derive(Debug, Error)]
+pub enum InvalidAnonymousSenderTagRepresentation {
+    #[error("Failed to decode the base58-encoded string - {0}")]
+    MalformedString(#[from] bs58::decode::Error),
+
+    #[error(
+        "Decoded AnonymousSenderTag has invalid length. Expected {expected}, but got {received}"
+    )]
+    InvalidLength { received: usize, expected: usize },
+}
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[cfg_attr(target_arch = "wasm32", wasm_bindgen)]
+pub struct AnonymousSenderTag([u8; SENDER_TAG_SIZE]);
+
+impl From<[u8; SENDER_TAG_SIZE]> for AnonymousSenderTag {
+    fn from(bytes: [u8; SENDER_TAG_SIZE]) -> Self {
+        AnonymousSenderTag(bytes)
+    }
+}
+
+impl Display for AnonymousSenderTag {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.to_base58_string())
+    }
+}
+
+impl AnonymousSenderTag {
+    pub fn new_random<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
+        let mut bytes = [0u8; SENDER_TAG_SIZE];
+        rng.fill_bytes(&mut bytes);
+        AnonymousSenderTag(bytes)
+    }
+
+    pub fn to_bytes(&self) -> [u8; SENDER_TAG_SIZE] {
+        self.0
+    }
+
+    pub fn from_bytes(bytes: [u8; SENDER_TAG_SIZE]) -> Self {
+        AnonymousSenderTag(bytes)
+    }
+
+    pub fn to_base58_string(self) -> String {
+        bs58::encode(self.to_bytes()).into_string()
+    }
+
+    pub fn try_from_base58_string<I: AsRef<[u8]>>(
+        val: I,
+    ) -> Result<Self, InvalidAnonymousSenderTagRepresentation> {
+        let bytes = bs58::decode(val).into_vec()?;
+        if bytes.len() != SENDER_TAG_SIZE {
+            return Err(InvalidAnonymousSenderTagRepresentation::InvalidLength {
+                received: bytes.len(),
+                expected: SENDER_TAG_SIZE,
+            });
+        }
+
+        // the unwrap here is fine as we just asserted the bytes are of exactly SENDER_TAG_SIZE length
+        let byte_array: [u8; SENDER_TAG_SIZE] = bytes.try_into().unwrap();
+        Ok(AnonymousSenderTag::from_bytes(byte_array))
+    }
+}
+
+#[derive(Debug, Error)]
+pub enum InvalidReplyRequestError {
+    #[error("Did not provide sufficient number of bytes to deserialize a valid request")]
+    RequestTooShortToDeserialize,
+
+    #[error("{received} is not a valid content tag for a repliable message")]
+    InvalidRepliableContentTag { received: u8 },
+
+    #[error("{received} is not a valid content tag for a reply message")]
+    InvalidReplyContentTag { received: u8 },
+
+    #[error("failed to deserialize recipient information - {0}")]
+    MalformedRecipient(#[from] RecipientFormattingError),
+
+    #[error("failed to deserialize replySURB - {0}")]
+    MalformedReplySurb(#[from] ReplySurbError),
+}
+
+#[derive(Debug)]
+pub struct RepliableMessage {
+    pub sender_tag: AnonymousSenderTag,
+    pub content: RepliableMessageContent,
+}
+
+impl Display for RepliableMessage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match &self.content {
+            RepliableMessageContent::Data {
+                message,
+                reply_surbs,
+            } => write!(
+                f,
+                "repliable {:.2} kiB data message with {} reply surbs attached from {}",
+                message.len() as f64 / 1024.0,
+                reply_surbs.len(),
+                self.sender_tag,
+            ),
+            RepliableMessageContent::AdditionalSurbs { reply_surbs } => write!(
+                f,
+                "repliable additional surbs message ({} reply surbs attached) from {}",
+                reply_surbs.len(),
+                self.sender_tag,
+            ),
+            RepliableMessageContent::Heartbeat {
+                additional_reply_surbs,
+            } => {
+                write!(
+                    f,
+                    "repliable heartbeat message ({} reply surbs attached) from {}",
+                    additional_reply_surbs.len(),
+                    self.sender_tag,
+                )
+            }
+        }
+    }
+}
+
+impl RepliableMessage {
+    pub fn new_data(
+        data: Vec<u8>,
+        sender_tag: AnonymousSenderTag,
+        reply_surbs: Vec<ReplySurb>,
+    ) -> Self {
+        RepliableMessage {
+            sender_tag,
+            content: RepliableMessageContent::Data {
+                message: data,
+                reply_surbs,
+            },
+        }
+    }
+
+    pub fn new_additional_surbs(
+        sender_tag: AnonymousSenderTag,
+        reply_surbs: Vec<ReplySurb>,
+    ) -> Self {
+        RepliableMessage {
+            sender_tag,
+            content: RepliableMessageContent::AdditionalSurbs { reply_surbs },
+        }
+    }
+
+    pub fn into_bytes(self) -> Vec<u8> {
+        let content_tag = self.content.tag();
+
+        self.sender_tag
+            .to_bytes()
+            .into_iter()
+            .chain(std::iter::once(content_tag as u8))
+            .chain(self.content.into_bytes())
+            .collect()
+    }
+
+    pub fn try_from_bytes(
+        bytes: &[u8],
+        num_mix_hops: u8,
+    ) -> Result<Self, InvalidReplyRequestError> {
+        if bytes.len() < SENDER_TAG_SIZE + 1 {
+            return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+        }
+        let sender_tag =
+            AnonymousSenderTag::from_bytes(bytes[..SENDER_TAG_SIZE].try_into().unwrap());
+        let content_tag = RepliableMessageContentTag::try_from(bytes[SENDER_TAG_SIZE])?;
+
+        let content = RepliableMessageContent::try_from_bytes(
+            &bytes[SENDER_TAG_SIZE + 1..],
+            num_mix_hops,
+            content_tag,
+        )?;
+
+        Ok(RepliableMessage {
+            sender_tag,
+            content,
+        })
+    }
+}
+
+// this recovery code is shared between all variants containing reply surbs
+fn recover_reply_surbs(
+    bytes: &[u8],
+    num_mix_hops: u8,
+) -> Result<(Vec<ReplySurb>, usize), InvalidReplyRequestError> {
+    let mut consumed = mem::size_of::<u32>();
+    if bytes.len() < consumed {
+        return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+    }
+    let num_surbs = u32::from_be_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]);
+    let surb_size = ReplySurb::serialized_len(num_mix_hops);
+    if bytes[consumed..].len() < num_surbs as usize * surb_size {
+        return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+    }
+
+    let mut reply_surbs = Vec::with_capacity(num_surbs as usize);
+    for _ in 0..num_surbs as usize {
+        let surb_bytes = &bytes[consumed..consumed + surb_size];
+        let reply_surb = ReplySurb::from_bytes(surb_bytes)?;
+        reply_surbs.push(reply_surb);
+
+        consumed += surb_size;
+    }
+
+    Ok((reply_surbs, consumed))
+}
+
+#[repr(u8)]
+enum RepliableMessageContentTag {
+    Data = 0,
+    AdditionalSurbs = 1,
+    Heartbeat = 2,
+}
+
+impl TryFrom<u8> for RepliableMessageContentTag {
+    type Error = InvalidReplyRequestError;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            _ if value == (RepliableMessageContentTag::Data as u8) => Ok(Self::Data),
+            _ if value == (RepliableMessageContentTag::AdditionalSurbs as u8) => {
+                Ok(Self::AdditionalSurbs)
+            }
+            _ if value == (RepliableMessageContentTag::Heartbeat as u8) => Ok(Self::Heartbeat),
+            val => Err(InvalidReplyRequestError::InvalidRepliableContentTag { received: val }),
+        }
+    }
+}
+
+// sent by original sender that initialised the communication that knows address of the remote
+#[derive(Debug)]
+pub enum RepliableMessageContent {
+    Data {
+        message: Vec<u8>,
+        reply_surbs: Vec<ReplySurb>,
+    },
+    AdditionalSurbs {
+        reply_surbs: Vec<ReplySurb>,
+    },
+    Heartbeat {
+        additional_reply_surbs: Vec<ReplySurb>,
+    },
+}
+
+impl RepliableMessageContent {
+    pub fn into_bytes(self) -> Vec<u8> {
+        match self {
+            RepliableMessageContent::Data {
+                message,
+                reply_surbs,
+            } => {
+                let num_surbs = reply_surbs.len() as u32;
+
+                num_surbs
+                    .to_be_bytes()
+                    .into_iter()
+                    .chain(reply_surbs.into_iter().flat_map(|s| s.to_bytes()))
+                    .chain(message.into_iter())
+                    .collect()
+            }
+            RepliableMessageContent::AdditionalSurbs { reply_surbs } => {
+                let num_surbs = reply_surbs.len() as u32;
+
+                num_surbs
+                    .to_be_bytes()
+                    .into_iter()
+                    .chain(reply_surbs.into_iter().flat_map(|s| s.to_bytes()))
+                    .collect()
+            }
+            RepliableMessageContent::Heartbeat {
+                additional_reply_surbs,
+            } => {
+                let num_surbs = additional_reply_surbs.len() as u32;
+
+                num_surbs
+                    .to_be_bytes()
+                    .into_iter()
+                    .chain(
+                        additional_reply_surbs
+                            .into_iter()
+                            .flat_map(|s| s.to_bytes()),
+                    )
+                    .collect()
+            }
+        }
+    }
+
+    fn try_from_bytes(
+        bytes: &[u8],
+        num_mix_hops: u8,
+        tag: RepliableMessageContentTag,
+    ) -> Result<Self, InvalidReplyRequestError> {
+        if bytes.is_empty() {
+            return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+        }
+
+        let (reply_surbs, n) = recover_reply_surbs(bytes, num_mix_hops)?;
+
+        match tag {
+            RepliableMessageContentTag::Data => Ok(RepliableMessageContent::Data {
+                message: bytes[n..].to_vec(),
+                reply_surbs,
+            }),
+            RepliableMessageContentTag::AdditionalSurbs => {
+                Ok(RepliableMessageContent::AdditionalSurbs { reply_surbs })
+            }
+            RepliableMessageContentTag::Heartbeat => Ok(RepliableMessageContent::Heartbeat {
+                additional_reply_surbs: reply_surbs,
+            }),
+        }
+    }
+
+    fn tag(&self) -> RepliableMessageContentTag {
+        match self {
+            RepliableMessageContent::Data { .. } => RepliableMessageContentTag::Data,
+            RepliableMessageContent::AdditionalSurbs { .. } => {
+                RepliableMessageContentTag::AdditionalSurbs
+            }
+            RepliableMessageContent::Heartbeat { .. } => RepliableMessageContentTag::Heartbeat,
+        }
+    }
+}
+
+// sent by the remote party who does **NOT** know the original sender's identity
+#[derive(Debug)]
+pub struct ReplyMessage {
+    pub content: ReplyMessageContent,
+}
+
+impl Display for ReplyMessage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match &self.content {
+            ReplyMessageContent::Data { message } => write!(
+                f,
+                "{:.2} kiB reply data message",
+                message.len() as f64 / 1024.0
+            ),
+            ReplyMessageContent::SurbRequest { recipient, amount } => write!(
+                f,
+                "request for {amount} additional reply SURBs from {recipient}",
+            ),
+        }
+    }
+}
+
+impl ReplyMessage {
+    pub fn new_data_message(message: Vec<u8>) -> Self {
+        ReplyMessage {
+            content: ReplyMessageContent::Data { message },
+        }
+    }
+
+    pub fn new_surb_request_message(recipient: Recipient, amount: u32) -> Self {
+        ReplyMessage {
+            content: ReplyMessageContent::SurbRequest {
+                recipient: Box::new(recipient),
+                amount,
+            },
+        }
+    }
+
+    pub fn into_bytes(self) -> Vec<u8> {
+        let content_tag = self.content.tag();
+
+        std::iter::once(content_tag as u8)
+            .chain(self.content.into_bytes())
+            .collect()
+    }
+
+    pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, InvalidReplyRequestError> {
+        if bytes.is_empty() {
+            return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+        }
+        let tag = ReplyMessageContentTag::try_from(bytes[0])?;
+        let content = ReplyMessageContent::try_from_bytes(&bytes[1..], tag)?;
+
+        Ok(ReplyMessage { content })
+    }
+}
+
+#[repr(u8)]
+enum ReplyMessageContentTag {
+    Data = 0,
+    SurbRequest = 1,
+}
+
+impl TryFrom<u8> for ReplyMessageContentTag {
+    type Error = InvalidReplyRequestError;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            _ if value == (ReplyMessageContentTag::Data as u8) => Ok(Self::Data),
+            _ if value == (ReplyMessageContentTag::SurbRequest as u8) => Ok(Self::SurbRequest),
+            val => Err(InvalidReplyRequestError::InvalidReplyContentTag { received: val }),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum ReplyMessageContent {
+    // TODO: later allow to request surbs whilst sending data
+    Data {
+        message: Vec<u8>,
+    },
+    SurbRequest {
+        recipient: Box<Recipient>,
+        amount: u32,
+    },
+}
+
+impl ReplyMessageContent {
+    pub fn into_bytes(self) -> Vec<u8> {
+        match self {
+            ReplyMessageContent::Data { message } => message,
+            ReplyMessageContent::SurbRequest { recipient, amount } => recipient
+                .to_bytes()
+                .into_iter()
+                .chain(amount.to_be_bytes().into_iter())
+                .collect(),
+        }
+    }
+
+    fn try_from_bytes(
+        bytes: &[u8],
+        tag: ReplyMessageContentTag,
+    ) -> Result<Self, InvalidReplyRequestError> {
+        if bytes.is_empty() {
+            return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+        }
+
+        match tag {
+            ReplyMessageContentTag::Data => Ok(ReplyMessageContent::Data {
+                message: bytes.to_vec(),
+            }),
+            ReplyMessageContentTag::SurbRequest => {
+                if bytes.len() != Recipient::LEN + std::mem::size_of::<u32>() {
+                    return Err(InvalidReplyRequestError::RequestTooShortToDeserialize);
+                }
+                let mut recipient_bytes = [0u8; Recipient::LEN];
+                recipient_bytes.copy_from_slice(&bytes[..Recipient::LEN]);
+
+                Ok(ReplyMessageContent::SurbRequest {
+                    recipient: Box::new(Recipient::try_from_bytes(recipient_bytes)?),
+                    amount: u32::from_be_bytes([
+                        bytes[Recipient::LEN],
+                        bytes[Recipient::LEN + 1],
+                        bytes[Recipient::LEN + 2],
+                        bytes[Recipient::LEN + 3],
+                    ]),
+                })
+            }
+        }
+    }
+
+    fn tag(&self) -> ReplyMessageContentTag {
+        match self {
+            ReplyMessageContent::Data { .. } => ReplyMessageContentTag::Data,
+            ReplyMessageContent::SurbRequest { .. } => ReplyMessageContentTag::SurbRequest,
+        }
+    }
+}
diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml
index 5f47ab5358..3d6bacab61 100644
--- a/common/nymsphinx/chunking/Cargo.toml
+++ b/common/nymsphinx/chunking/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
 [dependencies]
 log = "0.4.8"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+thiserror = "1.0.37"
 
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
diff --git a/common/nymsphinx/chunking/src/fragment.rs b/common/nymsphinx/chunking/src/fragment.rs
index 58c1baa78a..8d909982eb 100644
--- a/common/nymsphinx/chunking/src/fragment.rs
+++ b/common/nymsphinx/chunking/src/fragment.rs
@@ -1,12 +1,10 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::set::generate_set_id;
 use crate::ChunkingError;
 use nymsphinx_params::{SerializedFragmentIdentifier, FRAG_ID_LEN};
-use rand::Rng;
 use std::convert::TryInto;
-use std::fmt::{self, Formatter};
+use std::fmt::{self, Debug, Formatter};
 
 // Personal reflection: In hindsight I've spent too much time on relatively too little
 // gain here, as even though I might have saved couple of bytes per packet, the gain
@@ -60,7 +58,7 @@ pub const COVER_FRAG_ID: FragmentIdentifier = FragmentIdentifier {
 /// and u8 position of the `Fragment` in the set.
 // TODO: this should really be redesigned, especially how cover and reply messages are really
 // "abusing" this. They should work with it natively instead.
-#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq)]
+#[derive(Debug, Clone, Copy, Hash, Eq, PartialEq, Ord, PartialOrd)]
 pub struct FragmentIdentifier {
     set_id: i32,
     fragment_position: u8,
@@ -77,20 +75,6 @@ impl fmt::Display for FragmentIdentifier {
 }
 
 impl FragmentIdentifier {
-    // I really dislike how 'hacky' this function seems
-    // refer to: https://github.com/nymtech/nym/issues/294 for further discussion
-    pub fn new_reply<R: Rng>(rng: &mut R) -> Self {
-        FragmentIdentifier {
-            set_id: generate_set_id(rng),
-            fragment_position: 0,
-        }
-    }
-
-    // and this one
-    pub fn is_reply(self) -> bool {
-        self.set_id > 0 && self.fragment_position == 0
-    }
-
     pub fn to_bytes(self) -> SerializedFragmentIdentifier {
         debug_assert_eq!(FRAG_ID_LEN, 5);
 
@@ -110,7 +94,7 @@ impl FragmentIdentifier {
         let set_id = i32::from_be_bytes([b[0], b[1], b[2], b[3]]);
         // set_id == 0 is valid for COVER_FRAG_ID and replies
         if set_id < 0 {
-            return Err(ChunkingError::MalformedFragmentIdentifier);
+            return Err(ChunkingError::MalformedFragmentIdentifier { received: set_id });
         }
 
         Ok(FragmentIdentifier {
@@ -124,12 +108,22 @@ impl FragmentIdentifier {
 /// Each `Fragment` after being marshaled is guaranteed to fit into a single sphinx packet.
 /// The `Fragment` itself consists of part, or whole of, message to be sent as well as additional
 /// header used to reconstruct the message after being received.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(PartialEq, Clone)]
 pub struct Fragment {
     header: FragmentHeader,
     payload: Vec<u8>,
 }
 
+// manual implementation to hide detailed payload that we don't care about
+impl Debug for Fragment {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Fragment")
+            .field("header", &self.header)
+            .field("payload length", &self.payload.len())
+            .finish()
+    }
+}
+
 impl Fragment {
     /// Tries to encapsulate provided payload slice and metadata into a `Fragment`.
     /// It can fail if payload would not fully fit in a single `Fragment` or some of the metadata
@@ -153,24 +147,42 @@ impl Fragment {
 
         // check for whether payload has expected length, which depend on whether fragment is linked
         // and if it's the only one or the last one in the set (then lower bound is removed)
+        let max_linked_len = linked_fragment_payload_max_len(max_plaintext_size);
+        let max_unlinked_len = unlinked_fragment_payload_max_len(max_plaintext_size);
+
         if previous_fragments_set_id.is_some() {
             if total_fragments > 1 {
-                if payload.len() != linked_fragment_payload_max_len(max_plaintext_size) {
-                    return Err(ChunkingError::InvalidPayloadLengthError);
+                if payload.len() != max_linked_len {
+                    return Err(ChunkingError::InvalidPayloadLengthError {
+                        received: payload.len(),
+                        expected: max_linked_len,
+                    });
                 }
-            } else if payload.len() > linked_fragment_payload_max_len(max_plaintext_size) {
-                return Err(ChunkingError::InvalidPayloadLengthError);
+            } else if payload.len() > max_linked_len {
+                return Err(ChunkingError::TooLongPayloadLengthError {
+                    received: payload.len(),
+                    expected_at_most: max_linked_len,
+                });
             }
         } else if next_fragments_set_id.is_some() {
-            if payload.len() != linked_fragment_payload_max_len(max_plaintext_size) {
-                return Err(ChunkingError::InvalidPayloadLengthError);
+            if payload.len() != max_linked_len {
+                return Err(ChunkingError::InvalidPayloadLengthError {
+                    received: payload.len(),
+                    expected: max_linked_len,
+                });
             }
         } else if total_fragments != current_fragment {
-            if payload.len() != unlinked_fragment_payload_max_len(max_plaintext_size) {
-                return Err(ChunkingError::InvalidPayloadLengthError);
+            if payload.len() != max_unlinked_len {
+                return Err(ChunkingError::InvalidPayloadLengthError {
+                    received: payload.len(),
+                    expected: max_unlinked_len,
+                });
             }
-        } else if payload.len() > unlinked_fragment_payload_max_len(max_plaintext_size) {
-            return Err(ChunkingError::InvalidPayloadLengthError);
+        } else if payload.len() > max_unlinked_len {
+            return Err(ChunkingError::TooLongPayloadLengthError {
+                received: payload.len(),
+                expected_at_most: max_unlinked_len,
+            });
         }
 
         Ok(Fragment {
@@ -196,6 +208,11 @@ impl Fragment {
         }
     }
 
+    /// Gets the size of payload contained in this `Fragment`.
+    pub fn payload_size(&self) -> usize {
+        self.payload.len()
+    }
+
     /// Extracts id of this `Fragment`.
     pub fn id(&self) -> i32 {
         self.header.id
@@ -347,7 +364,10 @@ impl FragmentHeader {
     fn try_from_bytes(b: &[u8]) -> Result<(Self, usize), ChunkingError> {
         // header needs to be at least 7 bytes long
         if b.len() < UNLINKED_FRAGMENTED_HEADER_LEN {
-            return Err(ChunkingError::TooShortFragmentData);
+            return Err(ChunkingError::TooShortFragmentHeader {
+                received: b.len(),
+                expected: UNLINKED_FRAGMENTED_HEADER_LEN,
+            });
         }
         let frag_id = i32::from_be_bytes(b[0..4].try_into().unwrap());
         // sanity check for the fragmentation flag
@@ -370,7 +390,10 @@ impl FragmentHeader {
         let read_bytes = if b[6] != 0 {
             // there's linking ID supposedly attached, make sure we have enough bytes to parse
             if b.len() < LINKED_FRAGMENTED_HEADER_LEN {
-                return Err(ChunkingError::TooShortFragmentData);
+                return Err(ChunkingError::TooShortFragmentHeader {
+                    received: b.len(),
+                    expected: LINKED_FRAGMENTED_HEADER_LEN,
+                });
             }
             let flagged_linked_id = i32::from_be_bytes(b[6..10].try_into().unwrap());
 
diff --git a/common/nymsphinx/chunking/src/lib.rs b/common/nymsphinx/chunking/src/lib.rs
index 62a246955b..60316edb15 100644
--- a/common/nymsphinx/chunking/src/lib.rs
+++ b/common/nymsphinx/chunking/src/lib.rs
@@ -3,6 +3,7 @@
 
 use crate::fragment::{linked_fragment_payload_max_len, unlinked_fragment_payload_max_len};
 pub use set::split_into_sets;
+use thiserror::Error;
 
 // Future consideration: currently in a lot of places, the payloads have randomised content
 // which is not a perfect testing strategy as it might not detect some edge cases I never would
@@ -45,18 +46,26 @@ pub mod set;
 /// Both of those concepts as well as their structures, i.e. `Set` and `Fragment`
 /// are further explained in the respective files.
 
-#[derive(PartialEq, Eq, Debug)]
+#[derive(PartialEq, Eq, Debug, Error)]
 pub enum ChunkingError {
-    InvalidPayloadLengthError,
-    TooBigMessageToSplit,
+    #[error("Received payload is too long. Got {received}, expected {expected}")]
+    InvalidPayloadLengthError { received: usize, expected: usize },
+
+    #[error("Received payload is too long. Got {received}, expected at most {expected_at_most}")]
+    TooLongPayloadLengthError {
+        received: usize,
+        expected_at_most: usize,
+    },
+
+    // this should really be split into multiple variants to provide better error information
+    #[error("Provided header was malformed or contained self-contradicting fields")]
     MalformedHeaderError,
-    NoValidProvidersError,
-    NoValidRoutesAvailableError,
-    InvalidTopologyError,
-    TooShortFragmentData,
-    MalformedFragmentData,
-    UnexpectedFragmentCount,
-    MalformedFragmentIdentifier,
+
+    #[error("Received too few bytes to deserialize fragment header. Got {received}, expected {expected}")]
+    TooShortFragmentHeader { received: usize, expected: usize },
+
+    #[error("Received fragment identifier ({received}) is not a valid value!")]
+    MalformedFragmentIdentifier { received: i32 },
 }
 
 /// Returns number of fragments the message will be split to as well as number of available
@@ -94,7 +103,7 @@ pub fn number_of_required_fragments(
 
             // we know for sure that all fragments in all but last set are definitely full
             // (last one has single 'linked' fragment)
-            let without_last = (n - 1) * (u8::max_value() as usize);
+            let without_last = (n - 1) * (u8::MAX as usize);
             let linked_fragments_without_last = (2 * n - 2) - 1;
             let unlinked_fragments_without_last = without_last - linked_fragments_without_last;
 
diff --git a/common/nymsphinx/cover/Cargo.toml b/common/nymsphinx/cover/Cargo.toml
index 6fd629ade7..064ebf1298 100644
--- a/common/nymsphinx/cover/Cargo.toml
+++ b/common/nymsphinx/cover/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 
 [dependencies]
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+thiserror = "1.0.37"
 
 crypto = { path = "../../crypto" }
 nymsphinx-acknowledgements = { path = "../acknowledgements" }
diff --git a/common/nymsphinx/cover/src/lib.rs b/common/nymsphinx/cover/src/lib.rs
index aaaff5a9b5..2ce9454d5c 100644
--- a/common/nymsphinx/cover/src/lib.rs
+++ b/common/nymsphinx/cover/src/lib.rs
@@ -6,7 +6,7 @@ use crypto::symmetric::stream_cipher;
 use nymsphinx_acknowledgements::surb_ack::SurbAck;
 use nymsphinx_acknowledgements::AckKey;
 use nymsphinx_addressing::clients::Recipient;
-use nymsphinx_addressing::nodes::{NymNodeRoutingAddress, NymNodeRoutingAddressError};
+use nymsphinx_addressing::nodes::NymNodeRoutingAddress;
 use nymsphinx_chunking::fragment::COVER_FRAG_ID;
 use nymsphinx_forwarding::packet::MixPacket;
 use nymsphinx_params::packet_sizes::PacketSize;
@@ -18,35 +18,18 @@ use nymsphinx_types::{delays, Error as SphinxError};
 use rand::{CryptoRng, RngCore};
 use std::convert::TryFrom;
 use std::time;
+use thiserror::Error;
 use topology::{NymTopology, NymTopologyError};
 
 pub const LOOP_COVER_MESSAGE_PAYLOAD: &[u8] = b"The cake is a lie!";
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum CoverMessageError {
-    NoValidProvidersError,
-    InvalidTopologyError,
-    SphinxError(SphinxError),
-    InvalidFirstMixAddress,
-}
+    #[error("Could not construct cover message due to invalid topology - {0}")]
+    InvalidTopologyError(#[from] NymTopologyError),
 
-impl From<SphinxError> for CoverMessageError {
-    fn from(err: SphinxError) -> Self {
-        CoverMessageError::SphinxError(err)
-    }
-}
-
-impl From<NymNodeRoutingAddressError> for CoverMessageError {
-    fn from(_: NymNodeRoutingAddressError) -> Self {
-        use CoverMessageError::*;
-        InvalidFirstMixAddress
-    }
-}
-
-impl From<NymTopologyError> for CoverMessageError {
-    fn from(_: NymTopologyError) -> Self {
-        CoverMessageError::InvalidTopologyError
-    }
+    #[error("Could not construct a valid sphinx packet - {0}")]
+    SphinxError(#[from] SphinxError),
 }
 
 pub fn generate_loop_cover_surb_ack<R>(
diff --git a/common/nymsphinx/framing/Cargo.toml b/common/nymsphinx/framing/Cargo.toml
index 6921a8cf69..fc46ece44a 100644
--- a/common/nymsphinx/framing/Cargo.toml
+++ b/common/nymsphinx/framing/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
 [dependencies]
 bytes = "1.0"
 tokio-util = { version = "0.7.3", features = ["codec"] }
+thiserror = "1.0.37"
 
 nymsphinx-types = { path = "../types" }
 nymsphinx-params = { path = "../params" }
diff --git a/common/nymsphinx/framing/src/codec.rs b/common/nymsphinx/framing/src/codec.rs
index 53bd77c3b7..f3986d2ece 100644
--- a/common/nymsphinx/framing/src/codec.rs
+++ b/common/nymsphinx/framing/src/codec.rs
@@ -1,57 +1,48 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::packet::{FramedSphinxPacket, Header};
 use bytes::{Buf, BufMut, BytesMut};
 use nymsphinx_params::packet_modes::InvalidPacketMode;
 use nymsphinx_params::packet_sizes::{InvalidPacketSize, PacketSize};
+use nymsphinx_types::Error as SphinxError;
 use nymsphinx_types::SphinxPacket;
 use std::io;
+use thiserror::Error;
 use tokio_util::codec::{Decoder, Encoder};
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum SphinxCodecError {
-    InvalidPacketSize,
-    InvalidPacketMode,
-    MalformedSphinxPacket,
-    IoError(io::Error),
-}
+    #[error("the packet size information was malformed - {0}")]
+    InvalidPacketSize(#[from] InvalidPacketSize),
 
-impl From<io::Error> for SphinxCodecError {
-    fn from(err: io::Error) -> Self {
-        SphinxCodecError::IoError(err)
-    }
+    #[error("the packet mode information was malformed - {0}")]
+    InvalidPacketMode(#[from] InvalidPacketMode),
+
+    #[error("the actual sphinx packet was malformed - {0}")]
+    MalformedSphinxPacket(#[from] SphinxError),
+
+    #[error("encountered an IO error - {0}")]
+    IoError(#[from] io::Error),
 }
 
 impl From<SphinxCodecError> for io::Error {
     fn from(err: SphinxCodecError) -> Self {
         match err {
-            SphinxCodecError::InvalidPacketSize => {
-                io::Error::new(io::ErrorKind::InvalidInput, "invalid packet size")
+            SphinxCodecError::InvalidPacketSize(source) => {
+                io::Error::new(io::ErrorKind::InvalidInput, source)
             }
-            SphinxCodecError::InvalidPacketMode => {
-                io::Error::new(io::ErrorKind::InvalidInput, "invalid packet mode")
+            SphinxCodecError::InvalidPacketMode(source) => {
+                io::Error::new(io::ErrorKind::InvalidInput, source)
             }
-            SphinxCodecError::MalformedSphinxPacket => {
-                io::Error::new(io::ErrorKind::InvalidData, "malformed packet")
+            SphinxCodecError::MalformedSphinxPacket(source) => {
+                io::Error::new(io::ErrorKind::InvalidData, source)
             }
             SphinxCodecError::IoError(err) => err,
         }
     }
 }
 
-impl From<InvalidPacketSize> for SphinxCodecError {
-    fn from(_: InvalidPacketSize) -> Self {
-        SphinxCodecError::InvalidPacketSize
-    }
-}
-
-impl From<InvalidPacketMode> for SphinxCodecError {
-    fn from(_: InvalidPacketMode) -> Self {
-        SphinxCodecError::InvalidPacketMode
-    }
-}
-
 // TODO: in the future it could be extended to have state containing symmetric encryption key
 // so that all data could be encrypted easily (alternatively we could just slap TLS)
 pub struct SphinxCodec;
@@ -97,17 +88,11 @@ impl Decoder for SphinxCodec {
         // advance buffer past the header - at this point we have enough bytes
         src.advance(header.size());
         let sphinx_packet_bytes = src.split_to(sphinx_packet_size);
-        let sphinx_packet = match SphinxPacket::from_bytes(&sphinx_packet_bytes) {
-            Ok(sphinx_packet) => sphinx_packet,
-            // here it could be debatable whether stream is corrupt or not,
-            // but let's go with the safer approach and assume it is.
-            Err(_) => return Err(SphinxCodecError::MalformedSphinxPacket),
-        };
 
-        let nymsphinx_packet = FramedSphinxPacket {
-            header,
-            packet: sphinx_packet,
-        };
+        // here it could be debatable whether stream is corrupt or not,
+        // but let's go with the safer approach and assume it is.
+        let packet = SphinxPacket::from_bytes(&sphinx_packet_bytes)?;
+        let nymsphinx_packet = FramedSphinxPacket { header, packet };
 
         // As per docs:
         // Before returning from the function, implementations should ensure that the buffer
@@ -178,7 +163,7 @@ mod packet_encoding {
         ];
         SphinxPacketBuilder::new()
             .with_payload_size(size.payload_size())
-            .build_packet(b"foomp".to_vec(), &route, &destination, &delays)
+            .build_packet(b"foomp", &route, &destination, &delays)
             .unwrap()
     }
 
diff --git a/common/nymsphinx/params/Cargo.toml b/common/nymsphinx/params/Cargo.toml
index a06f897f22..ebca914742 100644
--- a/common/nymsphinx/params/Cargo.toml
+++ b/common/nymsphinx/params/Cargo.toml
@@ -7,5 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+thiserror = "1.0.37"
+
 crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
 nymsphinx-types = { path = "../types" }
diff --git a/common/nymsphinx/params/src/packet_modes.rs b/common/nymsphinx/params/src/packet_modes.rs
index 819b32b3af..3fb7ac6358 100644
--- a/common/nymsphinx/params/src/packet_modes.rs
+++ b/common/nymsphinx/params/src/packet_modes.rs
@@ -1,10 +1,14 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use std::convert::TryFrom;
+use thiserror::Error;
 
-#[derive(Debug)]
-pub struct InvalidPacketMode;
+#[derive(Error, Debug)]
+#[error("{received} is not a valid packet mode tag")]
+pub struct InvalidPacketMode {
+    received: u8,
+}
 
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -31,11 +35,11 @@ impl PacketMode {
 impl TryFrom<u8> for PacketMode {
     type Error = InvalidPacketMode;
 
-    fn try_from(value: u8) -> std::result::Result<Self, Self::Error> {
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
             _ if value == (PacketMode::Mix as u8) => Ok(Self::Mix),
             _ if value == (PacketMode::Vpn as u8) => Ok(Self::Vpn),
-            _ => Err(InvalidPacketMode),
+            v => Err(InvalidPacketMode { received: v }),
         }
     }
 }
diff --git a/common/nymsphinx/params/src/packet_sizes.rs b/common/nymsphinx/params/src/packet_sizes.rs
index aa573ffe11..ef9976bd92 100644
--- a/common/nymsphinx/params/src/packet_sizes.rs
+++ b/common/nymsphinx/params/src/packet_sizes.rs
@@ -6,6 +6,7 @@ use nymsphinx_types::header::HEADER_SIZE;
 use nymsphinx_types::PAYLOAD_OVERHEAD_SIZE;
 use std::convert::TryFrom;
 use std::str::FromStr;
+use thiserror::Error;
 
 // it's up to the smart people to figure those values out : )
 const REGULAR_PACKET_SIZE: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 2 * 1024;
@@ -20,11 +21,17 @@ const EXTENDED_PACKET_SIZE_8: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 8 *
 const EXTENDED_PACKET_SIZE_16: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 16 * 1024;
 const EXTENDED_PACKET_SIZE_32: usize = HEADER_SIZE + PAYLOAD_OVERHEAD_SIZE + 32 * 1024;
 
-#[derive(Debug)]
-pub struct InvalidPacketSize;
+#[derive(Debug, Error)]
+pub enum InvalidPacketSize {
+    #[error("{received} is not a valid packet size tag")]
+    UnknownPacketTag { received: u8 },
 
-#[derive(Debug)]
-pub struct InvalidExtendedPacketSize;
+    #[error("{received} is not a valid extended packet size variant")]
+    UnknownExtendedPacketVariant { received: String },
+
+    #[error("{received} does not correspond with any known packet size")]
+    UnknownPacketSize { received: usize },
+}
 
 #[repr(u8)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -55,7 +62,9 @@ impl FromStr for PacketSize {
             "extended8" => Ok(Self::ExtendedPacket8),
             "extended16" => Ok(Self::ExtendedPacket16),
             "extended32" => Ok(Self::ExtendedPacket32),
-            _ => Err(InvalidPacketSize),
+            s => Err(InvalidPacketSize::UnknownExtendedPacketVariant {
+                received: s.to_string(),
+            }),
         }
     }
 }
@@ -63,14 +72,14 @@ impl FromStr for PacketSize {
 impl TryFrom<u8> for PacketSize {
     type Error = InvalidPacketSize;
 
-    fn try_from(value: u8) -> std::result::Result<Self, Self::Error> {
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
             _ if value == (PacketSize::RegularPacket as u8) => Ok(Self::RegularPacket),
             _ if value == (PacketSize::AckPacket as u8) => Ok(Self::AckPacket),
             _ if value == (PacketSize::ExtendedPacket8 as u8) => Ok(Self::ExtendedPacket8),
             _ if value == (PacketSize::ExtendedPacket16 as u8) => Ok(Self::ExtendedPacket16),
             _ if value == (PacketSize::ExtendedPacket32 as u8) => Ok(Self::ExtendedPacket32),
-            _ => Err(InvalidPacketSize),
+            v => Err(InvalidPacketSize::UnknownPacketTag { received: v }),
         }
     }
 }
@@ -94,7 +103,7 @@ impl PacketSize {
         self.size() - HEADER_SIZE
     }
 
-    pub fn get_type(size: usize) -> std::result::Result<Self, InvalidPacketSize> {
+    pub fn get_type(size: usize) -> Result<Self, InvalidPacketSize> {
         if PacketSize::RegularPacket.size() == size {
             Ok(PacketSize::RegularPacket)
         } else if PacketSize::AckPacket.size() == size {
@@ -106,7 +115,7 @@ impl PacketSize {
         } else if PacketSize::ExtendedPacket32.size() == size {
             Ok(PacketSize::ExtendedPacket32)
         } else {
-            Err(InvalidPacketSize)
+            Err(InvalidPacketSize::UnknownPacketSize { received: size })
         }
     }
 
diff --git a/common/nymsphinx/src/lib.rs b/common/nymsphinx/src/lib.rs
index e3e7c51fac..bbc69c2682 100644
--- a/common/nymsphinx/src/lib.rs
+++ b/common/nymsphinx/src/lib.rs
@@ -1,6 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+pub mod message;
 pub mod preparer;
 pub mod receiver;
 pub mod utils;
@@ -16,3 +17,6 @@ pub use nymsphinx_forwarding as forwarding;
 pub use nymsphinx_framing as framing;
 pub use nymsphinx_params as params;
 pub use nymsphinx_types::*;
+
+// TEMP UNTIL FURTHER REFACTORING
+pub use preparer::payload::NymsphinxPayloadBuilder;
diff --git a/common/nymsphinx/src/message.rs b/common/nymsphinx/src/message.rs
new file mode 100644
index 0000000000..f9b32daa35
--- /dev/null
+++ b/common/nymsphinx/src/message.rs
@@ -0,0 +1,238 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::chunking;
+use crypto::asymmetric::encryption;
+use crypto::Digest;
+use nymsphinx_addressing::clients::Recipient;
+use nymsphinx_addressing::nodes::MAX_NODE_ADDRESS_UNPADDED_LEN;
+use nymsphinx_anonymous_replies::requests::{
+    InvalidReplyRequestError, RepliableMessage, RepliableMessageContent, ReplyMessage,
+    ReplyMessageContent,
+};
+use nymsphinx_chunking::fragment::Fragment;
+use nymsphinx_params::{PacketSize, ReplySurbKeyDigestAlgorithm};
+use rand::Rng;
+use std::fmt::{Display, Formatter};
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum NymMessageError {
+    #[error("{received} is not a valid type tag for a NymMessage")]
+    InvalidMessageType { received: u8 },
+
+    #[error(transparent)]
+    InvalidReplyRequest(#[from] InvalidReplyRequestError),
+
+    #[error("The received message seems to have incorrect zero padding (no '1' byte found)")]
+    InvalidMessagePadding,
+
+    #[error("Received empty message for deserialization")]
+    EmptyMessage,
+}
+
+#[repr(u8)]
+enum NymMessageType {
+    Plain = 0,
+    Repliable = 1,
+    Reply = 2,
+}
+
+impl TryFrom<u8> for NymMessageType {
+    type Error = NymMessageError;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            _ if value == (NymMessageType::Plain as u8) => Ok(Self::Plain),
+            _ if value == (NymMessageType::Repliable as u8) => Ok(Self::Repliable),
+            _ if value == (NymMessageType::Reply as u8) => Ok(Self::Reply),
+            val => Err(NymMessageError::InvalidMessageType { received: val }),
+        }
+    }
+}
+
+pub type PlainMessage = Vec<u8>;
+
+#[derive(Debug)]
+pub enum NymMessage {
+    Plain(PlainMessage),
+    Repliable(RepliableMessage),
+    Reply(ReplyMessage),
+}
+
+impl Display for NymMessage {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            NymMessage::Plain(plain_message) => write!(
+                f,
+                "plain {:.2} kiB message",
+                plain_message.len() as f64 / 1024.0
+            ),
+            NymMessage::Repliable(repliable_message) => repliable_message.fmt(f),
+            NymMessage::Reply(reply_message) => reply_message.fmt(f),
+        }
+    }
+}
+
+impl NymMessage {
+    pub fn new_additional_surbs_request(recipient: Recipient, amount: u32) -> Self {
+        NymMessage::Reply(ReplyMessage {
+            content: ReplyMessageContent::SurbRequest {
+                recipient: Box::new(recipient),
+                amount,
+            },
+        })
+    }
+
+    pub fn new_plain(msg: Vec<u8>) -> Self {
+        NymMessage::Plain(msg)
+    }
+
+    pub fn new_repliable(msg: RepliableMessage) -> Self {
+        NymMessage::Repliable(msg)
+    }
+
+    pub fn new_reply(msg: ReplyMessage) -> Self {
+        NymMessage::Reply(msg)
+    }
+
+    pub fn is_reply_surb_request(&self) -> bool {
+        match self {
+            NymMessage::Reply(reply_msg) => {
+                matches!(reply_msg.content, ReplyMessageContent::SurbRequest { .. })
+            }
+            _ => false,
+        }
+    }
+
+    pub fn into_inner_data(self) -> Vec<u8> {
+        match self {
+            NymMessage::Plain(data) => data,
+            NymMessage::Repliable(repliable) => match repliable.content {
+                RepliableMessageContent::Data { message, .. } => message,
+                _ => Vec::new(),
+            },
+            NymMessage::Reply(reply) => match reply.content {
+                ReplyMessageContent::Data { message } => message,
+                _ => Vec::new(),
+            },
+        }
+    }
+
+    fn typ(&self) -> NymMessageType {
+        match self {
+            NymMessage::Plain(_) => NymMessageType::Plain,
+            NymMessage::Repliable(_) => NymMessageType::Repliable,
+            NymMessage::Reply(_) => NymMessageType::Reply,
+        }
+    }
+
+    fn inner_bytes(self) -> Vec<u8> {
+        match self {
+            NymMessage::Plain(msg) => msg,
+            NymMessage::Repliable(msg) => msg.into_bytes(),
+            NymMessage::Reply(msg) => msg.into_bytes(),
+        }
+    }
+
+    // the message is in the format of:
+    // typ || msg
+    fn into_bytes(self) -> Vec<u8> {
+        let typ = self.typ();
+
+        std::iter::once(typ as u8)
+            .chain(self.inner_bytes())
+            .collect()
+    }
+
+    fn try_from_bytes(bytes: &[u8], num_mix_hops: u8) -> Result<Self, NymMessageError> {
+        if bytes.is_empty() {
+            return Err(NymMessageError::EmptyMessage);
+        }
+
+        let typ_tag = NymMessageType::try_from(bytes[0])?;
+        match typ_tag {
+            NymMessageType::Plain => Ok(NymMessage::Plain(bytes[1..].to_vec())),
+            NymMessageType::Repliable => Ok(NymMessage::Repliable(
+                RepliableMessage::try_from_bytes(&bytes[1..], num_mix_hops)?,
+            )),
+            NymMessageType::Reply => Ok(NymMessage::Reply(ReplyMessage::try_from_bytes(
+                &bytes[1..],
+            )?)),
+        }
+    }
+
+    /// Length of plaintext (from the sphinx point of view) data that is available per sphinx
+    /// packet.
+    pub fn available_plaintext_per_packet(&self, packet_size: PacketSize) -> usize {
+        let ack_overhead = MAX_NODE_ADDRESS_UNPADDED_LEN + PacketSize::AckPacket.size();
+
+        let variant_overhead = match self {
+            // each plain or repliable packet attaches an ephemeral public key so that the recipient
+            // could perform diffie-hellman with its own keys followed by a kdf to re-derive
+            // the packet encryption key
+            NymMessage::Plain(_) | NymMessage::Repliable(_) => encryption::PUBLIC_KEY_SIZE,
+            // each reply attaches the digest of the encryption key so that the recipient could
+            // lookup correct key for decryption,
+            NymMessage::Reply(_) => ReplySurbKeyDigestAlgorithm::output_size(),
+        };
+
+        packet_size.plaintext_size() - ack_overhead - variant_overhead
+    }
+
+    /// Pads the message so that after it gets chunked, it will occupy exactly N sphinx packets.
+    /// Produces new_message = message || 1 || 0000....
+    pub fn pad_to_full_packet_lengths(self, plaintext_per_packet: usize) -> PaddedMessage {
+        let bytes = self.into_bytes();
+
+        // 1 is added as there will always have to be at least a single byte of padding (1) added
+        // to be able to later distinguish the actual padding from the underlying message
+        let (_, space_left) =
+            chunking::number_of_required_fragments(bytes.len() + 1, plaintext_per_packet);
+
+        bytes
+            .into_iter()
+            .chain(std::iter::once(1u8))
+            .chain(std::iter::repeat(0u8).take(space_left))
+            .collect::<Vec<_>>()
+            .into()
+    }
+}
+
+pub struct PaddedMessage(Vec<u8>);
+
+impl PaddedMessage {
+    pub fn new_reconstructed(bytes: Vec<u8>) -> Self {
+        PaddedMessage(bytes)
+    }
+
+    /// Splits the padded message into [`Fragment`] that when serialized are going to become
+    /// sphinx packet payloads.
+    pub fn split_into_fragments<R: Rng>(
+        self,
+        rng: &mut R,
+        plaintext_per_packet: usize,
+    ) -> Vec<Fragment> {
+        chunking::split_into_sets(rng, &self.0, plaintext_per_packet)
+            .into_iter()
+            .flat_map(|fragment_set| fragment_set.into_iter())
+            .collect()
+    }
+
+    // reverse of NymMessage::pad_to_full_packet_lengths
+    pub fn remove_padding(self, num_mix_hops: u8) -> Result<NymMessage, NymMessageError> {
+        // we are looking for first occurrence of 1 in the tail and we get its index
+        if let Some(padding_end) = self.0.iter().rposition(|b| *b == 1) {
+            // and now we only take bytes until that point (but not including it)
+            NymMessage::try_from_bytes(&self.0[..padding_end], num_mix_hops)
+        } else {
+            Err(NymMessageError::InvalidMessagePadding)
+        }
+    }
+}
+
+impl From<Vec<u8>> for PaddedMessage {
+    fn from(bytes: Vec<u8>) -> Self {
+        PaddedMessage(bytes)
+    }
+}
diff --git a/common/nymsphinx/src/preparer/mod.rs b/common/nymsphinx/src/preparer/mod.rs
index d91a7c85a5..19f68e30bc 100644
--- a/common/nymsphinx/src/preparer/mod.rs
+++ b/common/nymsphinx/src/preparer/mod.rs
@@ -1,24 +1,17 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::chunking;
-use crypto::asymmetric::encryption;
-use crypto::shared_key::new_ephemeral_shared_key;
-use crypto::symmetric::stream_cipher;
-use crypto::Digest;
+use crate::message::NymMessage;
+use crate::NymsphinxPayloadBuilder;
 use nymsphinx_acknowledgements::surb_ack::SurbAck;
 use nymsphinx_acknowledgements::AckKey;
 use nymsphinx_addressing::clients::Recipient;
-use nymsphinx_addressing::nodes::{NymNodeRoutingAddress, MAX_NODE_ADDRESS_UNPADDED_LEN};
-use nymsphinx_anonymous_replies::encryption_key::SurbEncryptionKey;
+use nymsphinx_addressing::nodes::NymNodeRoutingAddress;
 use nymsphinx_anonymous_replies::reply_surb::ReplySurb;
 use nymsphinx_chunking::fragment::{Fragment, FragmentIdentifier};
 use nymsphinx_forwarding::packet::MixPacket;
 use nymsphinx_params::packet_sizes::PacketSize;
-use nymsphinx_params::{
-    PacketEncryptionAlgorithm, PacketHkdfAlgorithm, ReplySurbEncryptionAlgorithm,
-    ReplySurbKeyDigestAlgorithm, DEFAULT_NUM_MIX_HOPS,
-};
+use nymsphinx_params::DEFAULT_NUM_MIX_HOPS;
 use nymsphinx_types::builder::SphinxPacketBuilder;
 use nymsphinx_types::{delays, Delay};
 use rand::{CryptoRng, Rng};
@@ -26,6 +19,8 @@ use std::convert::TryFrom;
 use std::time::Duration;
 use topology::{NymTopology, NymTopologyError};
 
+pub(crate) mod payload;
+
 /// Represents fully packed and prepared [`Fragment`] that can be sent through the mix network.
 pub struct PreparedFragment {
     /// Indicates the total expected round-trip time, i.e. delay from the sending of this message
@@ -36,27 +31,17 @@ pub struct PreparedFragment {
     /// address of the node to which the message should be sent, the actual 'chunk' of the message
     /// going through the mix network and also the 'mode' of the packet, i.e. VPN or Mix.
     pub mix_packet: MixPacket,
-}
 
-#[derive(Debug)]
-pub enum PreparationError {
-    TopologyError(NymTopologyError),
-    TooLongReplyMessageError,
-}
-
-impl From<NymTopologyError> for PreparationError {
-    fn from(err: NymTopologyError) -> Self {
-        PreparationError::TopologyError(err)
-    }
+    /// Identifier to uniquely identify a fragment.
+    pub fragment_identifier: FragmentIdentifier,
 }
 
 /// Prepares the message that is to be sent through the mix network by attaching
 /// an optional reply-SURB, padding it to appropriate length, encrypting its content,
 /// and chunking into appropriate size [`Fragment`]s.
-// #[cfg_attr(not(target_arch = "wasm32"), derive(Clone))]
 #[derive(Clone)]
 #[must_use]
-pub struct MessagePreparer<R: CryptoRng + Rng> {
+pub struct MessagePreparer<R> {
     /// Instance of a cryptographically secure random number generator.
     rng: R,
 
@@ -115,86 +100,70 @@ where
         self.sender_address = sender_address;
     }
 
-    /// Length of plaintext (from the sphinx point of view) data that is available per sphinx
-    /// packet.
-    fn available_plaintext_per_packet(&self) -> usize {
-        // we need to put first hop's destination alongside the actual ack data
-        // TODO: a possible optimization way down the line: currently we're always assuming that
-        // the addresses will have `MAX_NODE_ADDRESS_UNPADDED_LEN`, i.e. be ipv6. In most cases
-        // they're actually going to be ipv4 hence wasting few bytes every packet.
-        // To fully utilise all available space, I guess first we'd need to generate routes for ACKs
-        // and only then perform the chunking with `available_plaintext_size` being called per chunk.
-        // However this will probably introduce bunch of complexity
-        // for relatively not a lot of gain, so it shouldn't be done just yet.
-        let ack_overhead = MAX_NODE_ADDRESS_UNPADDED_LEN + PacketSize::AckPacket.size();
-        let ephemeral_public_key_overhead = encryption::PUBLIC_KEY_SIZE;
-
-        self.packet_size.plaintext_size() - ack_overhead - ephemeral_public_key_overhead
-    }
-
-    /// Pads the message so that after it gets chunked, it will occupy exactly N sphinx packets.
-    /// Produces new_message = message || 1 || 0000....
-    fn pad_message(&self, message: Vec<u8>) -> Vec<u8> {
-        // 1 is added as there will always have to be at least a single byte of padding (1) added
-        // to be able to later distinguish the actual padding from the underlying message
-        let (_, space_left) = chunking::number_of_required_fragments(
-            message.len() + 1,
-            self.available_plaintext_per_packet(),
-        );
-
-        message
-            .into_iter()
-            .chain(std::iter::once(1u8))
-            .chain(std::iter::repeat(0u8).take(space_left))
-            .collect()
-    }
-
-    /// Attaches reply-SURB to the message alongside the reply key.
-    /// Results in:
-    /// new_message = 0 || message
-    /// OR
-    /// new_message = 1 || REPLY_KEY || REPLY_SURB || message
-    fn optionally_attach_reply_surb(
+    pub fn generate_reply_surbs(
         &mut self,
-        message: Vec<u8>,
-        should_attach: bool,
+        amount: usize,
         topology: &NymTopology,
-    ) -> Result<(Vec<u8>, Option<SurbEncryptionKey>), PreparationError> {
-        if should_attach {
+    ) -> Result<Vec<ReplySurb>, NymTopologyError> {
+        let mut reply_surbs = Vec::with_capacity(amount);
+        for _ in 0..amount {
             let reply_surb = ReplySurb::construct(
                 &mut self.rng,
                 &self.sender_address,
                 self.average_packet_delay,
                 topology,
             )?;
-
-            let reply_key = reply_surb.encryption_key();
-            // if there's a reply surb, the message takes form of `1 || REPLY_KEY || REPLY_SURB || MSG`
-            Ok((
-                std::iter::once(true as u8)
-                    .chain(reply_surb.to_bytes().iter().cloned())
-                    .chain(message.into_iter())
-                    .collect(),
-                Some(reply_key.clone()),
-            ))
-        } else {
-            // but if there's no reply surb, the message takes form of `0 || MSG`
-            Ok((
-                std::iter::once(false as u8)
-                    .chain(message.into_iter())
-                    .collect(),
-                None,
-            ))
+            reply_surbs.push(reply_surb)
         }
+
+        Ok(reply_surbs)
     }
 
-    /// Splits the message into [`Fragment`] that are going to be put later put into sphinx packets.
-    fn split_message(&mut self, message: Vec<u8>) -> Vec<Fragment> {
-        let plaintext_per_packet = self.available_plaintext_per_packet();
-        chunking::split_into_sets(&mut self.rng, &message, plaintext_per_packet)
-            .into_iter()
-            .flat_map(|fragment_set| fragment_set.into_iter())
-            .collect()
+    /// The procedure is as follows:
+    /// For each fragment:
+    /// - compute SURB_ACK
+    /// - generate (x, g^x)
+    /// - obtain key k from the reply-surb which was computed as follows:
+    ///     k = KDF(remote encryption key ^ x) this is equivalent to KDF( dh(remote, x) )
+    /// - compute v_b = AES-128-CTR(k, serialized_fragment)
+    /// - compute vk_b = H(k) || v_b
+    /// - compute sphinx_plaintext = SURB_ACK || H(k) || v_b
+    /// - compute sphinx_packet by applying the reply surb on the sphinx_plaintext
+    pub fn prepare_reply_chunk_for_sending(
+        &mut self,
+        fragment: Fragment,
+        topology: &NymTopology,
+        ack_key: &AckKey,
+        reply_surb: ReplySurb,
+    ) -> Result<PreparedFragment, NymTopologyError> {
+        // this is not going to be accurate by any means. but that's the best estimation we can do
+        let expected_forward_delay = Delay::new_from_millis(
+            (self.average_packet_delay.as_millis() * self.num_mix_hops as u128) as u64,
+        );
+
+        let fragment_identifier = fragment.fragment_identifier();
+
+        // create an ack
+        let surb_ack = self.generate_surb_ack(fragment_identifier, topology, ack_key)?;
+        let ack_delay = surb_ack.expected_total_delay();
+
+        let packet_payload = NymsphinxPayloadBuilder::new(fragment, surb_ack)
+            .build_reply(reply_surb.encryption_key());
+
+        // the unwrap here is fine as the failures can only originate from attempting to use invalid payload lenghts
+        // and we just very carefully constructed a (presumably) valid one
+        let (sphinx_packet, first_hop_address) = reply_surb
+            .apply_surb(packet_payload, Some(self.packet_size))
+            .unwrap();
+
+        Ok(PreparedFragment {
+            // the round-trip delay is the sum of delays of all hops on the forward route as
+            // well as the total delay of the ack packet.
+            // we don't know the delays inside the reply surbs so we use best-effort estimation from our poisson distribution
+            total_delay: expected_forward_delay + ack_delay,
+            mix_packet: MixPacket::new(first_hop_address, sphinx_packet, Default::default()),
+            fragment_identifier,
+        })
     }
 
     /// Tries to convert this [`Fragment`] into a [`SphinxPacket`] that can be sent through the Nym mix-network,
@@ -221,46 +190,14 @@ where
         ack_key: &AckKey,
         packet_recipient: &Recipient,
     ) -> Result<PreparedFragment, NymTopologyError> {
+        let fragment_identifier = fragment.fragment_identifier();
+
         // create an ack
-        let (ack_delay, surb_ack_bytes) = self
-            .generate_surb_ack(fragment.fragment_identifier(), topology, ack_key)?
-            .prepare_for_sending();
+        let surb_ack = self.generate_surb_ack(fragment_identifier, topology, ack_key)?;
+        let ack_delay = surb_ack.expected_total_delay();
 
-        // TODO:
-        // TODO:
-        // TODO:
-        // TODO:
-        // TODO: ASK @AP AND @DH WHETHER THOSE KEYS CAN/SHOULD ALSO BE REUSED IN VPN MODE!!
-        // TODO:
-        // TODO:
-        // TODO:
-        // TODO:
-
-        // create keys for 'payload' encryption
-        let (ephemeral_keypair, shared_key) =
-            new_ephemeral_shared_key::<PacketEncryptionAlgorithm, PacketHkdfAlgorithm, _>(
-                &mut self.rng,
-                packet_recipient.encryption_key(),
-            );
-
-        // serialize fragment and encrypt its content
-        let mut chunk_data = fragment.into_bytes();
-
-        let zero_iv = stream_cipher::zero_iv::<PacketEncryptionAlgorithm>();
-        stream_cipher::encrypt_in_place::<PacketEncryptionAlgorithm>(
-            &shared_key,
-            &zero_iv,
-            &mut chunk_data,
-        );
-
-        // combine it together as follows:
-        // SURB_ACK_FIRST_HOP || SURB_ACK_DATA || EPHEMERAL_KEY || CHUNK_DATA
-        // (note: surb_ack_bytes contains SURB_ACK_FIRST_HOP || SURB_ACK_DATA )
-        let packet_payload: Vec<_> = surb_ack_bytes
-            .into_iter()
-            .chain(ephemeral_keypair.public_key().to_bytes().iter().cloned())
-            .chain(chunk_data.into_iter())
-            .collect();
+        let packet_payload = NymsphinxPayloadBuilder::new(fragment, surb_ack)
+            .build_regular(&mut self.rng, packet_recipient.encryption_key());
 
         // generate pseudorandom route for the packet
         let route = topology.random_route_to_gateway(
@@ -290,6 +227,7 @@ where
             // note that the last hop of the packet is a gateway that does not do any delays
             total_delay: delays.iter().take(delays.len() - 1).sum::<Delay>() + ack_delay,
             mix_packet: MixPacket::new(first_hop_address, sphinx_packet, Default::default()),
+            fragment_identifier,
         })
     }
 
@@ -310,113 +248,12 @@ where
         )
     }
 
-    /// Attaches an optional reply-surb and correct padding to the underlying message
-    /// and splits it into [`Fragment`] that can be later packed into sphinx packets to be
-    /// sent through the mix network.
-    pub fn prepare_and_split_message(
-        &mut self,
-        message: Vec<u8>,
-        with_reply_surb: bool,
-        topology: &NymTopology,
-    ) -> Result<(Vec<Fragment>, Option<SurbEncryptionKey>), PreparationError> {
-        let (message, reply_key) =
-            self.optionally_attach_reply_surb(message, with_reply_surb, topology)?;
+    pub fn pad_and_split_message(&mut self, message: NymMessage) -> Vec<Fragment> {
+        let plaintext_per_packet = message.available_plaintext_per_packet(self.packet_size);
 
-        let message = self.pad_message(message);
-
-        Ok((self.split_message(message), reply_key))
-    }
-
-    // TODO: perhaps the return type could somehow be combined with [`PreparedFragment`] ?
-    pub async fn prepare_reply_for_use(
-        &mut self,
-        message: Vec<u8>,
-        reply_surb: ReplySurb,
-        topology: &NymTopology,
-        ack_key: &AckKey,
-    ) -> Result<(MixPacket, FragmentIdentifier), PreparationError> {
-        // there's no chunking in reply-surbs so there's a hard limit on message,
-        // we also need to put the key digest into the message (same size as ephemeral key)
-        // and need 1 byte to indicate padding length (this is not the case for 'normal' messages
-        // as there the padding is added for the whole message)
-        // so before doing any processing, let's see if we have enough space for it all
-        let ack_overhead = MAX_NODE_ADDRESS_UNPADDED_LEN + PacketSize::AckPacket.size();
-        if message.len()
-            > self.packet_size.plaintext_size()
-                - ack_overhead
-                - ReplySurbKeyDigestAlgorithm::output_size()
-                - 1
-        {
-            return Err(PreparationError::TooLongReplyMessageError);
-        }
-
-        let reply_id = FragmentIdentifier::new_reply(&mut self.rng);
-
-        // create an ack
-        // even though it won't be used for retransmission, it must be present so that
-        // gateways could not distinguish reply packets from normal messages due to lack of said acks
-        // note: the ack delay is irrelevant since we do not know the delay of actual surb
-        let (_, surb_ack_bytes) = self
-            .generate_surb_ack(reply_id, topology, ack_key)?
-            .prepare_for_sending();
-
-        let zero_pad_len = self.packet_size.plaintext_size()
-            - message.len()
-            - ack_overhead
-            - ReplySurbKeyDigestAlgorithm::output_size()
-            - 1;
-
-        // create reply message that will reach the recipient:
-        let mut reply_content: Vec<_> = message
-            .into_iter()
-            .chain(std::iter::once(1))
-            .chain(std::iter::repeat(0).take(zero_pad_len))
-            .collect();
-
-        // encrypt the reply message
-        let zero_iv = stream_cipher::zero_iv::<ReplySurbEncryptionAlgorithm>();
-        stream_cipher::encrypt_in_place::<ReplySurbEncryptionAlgorithm>(
-            reply_surb.encryption_key().inner(),
-            &zero_iv,
-            &mut reply_content,
-        );
-
-        // combine it together as follows:
-        // SURB_ACK_FIRST_HOP || SURB_ACK_DATA || KEY_DIGEST || E (REPLY_MESSAGE || 1 || 0*)
-        // (note: surb_ack_bytes contains SURB_ACK_FIRST_HOP || SURB_ACK_DATA )
-        let packet_payload: Vec<_> = surb_ack_bytes
-            .into_iter()
-            .chain(reply_surb.encryption_key().compute_digest().iter().copied())
-            .chain(reply_content.into_iter())
-            .collect();
-
-        // finally put it all inside a sphinx packet
-        // this can only fail if packet payload has incorrect size, but if it does, it means
-        // there's a bug in the above code
-        let (packet, first_hop) = reply_surb
-            .apply_surb(&packet_payload, Some(self.packet_size))
-            .unwrap();
-
-        Ok((
-            MixPacket::new(first_hop, packet, Default::default()),
-            reply_id,
-        ))
-    }
-
-    #[allow(dead_code)]
-    #[cfg(test)]
-    pub(crate) fn test_fixture() -> MessagePreparer<rand::rngs::OsRng> {
-        let rng = rand::rngs::OsRng;
-        let dummy_address = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@4sBbL1ngf1vtNqykydQKTFh26sQCw888GpUqvPvyNB4f").unwrap();
-
-        MessagePreparer {
-            rng,
-            packet_size: Default::default(),
-            sender_address: dummy_address,
-            average_packet_delay: Default::default(),
-            average_ack_delay: Default::default(),
-            num_mix_hops: DEFAULT_NUM_MIX_HOPS,
-        }
+        message
+            .pad_to_full_packet_lengths(plaintext_per_packet)
+            .split_into_fragments(&mut self.rng, plaintext_per_packet)
     }
 }
 
diff --git a/common/nymsphinx/src/preparer/payload.rs b/common/nymsphinx/src/preparer/payload.rs
new file mode 100644
index 0000000000..94acde03c8
--- /dev/null
+++ b/common/nymsphinx/src/preparer/payload.rs
@@ -0,0 +1,97 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crypto::aes::cipher::{KeyIvInit, StreamCipher};
+use crypto::asymmetric::encryption;
+use crypto::shared_key::new_ephemeral_shared_key;
+use crypto::symmetric::stream_cipher;
+use crypto::symmetric::stream_cipher::CipherKey;
+use nymsphinx_acknowledgements::surb_ack::SurbAck;
+use nymsphinx_anonymous_replies::SurbEncryptionKey;
+use nymsphinx_chunking::fragment::Fragment;
+use nymsphinx_params::{
+    PacketEncryptionAlgorithm, PacketHkdfAlgorithm, ReplySurbEncryptionAlgorithm,
+};
+use rand::{CryptoRng, RngCore};
+
+pub struct NymsphinxPayloadBuilder {
+    fragment: Fragment,
+    surb_ack: SurbAck,
+}
+
+impl NymsphinxPayloadBuilder {
+    pub fn new(fragment: Fragment, surb_ack: SurbAck) -> Self {
+        NymsphinxPayloadBuilder { fragment, surb_ack }
+    }
+
+    fn build<C>(
+        self,
+        packet_encryption_key: &CipherKey<C>,
+        variant_data: impl IntoIterator<Item = u8>,
+    ) -> NymsphinxPayload
+    where
+        C: StreamCipher + KeyIvInit,
+    {
+        let (_, surb_ack_bytes) = self.surb_ack.prepare_for_sending();
+
+        let mut fragment_data = self.fragment.into_bytes();
+        stream_cipher::encrypt_in_place::<C>(
+            packet_encryption_key,
+            &stream_cipher::zero_iv::<C>(),
+            &mut fragment_data,
+        );
+
+        // combines all the data as follows:
+        // SURB_ACK || VARIANT_SPECIFIC_DATA || CHUNK_DATA
+        // where variant-specific data is as follows:
+        // for replies it would be the digest of the encryption key used
+        // for 'regular' messages it would be the public component used in DH later used in the KDF
+        NymsphinxPayload(
+            surb_ack_bytes
+                .into_iter()
+                .chain(variant_data.into_iter())
+                .chain(fragment_data.into_iter())
+                .collect(),
+        )
+    }
+
+    pub fn build_reply(self, packet_encryption_key: &SurbEncryptionKey) -> NymsphinxPayload {
+        let key_digest = packet_encryption_key.compute_digest();
+        self.build::<ReplySurbEncryptionAlgorithm>(
+            packet_encryption_key.inner(),
+            key_digest.into_iter(),
+        )
+    }
+
+    pub fn build_regular<R>(
+        self,
+        rng: &mut R,
+        recipient_encryption_key: &encryption::PublicKey,
+    ) -> NymsphinxPayload
+    where
+        R: RngCore + CryptoRng,
+    {
+        // create keys for 'payload' encryption
+        let (ephemeral_keypair, shared_key) = new_ephemeral_shared_key::<
+            PacketEncryptionAlgorithm,
+            PacketHkdfAlgorithm,
+            _,
+        >(rng, recipient_encryption_key);
+
+        self.build::<PacketEncryptionAlgorithm>(
+            &shared_key,
+            ephemeral_keypair.public_key().to_bytes(),
+        )
+    }
+}
+
+// the actual byte data that will be put into the sphinx packet paylaod.
+// no more transformations are going to happen to it
+// TODO: use that fact for some better compile time assertions
+pub struct NymsphinxPayload(Vec<u8>);
+
+impl AsRef<[u8]> for NymsphinxPayload {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
diff --git a/common/nymsphinx/src/receiver.rs b/common/nymsphinx/src/receiver.rs
index 0b6a8e96dd..453f632f76 100644
--- a/common/nymsphinx/src/receiver.rs
+++ b/common/nymsphinx/src/receiver.rs
@@ -1,13 +1,22 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::message::{NymMessage, NymMessageError, PaddedMessage, PlainMessage};
+use crypto::aes::cipher::{KeyIvInit, StreamCipher};
 use crypto::asymmetric::encryption;
 use crypto::shared_key::recompute_shared_key;
 use crypto::symmetric::stream_cipher;
-use nymsphinx_anonymous_replies::reply_surb::{ReplySurb, ReplySurbError};
+use crypto::symmetric::stream_cipher::CipherKey;
+use nymsphinx_anonymous_replies::requests::AnonymousSenderTag;
+use nymsphinx_anonymous_replies::SurbEncryptionKey;
 use nymsphinx_chunking::fragment::Fragment;
 use nymsphinx_chunking::reconstruction::MessageReconstructor;
-use nymsphinx_params::{PacketEncryptionAlgorithm, PacketHkdfAlgorithm, DEFAULT_NUM_MIX_HOPS};
+use nymsphinx_chunking::ChunkingError;
+use nymsphinx_params::{
+    PacketEncryptionAlgorithm, PacketHkdfAlgorithm, ReplySurbEncryptionAlgorithm,
+    DEFAULT_NUM_MIX_HOPS,
+};
+use thiserror::Error;
 
 // TODO: should this live in this file?
 #[derive(Debug)]
@@ -15,31 +24,53 @@ pub struct ReconstructedMessage {
     /// The actual plaintext message that was received.
     pub message: Vec<u8>,
 
-    /// Optional ReplySURB to allow for an anonymous reply to the sender.
-    pub reply_surb: Option<ReplySurb>,
+    /// Optional ephemeral sender tag indicating pseudo-identity of the party who sent us the message
+    /// (alongside any reply SURBs)
+    pub sender_tag: Option<AnonymousSenderTag>,
 }
 
-#[derive(Debug)]
+impl From<ReconstructedMessage> for (Vec<u8>, Option<AnonymousSenderTag>) {
+    fn from(msg: ReconstructedMessage) -> Self {
+        (msg.message, msg.sender_tag)
+    }
+}
+
+impl ReconstructedMessage {
+    pub fn new(message: Vec<u8>, sender_tag: AnonymousSenderTag) -> Self {
+        Self {
+            message,
+            sender_tag: Some(sender_tag),
+        }
+    }
+
+    pub fn into_inner(self) -> (Vec<u8>, Option<AnonymousSenderTag>) {
+        self.into()
+    }
+}
+
+impl From<PlainMessage> for ReconstructedMessage {
+    fn from(message: PlainMessage) -> Self {
+        ReconstructedMessage {
+            message,
+            sender_tag: None,
+        }
+    }
+}
+
+#[derive(Debug, Error)]
 pub enum MessageRecoveryError {
-    InvalidSurbPrefixError,
-    MalformedSurbError(ReplySurbError),
-    InvalidRemoteEphemeralKey(encryption::KeyRecoveryError),
-    MalformedFragmentError,
-    InvalidMessagePaddingError,
-    MalformedReconstructedMessage(Vec<i32>),
-    TooShortMessageError,
-}
+    #[error("Recovered remote x25519 public key is invalid - {0}")]
+    InvalidRemoteEphemeralKey(#[from] encryption::KeyRecoveryError),
 
-impl From<ReplySurbError> for MessageRecoveryError {
-    fn from(err: ReplySurbError) -> Self {
-        MessageRecoveryError::MalformedSurbError(err)
-    }
-}
+    #[error("The reconstructed message was malformed - {source}")]
+    MalformedReconstructedMessage {
+        #[source]
+        source: NymMessageError,
+        used_sets: Vec<i32>,
+    },
 
-impl From<encryption::KeyRecoveryError> for MessageRecoveryError {
-    fn from(err: encryption::KeyRecoveryError) -> Self {
-        MessageRecoveryError::InvalidRemoteEphemeralKey(err)
-    }
+    #[error("Failed to recover message fragment - {0}")]
+    FragmentRecoveryError(#[from] ChunkingError),
 }
 
 pub struct MessageReceiver {
@@ -64,36 +95,34 @@ impl MessageReceiver {
         self
     }
 
-    /// Parses the message to strip and optionally recover reply SURB.
-    fn recover_reply_surb_from_message(
-        &self,
-        message: &mut Vec<u8>,
-    ) -> Result<Option<ReplySurb>, MessageRecoveryError> {
-        match message[0] {
-            n if n == false as u8 => {
-                message.remove(0);
-                Ok(None)
-            }
-            n if n == true as u8 => {
-                let surb_len: usize = ReplySurb::serialized_len(self.num_mix_hops);
-                // note the extra +1 (due to 0/1 message prefix)
-                let surb_bytes = &message[1..1 + surb_len];
-                let reply_surb = ReplySurb::from_bytes(surb_bytes)?;
+    fn decrypt_raw_message<C>(&self, message: &mut [u8], key: &CipherKey<C>)
+    where
+        C: StreamCipher + KeyIvInit,
+    {
+        let zero_iv = stream_cipher::zero_iv::<C>();
+        stream_cipher::decrypt_in_place::<C>(key, &zero_iv, message)
+    }
 
-                *message = message.drain(1 + surb_len..).collect();
-                Ok(Some(reply_surb))
-            }
-            _ => Err(MessageRecoveryError::InvalidSurbPrefixError),
-        }
+    /// Given raw fragment data, **WITH KEY DIGEST PREFIX ALREADY REMOVED!!**, uses looked up
+    /// key to decrypt fragment data
+    pub fn recover_plaintext_from_reply(
+        &self,
+        reply_ciphertext: &mut [u8],
+        reply_key: SurbEncryptionKey,
+    ) {
+        self.decrypt_raw_message::<ReplySurbEncryptionAlgorithm>(
+            reply_ciphertext,
+            reply_key.inner(),
+        )
     }
 
     /// Given raw fragment data, recovers the remote ephemeral key, recomputes shared secret,
     /// uses it to decrypt fragment data
-    pub fn recover_plaintext(
+    pub fn recover_plaintext_from_regular_packet<'a>(
         &self,
         local_key: &encryption::PrivateKey,
-        mut raw_enc_frag: Vec<u8>,
-    ) -> Result<Vec<u8>, MessageRecoveryError> {
+        raw_enc_frag: &'a mut [u8],
+    ) -> Result<&'a mut [u8], MessageRecoveryError> {
         // 1. recover remote encryption key
         let remote_key_bytes = &raw_enc_frag[..encryption::PUBLIC_KEY_SIZE];
         let remote_ephemeral_key = encryption::PublicKey::from_bytes(remote_key_bytes)?;
@@ -105,33 +134,17 @@ impl MessageReceiver {
         );
 
         // 3. decrypt fragment data
-        let fragment_bytes = &mut raw_enc_frag[encryption::PUBLIC_KEY_SIZE..];
+        let fragment_ciphertext = &mut raw_enc_frag[encryption::PUBLIC_KEY_SIZE..];
 
-        let zero_iv = stream_cipher::zero_iv::<PacketEncryptionAlgorithm>();
-        Ok(stream_cipher::decrypt::<PacketEncryptionAlgorithm>(
-            &encryption_key,
-            &zero_iv,
-            fragment_bytes,
-        ))
+        self.decrypt_raw_message::<PacketEncryptionAlgorithm>(fragment_ciphertext, &encryption_key);
+        let fragment_data = fragment_ciphertext;
+
+        Ok(fragment_data)
     }
 
     /// Given fragment data recovers [`Fragment`] itself.
     pub fn recover_fragment(&self, frag_data: &[u8]) -> Result<Fragment, MessageRecoveryError> {
-        Fragment::try_from_bytes(frag_data)
-            .map_err(|_| MessageRecoveryError::MalformedFragmentError)
-    }
-
-    /// Removes the zero padding from the message that was initially included to ensure same length
-    /// sphinx payloads.
-    pub fn remove_padding(message: &mut Vec<u8>) -> Result<(), MessageRecoveryError> {
-        // we are looking for first occurrence of 1 in the tail and we get its index
-        if let Some(i) = message.iter().rposition(|b| *b == 1) {
-            // and now we only take bytes until that point (but not including it)
-            *message = message.drain(..i).collect();
-            Ok(())
-        } else {
-            Err(MessageRecoveryError::InvalidMessagePaddingError)
-        }
+        Ok(Fragment::try_from_bytes(frag_data)?)
     }
 
     /// Inserts given [`Fragment`] into the reconstructor.
@@ -144,30 +157,15 @@ impl MessageReceiver {
     pub fn insert_new_fragment(
         &mut self,
         fragment: Fragment,
-    ) -> Result<Option<(ReconstructedMessage, Vec<i32>)>, MessageRecoveryError> {
-        if let Some((mut message, used_sets)) = self.reconstructor.insert_new_fragment(fragment) {
-            // Split message into plaintext and reply-SURB
-            let reply_surb = match self.recover_reply_surb_from_message(&mut message) {
-                Ok(reply_surb) => reply_surb,
-                Err(_) => {
-                    return Err(MessageRecoveryError::MalformedReconstructedMessage(
-                        used_sets,
-                    ));
-                }
-            };
-
-            // Finally, remove the zero padding from the message
-            Self::remove_padding(&mut message).map_err(|_| {
-                MessageRecoveryError::MalformedReconstructedMessage(used_sets.clone())
-            })?;
-
-            Ok(Some((
-                ReconstructedMessage {
-                    message,
-                    reply_surb,
-                },
-                used_sets,
-            )))
+    ) -> Result<Option<(NymMessage, Vec<i32>)>, MessageRecoveryError> {
+        if let Some((message, used_sets)) = self.reconstructor.insert_new_fragment(fragment) {
+            match PaddedMessage::new_reconstructed(message).remove_padding(self.num_mix_hops) {
+                Ok(message) => Ok(Some((message, used_sets))),
+                Err(err) => Err(MessageRecoveryError::MalformedReconstructedMessage {
+                    source: err,
+                    used_sets,
+                }),
+            }
         } else {
             Ok(None)
         }
@@ -188,16 +186,14 @@ mod message_receiver {
     use super::*;
     use crypto::asymmetric::identity;
     use mixnet_contract_common::Layer;
-    use nymsphinx_addressing::clients::Recipient;
-    use rand::rngs::OsRng;
     use std::collections::HashMap;
-    use std::time::Duration;
     use topology::{gateway, mix, NymTopology};
 
     // TODO: is it somehow maybe possible to move it to `topology` and have if conditionally
     // available to other modules?
     /// Returns a hardcoded, valid instance of [`NymTopology`] that is to be used in
     /// tests requiring instance of topology.
+    #[allow(dead_code)]
     fn topology_fixture() -> NymTopology {
         let mut mixes = HashMap::new();
         mixes.insert(
@@ -282,41 +278,4 @@ mod message_receiver {
             }],
         )
     }
-
-    #[test]
-    fn correctly_splits_message_into_plaintext_and_surb() {
-        let message_receiver: MessageReceiver = Default::default();
-
-        // the actual 'correctness' of the underlying message doesn't matter for this test
-        let message = vec![42; 100];
-        let dummy_recipient = Recipient::try_from_base58_string("CytBseW6yFXUMzz4SGAKdNLGR7q3sJLLYxyBGvutNEQV.4QXYyEVc5fUDjmmi8PrHN9tdUFV4PCvSJE1278cHyvoe@FioFa8nMmPpQnYi7JyojoTuwGLeyNS8BF4ChPr29zUML").unwrap();
-        let average_delay = Duration::from_millis(500);
-        let topology = topology_fixture();
-
-        let reply_surb =
-            ReplySurb::construct(&mut OsRng, &dummy_recipient, average_delay, &topology).unwrap();
-
-        let reply_surb_bytes = reply_surb.to_bytes();
-
-        // this is not exactly what is 'received' but rather after "some" processing, however,
-        // this is the expected argument to the function
-        let mut received_without_surb: Vec<_> =
-            std::iter::once(0).chain(message.iter().cloned()).collect();
-
-        let reply_surb = message_receiver
-            .recover_reply_surb_from_message(&mut received_without_surb)
-            .unwrap();
-        assert_eq!(received_without_surb, message);
-        assert!(reply_surb.is_none());
-
-        let mut received_with_surb: Vec<_> = std::iter::once(1)
-            .chain(reply_surb_bytes.iter().cloned())
-            .chain(message.iter().cloned())
-            .collect();
-        let reply_surb = message_receiver
-            .recover_reply_surb_from_message(&mut received_with_surb)
-            .unwrap();
-        assert_eq!(received_with_surb, message);
-        assert_eq!(reply_surb_bytes, reply_surb.unwrap().to_bytes());
-    }
 }
diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml
index 34a916bbf5..353de2b1b2 100644
--- a/common/nymsphinx/types/Cargo.toml
+++ b/common/nymsphinx/types/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-sphinx = { git = "https://github.com/nymtech/sphinx", rev="c494250f2a78bed33a618d470792418eee932859" }
+sphinx = { git = "https://github.com/nymtech/sphinx", rev="e05a1992522ed0afd3c6fcac160313ffc9bb306a" }
 #sphinx = { path = "../../../../sphinx"}
diff --git a/common/socks5/ordered-buffer/Cargo.toml b/common/socks5/ordered-buffer/Cargo.toml
index f5ea5545d8..58dd09b263 100644
--- a/common/socks5/ordered-buffer/Cargo.toml
+++ b/common/socks5/ordered-buffer/Cargo.toml
@@ -8,3 +8,4 @@ edition = "2021"
 
 [dependencies]
 log = "0.4"
+thiserror = "1.0.37"
\ No newline at end of file
diff --git a/common/socks5/ordered-buffer/src/message.rs b/common/socks5/ordered-buffer/src/message.rs
index f5f28f53b1..15627d7fe0 100644
--- a/common/socks5/ordered-buffer/src/message.rs
+++ b/common/socks5/ordered-buffer/src/message.rs
@@ -1,9 +1,16 @@
-use std::cmp::Ordering;
+// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
 
-#[derive(Debug, PartialEq, Eq)]
+use std::cmp::Ordering;
+use thiserror::Error;
+
+#[derive(Error, Debug, PartialEq, Eq)]
 pub enum MessageError {
+    #[error("the received message was empty")]
     NoData,
-    IndexTooShort,
+
+    #[error("could not extract message index. Received {received} bytes, but expected {expected}")]
+    IndexTooShort { received: usize, expected: usize },
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -32,7 +39,10 @@ impl OrderedMessage {
         }
 
         if data.len() < 8 {
-            return Err(MessageError::IndexTooShort);
+            return Err(MessageError::IndexTooShort {
+                received: data.len(),
+                expected: 8,
+            });
         }
         let index = u64::from_be_bytes([
             data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7],
@@ -81,7 +91,13 @@ mod ordered_message_from_bytes {
     #[test]
     fn fails_when_data_is_too_short() {
         let result = OrderedMessage::try_from_bytes(vec![1, 2, 3]);
-        assert_eq!(Err(MessageError::IndexTooShort), result);
+        assert_eq!(
+            Err(MessageError::IndexTooShort {
+                received: 3,
+                expected: 8
+            }),
+            result
+        );
     }
 
     #[test]
diff --git a/common/socks5/proxy-helpers/src/connection_controller.rs b/common/socks5/proxy-helpers/src/connection_controller.rs
index 97c4487af6..66c8b94a7a 100644
--- a/common/socks5/proxy-helpers/src/connection_controller.rs
+++ b/common/socks5/proxy-helpers/src/connection_controller.rs
@@ -11,7 +11,7 @@ use std::{
     collections::{HashMap, HashSet},
     time::Duration,
 };
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::time;
 
 /// A generic message produced after reading from a socket/connection. It includes data that was
@@ -53,7 +53,7 @@ impl ActiveConnection {
         let ordered_message = match OrderedMessage::try_from_bytes(payload) {
             Ok(msg) => msg,
             Err(err) => {
-                error!("Malformed ordered message - {:?}", err);
+                error!("Malformed ordered message - {err}");
                 return;
             }
         };
@@ -98,14 +98,14 @@ pub struct Controller {
     // un-order messages. Note we don't ever expect to have more than 1-2 messages per connection here
     pending_messages: HashMap<ConnectionId, Vec<(Vec<u8>, bool)>>,
 
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl Controller {
     pub fn new(
         client_connection_tx: ConnectionCommandSender,
         broadcast_connections: BroadcastActiveConnections,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> (Self, ControllerSender) {
         let (sender, receiver) = mpsc::unbounded();
         (
@@ -158,9 +158,9 @@ impl Controller {
             .unbounded_send(ConnectionCommand::Close(conn_id))
         {
             if self.shutdown.is_shutdown_poll() {
-                log::debug!("Failed to send: {}", err);
+                log::debug!("Failed to send: {err}");
             } else {
-                log::error!("Failed to send: {}", err);
+                log::error!("Failed to send: {err}");
             }
         }
     }
@@ -197,7 +197,7 @@ impl Controller {
                         socket_closed: active_connection.is_closed,
                     })
                 {
-                    error!("WTF IS THIS: {:?}", err);
+                    error!("WTF IS THIS: {err}");
                 }
 
                 // TODO: ABOVE UNWRAP CAUSED A CRASH IN A NORMAL USE!!!!
diff --git a/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs b/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs
index f2ebc2cd9b..2065f7770b 100644
--- a/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs
+++ b/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs
@@ -15,7 +15,7 @@ use socks5_requests::ConnectionId;
 use std::fmt::Debug;
 use std::time::Duration;
 use std::{io, sync::Arc};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::select;
 use tokio::{net::tcp::OwnedReadHalf, sync::Notify, time::sleep};
 
@@ -54,7 +54,7 @@ where
         Some(data) => match data {
             Ok(data) => (data, false),
             Err(err) => {
-                error!(target: &*format!("({}) socks5 inbound", connection_id), "failed to read request from the socket - {}", err);
+                error!(target: &*format!("({}) socks5 inbound", connection_id), "failed to read request from the socket - {err}");
                 (Default::default(), true)
             }
         },
@@ -77,16 +77,11 @@ where
         ordered_msg.len()
     );
 
-    // If we are closing the socket, wait until the data has passed `OutQueueControl` and the lane
-    // is empty, otherwise just wait until we are reasonably close to finish sending as a way to
-    // throttle the incoming data.
-    if let Some(lane_queue_lengths) = lane_queue_lengths {
-        if is_finished {
-            wait_until_lane_empty(lane_queue_lengths, connection_id).await;
-        } else {
-            // We allow a bit of slack when this is not the last msg
-            wait_until_lane_almost_empty(lane_queue_lengths, connection_id).await;
-        }
+    // Before sending the data downstream, wait for the lane at the `OutQueueControl` is reasonably
+    // close to finishing. This is a way of pacing the sending application (backpressure).
+    if let Some(ref lane_queue_lengths) = lane_queue_lengths {
+        // We allow a bit of slack to try to keep the pipeline >0
+        wait_until_lane_almost_empty(lane_queue_lengths, connection_id).await;
     }
 
     mix_sender
@@ -95,16 +90,30 @@ where
         .expect("InputMessageReceiver has stopped receiving!");
 
     if is_finished {
-        // technically we already informed it when we sent the message to mixnet above
-        debug!(target: &*format!("({}) socks5 inbound", connection_id), "The local socket is closed - won't receive any more data. Informing remote about that...");
+        // After sending, if this is the last message, wait until we've actually transmitted the data
+        // in the `OutQueueControl` and the lane is empty.
+        if let Some(ref lane_queue_lengths) = lane_queue_lengths {
+            // This is basically an ugly workaround to make sure that we don't start waiting until
+            // the data that we pushed arrived at the OutQueueControl.
+            // This usually not a problem in the socks5-client, but for the network-requester this
+            // info is synced at up to every 500ms.
+            sleep(Duration::from_secs(2)).await;
+            wait_until_lane_empty(lane_queue_lengths, connection_id).await;
+        }
+
+        // Technically we already informed it when we sent the message to mixnet above
+        debug!(
+            target: &*format!("({}) socks5 inbound", connection_id),
+            "The local socket is closed - won't receive any more data. Informing remote about that..."
+        );
     }
 
     is_finished
 }
 
-async fn wait_until_lane_empty(lane_queue_lengths: LaneQueueLengths, connection_id: u64) {
+async fn wait_until_lane_empty(lane_queue_lengths: &LaneQueueLengths, connection_id: u64) {
     if tokio::time::timeout(
-        Duration::from_secs(2 * 60),
+        Duration::from_secs(4 * 60),
         wait_for_lane(
             lane_queue_lengths,
             connection_id,
@@ -119,13 +128,13 @@ async fn wait_until_lane_empty(lane_queue_lengths: LaneQueueLengths, connection_
     }
 }
 
-async fn wait_until_lane_almost_empty(lane_queue_lengths: LaneQueueLengths, connection_id: u64) {
+async fn wait_until_lane_almost_empty(lane_queue_lengths: &LaneQueueLengths, connection_id: u64) {
     if tokio::time::timeout(
-        Duration::from_secs(2 * 60),
+        Duration::from_secs(4 * 60),
         wait_for_lane(
             lane_queue_lengths,
             connection_id,
-            10,
+            30,
             Duration::from_millis(100),
         ),
     )
@@ -137,7 +146,7 @@ async fn wait_until_lane_almost_empty(lane_queue_lengths: LaneQueueLengths, conn
 }
 
 async fn wait_for_lane(
-    lane_queue_lengths: LaneQueueLengths,
+    lane_queue_lengths: &LaneQueueLengths,
     connection_id: u64,
     queue_length_threshold: usize,
     sleep_duration: Duration,
@@ -161,7 +170,7 @@ pub(super) async fn run_inbound<F, S>(
     adapter_fn: F,
     shutdown_notify: Arc<Notify>,
     lane_queue_lengths: Option<LaneQueueLengths>,
-    mut shutdown_listener: ShutdownListener,
+    mut shutdown_listener: TaskClient,
 ) -> OwnedReadHalf
 where
     F: Fn(ConnectionId, Vec<u8>, bool) -> S + Send + 'static,
diff --git a/common/socks5/proxy-helpers/src/proxy_runner/mod.rs b/common/socks5/proxy-helpers/src/proxy_runner/mod.rs
index defcbf4f5f..a87ada287e 100644
--- a/common/socks5/proxy-helpers/src/proxy_runner/mod.rs
+++ b/common/socks5/proxy-helpers/src/proxy_runner/mod.rs
@@ -6,7 +6,7 @@ use client_connections::LaneQueueLengths;
 use socks5_requests::ConnectionId;
 use std::fmt::Debug;
 use std::{sync::Arc, time::Duration};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::{net::TcpStream, sync::Notify};
 
 mod inbound;
@@ -50,7 +50,7 @@ pub struct ProxyRunner<S> {
     lane_queue_lengths: Option<LaneQueueLengths>,
 
     // Listens to shutdown commands from higher up
-    shutdown_listener: ShutdownListener,
+    shutdown_listener: TaskClient,
 }
 
 impl<S> ProxyRunner<S>
@@ -66,7 +66,7 @@ where
         mix_sender: MixProxySender<S>,
         connection_id: ConnectionId,
         lane_queue_lengths: Option<LaneQueueLengths>,
-        shutdown_listener: ShutdownListener,
+        shutdown_listener: TaskClient,
     ) -> Self {
         ProxyRunner {
             mix_receiver: Some(mix_receiver),
diff --git a/common/socks5/proxy-helpers/src/proxy_runner/outbound.rs b/common/socks5/proxy-helpers/src/proxy_runner/outbound.rs
index 78db73afb6..ed7f8d74c6 100644
--- a/common/socks5/proxy-helpers/src/proxy_runner/outbound.rs
+++ b/common/socks5/proxy-helpers/src/proxy_runner/outbound.rs
@@ -8,7 +8,7 @@ use futures::StreamExt;
 use log::*;
 use socks5_requests::ConnectionId;
 use std::{sync::Arc, time::Duration};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::io::AsyncWriteExt;
 use tokio::select;
 use tokio::{net::tcp::OwnedWriteHalf, sync::Notify, time::sleep, time::Instant};
@@ -33,7 +33,7 @@ async fn deal_with_message(
 
     if let Err(err) = writer.write_all(&connection_message.payload).await {
         // the other half is probably going to blow up too (if not, this task also needs to notify the other one!!)
-        error!(target: &*format!("({}) socks5 outbound", connection_id), "failed to write response back to the socket - {}", err);
+        error!(target: &*format!("({}) socks5 outbound", connection_id), "failed to write response back to the socket - {err}");
         return true;
     }
     if connection_message.socket_closed {
@@ -51,7 +51,7 @@ pub(super) async fn run_outbound(
     mut mix_receiver: ConnectionReceiver,
     connection_id: ConnectionId,
     shutdown_notify: Arc<Notify>,
-    mut shutdown_listener: ShutdownListener,
+    mut shutdown_listener: TaskClient,
 ) -> (OwnedWriteHalf, ConnectionReceiver) {
     let shutdown_future = shutdown_notify.notified().then(|_| sleep(SHUTDOWN_TIMEOUT));
     tokio::pin!(shutdown_future);
diff --git a/common/socks5/requests/src/msg.rs b/common/socks5/requests/src/msg.rs
index 2b688d8214..906c643524 100644
--- a/common/socks5/requests/src/msg.rs
+++ b/common/socks5/requests/src/msg.rs
@@ -9,13 +9,13 @@ use crate::response::{Response, ResponseError};
 
 #[derive(Debug, Error)]
 pub enum MessageError {
-    #[error("{0}")]
+    #[error(transparent)]
     Request(RequestError),
 
     #[error("{0:?}")]
     Response(ResponseError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     NetworkRequesterResponseError(NrError),
 
     #[error("no data")]
diff --git a/common/socks5/requests/src/network_requester_response.rs b/common/socks5/requests/src/network_requester_response.rs
index 64e459dfb0..eba3f88dd9 100644
--- a/common/socks5/requests/src/network_requester_response.rs
+++ b/common/socks5/requests/src/network_requester_response.rs
@@ -63,7 +63,7 @@ impl NetworkRequesterResponse {
         self.connection_id
             .to_be_bytes()
             .iter()
-            .cloned()
+            .copied()
             .chain(self.network_requester_error.into_bytes().into_iter())
             .collect()
     }
diff --git a/common/socks5/requests/src/request.rs b/common/socks5/requests/src/request.rs
index f6921e362a..3148f6cd84 100644
--- a/common/socks5/requests/src/request.rs
+++ b/common/socks5/requests/src/request.rs
@@ -15,6 +15,18 @@ pub enum RequestFlag {
     Send = 1,
 }
 
+impl TryFrom<u8> for RequestFlag {
+    type Error = RequestError;
+
+    fn try_from(value: u8) -> Result<RequestFlag, RequestError> {
+        match value {
+            _ if value == (RequestFlag::Connect as u8) => Ok(Self::Connect),
+            _ if value == (RequestFlag::Send as u8) => Ok(Self::Send),
+            _ => Err(RequestError::UnknownRequestFlag),
+        }
+    }
+}
+
 #[derive(Debug, Error)]
 pub enum RequestError {
     #[error("not enough bytes to recover the length of the address")]
@@ -45,23 +57,12 @@ impl RequestError {
     }
 }
 
-impl TryFrom<u8> for RequestFlag {
-    type Error = RequestError;
-
-    fn try_from(value: u8) -> Result<RequestFlag, RequestError> {
-        match value {
-            _ if value == (RequestFlag::Connect as u8) => Ok(Self::Connect),
-            _ if value == (RequestFlag::Send as u8) => Ok(Self::Send),
-            _ => Err(RequestError::UnknownRequestFlag),
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct ConnectRequest {
+    // TODO: is connection_id redundant now?
     pub conn_id: ConnectionId,
     pub remote_addr: RemoteAddress,
-    pub return_address: Recipient,
+    pub return_address: Option<Recipient>,
 }
 
 /// A request from a SOCKS5 client that a Nym Socks5 service provider should
@@ -82,7 +83,7 @@ impl Request {
     pub fn new_connect(
         conn_id: ConnectionId,
         remote_addr: RemoteAddress,
-        return_address: Recipient,
+        return_address: Option<Recipient>,
     ) -> Request {
         Request::Connect(Box::new(ConnectRequest {
             conn_id,
@@ -99,12 +100,13 @@ impl Request {
     /// Deserialize the request type, connection id, destination address and port,
     /// and the request body from bytes.
     ///
-    /// Serialized bytes looks like this:
-    ///
-    /// --------------------------------------------------------------------------------------
-    ///  request_flag | connection_id | address_length | remote_address_bytes | request_data |
-    ///        1      |       8       |      2         |    address_length    |    ...       |
-    /// --------------------------------------------------------------------------------------
+    // TODO: this was already inaccurate
+    // /// Serialized bytes looks like this:
+    // ///
+    // /// --------------------------------------------------------------------------------------
+    // ///  request_flag | connection_id | address_length | remote_address_bytes | request_data |
+    // ///        1      |       8       |      2         |    address_length    |    ...       |
+    // /// --------------------------------------------------------------------------------------
     ///
     /// The request_flag tells us whether this is a new connection request (`new_connect`),
     /// an already-established connection we should send up (`new_send`), or
@@ -144,14 +146,20 @@ impl Request {
                 // just a temporary reference to mid-slice for ease of use
                 let recipient_data_bytes = &connect_request_bytes[address_end..];
 
-                if recipient_data_bytes.len() != Recipient::LEN {
-                    return Err(RequestError::ReturnAddressTooShort);
-                }
+                let return_address = if recipient_data_bytes.is_empty() {
+                    None
+                } else {
+                    if recipient_data_bytes.len() != Recipient::LEN {
+                        return Err(RequestError::ReturnAddressTooShort);
+                    }
 
-                let mut return_bytes = [0u8; Recipient::LEN];
-                return_bytes.copy_from_slice(&recipient_data_bytes[..Recipient::LEN]);
-                let return_address = Recipient::try_from_bytes(return_bytes)
-                    .map_err(RequestError::MalformedReturnAddress)?;
+                    let mut return_bytes = [0u8; Recipient::LEN];
+                    return_bytes.copy_from_slice(&recipient_data_bytes[..Recipient::LEN]);
+                    Some(
+                        Recipient::try_from_bytes(return_bytes)
+                            .map_err(RequestError::MalformedReturnAddress)?,
+                    )
+                };
 
                 Ok(Request::new_connect(
                     connection_id,
@@ -161,7 +169,7 @@ impl Request {
             }
             RequestFlag::Send => {
                 let local_closed = b[9] != 0;
-                let data = b[10..].as_ref().to_vec();
+                let data = b[10..].to_vec();
 
                 Ok(Request::Send(connection_id, data, local_closed))
             }
@@ -178,15 +186,19 @@ impl Request {
                 let remote_address_bytes = req.remote_addr.into_bytes();
                 let remote_address_bytes_len = remote_address_bytes.len() as u16;
 
-                std::iter::once(RequestFlag::Connect as u8)
-                    .chain(req.conn_id.to_be_bytes().iter().cloned())
-                    .chain(remote_address_bytes_len.to_be_bytes().iter().cloned())
-                    .chain(remote_address_bytes.into_iter())
-                    .chain(req.return_address.to_bytes().iter().cloned())
-                    .collect()
+                let iter = std::iter::once(RequestFlag::Connect as u8)
+                    .chain(req.conn_id.to_be_bytes().into_iter())
+                    .chain(remote_address_bytes_len.to_be_bytes().into_iter())
+                    .chain(remote_address_bytes.into_iter());
+
+                if let Some(return_address) = req.return_address {
+                    iter.chain(return_address.to_bytes().into_iter()).collect()
+                } else {
+                    iter.collect()
+                }
             }
             Request::Send(conn_id, data, local_closed) => std::iter::once(RequestFlag::Send as u8)
-                .chain(conn_id.to_be_bytes().iter().cloned())
+                .chain(conn_id.to_be_bytes().into_iter())
                 .chain(std::iter::once(local_closed as u8))
                 .chain(data.into_iter())
                 .collect(),
@@ -324,7 +336,7 @@ mod request_deserialization_tests {
             let request_bytes: Vec<_> = request_bytes_prefix
                 .iter()
                 .cloned()
-                .chain(recipient_bytes.iter().cloned())
+                .chain(recipient_bytes.into_iter())
                 .collect();
             assert!(Request::try_from_bytes(&request_bytes)
                 .unwrap_err()
@@ -361,7 +373,7 @@ mod request_deserialization_tests {
 
             let request_bytes: Vec<_> = request_bytes
                 .into_iter()
-                .chain(recipient_bytes.iter().cloned())
+                .chain(recipient_bytes.into_iter())
                 .collect();
 
             let request = Request::try_from_bytes(&request_bytes).unwrap();
@@ -370,7 +382,7 @@ mod request_deserialization_tests {
                     assert_eq!("foo.com".to_string(), req.remote_addr);
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), req.conn_id);
                     assert_eq!(
-                        req.return_address.to_bytes().to_vec(),
+                        req.return_address.unwrap().to_bytes().to_vec(),
                         recipient.to_bytes().to_vec()
                     );
                 }
@@ -408,7 +420,7 @@ mod request_deserialization_tests {
 
             let request_bytes: Vec<_> = request_bytes
                 .into_iter()
-                .chain(recipient_bytes.iter().cloned())
+                .chain(recipient_bytes.into_iter())
                 .collect();
 
             let request = Request::try_from_bytes(&request_bytes).unwrap();
@@ -417,7 +429,7 @@ mod request_deserialization_tests {
                     assert_eq!("foo.com".to_string(), req.remote_addr);
                     assert_eq!(u64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]), req.conn_id);
                     assert_eq!(
-                        req.return_address.to_bytes().to_vec(),
+                        req.return_address.unwrap().to_bytes().to_vec(),
                         recipient.to_bytes().to_vec()
                     );
                 }
diff --git a/common/task/Cargo.toml b/common/task/Cargo.toml
index 8240207575..ee83423f5f 100644
--- a/common/task/Cargo.toml
+++ b/common/task/Cargo.toml
@@ -15,5 +15,11 @@ tokio = { version = "1.21.2", features = ["macros", "sync"] }
 version = "1.21.2"
 features = ["signal", "time"]
 
+[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures]
+version = "0.4"
+
+[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
+version = "0.2.83"
+
 [dev-dependencies]
 tokio = { version = "1.21.2", features = ["rt-multi-thread", "net", "signal", "test-util", "macros"] }
diff --git a/common/task/src/lib.rs b/common/task/src/lib.rs
index e2b5f623df..7ac5ab8431 100644
--- a/common/task/src/lib.rs
+++ b/common/task/src/lib.rs
@@ -1,10 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod shutdown;
+pub mod manager;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod signal;
+pub mod spawn;
 
-pub use shutdown::{ShutdownListener, ShutdownNotifier};
+pub use manager::{StatusReceiver, StatusSender, TaskClient, TaskManager};
 #[cfg(not(target_arch = "wasm32"))]
 pub use signal::{wait_for_signal, wait_for_signal_and_error};
+
+pub use spawn::spawn_with_report_error;
diff --git a/common/task/src/shutdown.rs b/common/task/src/manager.rs
similarity index 52%
rename from common/task/src/shutdown.rs
rename to common/task/src/manager.rs
index 0f8efa51d7..f40a525527 100644
--- a/common/task/src/shutdown.rs
+++ b/common/task/src/manager.rs
@@ -3,7 +3,7 @@
 
 use std::{error::Error, time::Duration};
 
-use futures::FutureExt;
+use futures::{future::pending, FutureExt, SinkExt, StreamExt};
 use tokio::{
     sync::{
         mpsc,
@@ -14,19 +14,31 @@ use tokio::{
 
 const DEFAULT_SHUTDOWN_TIMER_SECS: u64 = 5;
 
-pub(crate) type SentError = Box<dyn Error + Send>;
+pub(crate) type SentError = Box<dyn Error + Send + Sync>;
 type ErrorSender = mpsc::UnboundedSender<SentError>;
 type ErrorReceiver = mpsc::UnboundedReceiver<SentError>;
 
+pub type SentStatus = Box<dyn Error + Send + Sync>;
+pub type StatusSender = futures::channel::mpsc::Sender<SentStatus>;
+pub type StatusReceiver = futures::channel::mpsc::Receiver<SentStatus>;
+
 #[derive(thiserror::Error, Debug)]
 enum TaskError {
     #[error("Task halted unexpectedly")]
     UnexpectedHalt,
 }
 
-/// Used to notify other tasks to gracefully shutdown
+// TODO: possibly we should create a `Status` trait instead of reusing `Error`
+#[derive(thiserror::Error, Debug)]
+pub enum TaskStatus {
+    #[error("Ready")]
+    Ready,
+}
+
+/// Listens to status and error messages from tasks, as well as notifying them to gracefully
+/// shutdown. Keeps track of if task stop unexpectedly, such as in a panic.
 #[derive(Debug)]
-pub struct ShutdownNotifier {
+pub struct TaskManager {
     // These channels have the dual purpose of signalling it's time to shutdown, but also to keep
     // track of which tasks we are still waiting for.
     notify_tx: watch::Sender<()>,
@@ -43,13 +55,21 @@ pub struct ShutdownNotifier {
     // didn't manage to reliably get the explicitly sent error (and not the error sent during drop)
     task_drop_tx: ErrorSender,
     task_drop_rx: Option<ErrorReceiver>,
+
+    // A task might also send non-fatal errors (effectively, warnings) while running that is not
+    // the result of exiting.
+    task_status_tx: StatusSender,
+    task_status_rx: Option<StatusReceiver>,
 }
 
-impl Default for ShutdownNotifier {
+impl Default for TaskManager {
     fn default() -> Self {
         let (notify_tx, notify_rx) = watch::channel(());
         let (task_halt_tx, task_halt_rx) = mpsc::unbounded_channel();
         let (task_drop_tx, task_drop_rx) = mpsc::unbounded_channel();
+        // The status channel is bounded (unlike the others), since it's not always the case that
+        // there is a listener.
+        let (task_status_tx, task_status_rx) = futures::channel::mpsc::channel(128);
         Self {
             notify_tx,
             notify_rx: Some(notify_rx),
@@ -58,11 +78,13 @@ impl Default for ShutdownNotifier {
             task_return_error_rx: Some(task_halt_rx),
             task_drop_tx,
             task_drop_rx: Some(task_drop_rx),
+            task_status_tx,
+            task_status_rx: Some(task_status_rx),
         }
     }
 }
 
-impl ShutdownNotifier {
+impl TaskManager {
     pub fn new(shutdown_timer_secs: u64) -> Self {
         Self {
             shutdown_timer_secs,
@@ -70,14 +92,15 @@ impl ShutdownNotifier {
         }
     }
 
-    pub fn subscribe(&self) -> ShutdownListener {
-        ShutdownListener::new(
+    pub fn subscribe(&self) -> TaskClient {
+        TaskClient::new(
             self.notify_rx
                 .as_ref()
                 .expect("Unable to subscribe to shutdown notifier that is already shutdown")
                 .clone(),
             self.task_return_error_tx.clone(),
             self.task_drop_tx.clone(),
+            self.task_status_tx.clone(),
         )
     }
 
@@ -85,6 +108,32 @@ impl ShutdownNotifier {
         self.notify_tx.send(())
     }
 
+    pub async fn start_status_listener(&mut self, mut sender: StatusSender) {
+        // Announce that we are operational. This means that in the application where this is used,
+        // everything is up and running and ready to go.
+        if let Err(msg) = sender.send(Box::new(TaskStatus::Ready)).await {
+            log::error!("Error sending status message: {}", msg);
+        };
+
+        if let Some(mut task_status_rx) = self.task_status_rx.take() {
+            log::info!("Starting status message listener");
+            crate::spawn::spawn(async move {
+                loop {
+                    if let Some(msg) = task_status_rx.next().await {
+                        log::trace!("Got msg: {}", msg);
+                        if let Err(msg) = sender.send(msg).await {
+                            log::error!("Error sending status message: {}", msg);
+                        }
+                    } else {
+                        log::trace!("Stopping since channel closed");
+                        break;
+                    }
+                }
+                log::debug!("Status listener: Exiting");
+            });
+        }
+    }
+
     pub async fn wait_for_error(&mut self) -> Option<SentError> {
         let mut error_rx = self
             .task_return_error_rx
@@ -109,7 +158,7 @@ impl ShutdownNotifier {
     }
 
     pub async fn wait_for_shutdown(&mut self) {
-        log::info!("Waiting for shutdown");
+        log::debug!("Waiting for shutdown");
         if let Some(notify_rx) = self.notify_rx.take() {
             drop(notify_rx);
         }
@@ -133,9 +182,10 @@ impl ShutdownNotifier {
     }
 }
 
-/// Listen for shutdown notifications
+/// Listen for shutdown notifications, and can send error and status messages back to the
+/// `TaskManager`
 #[derive(Clone, Debug)]
-pub struct ShutdownListener {
+pub struct TaskClient {
     // If a shutdown notification has been registered
     shutdown: bool,
 
@@ -149,12 +199,14 @@ pub struct ShutdownListener {
     // Also notify if we dropped without shutdown being registered
     drop_error: ErrorSender,
 
-    // Sometimes it's necessary to clone and drop the shutdown listener during normal operation,
-    // for those situations we need to explicitly not drop (and trigger shutdown).
-    set_not_drop: bool,
+    // Send non-exit messages
+    status_msg: StatusSender,
+
+    // The current operating mode
+    mode: ClientOperatingMode,
 }
 
-impl ShutdownListener {
+impl TaskClient {
     #[cfg(not(target_arch = "wasm32"))]
     const SHUTDOWN_TIMEOUT: Duration = Duration::from_secs(5);
 
@@ -162,21 +214,51 @@ impl ShutdownListener {
         notify: watch::Receiver<()>,
         return_error: ErrorSender,
         drop_error: ErrorSender,
-    ) -> ShutdownListener {
-        ShutdownListener {
+        status_msg: StatusSender,
+    ) -> TaskClient {
+        TaskClient {
             shutdown: false,
             notify,
             return_error,
             drop_error,
-            set_not_drop: false,
+            status_msg,
+            mode: ClientOperatingMode::Listening,
         }
     }
 
+    // Create a dummy that will never report that we should shutdown.
+    pub fn dummy() -> TaskClient {
+        let (_notify_tx, notify_rx) = watch::channel(());
+        let (task_halt_tx, _task_halt_rx) = mpsc::unbounded_channel();
+        let (task_drop_tx, _task_drop_rx) = mpsc::unbounded_channel();
+        //let (task_status_tx, _task_status_rx) = futures::channel::mpsc::unbounded();
+        let (task_status_tx, _task_status_rx) = futures::channel::mpsc::channel(128);
+        TaskClient {
+            shutdown: false,
+            notify: notify_rx,
+            return_error: task_halt_tx,
+            drop_error: task_drop_tx,
+            status_msg: task_status_tx,
+            mode: ClientOperatingMode::Dummy,
+        }
+    }
+
+    pub fn is_dummy(&self) -> bool {
+        self.mode.is_dummy()
+    }
+
     pub fn is_shutdown(&self) -> bool {
-        self.shutdown
+        if self.mode.is_dummy() {
+            false
+        } else {
+            self.shutdown
+        }
     }
 
     pub async fn recv(&mut self) {
+        if self.mode.is_dummy() {
+            return pending().await;
+        }
         if self.shutdown {
             return;
         }
@@ -184,7 +266,19 @@ impl ShutdownListener {
         self.shutdown = true;
     }
 
+    pub async fn recv_with_delay(&mut self) {
+        self.recv()
+            .then(|msg| async move {
+                sleep(Duration::from_secs(2)).await;
+                msg
+            })
+            .await
+    }
+
     pub async fn recv_timeout(&mut self) {
+        if self.mode.is_dummy() {
+            return pending().await;
+        }
         #[cfg(not(target_arch = "wasm32"))]
         tokio::time::timeout(Self::SHUTDOWN_TIMEOUT, self.recv())
             .await
@@ -192,6 +286,9 @@ impl ShutdownListener {
     }
 
     pub fn is_shutdown_poll(&mut self) -> bool {
+        if self.mode.is_dummy() {
+            return false;
+        }
         if self.shutdown {
             return true;
         }
@@ -210,21 +307,39 @@ impl ShutdownListener {
         }
     }
 
+    // This listener should to *not* notify the ShutdownNotifier to shutdown when dropped. For
+    // example when we clone the listener for a task handling connections, we often want to drop
+    // without signal failure.
+    pub fn mark_as_success(&mut self) {
+        self.mode.set_should_not_signal_on_drop();
+    }
+
     pub fn send_we_stopped(&mut self, err: SentError) {
-        log::trace!("Notifying we stopped: {:?}", err);
+        if self.mode.is_dummy() {
+            return;
+        }
+        log::trace!("Notifying we stopped: {err}");
         if self.return_error.send(err).is_err() {
             log::error!("Failed to send back error message");
         }
     }
 
-    pub fn mark_as_success(&mut self) {
-        self.set_not_drop = true;
+    pub fn send_status_msg(&mut self, msg: SentStatus) {
+        if self.mode.is_dummy() {
+            return;
+        }
+        // Since it's not always the case that anyone is listening, just try send and ignore any
+        // failures.
+        self.status_msg.try_send(msg).ok();
     }
 }
 
-impl Drop for ShutdownListener {
+impl Drop for TaskClient {
     fn drop(&mut self) {
-        if !self.set_not_drop && !self.is_shutdown_poll() {
+        if !self.mode.should_signal_on_drop() {
+            return;
+        }
+        if !self.is_shutdown_poll() {
             log::trace!("Notifying stop on unexpected drop");
             // If we can't send, well then there is not much to do
             self.drop_error
@@ -234,13 +349,44 @@ impl Drop for ShutdownListener {
     }
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+enum ClientOperatingMode {
+    // Normal operations
+    Listening,
+    // Normal operations, but we don't report back if the we stop by getting dropped.
+    ListeningButDontReportHalt,
+    // Dummy mode, for when we don't do anything at all.
+    Dummy,
+}
+
+impl ClientOperatingMode {
+    fn is_dummy(&self) -> bool {
+        self == &ClientOperatingMode::Dummy
+    }
+
+    fn should_signal_on_drop(&self) -> bool {
+        match self {
+            ClientOperatingMode::Listening => true,
+            ClientOperatingMode::ListeningButDontReportHalt | ClientOperatingMode::Dummy => false,
+        }
+    }
+
+    fn set_should_not_signal_on_drop(&mut self) {
+        use ClientOperatingMode::{Dummy, Listening, ListeningButDontReportHalt};
+        *self = match &self {
+            ListeningButDontReportHalt | Listening => ListeningButDontReportHalt,
+            Dummy => Dummy,
+        };
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[tokio::test]
     async fn signal_shutdown() {
-        let shutdown = ShutdownNotifier::default();
+        let shutdown = TaskManager::default();
         let mut listener = shutdown.subscribe();
 
         let task = tokio::spawn(async move {
diff --git a/common/task/src/signal.rs b/common/task/src/signal.rs
index a04a0f5601..483c7c630b 100644
--- a/common/task/src/signal.rs
+++ b/common/task/src/signal.rs
@@ -1,4 +1,4 @@
-use crate::{shutdown::SentError, ShutdownNotifier};
+use crate::{manager::SentError, TaskManager};
 
 #[cfg(unix)]
 pub async fn wait_for_signal() {
@@ -29,7 +29,7 @@ pub async fn wait_for_signal() {
 }
 
 #[cfg(unix)]
-pub async fn wait_for_signal_and_error(shutdown: &mut ShutdownNotifier) -> Result<(), SentError> {
+pub async fn wait_for_signal_and_error(shutdown: &mut TaskManager) -> Result<(), SentError> {
     use tokio::signal::unix::{signal, SignalKind};
 
     let mut sigterm = signal(SignalKind::terminate()).expect("Failed to setup SIGTERM channel");
@@ -56,7 +56,7 @@ pub async fn wait_for_signal_and_error(shutdown: &mut ShutdownNotifier) -> Resul
 }
 
 #[cfg(not(unix))]
-pub async fn wait_for_signal_and_error(shutdown: &mut ShutdownNotifier) -> Result<(), SentError> {
+pub async fn wait_for_signal_and_error(shutdown: &mut TaskManager) -> Result<(), SentError> {
     tokio::select! {
         _ = tokio::signal::ctrl_c() => {
             log::info!("Received SIGINT");
diff --git a/common/task/src/spawn.rs b/common/task/src/spawn.rs
new file mode 100644
index 0000000000..d30c9ac850
--- /dev/null
+++ b/common/task/src/spawn.rs
@@ -0,0 +1,33 @@
+use crate::TaskClient;
+use std::future::Future;
+
+#[cfg(target_arch = "wasm32")]
+pub(crate) fn spawn<F>(future: F)
+where
+    F: Future<Output = ()> + 'static,
+{
+    wasm_bindgen_futures::spawn_local(future);
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) fn spawn<F>(future: F)
+where
+    F: Future + Send + 'static,
+    F::Output: Send + 'static,
+{
+    tokio::spawn(future);
+}
+
+pub fn spawn_with_report_error<F, T, E>(future: F, mut shutdown: TaskClient)
+where
+    F: Future<Output = Result<T, E>> + Send + 'static,
+    T: 'static,
+    E: std::error::Error + Send + Sync + 'static,
+{
+    let future_that_sends = async move {
+        if let Err(err) = future.await {
+            shutdown.send_we_stopped(Box::new(err));
+        }
+    };
+    spawn(future_that_sends);
+}
diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml
index f2a8a899fd..2996aeb639 100644
--- a/common/topology/Cargo.toml
+++ b/common/topology/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2021"
 bs58 = "0.4"
 log = "0.4"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
+thiserror = "1.0.37"
 
 ## internal
 crypto = { path = "../crypto" }
diff --git a/common/topology/src/gateway.rs b/common/topology/src/gateway.rs
index 57b34146e6..9df2156b32 100644
--- a/common/topology/src/gateway.rs
+++ b/common/topology/src/gateway.rs
@@ -7,63 +7,25 @@ use mixnet_contract_common::GatewayBond;
 use nymsphinx_addressing::nodes::{NodeIdentity, NymNodeRoutingAddress};
 use nymsphinx_types::Node as SphinxNode;
 use std::convert::{TryFrom, TryInto};
-use std::fmt::{self, Display, Formatter};
+use std::fmt;
 use std::io;
 use std::net::SocketAddr;
+use thiserror::Error;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum GatewayConversionError {
-    InvalidIdentityKey(identity::Ed25519RecoveryError),
-    InvalidSphinxKey(encryption::KeyRecoveryError),
-    InvalidAddress(String, io::Error),
-    InvalidStake,
-    Other(Box<dyn std::error::Error + Send + Sync>),
-}
+    #[error("gateway identity key was malformed - {0}")]
+    InvalidIdentityKey(#[from] identity::Ed25519RecoveryError),
 
-impl From<encryption::KeyRecoveryError> for GatewayConversionError {
-    fn from(err: encryption::KeyRecoveryError) -> Self {
-        GatewayConversionError::InvalidSphinxKey(err)
-    }
-}
+    #[error("gateway sphinx key was malformed - {0}")]
+    InvalidSphinxKey(#[from] encryption::KeyRecoveryError),
 
-impl From<identity::Ed25519RecoveryError> for GatewayConversionError {
-    fn from(err: identity::Ed25519RecoveryError) -> Self {
-        GatewayConversionError::InvalidIdentityKey(err)
-    }
-}
-
-impl Display for GatewayConversionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            GatewayConversionError::InvalidIdentityKey(err) => write!(
-                f,
-                "failed to convert gateway due to invalid identity key - {}",
-                err
-            ),
-            GatewayConversionError::InvalidSphinxKey(err) => write!(
-                f,
-                "failed to convert gateway due to invalid sphinx key - {}",
-                err
-            ),
-            GatewayConversionError::InvalidAddress(address, err) => {
-                write!(
-                    f,
-                    "failed to convert gateway due to invalid address {} - {}",
-                    address, err
-                )
-            }
-            GatewayConversionError::InvalidStake => {
-                write!(f, "failed to convert gateway due to invalid stake")
-            }
-            GatewayConversionError::Other(err) => {
-                write!(
-                    f,
-                    "failed to convert gateway due to another error - {}",
-                    err
-                )
-            }
-        }
-    }
+    #[error("'{value}' is not a valid gateway address - {source}")]
+    InvalidAddress {
+        value: String,
+        #[source]
+        source: io::Error,
+    },
 }
 
 #[derive(Debug, Clone)]
@@ -123,14 +85,22 @@ impl<'a> TryFrom<&'a GatewayBond> for Node {
     type Error = GatewayConversionError;
 
     fn try_from(bond: &'a GatewayBond) -> Result<Self, Self::Error> {
-        let host: NetworkAddress = bond.gateway.host.parse().map_err(|err| {
-            GatewayConversionError::InvalidAddress(bond.gateway.host.clone(), err)
-        })?;
+        let host: NetworkAddress =
+            bond.gateway
+                .host
+                .parse()
+                .map_err(|err| GatewayConversionError::InvalidAddress {
+                    value: bond.gateway.host.clone(),
+                    source: err,
+                })?;
 
         // try to completely resolve the host in the mix situation to avoid doing it every
         // single time we want to construct a path
         let mix_host = host.to_socket_addrs(bond.gateway.mix_port).map_err(|err| {
-            GatewayConversionError::InvalidAddress(bond.gateway.host.clone(), err)
+            GatewayConversionError::InvalidAddress {
+                value: bond.gateway.host.clone(),
+                source: err,
+            }
         })?[0];
 
         Ok(Node {
diff --git a/common/topology/src/lib.rs b/common/topology/src/lib.rs
index 6ef41c9aad..527176339d 100644
--- a/common/topology/src/lib.rs
+++ b/common/topology/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::filter::VersionFilterable;
@@ -14,19 +14,31 @@ use std::fmt::{self, Display, Formatter};
 use std::io;
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::str::FromStr;
+use thiserror::Error;
 
 pub mod filter;
 pub mod gateway;
 pub mod mix;
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Error)]
 pub enum NymTopologyError {
-    InvalidMixLayerError,
-    MissingLayerError(Vec<u64>),
-    NonExistentGatewayError,
+    #[error("The provided network topology is empty - there are no mixnodes and no gateways on it - the network request(s) probably failed")]
+    EmptyNetworkTopology,
 
-    InvalidNumberOfHopsError,
-    NoMixesOnLayerAvailable(MixLayer),
+    #[error("The provided network topology has no gateways available")]
+    NoGatewaysAvailable,
+
+    #[error("The provided network topology has no mixnodes available")]
+    NoMixnodesAvailable,
+
+    #[error("Gateway with identity key {identity_key} doesn't exist")]
+    NonExistentGatewayError { identity_key: String },
+
+    #[error("Wanted to create a mix route with {requested} hops, while only {available} layers are available")]
+    InvalidNumberOfHopsError { available: usize, requested: usize },
+
+    #[error("No mixnodes available on layer {layer}")]
+    EmptyMixLayer { layer: MixLayer },
 }
 
 #[derive(Debug, Clone)]
@@ -84,6 +96,10 @@ impl NymTopology {
         &self.mixes
     }
 
+    pub fn num_mixnodes(&self) -> usize {
+        self.mixes.values().flat_map(|m| m.iter()).count()
+    }
+
     pub fn mixes_as_vec(&self) -> Vec<mix::Node> {
         let mut mixes: Vec<mix::Node> = vec![];
 
@@ -130,7 +146,10 @@ impl NymTopology {
         use rand::seq::SliceRandom;
 
         if self.mixes.len() < num_mix_hops as usize {
-            return Err(NymTopologyError::InvalidNumberOfHopsError);
+            return Err(NymTopologyError::InvalidNumberOfHopsError {
+                available: self.mixes.len(),
+                requested: num_mix_hops as usize,
+            });
         }
         let mut route = Vec::with_capacity(num_mix_hops as usize);
 
@@ -140,13 +159,13 @@ impl NymTopology {
             let layer_mixes = self
                 .mixes
                 .get(&layer)
-                .ok_or(NymTopologyError::NoMixesOnLayerAvailable(layer))?;
+                .ok_or(NymTopologyError::EmptyMixLayer { layer })?;
 
             // choose a random mix from the above list
             // this can return a 'None' only if slice is empty
             let random_mix = layer_mixes
                 .choose(rng)
-                .ok_or(NymTopologyError::NoMixesOnLayerAvailable(layer))?;
+                .ok_or(NymTopologyError::EmptyMixLayer { layer })?;
             route.push(random_mix.into());
         }
 
@@ -165,9 +184,11 @@ impl NymTopology {
         // I don't think there's a need for this RNG to be crypto-secure
         R: Rng + ?Sized,
     {
-        let gateway = self
-            .get_gateway(gateway_identity)
-            .ok_or(NymTopologyError::NonExistentGatewayError)?;
+        let gateway = self.get_gateway(gateway_identity).ok_or(
+            NymTopologyError::NonExistentGatewayError {
+                identity_key: gateway_identity.to_base58_string(),
+            },
+        )?;
 
         Ok(self
             .random_mix_route(rng, num_mix_hops)?
@@ -182,29 +203,39 @@ impl NymTopology {
     }
 
     /// Checks if a mixnet path can be constructed using the specified number of hops
-    pub fn can_construct_path_through(&self, num_mix_hops: u8) -> bool {
-        // if there are no gateways present, we can't do anything
-        if self.gateways.is_empty() {
-            return false;
+    pub fn ensure_can_construct_path_through(
+        &self,
+        num_mix_hops: u8,
+    ) -> Result<(), NymTopologyError> {
+        let mixnodes = self.mixes();
+        // 1. is it completely empty?
+        if mixnodes.is_empty() && self.gateways().is_empty() {
+            return Err(NymTopologyError::EmptyNetworkTopology);
         }
 
-        // early termination
-        if self.mixes.is_empty() {
-            return false;
+        // 2. does it have any mixnode at all?
+        if mixnodes.is_empty() {
+            return Err(NymTopologyError::NoMixnodesAvailable);
         }
 
-        // make sure there's at least one mix per layer
-        for i in 1..=num_mix_hops {
-            match self.mixes.get(&i) {
-                None => return false,
-                Some(layer_entry) => {
-                    if layer_entry.is_empty() {
-                        return false;
+        // 3. does it have any gateways at all?
+        if self.gateways().is_empty() {
+            return Err(NymTopologyError::NoGatewaysAvailable);
+        }
+
+        // 4. does it have a mixnode on each layer?
+        for layer in 1..=num_mix_hops {
+            match mixnodes.get(&layer) {
+                None => return Err(NymTopologyError::EmptyMixLayer { layer }),
+                Some(layer_nodes) => {
+                    if layer_nodes.is_empty() {
+                        return Err(NymTopologyError::EmptyMixLayer { layer });
                     }
                 }
             }
         }
-        true
+
+        Ok(())
     }
 
     #[must_use]
@@ -245,7 +276,7 @@ pub fn nym_topology_from_detailed(
         match bond.try_into() {
             Ok(mix) => layer_entry.push(mix),
             Err(err) => {
-                warn!("Mix {} / {} is malformed - {}", mix_id, mix_identity, err);
+                warn!("Mix {} / {} is malformed - {err}", mix_id, mix_identity);
                 continue;
             }
         }
@@ -257,7 +288,7 @@ pub fn nym_topology_from_detailed(
         match bond.try_into() {
             Ok(gate) => gateways.push(gate),
             Err(err) => {
-                warn!("Gateway {} is malformed - {}", gate_id, err);
+                warn!("Gateway {} is malformed - {err}", gate_id);
                 continue;
             }
         }
diff --git a/common/topology/src/mix.rs b/common/topology/src/mix.rs
index 81e0308b2f..08d7f5c0b7 100644
--- a/common/topology/src/mix.rs
+++ b/common/topology/src/mix.rs
@@ -7,63 +7,24 @@ use mixnet_contract_common::{Layer, MixId, MixNodeBond};
 use nymsphinx_addressing::nodes::NymNodeRoutingAddress;
 use nymsphinx_types::Node as SphinxNode;
 use std::convert::{TryFrom, TryInto};
-use std::fmt::{self, Display, Formatter};
 use std::io;
 use std::net::SocketAddr;
+use thiserror::Error;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum MixnodeConversionError {
-    InvalidIdentityKey(identity::Ed25519RecoveryError),
-    InvalidSphinxKey(encryption::KeyRecoveryError),
-    InvalidAddress(String, io::Error),
-    InvalidStake,
-    Other(Box<dyn std::error::Error + Send + Sync>),
-}
+    #[error("mixnode identity key was malformed - {0}")]
+    InvalidIdentityKey(#[from] identity::Ed25519RecoveryError),
 
-impl From<encryption::KeyRecoveryError> for MixnodeConversionError {
-    fn from(err: encryption::KeyRecoveryError) -> Self {
-        MixnodeConversionError::InvalidSphinxKey(err)
-    }
-}
+    #[error("mixnode sphinx key was malformed - {0}")]
+    InvalidSphinxKey(#[from] encryption::KeyRecoveryError),
 
-impl From<identity::Ed25519RecoveryError> for MixnodeConversionError {
-    fn from(err: identity::Ed25519RecoveryError) -> Self {
-        MixnodeConversionError::InvalidIdentityKey(err)
-    }
-}
-
-impl Display for MixnodeConversionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            MixnodeConversionError::InvalidIdentityKey(err) => write!(
-                f,
-                "failed to convert mixnode due to invalid identity key - {}",
-                err
-            ),
-            MixnodeConversionError::InvalidSphinxKey(err) => write!(
-                f,
-                "failed to convert mixnode due to invalid sphinx key - {}",
-                err
-            ),
-            MixnodeConversionError::InvalidAddress(address, err) => {
-                write!(
-                    f,
-                    "failed to convert mixnode due to invalid address {} - {}",
-                    address, err
-                )
-            }
-            MixnodeConversionError::InvalidStake => {
-                write!(f, "failed to convert mixnode due to invalid stake")
-            }
-            MixnodeConversionError::Other(err) => {
-                write!(
-                    f,
-                    "failed to convert mixnode due to another error - {}",
-                    err
-                )
-            }
-        }
-    }
+    #[error("'{value}' is not a valid mixnode address - {source}")]
+    InvalidAddress {
+        value: String,
+        #[source]
+        source: io::Error,
+    },
 }
 
 #[derive(Debug, Clone)]
@@ -100,16 +61,22 @@ impl<'a> TryFrom<&'a MixNodeBond> for Node {
     type Error = MixnodeConversionError;
 
     fn try_from(bond: &'a MixNodeBond) -> Result<Self, Self::Error> {
-        let host: NetworkAddress = bond.mix_node.host.parse().map_err(|err| {
-            MixnodeConversionError::InvalidAddress(bond.mix_node.host.clone(), err)
-        })?;
+        let host: NetworkAddress =
+            bond.mix_node
+                .host
+                .parse()
+                .map_err(|err| MixnodeConversionError::InvalidAddress {
+                    value: bond.mix_node.host.clone(),
+                    source: err,
+                })?;
 
         // try to completely resolve the host in the mix situation to avoid doing it every
         // single time we want to construct a path
         let mix_host = host
             .to_socket_addrs(bond.mix_node.mix_port)
-            .map_err(|err| {
-                MixnodeConversionError::InvalidAddress(bond.mix_node.host.clone(), err)
+            .map_err(|err| MixnodeConversionError::InvalidAddress {
+                value: bond.mix_node.host.clone(),
+                source: err,
             })?[0];
 
         Ok(Node {
diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml
index 54603c02d2..798303d9a8 100644
--- a/common/types/Cargo.toml
+++ b/common/types/Cargo.toml
@@ -23,7 +23,7 @@ cosmwasm-std = "1.0.0"
 cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 
 validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
diff --git a/common/types/src/currency.rs b/common/types/src/currency.rs
index 38292d11d3..c9ba2e908b 100644
--- a/common/types/src/currency.rs
+++ b/common/types/src/currency.rs
@@ -9,7 +9,7 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::fmt::{Display, Formatter};
 use strum::{Display, EnumString, EnumVariantNames};
-use validator_client::nymd::Coin;
+use validator_client::nyxd::Coin;
 
 #[cfg(feature = "generate-ts")]
 use ts_rs::{Dependency, TS};
diff --git a/common/types/src/error.rs b/common/types/src/error.rs
index b0874ba7aa..39248500e2 100644
--- a/common/types/src/error.rs
+++ b/common/types/src/error.rs
@@ -1,16 +1,16 @@
 use serde::{Serialize, Serializer};
 use std::io;
 use thiserror::Error;
-use validator_client::validator_api::error::ValidatorAPIError;
-use validator_client::{nymd::error::NymdError, ValidatorClientError};
+use validator_client::nym_api::error::NymAPIError;
+use validator_client::{nyxd::error::NyxdError, ValidatorClientError};
 
 // TODO: ask @MS why this even exists
 #[derive(Error, Debug)]
 pub enum TypesError {
     #[error("{source}")]
-    NymdError {
+    NyxdError {
         #[from]
-        source: NymdError,
+        source: NyxdError,
     },
     #[error("{source}")]
     CosmwasmStd {
@@ -23,9 +23,9 @@ pub enum TypesError {
         source: eyre::Report,
     },
     #[error("{source}")]
-    ValidatorApiError {
+    NymApiError {
         #[from]
-        source: ValidatorAPIError,
+        source: NymAPIError,
     },
     #[error("{source}")]
     IOError {
@@ -52,8 +52,8 @@ pub enum TypesError {
         #[from]
         source: cosmwasm_std::DecimalRangeExceeded,
     },
-    #[error("No validator API URL configured")]
-    NoValidatorApiUrlConfigured,
+    #[error("No nym API URL configured")]
+    NoNymApiUrlConfigured,
     #[error("{0} is not a valid amount string")]
     InvalidAmount(String),
     #[error("{0} is not a valid denomination string")]
@@ -88,10 +88,10 @@ impl Serialize for TypesError {
 impl From<ValidatorClientError> for TypesError {
     fn from(e: ValidatorClientError) -> Self {
         match e {
-            ValidatorClientError::ValidatorAPIError { source } => source.into(),
+            ValidatorClientError::NymAPIError { source } => source.into(),
             ValidatorClientError::MalformedUrlProvided(e) => e.into(),
-            ValidatorClientError::NymdError(e) => e.into(),
-            ValidatorClientError::NoAPIUrlAvailable => TypesError::NoValidatorApiUrlConfigured,
+            ValidatorClientError::NyxdError(e) => e.into(),
+            ValidatorClientError::NoAPIUrlAvailable => TypesError::NoNymApiUrlConfigured,
         }
     }
 }
diff --git a/common/types/src/fees.rs b/common/types/src/fees.rs
index 747693ce9c..561a1a8e81 100644
--- a/common/types/src/fees.rs
+++ b/common/types/src/fees.rs
@@ -1,6 +1,6 @@
 use crate::currency::DecCoin;
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::Fee;
+use validator_client::nyxd::Fee;
 
 #[cfg(feature = "generate-ts")]
 use ts_rs::{Dependency, TS};
@@ -53,7 +53,7 @@ impl TS for FeeDetails {
 #[cfg(feature = "generate-ts")]
 pub mod ts_type_helpers {
     use serde::{Deserialize, Serialize};
-    use validator_client::nymd::GasAdjustment;
+    use validator_client::nyxd::GasAdjustment;
 
     #[derive(Debug, Clone, Serialize, Deserialize, ts_rs::TS)]
     #[ts(export_to = "ts-packages/types/src/types/rust/Fee.ts")]
diff --git a/common/types/src/gas.rs b/common/types/src/gas.rs
index 9441008569..23e004293b 100644
--- a/common/types/src/gas.rs
+++ b/common/types/src/gas.rs
@@ -1,6 +1,6 @@
 use cosmrs::tx::Gas as CosmrsGas;
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::cosmwasm_client::types::GasInfo as ValidatorClientGasInfo;
+use validator_client::nyxd::cosmwasm_client::types::GasInfo as ValidatorClientGasInfo;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
diff --git a/common/types/src/gateway.rs b/common/types/src/gateway.rs
index 8895a69761..221097354c 100644
--- a/common/types/src/gateway.rs
+++ b/common/types/src/gateway.rs
@@ -5,6 +5,7 @@ use mixnet_contract_common::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use std::fmt;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -75,3 +76,37 @@ impl GatewayBond {
         })
     }
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct GatewayNodeDetailsResponse {
+    pub identity_key: String,
+    pub sphinx_key: String,
+    pub owner_signature: String,
+    pub announce_address: String,
+    pub bind_address: String,
+    pub version: String,
+    pub mix_port: u16,
+    pub clients_port: u16,
+    pub data_store: String,
+}
+
+impl fmt::Display for GatewayNodeDetailsResponse {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        writeln!(f, "Identity Key: {}", self.identity_key)?;
+        writeln!(f, "Sphinx Key: {}", self.sphinx_key)?;
+        writeln!(f, "Owner Signature: {}", self.owner_signature)?;
+        writeln!(
+            f,
+            "Host: {} (bind address: {})",
+            self.announce_address, self.bind_address
+        )?;
+        writeln!(f, "Version: {}", self.version)?;
+        writeln!(
+            f,
+            "Mix Port: {}, Clients port: {}",
+            self.mix_port, self.clients_port
+        )?;
+
+        writeln!(f, "Data store is at: {}", self.data_store)
+    }
+}
diff --git a/common/types/src/mixnode.rs b/common/types/src/mixnode.rs
index e1c3bf4940..fe8dd848bb 100644
--- a/common/types/src/mixnode.rs
+++ b/common/types/src/mixnode.rs
@@ -12,6 +12,7 @@ use mixnet_contract_common::{
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use std::fmt;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
@@ -161,3 +162,42 @@ impl MixNodeCostParams {
         })
     }
 }
+
+#[derive(Serialize, Deserialize)]
+pub struct MixnodeNodeDetailsResponse {
+    pub identity_key: String,
+    pub sphinx_key: String,
+    pub owner_signature: String,
+    pub announce_address: String,
+    pub bind_address: String,
+    pub version: String,
+    pub mix_port: u16,
+    pub http_api_port: u16,
+    pub verloc_port: u16,
+    pub wallet_address: Option<String>,
+}
+
+impl fmt::Display for MixnodeNodeDetailsResponse {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let wallet_address = self.wallet_address.clone().unwrap_or_default();
+        writeln!(f, "Identity Key: {}", self.identity_key)?;
+        writeln!(f, "Sphinx Key: {}", self.sphinx_key)?;
+        writeln!(f, "Owner Signature: {}", self.owner_signature)?;
+        writeln!(
+            f,
+            "Host: {} (bind address: {})",
+            self.announce_address, self.bind_address
+        )?;
+        writeln!(f, "Version: {}", self.version)?;
+        writeln!(
+            f,
+            "Mix Port: {}, Verloc port: {}, Http Port: {}\n",
+            self.mix_port, self.verloc_port, self.http_api_port
+        )?;
+        writeln!(
+            f,
+            "You are bonding to wallet address: {}\n\n",
+            wallet_address
+        )
+    }
+}
diff --git a/common/types/src/pending_events.rs b/common/types/src/pending_events.rs
index afe5a54d9e..e9d578dc12 100644
--- a/common/types/src/pending_events.rs
+++ b/common/types/src/pending_events.rs
@@ -57,6 +57,10 @@ pub enum PendingEpochEventData {
         mix_id: MixId,
         proxy: Option<String>,
     },
+    PledgeMore {
+        mix_id: MixId,
+        amount: DecCoin,
+    },
     UnbondMixnode {
         mix_id: MixId,
     },
@@ -91,6 +95,12 @@ impl PendingEpochEventData {
                 mix_id,
                 proxy: proxy.map(|p| p.into_string()),
             }),
+            MixnetContractPendingEpochEventKind::PledgeMore { mix_id, amount } => {
+                Ok(PendingEpochEventData::PledgeMore {
+                    mix_id,
+                    amount: reg.attempt_convert_to_display_dec_coin(amount.into())?,
+                })
+            }
             MixnetContractPendingEpochEventKind::UnbondMixnode { mix_id } => {
                 Ok(PendingEpochEventData::UnbondMixnode { mix_id })
             }
diff --git a/common/types/src/transaction.rs b/common/types/src/transaction.rs
index b5dd50a4ae..e896f95130 100644
--- a/common/types/src/transaction.rs
+++ b/common/types/src/transaction.rs
@@ -2,8 +2,8 @@ use crate::currency::DecCoin;
 use crate::error::TypesError;
 use crate::gas::{Gas, GasInfo};
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::cosmwasm_client::types::ExecuteResult;
-use validator_client::nymd::TxResponse;
+use validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
+use validator_client::nyxd::TxResponse;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(
diff --git a/common/wasm-utils/Cargo.toml b/common/wasm-utils/Cargo.toml
index 75021ddad9..be39421ce2 100644
--- a/common/wasm-utils/Cargo.toml
+++ b/common/wasm-utils/Cargo.toml
@@ -16,6 +16,7 @@ wasm-bindgen-futures = "0.4"
 [dependencies.tungstenite]
 version = "0.13"
 default-features = false
+optional = true
 
 [dependencies.web-sys]
 version = "0.3"
@@ -30,3 +31,9 @@ features = [
     "WebSocket",
     "Window",
 ]
+optional = true
+
+[features]
+default = ["sleep"]
+websocket = ["tungstenite", "web-sys"]
+sleep = ["web-sys"]
\ No newline at end of file
diff --git a/common/wasm-utils/src/lib.rs b/common/wasm-utils/src/lib.rs
index 94b8faae05..8e0205c6de 100644
--- a/common/wasm-utils/src/lib.rs
+++ b/common/wasm-utils/src/lib.rs
@@ -5,8 +5,8 @@ use js_sys::Promise;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsValue;
 use wasm_bindgen_futures::JsFuture;
-use web_sys::window;
 
+#[cfg(feature = "websocket")]
 pub mod websocket;
 
 // will cause messages to be written as if console.log("...") was called
@@ -39,9 +39,10 @@ extern "C" {
     pub fn error(s: &str);
 }
 
+#[cfg(feature = "sleep")]
 pub async fn sleep(ms: i32) -> Result<(), JsValue> {
     let promise = Promise::new(&mut |yes, _| {
-        let win = window().expect("no window available!");
+        let win = web_sys::window().expect("no window available!");
         win.set_timeout_with_callback_and_timeout_and_arguments_0(&yes, ms)
             .unwrap();
     });
diff --git a/contracts/.gitignore b/contracts/.gitignore
new file mode 100644
index 0000000000..ffa3bbd20e
--- /dev/null
+++ b/contracts/.gitignore
@@ -0,0 +1 @@
+Cargo.lock
\ No newline at end of file
diff --git a/contracts/CHANGELOG.md b/contracts/CHANGELOG.md
index f57a633956..d52edc427d 100644
--- a/contracts/CHANGELOG.md
+++ b/contracts/CHANGELOG.md
@@ -1,9 +1,15 @@
 ## Unreleased
 
-## Added
+## [nym-contracts-v1.1.2](https://github.com/nymtech/nym/tree/nym-contracts-v1.1.2) (2022-12-07)
+
+### Added
 
 - Added migration code to the mixnet contract to allow updating stored vesting contract address to make it easier to deploy any future environments ([#1759],[#1769])
+- Added an option to pledge additional tokens without the need to rebond minxode ([#1679])
+- Added support for node families ([#1670])
 
+[#1670]: https://github.com/nymtech/nym/pull/1670
+[#1679]: https://github.com/nymtech/nym/pull/1679
 [#1759]: https://github.com/nymtech/nym/pull/1759
 [#1769]: https://github.com/nymtech/nym/pull/1769
 
@@ -93,4 +99,4 @@
 [#1292]: https://github.com/nymtech/nym/pull/1292
 [#1331]: https://github.com/nymtech/nym/pull/1331
 [#1369]: https://github.com/nymtech/nym/pull/1369
-[#1373]: https://github.com/nymtech/nym/pull/1373
\ No newline at end of file
+[#1373]: https://github.com/nymtech/nym/pull/1373
diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
deleted file mode 100644
index d2fc273d22..0000000000
--- a/contracts/Cargo.lock
+++ /dev/null
@@ -1,1783 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
- "ctr",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.52"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "autocfg"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
-
-[[package]]
-name = "bandwidth-claim-contract"
-version = "0.1.0"
-dependencies = [
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64ct"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dea908e7347a8c64e378c17e30ef880ad73e3b4498346b055c2c00ea342f3179"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "blake2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
-dependencies = [
- "byte-tools",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
-[[package]]
-name = "bumpalo"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "cc"
-version = "1.0.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
-dependencies = [
- "byteorder",
- "keystream",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
-dependencies = [
- "libc",
- "num-integer",
- "num-traits",
- "time 0.1.43",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "coconut-bandwidth"
-version = "0.1.0"
-dependencies = [
- "bandwidth-claim-contract",
- "coconut-bandwidth-contract-common",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-controllers",
- "cw-storage-plus",
- "multisig-contract-common",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "coconut-bandwidth-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-dkg"
-version = "0.1.0"
-dependencies = [
- "coconut-dkg-common",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-controllers",
- "cw-storage-plus",
- "cw4",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "coconut-dkg-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-utils",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-test"
-version = "0.1.0"
-dependencies = [
- "bandwidth-claim-contract",
- "coconut-bandwidth",
- "coconut-bandwidth-contract-common",
- "coconut-dkg",
- "coconut-dkg-common",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-controllers",
- "cw-multi-test",
- "cw-storage-plus",
- "cw-utils",
- "cw3-flex-multisig",
- "cw4",
- "cw4-group",
- "multisig-contract-common",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
-[[package]]
-name = "contracts-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-crypto"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
-dependencies = [
- "digest 0.9.0",
- "ed25519-zebra",
- "k256",
- "rand_core 0.6.3",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-derive"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b36e527620a2a3e00e46b6e731ab6c9b68d11069c986f7d7be8eba79ef081a4"
-dependencies = [
- "syn",
-]
-
-[[package]]
-name = "cosmwasm-schema"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772e80bbad231a47a2068812b723a1ff81dd4a0d56c9391ac748177bea3a61da"
-dependencies = [
- "schemars",
- "serde_json",
-]
-
-[[package]]
-name = "cosmwasm-std"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
-dependencies = [
- "base64",
- "cosmwasm-crypto",
- "cosmwasm-derive",
- "forward_ref",
- "schemars",
- "serde",
- "serde-json-wasm",
- "thiserror",
- "uint",
-]
-
-[[package]]
-name = "cosmwasm-storage"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d18403b07304d15d304dad11040d45bbcaf78d603b4be3fb5e2685c16f9229b5"
-dependencies = [
- "cosmwasm-std",
- "serde",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "ed25519-dalek",
- "nymsphinx-types",
- "pemstore",
- "rand",
- "subtle-encoding",
- "x25519-dalek",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
-dependencies = [
- "generic-array 0.14.5",
- "rand_core 0.6.3",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.5",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "cw-controllers"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0bc6019b4d3d81e11f5c384bcce7173e2210bd654d75c6c9668e12cca05dfa"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw-multi-test"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f9a8ab7c3c29ec93cb7a39ce4b14a05e053153b4a17ef7cf2246af1b7c087e"
-dependencies = [
- "anyhow",
- "cosmwasm-std",
- "cosmwasm-storage",
- "cw-storage-plus",
- "cw-utils",
- "derivative",
- "itertools",
- "prost",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-utils"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw2"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3-fixed-multisig"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw3",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw3-flex-multisig"
-version = "0.13.1"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-multi-test",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw3",
- "cw3-fixed-multisig",
- "cw4",
- "cw4-group",
- "multisig-contract-common",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw4"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw4-group"
-version = "0.13.4"
-dependencies = [
- "cosmwasm-schema",
- "cosmwasm-std",
- "cw-controllers",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw4",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf"
-
-[[package]]
-name = "ecdsa"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand",
- "serde",
- "sha2",
- "zeroize",
-]
-
-[[package]]
-name = "ed25519-zebra"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
-dependencies = [
- "curve25519-dalek",
- "hex",
- "rand_core 0.6.3",
- "serde",
- "sha2",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "ff",
- "generic-array 0.14.5",
- "group",
- "rand_core 0.6.3",
- "sec1",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ff"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
-dependencies = [
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "forward_ref"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "git2"
-version = "0.13.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
-[[package]]
-name = "group"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
-dependencies = [
- "ff",
- "rand_core 0.6.3",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hkdf"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
-dependencies = [
- "digest 0.9.0",
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "humantime-serde"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
-dependencies = [
- "humantime",
- "serde",
-]
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "k256"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
-dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sec1",
- "sha2",
-]
-
-[[package]]
-name = "keystream"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.112"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.12.26+1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
-
-[[package]]
-name = "libz-sys"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "lioness"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
-dependencies = [
- "arrayref",
- "blake2",
- "chacha",
- "keystream",
-]
-
-[[package]]
-name = "log"
-version = "0.4.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "mixnet-contract"
-version = "1.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-schema",
- "cosmwasm-std",
- "cosmwasm-storage",
- "crypto",
- "cw-storage-plus",
- "mixnet-contract-common",
- "rand_chacha",
- "schemars",
- "serde",
- "thiserror",
- "time 0.3.6",
- "vergen",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "mixnet-contract-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "contracts-common",
- "cosmwasm-std",
- "humantime-serde",
- "log",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time 0.3.6",
-]
-
-[[package]]
-name = "multisig-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "cw3",
- "cw3-fixed-multisig",
- "cw4",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a1eb3a36534514077c1e079ada2fb170ef30c47d203aa6916138cf882ecd52"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "nymsphinx-types"
-version = "0.1.0"
-dependencies = [
- "sphinx",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "pem"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
-dependencies = [
- "base64",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "pemstore"
-version = "0.1.0"
-dependencies = [
- "pem",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pkcs8"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
-dependencies = [
- "der",
- "spki",
- "zeroize",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "prost"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom 0.2.3",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "regex"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
-[[package]]
-name = "rfc6979"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
-dependencies = [
- "crypto-bigint",
- "hmac",
- "zeroize",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
-
-[[package]]
-name = "ryu"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
-
-[[package]]
-name = "schemars"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3"
-dependencies = [
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn",
-]
-
-[[package]]
-name = "sec1"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
-dependencies = [
- "der",
- "generic-array 0.14.5",
- "pkcs8",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
-
-[[package]]
-name = "serde"
-version = "1.0.133"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-json-wasm"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.133"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "signature"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4"
-dependencies = [
- "digest 0.9.0",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "sphinx"
-version = "0.1.0"
-source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859"
-dependencies = [
- "aes",
- "arrayref",
- "blake2",
- "bs58",
- "byteorder",
- "chacha",
- "curve25519-dalek",
- "digest 0.9.0",
- "hkdf",
- "hmac",
- "lioness",
- "log",
- "rand",
- "rand_distr",
- "sha2",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "spki"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "subtle-encoding"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d54b9298e05179c335de2b9645d061255bcd5155f843b3e328d2cfe0a5b413"
-dependencies = [
- "itoa",
- "libc",
- "num_threads",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
-
-[[package]]
-name = "tinyvec"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "uint"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vergen"
-version = "5.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e"
-dependencies = [
- "anyhow",
- "cfg-if",
- "chrono",
- "enum-iterator",
- "getset",
- "git2",
- "rustc_version",
- "rustversion",
- "thiserror",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vesting-contract"
-version = "1.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-storage-plus",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "thiserror",
- "vergen",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "vesting-contract-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "mixnet-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "x25519-dalek"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
diff --git a/contracts/basic-bandwidth-generation/package-lock.json b/contracts/basic-bandwidth-generation/package-lock.json
index c954a7d488..1498ec38eb 100644
--- a/contracts/basic-bandwidth-generation/package-lock.json
+++ b/contracts/basic-bandwidth-generation/package-lock.json
@@ -15,12 +15,12 @@
       },
       "devDependencies": {
         "@nomiclabs/hardhat-ethers": "^2.0.5",
-        "@nomiclabs/hardhat-etherscan": "^3.0.3",
+        "@nomiclabs/hardhat-etherscan": "^3.1.0",
         "@nomiclabs/hardhat-waffle": "^2.0.3",
         "chai": "^4.3.6",
         "ethereum-waffle": "^3.4.4",
         "ethers": "^5.6.1",
-        "hardhat": "^2.9.2",
+        "hardhat": "^2.11.2",
         "solidity-coverage": "^0.7.20"
       }
     },
@@ -397,48 +397,6 @@
         "node": ">=10.0"
       }
     },
-    "node_modules/@ethereumjs/block": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/block/-/block-3.6.2.tgz",
-      "integrity": "sha512-mOqYWwMlAZpYUEOEqt7EfMFuVL2eyLqWWIzcf4odn6QgXY8jBI2NhVuJncrMCKeMZrsJAe7/auaRRB6YcdH+Qw==",
-      "dependencies": {
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/tx": "^3.5.1",
-        "ethereumjs-util": "^7.1.4",
-        "merkle-patricia-tree": "^4.2.4"
-      }
-    },
-    "node_modules/@ethereumjs/blockchain": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.5.2.tgz",
-      "integrity": "sha512-Jz26iJmmsQtngerW6r5BDFaew/f2mObLrRZo3rskLOx1lmtMZ8+TX/vJexmivrnWgmAsTdNWhlKUYY4thPhPig==",
-      "dependencies": {
-        "@ethereumjs/block": "^3.6.2",
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/ethash": "^1.1.0",
-        "debug": "^4.3.3",
-        "ethereumjs-util": "^7.1.4",
-        "level-mem": "^5.0.1",
-        "lru-cache": "^5.1.1",
-        "semaphore-async-await": "^1.5.1"
-      }
-    },
-    "node_modules/@ethereumjs/blockchain/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@ethereumjs/common": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.3.tgz",
@@ -448,18 +406,6 @@
         "ethereumjs-util": "^7.1.4"
       }
     },
-    "node_modules/@ethereumjs/ethash": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/ethash/-/ethash-1.1.0.tgz",
-      "integrity": "sha512-/U7UOKW6BzpA+Vt+kISAoeDie1vAvY4Zy2KF5JJb+So7+1yKmJeJEHOGSnQIj330e9Zyl3L5Nae6VZyh2TJnAA==",
-      "dependencies": {
-        "@ethereumjs/block": "^3.5.0",
-        "@types/levelup": "^4.3.0",
-        "buffer-xor": "^2.0.1",
-        "ethereumjs-util": "^7.1.1",
-        "miller-rabin": "^4.0.0"
-      }
-    },
     "node_modules/@ethereumjs/tx": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.1.tgz",
@@ -469,41 +415,6 @@
         "ethereumjs-util": "^7.1.4"
       }
     },
-    "node_modules/@ethereumjs/vm": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/vm/-/vm-5.8.0.tgz",
-      "integrity": "sha512-mn2G2SX79QY4ckVvZUfxlNUpzwT2AEIkvgJI8aHoQaNYEHhH8rmdVDIaVVgz6//PjK52BZsK23afz+WvSR0Qqw==",
-      "dependencies": {
-        "@ethereumjs/block": "^3.6.2",
-        "@ethereumjs/blockchain": "^5.5.2",
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/tx": "^3.5.1",
-        "async-eventemitter": "^0.2.4",
-        "core-js-pure": "^3.0.1",
-        "debug": "^4.3.3",
-        "ethereumjs-util": "^7.1.4",
-        "functional-red-black-tree": "^1.0.1",
-        "mcl-wasm": "^0.7.1",
-        "merkle-patricia-tree": "^4.2.4",
-        "rustbn.js": "~0.2.0"
-      }
-    },
-    "node_modules/@ethereumjs/vm/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@ethersproject/abi": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.6.0.tgz",
@@ -1235,6 +1146,28 @@
         "rlp": "^2.2.3"
       }
     },
+    "node_modules/@noble/hashes": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz",
+      "integrity": "sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@noble/secp256k1": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.6.3.tgz",
+      "integrity": "sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -1270,6 +1203,348 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@nomicfoundation/ethereumjs-block": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-4.0.0.tgz",
+      "integrity": "sha512-bk8uP8VuexLgyIZAHExH1QEovqx0Lzhc9Ntm63nCRKLHXIZkobaFaeCVwTESV7YkPKUk7NiK11s8ryed4CS9yA==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-blockchain": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-6.0.0.tgz",
+      "integrity": "sha512-pLFEoea6MWd81QQYSReLlLfH7N9v7lH66JC/NMPN848ySPPQA5renWnE7wPByfQFzNrPBuDDRFFULMDmj1C0xw==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-ethash": "^2.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "abstract-level": "^1.0.3",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "level": "^8.0.0",
+        "lru-cache": "^5.1.1",
+        "memory-level": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-common": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-3.0.0.tgz",
+      "integrity": "sha512-WS7qSshQfxoZOpHG/XqlHEGRG1zmyjYrvmATvc4c62+gZXgre1ymYP8ZNgx/3FyZY0TWe9OjFlKOfLqmgOeYwA==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "crc-32": "^1.2.0"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-ethash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-2.0.0.tgz",
+      "integrity": "sha512-WpDvnRncfDUuXdsAXlI4lXbqUDOA+adYRQaEezIkxqDkc+LDyYDbd/xairmY98GnQzo1zIqsIL6GB5MoMSJDew==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "abstract-level": "^1.0.3",
+        "bigint-crypto-utils": "^3.0.23",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-evm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-1.0.0.tgz",
+      "integrity": "sha512-hVS6qRo3V1PLKCO210UfcEQHvlG7GqR8iFzp0yyjTg2TmJQizcChKgWo8KFsdMw6AyoLgLhHGHw4HdlP8a4i+Q==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-rlp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-4.0.0.tgz",
+      "integrity": "sha512-GaSOGk5QbUk4eBP5qFbpXoZoZUj/NrW7MRa0tKY4Ew4c2HAS0GXArEMAamtFrkazp0BO4K5p2ZCG3b2FmbShmw==",
+      "bin": {
+        "rlp": "bin/rlp"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-statemanager": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-1.0.0.tgz",
+      "integrity": "sha512-jCtqFjcd2QejtuAMjQzbil/4NHf5aAWxUc+CvS0JclQpl+7M0bxMofR2AJdtz+P3u0ke2euhYREDiE7iSO31vQ==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-trie": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-5.0.0.tgz",
+      "integrity": "sha512-LIj5XdE+s+t6WSuq/ttegJzZ1vliwg6wlb+Y9f4RlBpuK35B9K02bO7xU+E6Rgg9RGptkWd6TVLdedTI4eNc2A==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3",
+        "readable-stream": "^3.6.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-tx": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-4.0.0.tgz",
+      "integrity": "sha512-Gg3Lir2lNUck43Kp/3x6TfBNwcWC9Z1wYue9Nz3v4xjdcv6oDW9QSMJxqsKw9QEGoBBZ+gqwpW7+F05/rs/g1w==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-util": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-8.0.0.tgz",
+      "integrity": "sha512-2emi0NJ/HmTG+CGY58fa+DQuAoroFeSH9gKu9O6JnwTtlzJtgfTixuoOqLEgyyzZVvwfIpRueuePb8TonL1y+A==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0-beta.2",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-vm": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-6.0.0.tgz",
+      "integrity": "sha512-JMPxvPQ3fzD063Sg3Tp+UdwUkVxMoo1uML6KSzFhMH3hoQi/LMuXBoEHAoW83/vyNS9BxEe6jm6LmT5xdeEJ6w==",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-evm": "^1.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.0.3.tgz",
+      "integrity": "sha512-VFMiOQvsw7nx5bFmrmVp2Q9rhIjw2AFST4DYvWVVO9PMHPE23BY2+kyfrQ4J3xCMFC8fcBbGLt7l4q7m1SlTqg==",
+      "engines": {
+        "node": ">= 12"
+      },
+      "optionalDependencies": {
+        "@nomicfoundation/solidity-analyzer-darwin-arm64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-darwin-x64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-freebsd-x64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-musl": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-x64-gnu": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-x64-musl": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-x64-msvc": "0.0.3"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-darwin-arm64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.0.3.tgz",
+      "integrity": "sha512-W+bIiNiZmiy+MTYFZn3nwjyPUO6wfWJ0lnXx2zZrM8xExKObMrhCh50yy8pQING24mHfpPFCn89wEB/iG7vZDw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-darwin-x64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.0.3.tgz",
+      "integrity": "sha512-HuJd1K+2MgmFIYEpx46uzwEFjvzKAI765mmoMxy4K+Aqq1p+q7hHRlsFU2kx3NB8InwotkkIq3A5FLU1sI1WDw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-freebsd-x64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-freebsd-x64/-/solidity-analyzer-freebsd-x64-0.0.3.tgz",
+      "integrity": "sha512-2cR8JNy23jZaO/vZrsAnWCsO73asU7ylrHIe0fEsXbZYqBP9sMr+/+xP3CELDHJxUbzBY8zqGvQt1ULpyrG+Kw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-gnu": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.0.3.tgz",
+      "integrity": "sha512-Eyv50EfYbFthoOb0I1568p+eqHGLwEUhYGOxcRNywtlTE9nj+c+MT1LA53HnxD9GsboH4YtOOmJOulrjG7KtbA==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-musl": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.0.3.tgz",
+      "integrity": "sha512-V8grDqI+ivNrgwEt2HFdlwqV2/EQbYAdj3hbOvjrA8Qv+nq4h9jhQUxFpegYMDtpU8URJmNNlXgtfucSrAQwtQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-gnu": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.0.3.tgz",
+      "integrity": "sha512-uRfVDlxtwT1vIy7MAExWAkRD4r9M79zMG7S09mCrWUn58DbLs7UFl+dZXBX0/8FTGYWHhOT/1Etw1ZpAf5DTrg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-musl": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.0.3.tgz",
+      "integrity": "sha512-8HPwYdLbhcPpSwsE0yiU/aZkXV43vlXT2ycH+XlOjWOnLfH8C41z0njK8DHRtEFnp4OVN6E7E5lHBBKDZXCliA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-arm64-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-arm64-msvc/-/solidity-analyzer-win32-arm64-msvc-0.0.3.tgz",
+      "integrity": "sha512-5WWcT6ZNvfCuxjlpZOY7tdvOqT1kIQYlDF9Q42wMpZ5aTm4PvjdCmFDDmmTvyXEBJ4WTVmY5dWNWaxy8h/E28g==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-ia32-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-ia32-msvc/-/solidity-analyzer-win32-ia32-msvc-0.0.3.tgz",
+      "integrity": "sha512-P/LWGZwWkyjSwkzq6skvS2wRc3gabzAbk6Akqs1/Iiuggql2CqdLBkcYWL5Xfv3haynhL+2jlNkak+v2BTZI4A==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nomicfoundation/solidity-analyzer-win32-x64-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.0.3.tgz",
+      "integrity": "sha512-4AcTtLZG1s/S5mYAIr/sdzywdNwJpOcdStGF3QMBzEt+cGn3MchMaS9b1gyhb2KKM2c39SmPF5fUuWq1oBSQZQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@nomiclabs/hardhat-ethers": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.0.5.tgz",
@@ -1281,18 +1556,21 @@
       }
     },
     "node_modules/@nomiclabs/hardhat-etherscan": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.0.3.tgz",
-      "integrity": "sha512-OfNtUKc/ZwzivmZnnpwWREfaYncXteKHskn3yDnz+fPBZ6wfM4GR+d5RwjREzYFWE+o5iR9ruXhWw/8fejWM9g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.0.tgz",
+      "integrity": "sha512-JroYgfN1AlYFkQTQ3nRwFi4o8NtZF7K/qFR2dxDUgHbCtIagkUseca9L4E/D2ScUm4XT40+8PbCdqZi+XmHyQA==",
       "dev": true,
       "dependencies": {
         "@ethersproject/abi": "^5.1.2",
         "@ethersproject/address": "^5.0.2",
         "cbor": "^5.0.2",
+        "chalk": "^2.4.2",
         "debug": "^4.1.1",
         "fs-extra": "^7.0.1",
+        "lodash": "^4.17.11",
         "semver": "^6.3.0",
-        "undici": "^4.14.1"
+        "table": "^6.8.0",
+        "undici": "^5.4.0"
       },
       "peerDependencies": {
         "hardhat": "^2.0.4"
@@ -2038,6 +2316,48 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/@scure/base": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ]
+    },
+    "node_modules/@scure/bip32": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.0.tgz",
+      "integrity": "sha512-ftTW3kKX54YXLCxH6BB7oEEoJfoE2pIgw7MINKAs5PsS6nqKPuKk1haTF/EuHmYqG330t5GSrdmtRuHaY1a62Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.1.1",
+        "@noble/secp256k1": "~1.6.0",
+        "@scure/base": "~1.1.0"
+      }
+    },
+    "node_modules/@scure/bip39": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
+      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://paulmillr.com/funding/"
+        }
+      ],
+      "dependencies": {
+        "@noble/hashes": "~1.1.1",
+        "@scure/base": "~1.1.0"
+      }
+    },
     "node_modules/@sentry/core": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
@@ -2163,6 +2483,7 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.1.tgz",
       "integrity": "sha512-eLjj2L6AuQjBB6s/ibwCAc0DwrR5Ge+ys+wgWo+bviU7fV2nTMQhU63CGaDKXg9iTmMxwhkyoggdIR7ZGRfMgw==",
+      "dev": true,
       "dependencies": {
         "antlr4ts": "^0.5.0-alpha.4"
       }
@@ -2563,10 +2884,10 @@
         "typechain": "^3.0.0"
       }
     },
-    "node_modules/@types/abstract-leveldown": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz",
-      "integrity": "sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ=="
+    "node_modules/@types/async-eventemitter": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@types/async-eventemitter/-/async-eventemitter-0.2.1.tgz",
+      "integrity": "sha512-M2P4Ng26QbAeITiH7w1d7OxtldgfAe0wobpyJzVK/XOb0cUGKU2R4pfAhqcJBXAe2ife5ZOhSv4wk7p+ffURtg=="
     },
     "node_modules/@types/bignumber.js": {
       "version": "5.0.0",
@@ -2600,21 +2921,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/level-errors": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
-      "integrity": "sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ=="
-    },
-    "node_modules/@types/levelup": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@types/levelup/-/levelup-4.3.3.tgz",
-      "integrity": "sha512-K+OTIjJcZHVlZQN1HmU64VtrC0jC3dXWQozuEIR9zVvltIk90zaGPM2AgT+fIkChpzHhFE3YnvFLCbLtzAmexA==",
-      "dependencies": {
-        "@types/abstract-leveldown": "*",
-        "@types/level-errors": "*",
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -2744,28 +3050,53 @@
         "node": ">=6.5"
       }
     },
-    "node_modules/abstract-leveldown": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz",
-      "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==",
+    "node_modules/abstract-level": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz",
+      "integrity": "sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA==",
       "dependencies": {
-        "buffer": "^5.5.0",
-        "immediate": "^3.2.3",
-        "level-concat-iterator": "~2.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
+        "buffer": "^6.0.3",
+        "catering": "^2.1.0",
+        "is-buffer": "^2.0.5",
+        "level-supports": "^4.0.0",
+        "level-transcoder": "^1.0.1",
+        "module-error": "^1.0.1",
+        "queue-microtask": "^1.2.3"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      }
+    },
+    "node_modules/abstract-level/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -2897,7 +3228,8 @@
     "node_modules/antlr4ts": {
       "version": "0.5.0-alpha.4",
       "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
-      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ=="
+      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
+      "dev": true
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
@@ -2989,10 +3321,19 @@
         "node": "*"
       }
     },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dependencies": {
         "lodash": "^4.17.14"
       }
@@ -3105,6 +3446,25 @@
         "node": "*"
       }
     },
+    "node_modules/bigint-crypto-utils": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/bigint-crypto-utils/-/bigint-crypto-utils-3.1.6.tgz",
+      "integrity": "sha512-k5ljSLHx94jQTW3+18KEfxLJR8/XFBHqhfhEGF48qT8p/jL6EdiG7oNOiiIRGMFh2wEP8kaCXZbVd+5dYkngUg==",
+      "dependencies": {
+        "bigint-mod-arith": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
+    "node_modules/bigint-mod-arith": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/bigint-mod-arith/-/bigint-mod-arith-3.1.1.tgz",
+      "integrity": "sha512-SzFqdncZKXq5uh3oLFZXmzaZEMDsA7ml9l53xKaVGO6/+y26xNwAaTQEg2R+D+d07YduLbKi0dni3YPsR51UDQ==",
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
     "node_modules/bignumber.js": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
@@ -3137,23 +3497,26 @@
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
     "node_modules/body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dependencies": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -3164,53 +3527,11 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/body-parser/node_modules/http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/body-parser/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/body-parser/node_modules/raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -3263,6 +3584,17 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "node_modules/browser-level": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browser-level/-/browser-level-1.0.1.tgz",
+      "integrity": "sha512-XECYKJ+Dbzw0lbydyQuJzwNXtOpbMSq737qxJN11sIRTErOMShvDpbzTlgju7orJKvx4epULolZAuJGLzCmWRQ==",
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.1",
+        "module-error": "^1.0.2",
+        "run-parallel-limit": "^1.1.0"
+      }
+    },
     "node_modules/browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -3393,14 +3725,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz",
       "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo="
     },
-    "node_modules/buffer-xor": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
-      "integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
-      "dependencies": {
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node_modules/bufferutil": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz",
@@ -3414,9 +3738,9 @@
       }
     },
     "node_modules/bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -3497,6 +3821,14 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "node_modules/catering": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz",
+      "integrity": "sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/cbor": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
@@ -3698,6 +4030,22 @@
       "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz",
       "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw=="
     },
+    "node_modules/classic-level": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/classic-level/-/classic-level-1.2.0.tgz",
+      "integrity": "sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.0",
+        "module-error": "^1.0.1",
+        "napi-macros": "~2.0.0",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -3822,21 +4170,16 @@
       }
     },
     "node_modules/content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dependencies": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
     "node_modules/content-hash": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/content-hash/-/content-hash-2.5.2.tgz",
@@ -3873,16 +4216,6 @@
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
       "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
     },
-    "node_modules/core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -4062,9 +4395,9 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -4089,9 +4422,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "engines": {
         "node": ">=0.10"
       }
@@ -4129,33 +4462,6 @@
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
       "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
     },
-    "node_modules/deferred-leveldown": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
-      "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
-      "dependencies": {
-        "abstract-leveldown": "~6.2.1",
-        "inherits": "^2.0.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/deferred-leveldown/node_modules/abstract-leveldown": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-      "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "immediate": "^3.2.3",
-        "level-concat-iterator": "~2.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -4181,11 +4487,11 @@
       "integrity": "sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs="
     },
     "node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/des.js": {
@@ -4198,9 +4504,13 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-indent": {
       "version": "5.0.0",
@@ -4370,7 +4680,7 @@
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -4394,25 +4704,11 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/encoding-down": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz",
-      "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==",
-      "dependencies": {
-        "abstract-leveldown": "^6.2.1",
-        "inherits": "^2.0.3",
-        "level-codec": "^9.0.0",
-        "level-errors": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -4448,17 +4744,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "dependencies": {
-        "prr": "~1.0.1"
-      },
-      "bin": {
-        "errno": "cli.js"
-      }
-    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -4571,7 +4856,7 @@
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
@@ -4663,7 +4948,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -4976,37 +5261,38 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -5016,9 +5302,9 @@
       }
     },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5036,19 +5322,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
     "node_modules/ext": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -5165,16 +5438,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -5192,7 +5465,7 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-config": {
       "version": "1.0.0",
@@ -5320,7 +5593,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5351,6 +5624,19 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -5359,7 +5645,7 @@
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
     },
     "node_modules/ganache-core": {
       "version": "2.13.2",
@@ -14725,14 +15011,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
       "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
     },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
     "node_modules/handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
@@ -14776,19 +15054,24 @@
       }
     },
     "node_modules/hardhat": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.9.2.tgz",
-      "integrity": "sha512-elTcUK1EdFverWinybQ+DoJzsM6sgiHUYs0ZYNNXMfESty6ESHiFSwkfJsC88/q09vmIz6YVaMh73BYnYd+feQ==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.11.2.tgz",
+      "integrity": "sha512-BdsXC1CFJQDJKmAgCwpmGhFuVU6dcqlgMgT0Kg/xmFAFVugkpYu6NRmh4AaJ3Fah0/BR9DOR4XgQGIbg4eon/Q==",
       "dependencies": {
-        "@ethereumjs/block": "^3.6.0",
-        "@ethereumjs/blockchain": "^5.5.0",
-        "@ethereumjs/common": "^2.6.0",
-        "@ethereumjs/tx": "^3.4.0",
-        "@ethereumjs/vm": "^5.6.0",
         "@ethersproject/abi": "^5.1.2",
         "@metamask/eth-sig-util": "^4.0.0",
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-evm": "^1.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@nomicfoundation/ethereumjs-vm": "^6.0.0",
+        "@nomicfoundation/solidity-analyzer": "^0.0.3",
         "@sentry/node": "^5.18.1",
-        "@solidity-parser/parser": "^0.14.1",
         "@types/bn.js": "^5.1.0",
         "@types/lru-cache": "^5.1.0",
         "abort-controller": "^3.0.0",
@@ -14801,31 +15084,28 @@
         "debug": "^4.1.1",
         "enquirer": "^2.3.0",
         "env-paths": "^2.2.0",
-        "ethereum-cryptography": "^0.1.2",
+        "ethereum-cryptography": "^1.0.3",
         "ethereumjs-abi": "^0.6.8",
-        "ethereumjs-util": "^7.1.3",
         "find-up": "^2.1.0",
         "fp-ts": "1.19.3",
         "fs-extra": "^7.0.1",
-        "glob": "^7.1.3",
+        "glob": "7.2.0",
         "immutable": "^4.0.0-rc.12",
         "io-ts": "1.10.4",
+        "keccak": "^3.0.2",
         "lodash": "^4.17.11",
-        "merkle-patricia-tree": "^4.2.2",
         "mnemonist": "^0.38.0",
-        "mocha": "^9.2.0",
+        "mocha": "^10.0.0",
         "p-map": "^4.0.0",
         "qs": "^6.7.0",
         "raw-body": "^2.4.1",
         "resolve": "1.17.0",
         "semver": "^6.3.0",
-        "slash": "^3.0.0",
         "solc": "0.7.3",
         "source-map-support": "^0.5.13",
         "stacktrace-parser": "^0.1.10",
-        "true-case-path": "^2.2.1",
         "tsort": "0.0.1",
-        "undici": "^4.14.1",
+        "undici": "^5.4.0",
         "uuid": "^8.3.2",
         "ws": "^7.4.6"
       },
@@ -14833,7 +15113,30 @@
         "hardhat": "internal/cli/cli.js"
       },
       "engines": {
-        "node": "^12.0.0 || ^14.0.0 || ^16.0.0"
+        "node": "^14.0.0 || ^16.0.0 || ^18.0.0"
+      },
+      "peerDependencies": {
+        "ts-node": "*",
+        "typescript": "*"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        },
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/hardhat/node_modules/ethereum-cryptography": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.1.2.tgz",
+      "integrity": "sha512-XDSJlg4BD+hq9N2FjvotwUET9Tfxpxc3kWGE2AqUG5vcbeunnbImVk3cj6e/xT3phdW21mE8R5IugU4fspQDcQ==",
+      "dependencies": {
+        "@noble/hashes": "1.1.2",
+        "@noble/secp256k1": "1.6.3",
+        "@scure/bip32": "1.1.0",
+        "@scure/bip39": "1.1.0"
       }
     },
     "node_modules/hardhat/node_modules/uuid": {
@@ -15008,18 +15311,18 @@
       "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
     },
     "node_modules/http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dependencies": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/http-https": {
@@ -15103,11 +15406,6 @@
         "node": ">= 4"
       }
     },
-    "node_modules/immediate": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
-    },
     "node_modules/immutable": {
       "version": "4.0.0-rc.15",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.15.tgz",
@@ -15244,6 +15542,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -15535,7 +15855,8 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
     },
     "node_modules/iso-url": {
       "version": "0.4.7",
@@ -15703,110 +16024,63 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/level-codec": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
-      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+    "node_modules/level": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
+      "integrity": "sha512-ypf0jjAk2BWI33yzEaaotpq7fkOPALKAgDBxggO6Q9HGX2MRXn0wbP1Jn/tJv1gtL867+YOjOB49WaUF3UoJNQ==",
       "dependencies": {
-        "buffer": "^5.6.0"
+        "browser-level": "^1.0.1",
+        "classic-level": "^1.2.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/level-concat-iterator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
-      "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/level-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
-      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
-      "dependencies": {
-        "errno": "~0.1.1"
+        "node": ">=12"
       },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/level-iterator-stream": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
-      "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0",
-        "xtend": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/level-mem": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-5.0.1.tgz",
-      "integrity": "sha512-qd+qUJHXsGSFoHTziptAKXoLX87QjR7v2KMbqncDXPxQuCdsQlzmyX+gwrEHhlzn08vkf8TyipYyMmiC6Gobzg==",
-      "dependencies": {
-        "level-packager": "^5.0.3",
-        "memdown": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/level-packager": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
-      "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==",
-      "dependencies": {
-        "encoding-down": "^6.3.0",
-        "levelup": "^4.3.2"
-      },
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/level"
       }
     },
     "node_modules/level-supports": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz",
+      "integrity": "sha512-PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/level-transcoder": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
-      "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+      "resolved": "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz",
+      "integrity": "sha512-t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w==",
       "dependencies": {
-        "xtend": "^4.0.2"
+        "buffer": "^6.0.3",
+        "module-error": "^1.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/level-ws": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-2.0.0.tgz",
-      "integrity": "sha512-1iv7VXx0G9ec1isqQZ7y5LmoZo/ewAsyDHNA8EFDW5hqH2Kqovm33nSFkSdnLLAK+I5FlT+lo5Cw9itGe+CpQA==",
+    "node_modules/level-transcoder/node_modules/buffer": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "dependencies": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.0",
-        "xtend": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levelup": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
-      "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
-      "dependencies": {
-        "deferred-leveldown": "~5.3.0",
-        "level-errors": "~2.0.0",
-        "level-iterator-stream": "~4.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/levn": {
@@ -15889,6 +16163,12 @@
       "resolved": "https://registry.npmjs.org/lodash.sum/-/lodash.sum-4.0.2.tgz",
       "integrity": "sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s="
     },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
     "node_modules/log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -16010,11 +16290,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "node_modules/ltgt": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
-      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
-    },
     "node_modules/mcl-wasm": {
       "version": "0.7.9",
       "resolved": "https://registry.npmjs.org/mcl-wasm/-/mcl-wasm-0.7.9.tgz",
@@ -16041,42 +16316,19 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/memdown": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/memdown/-/memdown-5.1.0.tgz",
-      "integrity": "sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==",
+    "node_modules/memory-level": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/memory-level/-/memory-level-1.0.0.tgz",
+      "integrity": "sha512-UXzwewuWeHBz5krr7EvehKcmLFNoXxGcvuYhC41tRnkrTbJohtS7kVn9akmgirtRygg+f7Yjsfi8Uu5SGSQ4Og==",
       "dependencies": {
-        "abstract-leveldown": "~6.2.1",
-        "functional-red-black-tree": "~1.0.1",
-        "immediate": "~3.2.3",
-        "inherits": "~2.0.1",
-        "ltgt": "~2.2.0",
-        "safe-buffer": "~5.2.0"
+        "abstract-level": "^1.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "module-error": "^1.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/memdown/node_modules/abstract-leveldown": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-      "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "immediate": "^3.2.3",
-        "level-concat-iterator": "~2.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/memdown/node_modules/immediate": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
-      "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw="
-    },
     "node_modules/memorystream": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz",
@@ -16099,19 +16351,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/merkle-patricia-tree": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.4.tgz",
-      "integrity": "sha512-eHbf/BG6eGNsqqfbLED9rIqbsF4+sykEaBn6OLNs71tjclbMcMOk1tEPmJKcNcNCLkvbpY/lwyOlizWsqPNo8w==",
-      "dependencies": {
-        "@types/levelup": "^4.3.0",
-        "ethereumjs-util": "^7.1.4",
-        "level-mem": "^5.0.1",
-        "level-ws": "^2.0.0",
-        "readable-stream": "^3.6.0",
-        "semaphore-async-await": "^1.5.1"
-      }
-    },
     "node_modules/methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -16157,19 +16396,19 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
         "node": ">= 0.6"
@@ -16274,41 +16513,39 @@
       }
     },
     "node_modules/mocha": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
-      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
       "dependencies": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
-        "debug": "4.3.3",
+        "debug": "4.3.4",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
         "glob": "7.2.0",
-        "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
-        "minimatch": "4.2.1",
+        "minimatch": "5.0.1",
         "ms": "2.1.3",
-        "nanoid": "3.3.1",
+        "nanoid": "3.3.3",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.2.0",
+        "workerpool": "6.2.1",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 14.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -16320,27 +16557,14 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
-    "node_modules/mocha/node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/mocha/node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
     "node_modules/mocha/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -16401,11 +16625,11 @@
       }
     },
     "node_modules/mocha/node_modules/minimatch": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
-      "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=10"
@@ -16466,25 +16690,19 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/mocha/node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/mock-fs": {
       "version": "4.14.0",
       "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz",
       "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw=="
     },
+    "node_modules/module-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz",
+      "integrity": "sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -16540,9 +16758,9 @@
       "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18="
     },
     "node_modules/nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -16550,10 +16768,15 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/napi-macros": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
+      "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="
+    },
     "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -16765,9 +16988,9 @@
       }
     },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -17228,11 +17451,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
-    },
     "node_modules/psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -17278,9 +17496,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
@@ -17318,7 +17536,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -17360,12 +17577,12 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz",
-      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dependencies": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.3",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -17519,9 +17736,9 @@
       }
     },
     "node_modules/request/node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "engines": {
         "node": ">=0.6"
       }
@@ -17638,6 +17855,28 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "node_modules/run-parallel-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz",
+      "integrity": "sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "node_modules/rustbn.js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
@@ -17773,14 +18012,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/semaphore-async-await": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
-      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo=",
-      "engines": {
-        "node": ">=4.1"
-      }
-    },
     "node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -17790,23 +18021,23 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17823,12 +18054,12 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/send/node_modules/ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/sentence-case": {
       "version": "2.1.1",
@@ -17848,14 +18079,14 @@
       }
     },
     "node_modules/serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -17887,9 +18118,9 @@
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "node_modules/setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "node_modules/sha.js": {
       "version": "2.4.11",
@@ -18018,10 +18249,61 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/snake-case": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
@@ -18270,11 +18552,11 @@
       }
     },
     "node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/strict-uri-encode": {
@@ -18542,6 +18824,65 @@
         "ultron": "~1.1.0"
       }
     },
+    "node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/table/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/table/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tar": {
       "version": "4.4.19",
       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
@@ -18638,9 +18979,9 @@
       }
     },
     "node_modules/toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "engines": {
         "node": ">=0.6"
       }
@@ -18671,11 +19012,6 @@
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
       "dev": true
     },
-    "node_modules/true-case-path": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz",
-      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q=="
-    },
     "node_modules/ts-essentials": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz",
@@ -18826,7 +19162,7 @@
       "version": "4.6.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
       "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-      "dev": true,
+      "devOptional": true,
       "peer": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -18880,9 +19216,9 @@
       "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
     },
     "node_modules/undici": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
-      "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.10.0.tgz",
+      "integrity": "sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g==",
       "engines": {
         "node": ">=12.18"
       }
@@ -19562,9 +19898,9 @@
       "dev": true
     },
     "node_modules/workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -20114,42 +20450,6 @@
         "postinstall-postinstall": "^2.1.0"
       }
     },
-    "@ethereumjs/block": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/block/-/block-3.6.2.tgz",
-      "integrity": "sha512-mOqYWwMlAZpYUEOEqt7EfMFuVL2eyLqWWIzcf4odn6QgXY8jBI2NhVuJncrMCKeMZrsJAe7/auaRRB6YcdH+Qw==",
-      "requires": {
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/tx": "^3.5.1",
-        "ethereumjs-util": "^7.1.4",
-        "merkle-patricia-tree": "^4.2.4"
-      }
-    },
-    "@ethereumjs/blockchain": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/blockchain/-/blockchain-5.5.2.tgz",
-      "integrity": "sha512-Jz26iJmmsQtngerW6r5BDFaew/f2mObLrRZo3rskLOx1lmtMZ8+TX/vJexmivrnWgmAsTdNWhlKUYY4thPhPig==",
-      "requires": {
-        "@ethereumjs/block": "^3.6.2",
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/ethash": "^1.1.0",
-        "debug": "^4.3.3",
-        "ethereumjs-util": "^7.1.4",
-        "level-mem": "^5.0.1",
-        "lru-cache": "^5.1.1",
-        "semaphore-async-await": "^1.5.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
     "@ethereumjs/common": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.3.tgz",
@@ -20159,18 +20459,6 @@
         "ethereumjs-util": "^7.1.4"
       }
     },
-    "@ethereumjs/ethash": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/ethash/-/ethash-1.1.0.tgz",
-      "integrity": "sha512-/U7UOKW6BzpA+Vt+kISAoeDie1vAvY4Zy2KF5JJb+So7+1yKmJeJEHOGSnQIj330e9Zyl3L5Nae6VZyh2TJnAA==",
-      "requires": {
-        "@ethereumjs/block": "^3.5.0",
-        "@types/levelup": "^4.3.0",
-        "buffer-xor": "^2.0.1",
-        "ethereumjs-util": "^7.1.1",
-        "miller-rabin": "^4.0.0"
-      }
-    },
     "@ethereumjs/tx": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.1.tgz",
@@ -20180,35 +20468,6 @@
         "ethereumjs-util": "^7.1.4"
       }
     },
-    "@ethereumjs/vm": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/vm/-/vm-5.8.0.tgz",
-      "integrity": "sha512-mn2G2SX79QY4ckVvZUfxlNUpzwT2AEIkvgJI8aHoQaNYEHhH8rmdVDIaVVgz6//PjK52BZsK23afz+WvSR0Qqw==",
-      "requires": {
-        "@ethereumjs/block": "^3.6.2",
-        "@ethereumjs/blockchain": "^5.5.2",
-        "@ethereumjs/common": "^2.6.3",
-        "@ethereumjs/tx": "^3.5.1",
-        "async-eventemitter": "^0.2.4",
-        "core-js-pure": "^3.0.1",
-        "debug": "^4.3.3",
-        "ethereumjs-util": "^7.1.4",
-        "functional-red-black-tree": "^1.0.1",
-        "mcl-wasm": "^0.7.1",
-        "merkle-patricia-tree": "^4.2.4",
-        "rustbn.js": "~0.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
     "@ethersproject/abi": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.6.0.tgz",
@@ -20629,6 +20888,16 @@
         }
       }
     },
+    "@noble/hashes": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.2.tgz",
+      "integrity": "sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA=="
+    },
+    "@noble/secp256k1": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.6.3.tgz",
+      "integrity": "sha512-T04e4iTurVy7I8Sw4+c5OSN9/RkPlo1uKxAomtxQNLq8j1uPAqnsqG1bqvY3Jv7c13gyr6dui0zmh/I3+f/JaQ=="
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -20655,6 +20924,225 @@
         "fastq": "^1.6.0"
       }
     },
+    "@nomicfoundation/ethereumjs-block": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-4.0.0.tgz",
+      "integrity": "sha512-bk8uP8VuexLgyIZAHExH1QEovqx0Lzhc9Ntm63nCRKLHXIZkobaFaeCVwTESV7YkPKUk7NiK11s8ryed4CS9yA==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3"
+      }
+    },
+    "@nomicfoundation/ethereumjs-blockchain": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-6.0.0.tgz",
+      "integrity": "sha512-pLFEoea6MWd81QQYSReLlLfH7N9v7lH66JC/NMPN848ySPPQA5renWnE7wPByfQFzNrPBuDDRFFULMDmj1C0xw==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-ethash": "^2.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "abstract-level": "^1.0.3",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "level": "^8.0.0",
+        "lru-cache": "^5.1.1",
+        "memory-level": "^1.0.0"
+      }
+    },
+    "@nomicfoundation/ethereumjs-common": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-3.0.0.tgz",
+      "integrity": "sha512-WS7qSshQfxoZOpHG/XqlHEGRG1zmyjYrvmATvc4c62+gZXgre1ymYP8ZNgx/3FyZY0TWe9OjFlKOfLqmgOeYwA==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "crc-32": "^1.2.0"
+      }
+    },
+    "@nomicfoundation/ethereumjs-ethash": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-2.0.0.tgz",
+      "integrity": "sha512-WpDvnRncfDUuXdsAXlI4lXbqUDOA+adYRQaEezIkxqDkc+LDyYDbd/xairmY98GnQzo1zIqsIL6GB5MoMSJDew==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "abstract-level": "^1.0.3",
+        "bigint-crypto-utils": "^3.0.23",
+        "ethereum-cryptography": "0.1.3"
+      }
+    },
+    "@nomicfoundation/ethereumjs-evm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-1.0.0.tgz",
+      "integrity": "sha512-hVS6qRo3V1PLKCO210UfcEQHvlG7GqR8iFzp0yyjTg2TmJQizcChKgWo8KFsdMw6AyoLgLhHGHw4HdlP8a4i+Q==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      }
+    },
+    "@nomicfoundation/ethereumjs-rlp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-4.0.0.tgz",
+      "integrity": "sha512-GaSOGk5QbUk4eBP5qFbpXoZoZUj/NrW7MRa0tKY4Ew4c2HAS0GXArEMAamtFrkazp0BO4K5p2ZCG3b2FmbShmw=="
+    },
+    "@nomicfoundation/ethereumjs-statemanager": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-1.0.0.tgz",
+      "integrity": "sha512-jCtqFjcd2QejtuAMjQzbil/4NHf5aAWxUc+CvS0JclQpl+7M0bxMofR2AJdtz+P3u0ke2euhYREDiE7iSO31vQ==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1"
+      }
+    },
+    "@nomicfoundation/ethereumjs-trie": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-5.0.0.tgz",
+      "integrity": "sha512-LIj5XdE+s+t6WSuq/ttegJzZ1vliwg6wlb+Y9f4RlBpuK35B9K02bO7xU+E6Rgg9RGptkWd6TVLdedTI4eNc2A==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3",
+        "readable-stream": "^3.6.0"
+      }
+    },
+    "@nomicfoundation/ethereumjs-tx": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-4.0.0.tgz",
+      "integrity": "sha512-Gg3Lir2lNUck43Kp/3x6TfBNwcWC9Z1wYue9Nz3v4xjdcv6oDW9QSMJxqsKw9QEGoBBZ+gqwpW7+F05/rs/g1w==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "ethereum-cryptography": "0.1.3"
+      }
+    },
+    "@nomicfoundation/ethereumjs-util": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-8.0.0.tgz",
+      "integrity": "sha512-2emi0NJ/HmTG+CGY58fa+DQuAoroFeSH9gKu9O6JnwTtlzJtgfTixuoOqLEgyyzZVvwfIpRueuePb8TonL1y+A==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0-beta.2",
+        "ethereum-cryptography": "0.1.3"
+      }
+    },
+    "@nomicfoundation/ethereumjs-vm": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-vm/-/ethereumjs-vm-6.0.0.tgz",
+      "integrity": "sha512-JMPxvPQ3fzD063Sg3Tp+UdwUkVxMoo1uML6KSzFhMH3hoQi/LMuXBoEHAoW83/vyNS9BxEe6jm6LmT5xdeEJ6w==",
+      "requires": {
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-evm": "^1.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@types/async-eventemitter": "^0.2.1",
+        "async-eventemitter": "^0.2.4",
+        "debug": "^4.3.3",
+        "ethereum-cryptography": "0.1.3",
+        "functional-red-black-tree": "^1.0.1",
+        "mcl-wasm": "^0.7.1",
+        "rustbn.js": "~0.2.0"
+      }
+    },
+    "@nomicfoundation/solidity-analyzer": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.0.3.tgz",
+      "integrity": "sha512-VFMiOQvsw7nx5bFmrmVp2Q9rhIjw2AFST4DYvWVVO9PMHPE23BY2+kyfrQ4J3xCMFC8fcBbGLt7l4q7m1SlTqg==",
+      "requires": {
+        "@nomicfoundation/solidity-analyzer-darwin-arm64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-darwin-x64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-freebsd-x64": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-arm64-musl": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-x64-gnu": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-linux-x64-musl": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": "0.0.3",
+        "@nomicfoundation/solidity-analyzer-win32-x64-msvc": "0.0.3"
+      }
+    },
+    "@nomicfoundation/solidity-analyzer-darwin-arm64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.0.3.tgz",
+      "integrity": "sha512-W+bIiNiZmiy+MTYFZn3nwjyPUO6wfWJ0lnXx2zZrM8xExKObMrhCh50yy8pQING24mHfpPFCn89wEB/iG7vZDw==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-darwin-x64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.0.3.tgz",
+      "integrity": "sha512-HuJd1K+2MgmFIYEpx46uzwEFjvzKAI765mmoMxy4K+Aqq1p+q7hHRlsFU2kx3NB8InwotkkIq3A5FLU1sI1WDw==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-freebsd-x64": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-freebsd-x64/-/solidity-analyzer-freebsd-x64-0.0.3.tgz",
+      "integrity": "sha512-2cR8JNy23jZaO/vZrsAnWCsO73asU7ylrHIe0fEsXbZYqBP9sMr+/+xP3CELDHJxUbzBY8zqGvQt1ULpyrG+Kw==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.0.3.tgz",
+      "integrity": "sha512-Eyv50EfYbFthoOb0I1568p+eqHGLwEUhYGOxcRNywtlTE9nj+c+MT1LA53HnxD9GsboH4YtOOmJOulrjG7KtbA==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-linux-arm64-musl": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.0.3.tgz",
+      "integrity": "sha512-V8grDqI+ivNrgwEt2HFdlwqV2/EQbYAdj3hbOvjrA8Qv+nq4h9jhQUxFpegYMDtpU8URJmNNlXgtfucSrAQwtQ==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-linux-x64-gnu": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.0.3.tgz",
+      "integrity": "sha512-uRfVDlxtwT1vIy7MAExWAkRD4r9M79zMG7S09mCrWUn58DbLs7UFl+dZXBX0/8FTGYWHhOT/1Etw1ZpAf5DTrg==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-linux-x64-musl": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.0.3.tgz",
+      "integrity": "sha512-8HPwYdLbhcPpSwsE0yiU/aZkXV43vlXT2ycH+XlOjWOnLfH8C41z0njK8DHRtEFnp4OVN6E7E5lHBBKDZXCliA==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-arm64-msvc/-/solidity-analyzer-win32-arm64-msvc-0.0.3.tgz",
+      "integrity": "sha512-5WWcT6ZNvfCuxjlpZOY7tdvOqT1kIQYlDF9Q42wMpZ5aTm4PvjdCmFDDmmTvyXEBJ4WTVmY5dWNWaxy8h/E28g==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-ia32-msvc/-/solidity-analyzer-win32-ia32-msvc-0.0.3.tgz",
+      "integrity": "sha512-P/LWGZwWkyjSwkzq6skvS2wRc3gabzAbk6Akqs1/Iiuggql2CqdLBkcYWL5Xfv3haynhL+2jlNkak+v2BTZI4A==",
+      "optional": true
+    },
+    "@nomicfoundation/solidity-analyzer-win32-x64-msvc": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.0.3.tgz",
+      "integrity": "sha512-4AcTtLZG1s/S5mYAIr/sdzywdNwJpOcdStGF3QMBzEt+cGn3MchMaS9b1gyhb2KKM2c39SmPF5fUuWq1oBSQZQ==",
+      "optional": true
+    },
     "@nomiclabs/hardhat-ethers": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.0.5.tgz",
@@ -20663,18 +21151,21 @@
       "requires": {}
     },
     "@nomiclabs/hardhat-etherscan": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.0.3.tgz",
-      "integrity": "sha512-OfNtUKc/ZwzivmZnnpwWREfaYncXteKHskn3yDnz+fPBZ6wfM4GR+d5RwjREzYFWE+o5iR9ruXhWw/8fejWM9g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.0.tgz",
+      "integrity": "sha512-JroYgfN1AlYFkQTQ3nRwFi4o8NtZF7K/qFR2dxDUgHbCtIagkUseca9L4E/D2ScUm4XT40+8PbCdqZi+XmHyQA==",
       "dev": true,
       "requires": {
         "@ethersproject/abi": "^5.1.2",
         "@ethersproject/address": "^5.0.2",
         "cbor": "^5.0.2",
+        "chalk": "^2.4.2",
         "debug": "^4.1.1",
         "fs-extra": "^7.0.1",
+        "lodash": "^4.17.11",
         "semver": "^6.3.0",
-        "undici": "^4.14.1"
+        "table": "^6.8.0",
+        "undici": "^5.4.0"
       }
     },
     "@nomiclabs/hardhat-truffle5": {
@@ -21312,6 +21803,30 @@
         }
       }
     },
+    "@scure/base": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
+      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA=="
+    },
+    "@scure/bip32": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.0.tgz",
+      "integrity": "sha512-ftTW3kKX54YXLCxH6BB7oEEoJfoE2pIgw7MINKAs5PsS6nqKPuKk1haTF/EuHmYqG330t5GSrdmtRuHaY1a62Q==",
+      "requires": {
+        "@noble/hashes": "~1.1.1",
+        "@noble/secp256k1": "~1.6.0",
+        "@scure/base": "~1.1.0"
+      }
+    },
+    "@scure/bip39": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz",
+      "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==",
+      "requires": {
+        "@noble/hashes": "~1.1.1",
+        "@scure/base": "~1.1.0"
+      }
+    },
     "@sentry/core": {
       "version": "5.30.0",
       "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
@@ -21413,6 +21928,7 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.14.1.tgz",
       "integrity": "sha512-eLjj2L6AuQjBB6s/ibwCAc0DwrR5Ge+ys+wgWo+bviU7fV2nTMQhU63CGaDKXg9iTmMxwhkyoggdIR7ZGRfMgw==",
+      "dev": true,
       "requires": {
         "antlr4ts": "^0.5.0-alpha.4"
       }
@@ -21801,10 +22317,10 @@
         "ethers": "^5.0.2"
       }
     },
-    "@types/abstract-leveldown": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz",
-      "integrity": "sha512-q5veSX6zjUy/DlDhR4Y4cU0k2Ar+DT2LUraP00T19WLmTO6Se1djepCCaqU6nQrwcJ5Hyo/CWqxTzrrFg8eqbQ=="
+    "@types/async-eventemitter": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@types/async-eventemitter/-/async-eventemitter-0.2.1.tgz",
+      "integrity": "sha512-M2P4Ng26QbAeITiH7w1d7OxtldgfAe0wobpyJzVK/XOb0cUGKU2R4pfAhqcJBXAe2ife5ZOhSv4wk7p+ffURtg=="
     },
     "@types/bignumber.js": {
       "version": "5.0.0",
@@ -21837,21 +22353,6 @@
         "@types/node": "*"
       }
     },
-    "@types/level-errors": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.0.tgz",
-      "integrity": "sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ=="
-    },
-    "@types/levelup": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@types/levelup/-/levelup-4.3.3.tgz",
-      "integrity": "sha512-K+OTIjJcZHVlZQN1HmU64VtrC0jC3dXWQozuEIR9zVvltIk90zaGPM2AgT+fIkChpzHhFE3YnvFLCbLtzAmexA==",
-      "requires": {
-        "@types/abstract-leveldown": "*",
-        "@types/level-errors": "*",
-        "@types/node": "*"
-      }
-    },
     "@types/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -21978,25 +22479,38 @@
         "event-target-shim": "^5.0.0"
       }
     },
-    "abstract-leveldown": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz",
-      "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==",
+    "abstract-level": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/abstract-level/-/abstract-level-1.0.3.tgz",
+      "integrity": "sha512-t6jv+xHy+VYwc4xqZMn2Pa9DjcdzvzZmQGRjTFc8spIbRGHgBrEKbPq+rYXc7CCo0lxgYvSgKVg9qZAhpVQSjA==",
       "requires": {
-        "buffer": "^5.5.0",
-        "immediate": "^3.2.3",
-        "level-concat-iterator": "~2.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
+        "buffer": "^6.0.3",
+        "catering": "^2.1.0",
+        "is-buffer": "^2.0.5",
+        "level-supports": "^4.0.0",
+        "level-transcoder": "^1.0.1",
+        "module-error": "^1.0.1",
+        "queue-microtask": "^1.2.3"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        }
       }
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "address": {
@@ -22091,7 +22605,8 @@
     "antlr4ts": {
       "version": "0.5.0-alpha.4",
       "resolved": "https://registry.npmjs.org/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz",
-      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ=="
+      "integrity": "sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==",
+      "dev": true
     },
     "anymatch": {
       "version": "3.1.2",
@@ -22165,10 +22680,16 @@
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
       "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
     },
+    "astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true
+    },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "requires": {
         "lodash": "^4.17.14"
       }
@@ -22254,6 +22775,19 @@
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
+    "bigint-crypto-utils": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/bigint-crypto-utils/-/bigint-crypto-utils-3.1.6.tgz",
+      "integrity": "sha512-k5ljSLHx94jQTW3+18KEfxLJR8/XFBHqhfhEGF48qT8p/jL6EdiG7oNOiiIRGMFh2wEP8kaCXZbVd+5dYkngUg==",
+      "requires": {
+        "bigint-mod-arith": "^3.1.0"
+      }
+    },
+    "bigint-mod-arith": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/bigint-mod-arith/-/bigint-mod-arith-3.1.1.tgz",
+      "integrity": "sha512-SzFqdncZKXq5uh3oLFZXmzaZEMDsA7ml9l53xKaVGO6/+y26xNwAaTQEg2R+D+d07YduLbKi0dni3YPsR51UDQ=="
+    },
     "bignumber.js": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz",
@@ -22280,20 +22814,22 @@
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -22304,43 +22840,10 @@
             "ms": "2.0.0"
           }
         },
-        "http-errors": {
-          "version": "1.7.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        },
-        "raw-body": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-          "requires": {
-            "bytes": "3.1.0",
-            "http-errors": "1.7.2",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
         }
       }
     },
@@ -22392,6 +22895,17 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
+    "browser-level": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browser-level/-/browser-level-1.0.1.tgz",
+      "integrity": "sha512-XECYKJ+Dbzw0lbydyQuJzwNXtOpbMSq737qxJN11sIRTErOMShvDpbzTlgju7orJKvx4epULolZAuJGLzCmWRQ==",
+      "requires": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.1",
+        "module-error": "^1.0.2",
+        "run-parallel-limit": "^1.1.0"
+      }
+    },
     "browser-stdout": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
@@ -22514,14 +23028,6 @@
       "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz",
       "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo="
     },
-    "buffer-xor": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
-      "integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
-      "requires": {
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "bufferutil": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.5.tgz",
@@ -22531,9 +23037,9 @@
       }
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
     },
     "cacheable-request": {
       "version": "6.1.0",
@@ -22592,6 +23098,11 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
+    "catering": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/catering/-/catering-2.1.1.tgz",
+      "integrity": "sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w=="
+    },
     "cbor": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz",
@@ -22756,6 +23267,18 @@
       "resolved": "https://registry.npmjs.org/class-is/-/class-is-1.1.0.tgz",
       "integrity": "sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw=="
     },
+    "classic-level": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/classic-level/-/classic-level-1.2.0.tgz",
+      "integrity": "sha512-qw5B31ANxSluWz9xBzklRWTUAJ1SXIdaVKTVS7HcTGKOAmExx65Wo5BUICW+YGORe2FOUaDghoI9ZDxj82QcFg==",
+      "requires": {
+        "abstract-level": "^1.0.2",
+        "catering": "^2.1.0",
+        "module-error": "^1.0.1",
+        "napi-macros": "~2.0.0",
+        "node-gyp-build": "^4.3.0"
+      }
+    },
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -22861,18 +23384,11 @@
       }
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "requires": {
-        "safe-buffer": "5.1.2"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
+        "safe-buffer": "5.2.1"
       }
     },
     "content-hash": {
@@ -22905,11 +23421,6 @@
       "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
       "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
     },
-    "core-js-pure": {
-      "version": "3.21.1",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-      "integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ=="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -23061,9 +23572,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
-      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -23074,9 +23585,9 @@
       "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
     },
     "decompress-response": {
       "version": "3.3.0",
@@ -23105,29 +23616,6 @@
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
       "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
     },
-    "deferred-leveldown": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
-      "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
-      "requires": {
-        "abstract-leveldown": "~6.2.1",
-        "inherits": "^2.0.3"
-      },
-      "dependencies": {
-        "abstract-leveldown": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-          "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "immediate": "^3.2.3",
-            "level-concat-iterator": "~2.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        }
-      }
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -23147,9 +23635,9 @@
       "integrity": "sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs="
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
     },
     "des.js": {
       "version": "1.0.1",
@@ -23161,9 +23649,9 @@
       }
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "detect-indent": {
       "version": "5.0.0",
@@ -23297,7 +23785,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -23321,18 +23809,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
-    "encoding-down": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz",
-      "integrity": "sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==",
-      "requires": {
-        "abstract-leveldown": "^6.2.1",
-        "inherits": "^2.0.3",
-        "level-codec": "^9.0.0",
-        "level-errors": "^2.0.0"
-      }
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
     "end-of-stream": {
       "version": "1.4.4",
@@ -23360,14 +23837,6 @@
       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
     },
-    "errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -23461,7 +23930,7 @@
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "escape-string-regexp": {
       "version": "1.0.5",
@@ -23520,7 +23989,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "eth-ens-namehash": {
       "version": "2.0.8",
@@ -23803,46 +24272,47 @@
       "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.1",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
         "cookie": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+          "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
         },
         "debug": {
           "version": "2.6.9",
@@ -23856,16 +24326,6 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         }
       }
     },
@@ -23971,16 +24431,16 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -23995,7 +24455,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         }
       }
     },
@@ -24089,7 +24549,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "fs-extra": {
       "version": "7.0.1",
@@ -24114,6 +24574,12 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -24122,7 +24588,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+      "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
     },
     "ganache-core": {
       "version": "2.13.2",
@@ -31319,11 +31785,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
       "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
     },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="
-    },
     "handlebars": {
       "version": "4.7.7",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
@@ -31352,19 +31813,24 @@
       }
     },
     "hardhat": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.9.2.tgz",
-      "integrity": "sha512-elTcUK1EdFverWinybQ+DoJzsM6sgiHUYs0ZYNNXMfESty6ESHiFSwkfJsC88/q09vmIz6YVaMh73BYnYd+feQ==",
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.11.2.tgz",
+      "integrity": "sha512-BdsXC1CFJQDJKmAgCwpmGhFuVU6dcqlgMgT0Kg/xmFAFVugkpYu6NRmh4AaJ3Fah0/BR9DOR4XgQGIbg4eon/Q==",
       "requires": {
-        "@ethereumjs/block": "^3.6.0",
-        "@ethereumjs/blockchain": "^5.5.0",
-        "@ethereumjs/common": "^2.6.0",
-        "@ethereumjs/tx": "^3.4.0",
-        "@ethereumjs/vm": "^5.6.0",
         "@ethersproject/abi": "^5.1.2",
         "@metamask/eth-sig-util": "^4.0.0",
+        "@nomicfoundation/ethereumjs-block": "^4.0.0",
+        "@nomicfoundation/ethereumjs-blockchain": "^6.0.0",
+        "@nomicfoundation/ethereumjs-common": "^3.0.0",
+        "@nomicfoundation/ethereumjs-evm": "^1.0.0",
+        "@nomicfoundation/ethereumjs-rlp": "^4.0.0",
+        "@nomicfoundation/ethereumjs-statemanager": "^1.0.0",
+        "@nomicfoundation/ethereumjs-trie": "^5.0.0",
+        "@nomicfoundation/ethereumjs-tx": "^4.0.0",
+        "@nomicfoundation/ethereumjs-util": "^8.0.0",
+        "@nomicfoundation/ethereumjs-vm": "^6.0.0",
+        "@nomicfoundation/solidity-analyzer": "^0.0.3",
         "@sentry/node": "^5.18.1",
-        "@solidity-parser/parser": "^0.14.1",
         "@types/bn.js": "^5.1.0",
         "@types/lru-cache": "^5.1.0",
         "abort-controller": "^3.0.0",
@@ -31377,35 +31843,43 @@
         "debug": "^4.1.1",
         "enquirer": "^2.3.0",
         "env-paths": "^2.2.0",
-        "ethereum-cryptography": "^0.1.2",
+        "ethereum-cryptography": "^1.0.3",
         "ethereumjs-abi": "^0.6.8",
-        "ethereumjs-util": "^7.1.3",
         "find-up": "^2.1.0",
         "fp-ts": "1.19.3",
         "fs-extra": "^7.0.1",
-        "glob": "^7.1.3",
+        "glob": "7.2.0",
         "immutable": "^4.0.0-rc.12",
         "io-ts": "1.10.4",
+        "keccak": "^3.0.2",
         "lodash": "^4.17.11",
-        "merkle-patricia-tree": "^4.2.2",
         "mnemonist": "^0.38.0",
-        "mocha": "^9.2.0",
+        "mocha": "^10.0.0",
         "p-map": "^4.0.0",
         "qs": "^6.7.0",
         "raw-body": "^2.4.1",
         "resolve": "1.17.0",
         "semver": "^6.3.0",
-        "slash": "^3.0.0",
         "solc": "0.7.3",
         "source-map-support": "^0.5.13",
         "stacktrace-parser": "^0.1.10",
-        "true-case-path": "^2.2.1",
         "tsort": "0.0.1",
-        "undici": "^4.14.1",
+        "undici": "^5.4.0",
         "uuid": "^8.3.2",
         "ws": "^7.4.6"
       },
       "dependencies": {
+        "ethereum-cryptography": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.1.2.tgz",
+          "integrity": "sha512-XDSJlg4BD+hq9N2FjvotwUET9Tfxpxc3kWGE2AqUG5vcbeunnbImVk3cj6e/xT3phdW21mE8R5IugU4fspQDcQ==",
+          "requires": {
+            "@noble/hashes": "1.1.2",
+            "@noble/secp256k1": "1.6.3",
+            "@scure/bip32": "1.1.0",
+            "@scure/bip39": "1.1.0"
+          }
+        },
         "uuid": {
           "version": "8.3.2",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -31532,15 +32006,15 @@
       "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
     },
     "http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       }
     },
     "http-https": {
@@ -31594,11 +32068,6 @@
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
       "dev": true
     },
-    "immediate": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz",
-      "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q=="
-    },
     "immutable": {
       "version": "4.0.0-rc.15",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0-rc.15.tgz",
@@ -31702,6 +32171,11 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-buffer": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
+    },
     "is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -31890,7 +32364,8 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
     },
     "iso-url": {
       "version": "0.4.7",
@@ -32033,83 +32508,38 @@
         "invert-kv": "^1.0.0"
       }
     },
-    "level-codec": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz",
-      "integrity": "sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==",
+    "level": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
+      "integrity": "sha512-ypf0jjAk2BWI33yzEaaotpq7fkOPALKAgDBxggO6Q9HGX2MRXn0wbP1Jn/tJv1gtL867+YOjOB49WaUF3UoJNQ==",
       "requires": {
-        "buffer": "^5.6.0"
-      }
-    },
-    "level-concat-iterator": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz",
-      "integrity": "sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw=="
-    },
-    "level-errors": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
-      "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
-      "requires": {
-        "errno": "~0.1.1"
-      }
-    },
-    "level-iterator-stream": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
-      "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
-      "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "level-mem": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/level-mem/-/level-mem-5.0.1.tgz",
-      "integrity": "sha512-qd+qUJHXsGSFoHTziptAKXoLX87QjR7v2KMbqncDXPxQuCdsQlzmyX+gwrEHhlzn08vkf8TyipYyMmiC6Gobzg==",
-      "requires": {
-        "level-packager": "^5.0.3",
-        "memdown": "^5.0.0"
-      }
-    },
-    "level-packager": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz",
-      "integrity": "sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==",
-      "requires": {
-        "encoding-down": "^6.3.0",
-        "levelup": "^4.3.2"
+        "browser-level": "^1.0.1",
+        "classic-level": "^1.2.0"
       }
     },
     "level-supports": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-4.0.1.tgz",
+      "integrity": "sha512-PbXpve8rKeNcZ9C1mUicC9auIYFyGpkV9/i6g76tLgANwWhtG2v7I4xNBUlkn3lE2/dZF3Pi0ygYGtLc4RXXdA=="
+    },
+    "level-transcoder": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz",
-      "integrity": "sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==",
+      "resolved": "https://registry.npmjs.org/level-transcoder/-/level-transcoder-1.0.1.tgz",
+      "integrity": "sha512-t7bFwFtsQeD8cl8NIoQ2iwxA0CL/9IFw7/9gAjOonH0PWTTiRfY7Hq+Ejbsxh86tXobDQ6IOiddjNYIfOBs06w==",
       "requires": {
-        "xtend": "^4.0.2"
-      }
-    },
-    "level-ws": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/level-ws/-/level-ws-2.0.0.tgz",
-      "integrity": "sha512-1iv7VXx0G9ec1isqQZ7y5LmoZo/ewAsyDHNA8EFDW5hqH2Kqovm33nSFkSdnLLAK+I5FlT+lo5Cw9itGe+CpQA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.0",
-        "xtend": "^4.0.1"
-      }
-    },
-    "levelup": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
-      "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
-      "requires": {
-        "deferred-leveldown": "~5.3.0",
-        "level-errors": "~2.0.0",
-        "level-iterator-stream": "~4.0.0",
-        "level-supports": "~1.0.0",
-        "xtend": "~4.0.0"
+        "buffer": "^6.0.3",
+        "module-error": "^1.0.1"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.2.1"
+          }
+        }
       }
     },
     "levn": {
@@ -32183,6 +32613,12 @@
       "resolved": "https://registry.npmjs.org/lodash.sum/-/lodash.sum-4.0.2.tgz",
       "integrity": "sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s="
     },
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
     "log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -32276,11 +32712,6 @@
         "yallist": "^3.0.2"
       }
     },
-    "ltgt": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
-      "integrity": "sha1-81ypHEk/e3PaDgdJUwTxezH4fuU="
-    },
     "mcl-wasm": {
       "version": "0.7.9",
       "resolved": "https://registry.npmjs.org/mcl-wasm/-/mcl-wasm-0.7.9.tgz",
@@ -32301,36 +32732,14 @@
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
     },
-    "memdown": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/memdown/-/memdown-5.1.0.tgz",
-      "integrity": "sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==",
+    "memory-level": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/memory-level/-/memory-level-1.0.0.tgz",
+      "integrity": "sha512-UXzwewuWeHBz5krr7EvehKcmLFNoXxGcvuYhC41tRnkrTbJohtS7kVn9akmgirtRygg+f7Yjsfi8Uu5SGSQ4Og==",
       "requires": {
-        "abstract-leveldown": "~6.2.1",
-        "functional-red-black-tree": "~1.0.1",
-        "immediate": "~3.2.3",
-        "inherits": "~2.0.1",
-        "ltgt": "~2.2.0",
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "abstract-leveldown": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-          "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "immediate": "^3.2.3",
-            "level-concat-iterator": "~2.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-        "immediate": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz",
-          "integrity": "sha1-0UD6j2FGWb1lQSMwl92qwlzdmRw="
-        }
+        "abstract-level": "^1.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "module-error": "^1.0.1"
       }
     },
     "memorystream": {
@@ -32349,19 +32758,6 @@
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
-    "merkle-patricia-tree": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.4.tgz",
-      "integrity": "sha512-eHbf/BG6eGNsqqfbLED9rIqbsF4+sykEaBn6OLNs71tjclbMcMOk1tEPmJKcNcNCLkvbpY/lwyOlizWsqPNo8w==",
-      "requires": {
-        "@types/levelup": "^4.3.0",
-        "ethereumjs-util": "^7.1.4",
-        "level-mem": "^5.0.1",
-        "level-ws": "^2.0.0",
-        "readable-stream": "^3.6.0",
-        "semaphore-async-await": "^1.5.1"
-      }
-    },
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -32392,16 +32788,16 @@
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "mime-db": {
-      "version": "1.49.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
-      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
     },
     "mime-types": {
-      "version": "2.1.32",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
-      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "requires": {
-        "mime-db": "1.49.0"
+        "mime-db": "1.52.0"
       }
     },
     "mimic-response": {
@@ -32487,31 +32883,29 @@
       }
     },
     "mocha": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
-      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==",
       "requires": {
         "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
-        "debug": "4.3.3",
+        "debug": "4.3.4",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
         "glob": "7.2.0",
-        "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
-        "minimatch": "4.2.1",
+        "minimatch": "5.0.1",
         "ms": "2.1.3",
-        "nanoid": "3.3.1",
+        "nanoid": "3.3.3",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.2.0",
+        "workerpool": "6.2.1",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
@@ -32522,19 +32916,12 @@
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
           "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
         },
-        "debug": {
-          "version": "4.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
           "requires": {
-            "ms": "2.1.2"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.1.2",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-              "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-            }
+            "balanced-match": "^1.0.0"
           }
         },
         "escape-string-regexp": {
@@ -32573,11 +32960,11 @@
           }
         },
         "minimatch": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
-          "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+          "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
           "requires": {
-            "brace-expansion": "^1.1.7"
+            "brace-expansion": "^2.0.1"
           }
         },
         "ms": {
@@ -32613,14 +33000,6 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
         }
       }
     },
@@ -32629,6 +33008,11 @@
       "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz",
       "integrity": "sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw=="
     },
+    "module-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/module-error/-/module-error-1.0.2.tgz",
+      "integrity": "sha512-0yuvsqSCv8LbaOKhnsQ/T5JhyFlCYLPXK3U2sgV10zoKQwzs/MyfuQUOZQ1V/6OCOJsK/TRgNVrPuPDqtdMFtA=="
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -32683,14 +33067,19 @@
       "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18="
     },
     "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w=="
+    },
+    "napi-macros": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-2.0.0.tgz",
+      "integrity": "sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg=="
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
     "neo-async": {
       "version": "2.6.2",
@@ -32850,9 +33239,9 @@
       }
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "requires": {
         "ee-first": "1.1.1"
       }
@@ -33191,11 +33580,6 @@
         "ipaddr.js": "1.9.1"
       }
     },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
-    },
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -33234,9 +33618,9 @@
       "integrity": "sha512-ksWccjmXOHU2gJBnH0cK1lSYdvSZ0zLoCMSz/nTGh6hDvCSgcRxDyIcOBD6KNxFz3xhMPm/T267Tbe2JRymKEQ=="
     },
     "qs": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
-      "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "requires": {
         "side-channel": "^1.0.4"
       }
@@ -33260,8 +33644,7 @@
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "randombytes": {
       "version": "2.1.0",
@@ -33286,12 +33669,12 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz",
-      "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.3",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -33413,9 +33796,9 @@
           }
         },
         "qs": {
-          "version": "6.5.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+          "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
         }
       }
     },
@@ -33495,6 +33878,14 @@
         "queue-microtask": "^1.2.2"
       }
     },
+    "run-parallel-limit": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.1.0.tgz",
+      "integrity": "sha512-jJA7irRNM91jaKc3Hcl1npHsFLOXOoTkPCUL1JEa1R82O2miplXXRaGdjW/KM/98YQWDhJLiSs793CnXfblJUw==",
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "rustbn.js": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.2.0.tgz",
@@ -33595,34 +33986,29 @@
         "node-gyp-build": "^4.2.0"
       }
     },
-    "semaphore-async-await": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz",
-      "integrity": "sha1-hXvvXjZEYBykuVcLh+nfXKEpdPo="
-    },
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -33636,14 +34022,14 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
             }
           }
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
         }
       }
     },
@@ -33665,14 +34051,14 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "servify": {
@@ -33698,9 +34084,9 @@
       "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "sha.js": {
       "version": "2.4.11",
@@ -33784,7 +34170,45 @@
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
     },
     "snake-case": {
       "version": "2.1.0",
@@ -33998,9 +34422,9 @@
       }
     },
     "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "strict-uri-encode": {
       "version": "1.1.0",
@@ -34216,6 +34640,54 @@
         }
       }
     },
+    "table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ansi-regex": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        }
+      }
+    },
     "tar": {
       "version": "4.4.19",
       "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
@@ -34292,9 +34764,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
     },
     "tough-cookie": {
       "version": "2.5.0",
@@ -34318,11 +34790,6 @@
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
       "dev": true
     },
-    "true-case-path": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz",
-      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q=="
-    },
     "ts-essentials": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-1.0.4.tgz",
@@ -34449,7 +34916,7 @@
       "version": "4.6.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
       "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==",
-      "dev": true,
+      "devOptional": true,
       "peer": true
     },
     "typical": {
@@ -34487,9 +34954,9 @@
       "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
     },
     "undici": {
-      "version": "4.16.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz",
-      "integrity": "sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw=="
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.10.0.tgz",
+      "integrity": "sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g=="
     },
     "universalify": {
       "version": "0.1.2",
@@ -35056,9 +35523,9 @@
       "dev": true
     },
     "workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw=="
     },
     "wrap-ansi": {
       "version": "7.0.0",
diff --git a/contracts/basic-bandwidth-generation/package.json b/contracts/basic-bandwidth-generation/package.json
index 0fee523d6c..94ba8f7402 100644
--- a/contracts/basic-bandwidth-generation/package.json
+++ b/contracts/basic-bandwidth-generation/package.json
@@ -1,12 +1,12 @@
 {
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.5",
-    "@nomiclabs/hardhat-etherscan": "^3.0.3",
+    "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
     "chai": "^4.3.6",
     "ethereum-waffle": "^3.4.4",
     "ethers": "^5.6.1",
-    "hardhat": "^2.9.2",
+    "hardhat": "^2.11.2",
     "solidity-coverage": "^0.7.20"
   },
   "dependencies": {
diff --git a/contracts/coconut-bandwidth/src/error.rs b/contracts/coconut-bandwidth/src/error.rs
index 7bc8b11d4a..9f4aed6224 100644
--- a/contracts/coconut-bandwidth/src/error.rs
+++ b/contracts/coconut-bandwidth/src/error.rs
@@ -11,7 +11,7 @@ use thiserror::Error;
 /// Look at https://docs.rs/thiserror/1.0.21/thiserror/ for details.
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error(transparent)]
     Std(#[from] StdError),
 
     #[error("Received multiple coin types")]
@@ -29,6 +29,6 @@ pub enum ContractError {
     #[error("Credential already spent or in process of spending")]
     DuplicateBlindedSerialNumber,
 
-    #[error("{0}")]
+    #[error(transparent)]
     Admin(#[from] AdminError),
 }
diff --git a/contracts/coconut-bandwidth/src/storage.rs b/contracts/coconut-bandwidth/src/storage.rs
index 40e33b9f8d..549e64caaf 100644
--- a/contracts/coconut-bandwidth/src/storage.rs
+++ b/contracts/coconut-bandwidth/src/storage.rs
@@ -25,7 +25,7 @@ impl<'a> IndexList<SpendCredential> for SpendCredentialIndex<'a> {
     }
 }
 
-// gateways() is the storage access function.
+// spent_credentials() is the storage access function.
 pub(crate) fn spent_credentials<'a>(
 ) -> IndexedMap<'a, &'a str, SpendCredential, SpendCredentialIndex<'a>> {
     let indexes = SpendCredentialIndex {
diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml
index 479187c370..fe4440cf2f 100644
--- a/contracts/coconut-dkg/Cargo.toml
+++ b/contracts/coconut-dkg/Cargo.toml
@@ -19,4 +19,8 @@ cw4 = { version = "0.13.4" }
 
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
-thiserror = "1.0.23"
\ No newline at end of file
+thiserror = "1.0.23"
+
+[dev-dependencies]
+cw-multi-test = { version = "0.13.4" }
+cw4-group = { path = "../multisig/cw4-group" }
\ No newline at end of file
diff --git a/contracts/coconut-dkg/src/contract.rs b/contracts/coconut-dkg/src/contract.rs
new file mode 100644
index 0000000000..650cf312f0
--- /dev/null
+++ b/contracts/coconut-dkg/src/contract.rs
@@ -0,0 +1,265 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::dealers::queries::{
+    query_current_dealers_paged, query_dealer_details, query_past_dealers_paged,
+};
+use crate::dealers::transactions::try_add_dealer;
+use crate::dealings::queries::query_dealings_paged;
+use crate::dealings::transactions::try_commit_dealings;
+use crate::epoch_state::queries::{query_current_epoch, query_current_epoch_threshold};
+use crate::epoch_state::storage::CURRENT_EPOCH;
+use crate::epoch_state::transactions::advance_epoch_state;
+use crate::error::ContractError;
+use crate::state::{State, MULTISIG, STATE};
+use crate::verification_key_shares::queries::query_vk_shares_paged;
+use crate::verification_key_shares::transactions::try_commit_verification_key_share;
+use crate::verification_key_shares::transactions::try_verify_verification_key_share;
+use coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use coconut_dkg_common::types::{Epoch, EpochState};
+use cosmwasm_std::{
+    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
+};
+use cw4::Cw4Contract;
+
+/// Instantiate the contract.
+///
+/// `deps` contains Storage, API and Querier
+/// `env` contains block, message and contract info
+/// `msg` is the contract initialization message, sort of like a constructor call.
+#[entry_point]
+pub fn instantiate(
+    mut deps: DepsMut<'_>,
+    env: Env,
+    _info: MessageInfo,
+    msg: InstantiateMsg,
+) -> Result<Response, ContractError> {
+    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
+    MULTISIG.set(deps.branch(), Some(multisig_addr.clone()))?;
+
+    let group_addr = Cw4Contract(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
+        ContractError::InvalidGroup {
+            addr: msg.group_addr.clone(),
+        }
+    })?);
+
+    let state = State {
+        group_addr,
+        multisig_addr,
+        mix_denom: msg.mix_denom,
+    };
+    STATE.save(deps.storage, &state)?;
+
+    CURRENT_EPOCH.save(
+        deps.storage,
+        &Epoch::new(EpochState::default(), env.block.time),
+    )?;
+
+    Ok(Response::default())
+}
+
+/// Handle an incoming message
+#[entry_point]
+pub fn execute(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    msg: ExecuteMsg,
+) -> Result<Response, ContractError> {
+    match msg {
+        ExecuteMsg::RegisterDealer {
+            bte_key_with_proof,
+            announce_address,
+        } => try_add_dealer(deps, info, bte_key_with_proof, announce_address),
+        ExecuteMsg::CommitDealing { dealing_bytes } => {
+            try_commit_dealings(deps, info, dealing_bytes)
+        }
+        ExecuteMsg::CommitVerificationKeyShare { share } => {
+            try_commit_verification_key_share(deps, env, info, share)
+        }
+        ExecuteMsg::VerifyVerificationKeyShare { owner } => {
+            try_verify_verification_key_share(deps, info, owner)
+        }
+        ExecuteMsg::AdvanceEpochState {} => advance_epoch_state(deps, env),
+    }
+}
+
+#[entry_point]
+pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
+    let response = match msg {
+        QueryMsg::GetCurrentEpochState {} => to_binary(&query_current_epoch(deps.storage)?)?,
+        QueryMsg::GetCurrentEpochThreshold {} => {
+            to_binary(&query_current_epoch_threshold(deps.storage)?)?
+        }
+        QueryMsg::GetDealerDetails { dealer_address } => {
+            to_binary(&query_dealer_details(deps, dealer_address)?)?
+        }
+        QueryMsg::GetCurrentDealers { limit, start_after } => {
+            to_binary(&query_current_dealers_paged(deps, start_after, limit)?)?
+        }
+        QueryMsg::GetPastDealers { limit, start_after } => {
+            to_binary(&query_past_dealers_paged(deps, start_after, limit)?)?
+        }
+        QueryMsg::GetDealing {
+            idx,
+            limit,
+            start_after,
+        } => to_binary(&query_dealings_paged(deps, idx, start_after, limit)?)?,
+        QueryMsg::GetVerificationKeys { limit, start_after } => {
+            to_binary(&query_vk_shares_paged(deps, start_after, limit)?)?
+        }
+    };
+
+    Ok(response)
+}
+
+#[entry_point]
+pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+    Ok(Default::default())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::TEST_MIX_DENOM;
+    use crate::support::tests::helpers::{ADMIN_ADDRESS, MULTISIG_CONTRACT};
+    use coconut_dkg_common::msg::ExecuteMsg::RegisterDealer;
+    use coconut_dkg_common::types::NodeIndex;
+    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::{coins, Addr};
+    use cw4::Member;
+    use cw4_group::msg::InstantiateMsg as GroupInstantiateMsg;
+    use cw_multi_test::{App, AppBuilder, AppResponse, ContractWrapper, Executor};
+
+    fn instantiate_with_group(app: &mut App, members: &[Addr]) -> Addr {
+        let group_code_id = app.store_code(Box::new(ContractWrapper::new(
+            cw4_group::contract::execute,
+            cw4_group::contract::instantiate,
+            cw4_group::contract::query,
+        )));
+        let msg = GroupInstantiateMsg {
+            admin: Some(ADMIN_ADDRESS.to_string()),
+            members: members
+                .iter()
+                .map(|member| Member {
+                    addr: member.to_string(),
+                    weight: 10,
+                })
+                .collect(),
+        };
+        let group_contract_addr = app
+            .instantiate_contract(
+                group_code_id,
+                Addr::unchecked(ADMIN_ADDRESS),
+                &msg,
+                &[],
+                "group",
+                None,
+            )
+            .unwrap();
+
+        let coconut_dkg_code_id =
+            app.store_code(Box::new(ContractWrapper::new(execute, instantiate, query)));
+        let msg = InstantiateMsg {
+            group_addr: group_contract_addr.to_string(),
+            multisig_addr: MULTISIG_CONTRACT.to_string(),
+            mix_denom: TEST_MIX_DENOM.to_string(),
+        };
+        app.instantiate_contract(
+            coconut_dkg_code_id,
+            Addr::unchecked(ADMIN_ADDRESS),
+            &msg,
+            &[],
+            "coconut dkg",
+            None,
+        )
+        .unwrap()
+    }
+
+    fn parse_node_index(res: AppResponse) -> NodeIndex {
+        res.events
+            .into_iter()
+            .find(|e| &e.ty == "wasm")
+            .unwrap()
+            .attributes
+            .into_iter()
+            .find(|attr| &attr.key == "node_index")
+            .unwrap()
+            .value
+            .parse::<u64>()
+            .unwrap()
+    }
+
+    #[test]
+    fn initialize_contract() {
+        let mut deps = mock_dependencies();
+        let env = mock_env();
+        let msg = InstantiateMsg {
+            group_addr: "group_addr".to_string(),
+            multisig_addr: "multisig_addr".to_string(),
+            mix_denom: "nym".to_string(),
+        };
+        let info = mock_info("creator", &[]);
+
+        let res = instantiate(deps.as_mut(), env.clone(), info, msg);
+        assert!(res.is_ok())
+    }
+
+    #[test]
+    fn execute_add_dealer() {
+        let init_funds = coins(100, TEST_MIX_DENOM);
+        const MEMBER_SIZE: usize = 100;
+        let members: [Addr; MEMBER_SIZE] =
+            std::array::from_fn(|idx| Addr::unchecked(format!("member{}", idx)));
+
+        let mut app = AppBuilder::new().build(|router, _, storage| {
+            router
+                .bank
+                .init_balance(storage, &Addr::unchecked(ADMIN_ADDRESS), init_funds)
+                .unwrap();
+        });
+        let coconut_dkg_contract_addr = instantiate_with_group(&mut app, &members);
+
+        for (idx, member) in members.iter().enumerate() {
+            let res = app
+                .execute_contract(
+                    member.clone(),
+                    coconut_dkg_contract_addr.clone(),
+                    &RegisterDealer {
+                        bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        announce_address: "127.0.0.1:8000".to_string(),
+                    },
+                    &vec![],
+                )
+                .unwrap();
+            assert_eq!(parse_node_index(res), (idx + 1) as u64);
+
+            let err = app
+                .execute_contract(
+                    member.clone(),
+                    coconut_dkg_contract_addr.clone(),
+                    &RegisterDealer {
+                        bte_key_with_proof: "bte_key_with_proof".to_string(),
+                        announce_address: "127.0.0.1:8000".to_string(),
+                    },
+                    &vec![],
+                )
+                .unwrap_err();
+            assert_eq!(ContractError::AlreadyADealer, err.downcast().unwrap());
+        }
+
+        let unauthorized_member = Addr::unchecked("not_a_member");
+        let err = app
+            .execute_contract(
+                unauthorized_member,
+                coconut_dkg_contract_addr.clone(),
+                &RegisterDealer {
+                    bte_key_with_proof: "bte_key_with_proof".to_string(),
+                    announce_address: "127.0.0.1:8000".to_string(),
+                },
+                &vec![],
+            )
+            .unwrap_err();
+        assert_eq!(ContractError::Unauthorized, err.downcast().unwrap());
+    }
+}
diff --git a/contracts/coconut-dkg/src/dealers/queries.rs b/contracts/coconut-dkg/src/dealers/queries.rs
index 5221994dc0..b638629851 100644
--- a/contracts/coconut-dkg/src/dealers/queries.rs
+++ b/contracts/coconut-dkg/src/dealers/queries.rs
@@ -10,7 +10,7 @@ fn query_dealers(
     deps: Deps<'_>,
     start_after: Option<String>,
     limit: Option<u32>,
-    underlying_map: IndexedDealersMap<'_>,
+    underlying_map: &IndexedDealersMap<'_>,
 ) -> StdResult<PagedDealerResponse> {
     let limit = limit
         .unwrap_or(storage::DEALERS_PAGE_DEFAULT_LIMIT)
@@ -55,7 +55,7 @@ pub fn query_current_dealers_paged(
     start_after: Option<String>,
     limit: Option<u32>,
 ) -> StdResult<PagedDealerResponse> {
-    query_dealers(deps, start_after, limit, storage::current_dealers())
+    query_dealers(deps, start_after, limit, &storage::current_dealers())
 }
 
 pub fn query_past_dealers_paged(
@@ -63,5 +63,159 @@ pub fn query_past_dealers_paged(
     start_after: Option<String>,
     limit: Option<u32>,
 ) -> StdResult<PagedDealerResponse> {
-    query_dealers(deps, start_after, limit, storage::past_dealers())
+    query_dealers(deps, start_after, limit, &storage::past_dealers())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::dealers::storage::{DEALERS_PAGE_DEFAULT_LIMIT, DEALERS_PAGE_MAX_LIMIT};
+    use crate::support::tests::fixtures::dealer_details_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use cosmwasm_std::DepsMut;
+
+    fn fill_dealers(deps: DepsMut<'_>, mapping: &IndexedDealersMap<'_>, size: usize) {
+        for n in 0..size {
+            let dealer_details = dealer_details_fixture(n as u64);
+            mapping
+                .save(deps.storage, &dealer_details.address, &dealer_details)
+                .unwrap();
+        }
+    }
+
+    fn remove_dealers(deps: DepsMut<'_>, mapping: &IndexedDealersMap<'_>, size: usize) {
+        for n in 0..size {
+            let dealer_details = dealer_details_fixture(n as u64);
+            mapping
+                .remove(deps.storage, &dealer_details.address)
+                .unwrap();
+        }
+    }
+
+    #[test]
+    fn dealers_empty_on_init() {
+        let deps = init_contract();
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            let page1 = query_dealers(deps.as_ref(), None, None, &mapping).unwrap();
+            assert_eq!(0, page1.dealers.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let limit = 2;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            let page1 = query_dealers(deps.as_ref(), None, Option::from(limit), &mapping).unwrap();
+            assert_eq!(limit, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            // query without explicitly setting a limit
+            let page1 = query_dealers(deps.as_ref(), None, None, &mapping).unwrap();
+
+            assert_eq!(DEALERS_PAGE_DEFAULT_LIMIT, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * DEALERS_PAGE_MAX_LIMIT;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1000);
+
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(crazy_limit), &mapping).unwrap();
+
+            // we default to a decent sized upper bound instead
+            let expected_limit = DEALERS_PAGE_MAX_LIMIT;
+            assert_eq!(expected_limit, page1.dealers.len() as u32);
+
+            remove_dealers(deps.as_mut(), &mapping, 1000);
+        }
+    }
+
+    #[test]
+    fn dealers_pagination_works() {
+        let mut deps = init_contract();
+
+        let per_page = 2;
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 1);
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+
+            // page should have 1 result on it
+            assert_eq!(1, page1.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 1);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 2);
+            // page1 should have 2 results on it
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            assert_eq!(2, page1.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 2);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 3);
+            // page1 still has 2 results
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            assert_eq!(2, page1.dealers.len());
+
+            // retrieving the next page should start after the last key on this page
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealers(
+                deps.as_ref(),
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+                &mapping,
+            )
+            .unwrap();
+
+            assert_eq!(1, page2.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 3);
+        }
+
+        for mapping in [storage::current_dealers(), storage::past_dealers()] {
+            fill_dealers(deps.as_mut(), &mapping, 4);
+            let page1 =
+                query_dealers(deps.as_ref(), None, Option::from(per_page), &mapping).unwrap();
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealers(
+                deps.as_ref(),
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+                &mapping,
+            )
+            .unwrap();
+
+            // now we have 2 pages, with 2 results on the second page
+            assert_eq!(2, page2.dealers.len());
+            remove_dealers(deps.as_mut(), &mapping, 4);
+        }
+    }
 }
diff --git a/contracts/coconut-dkg/src/dealers/transactions.rs b/contracts/coconut-dkg/src/dealers/transactions.rs
index 74e7d61aee..6566581221 100644
--- a/contracts/coconut-dkg/src/dealers/transactions.rs
+++ b/contracts/coconut-dkg/src/dealers/transactions.rs
@@ -3,7 +3,8 @@
 
 use crate::dealers::storage as dealers_storage;
 use crate::epoch_state::utils::check_epoch_state;
-use crate::{ContractError, State, STATE};
+use crate::error::ContractError;
+use crate::state::{State, STATE};
 use coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState};
 use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};
 
@@ -64,3 +65,40 @@ pub fn try_add_dealer(
 
     Ok(Response::new().add_attribute("node_index", node_index.to_string()))
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::helpers;
+    use coconut_dkg_common::types::PUBLIC_KEY_SUBMISSION_TIME_SECS;
+    use cosmwasm_std::testing::{mock_env, mock_info};
+
+    #[test]
+    fn invalid_state() {
+        let mut deps = helpers::init_contract();
+        let owner = Addr::unchecked("owner");
+        let mut env = mock_env();
+        let info = mock_info(owner.as_str(), &[]);
+        let bte_key_with_proof = String::from("bte_key_with_proof");
+        let announce_address = String::from("localhost:8000");
+
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env).unwrap();
+
+        let ret = try_add_dealer(
+            deps.as_mut(),
+            info.clone(),
+            bte_key_with_proof.clone(),
+            announce_address.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::DealingExchange.to_string(),
+                expected_state: EpochState::default().to_string(),
+            }
+        );
+    }
+}
diff --git a/contracts/coconut-dkg/src/dealings/queries.rs b/contracts/coconut-dkg/src/dealings/queries.rs
index cf2321837c..0bf0452c14 100644
--- a/contracts/coconut-dkg/src/dealings/queries.rs
+++ b/contracts/coconut-dkg/src/dealings/queries.rs
@@ -43,3 +43,153 @@ pub fn query_dealings_paged(
         start_next_after,
     ))
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::dealings::storage::{DEALINGS_PAGE_DEFAULT_LIMIT, DEALINGS_PAGE_MAX_LIMIT};
+    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use cosmwasm_std::{Addr, DepsMut};
+
+    fn fill_dealings(deps: DepsMut<'_>, size: usize) {
+        for n in 0..size {
+            let dealing_share = dealing_bytes_fixture();
+            let sender = Addr::unchecked(format!("owner{}", n));
+            for idx in 0..TOTAL_DEALINGS {
+                DEALINGS_BYTES[idx]
+                    .save(deps.storage, &sender, &dealing_share)
+                    .unwrap();
+            }
+        }
+    }
+
+    #[test]
+    fn empty_on_bad_idx() {
+        let mut deps = init_contract();
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in TOTAL_DEALINGS as u64..100 * TOTAL_DEALINGS as u64 {
+            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
+            assert_eq!(0, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_empty_on_init() {
+        let deps = init_contract();
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let response = query_dealings_paged(deps.as_ref(), idx, None, Option::from(2)).unwrap();
+            assert_eq!(0, response.dealings.len());
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let limit = 2;
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(limit)).unwrap();
+            assert_eq!(limit, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        fill_dealings(deps.as_mut(), 1000);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // query without explicitly setting a limit
+            let page1 = query_dealings_paged(deps.as_ref(), idx, None, None).unwrap();
+
+            assert_eq!(DEALINGS_PAGE_DEFAULT_LIMIT, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        fill_dealings(deps.as_mut(), 1000);
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * DEALINGS_PAGE_MAX_LIMIT;
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(crazy_limit)).unwrap();
+
+            // we default to a decent sized upper bound instead
+            let expected_limit = DEALINGS_PAGE_MAX_LIMIT;
+            assert_eq!(expected_limit, page1.dealings.len() as u32);
+        }
+    }
+
+    #[test]
+    fn dealings_pagination_works() {
+        let mut deps = init_contract();
+
+        fill_dealings(deps.as_mut(), 1);
+
+        let per_page = 2;
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+
+            // page should have 1 result on it
+            assert_eq!(1, page1.dealings.len());
+        }
+
+        // save another
+        fill_dealings(deps.as_mut(), 2);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // page1 should have 2 results on it
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            assert_eq!(2, page1.dealings.len());
+        }
+
+        fill_dealings(deps.as_mut(), 3);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            // page1 still has 2 results
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            assert_eq!(2, page1.dealings.len());
+
+            // retrieving the next page should start after the last key on this page
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealings_paged(
+                deps.as_ref(),
+                idx,
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+            )
+            .unwrap();
+
+            assert_eq!(1, page2.dealings.len());
+        }
+
+        fill_dealings(deps.as_mut(), 4);
+
+        for idx in 0..TOTAL_DEALINGS as u64 {
+            let page1 =
+                query_dealings_paged(deps.as_ref(), idx, None, Option::from(per_page)).unwrap();
+            let start_after = page1.start_next_after.unwrap();
+            let page2 = query_dealings_paged(
+                deps.as_ref(),
+                idx,
+                Option::from(start_after.to_string()),
+                Option::from(per_page),
+            )
+            .unwrap();
+
+            // now we have 2 pages, with 2 results on the second page
+            assert_eq!(2, page2.dealings.len());
+        }
+    }
+}
diff --git a/contracts/coconut-dkg/src/dealings/transactions.rs b/contracts/coconut-dkg/src/dealings/transactions.rs
index 73e067e0d6..fe2e5544cb 100644
--- a/contracts/coconut-dkg/src/dealings/transactions.rs
+++ b/contracts/coconut-dkg/src/dealings/transactions.rs
@@ -4,7 +4,7 @@
 use crate::dealers::storage as dealers_storage;
 use crate::dealings::storage::DEALINGS_BYTES;
 use crate::epoch_state::utils::check_epoch_state;
-use crate::ContractError;
+use crate::error::ContractError;
 use coconut_dkg_common::types::{ContractSafeBytes, EpochState};
 use cosmwasm_std::{DepsMut, MessageInfo, Response};
 
@@ -35,3 +35,66 @@ pub fn try_commit_dealings(
         commitment: String::from("dealing"),
     })
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::fixtures::dealing_bytes_fixture;
+    use crate::support::tests::helpers;
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::types::PUBLIC_KEY_SUBMISSION_TIME_SECS;
+    use cosmwasm_std::testing::{mock_env, mock_info};
+    use cosmwasm_std::Addr;
+
+    #[test]
+    fn invalid_commit_dealing() {
+        let mut deps = helpers::init_contract();
+        let owner = Addr::unchecked("owner");
+        let mut env = mock_env();
+        let info = mock_info(owner.as_str(), &[]);
+        let dealing_bytes = dealing_bytes_fixture();
+
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::DealingExchange.to_string()
+            }
+        );
+
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env).unwrap();
+
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(ret, ContractError::NotADealer);
+
+        let dealer_details = DealerDetails {
+            address: owner.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &owner, &dealer_details)
+            .unwrap();
+
+        for dealings in DEALINGS_BYTES {
+            assert!(!dealings.has(deps.as_mut().storage, &owner));
+            let ret = try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone());
+            assert!(ret.is_ok());
+            assert!(dealings.has(deps.as_mut().storage, &owner));
+        }
+        let ret =
+            try_commit_dealings(deps.as_mut(), info.clone(), dealing_bytes.clone()).unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::AlreadyCommitted {
+                commitment: String::from("dealing"),
+            }
+        );
+    }
+}
diff --git a/contracts/coconut-dkg/src/epoch_state/mod.rs b/contracts/coconut-dkg/src/epoch_state/mod.rs
index 195ff89361..02c5bc4402 100644
--- a/contracts/coconut-dkg/src/epoch_state/mod.rs
+++ b/contracts/coconut-dkg/src/epoch_state/mod.rs
@@ -3,4 +3,5 @@
 
 pub mod queries;
 pub mod storage;
+pub mod transactions;
 pub mod utils;
diff --git a/contracts/coconut-dkg/src/epoch_state/queries.rs b/contracts/coconut-dkg/src/epoch_state/queries.rs
index 142ee4826a..3a68e0117c 100644
--- a/contracts/coconut-dkg/src/epoch_state/queries.rs
+++ b/contracts/coconut-dkg/src/epoch_state/queries.rs
@@ -1,13 +1,48 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use super::storage;
-use crate::ContractError;
-use coconut_dkg_common::types::EpochState;
+use crate::epoch_state::storage::{CURRENT_EPOCH, THRESHOLD};
+use crate::error::ContractError;
+use coconut_dkg_common::types::Epoch;
 use cosmwasm_std::Storage;
 
-pub(crate) fn query_current_epoch_state(
-    storage: &dyn Storage,
-) -> Result<EpochState, ContractError> {
-    storage::current_epoch_state(storage)
+pub(crate) fn query_current_epoch(storage: &dyn Storage) -> Result<Epoch, ContractError> {
+    CURRENT_EPOCH
+        .load(storage)
+        .map_err(|_| ContractError::EpochNotInitialised)
+}
+
+pub(crate) fn query_current_epoch_threshold(
+    storage: &dyn Storage,
+) -> Result<Option<u64>, ContractError> {
+    Ok(THRESHOLD.may_load(storage)?)
+}
+
+#[cfg(test)]
+pub(crate) mod test {
+    use super::*;
+    use crate::support::tests::helpers::init_contract;
+    use coconut_dkg_common::types::{EpochState, PUBLIC_KEY_SUBMISSION_TIME_SECS};
+    use cosmwasm_std::testing::mock_env;
+
+    #[test]
+    fn query_state() {
+        let mut deps = init_contract();
+        let epoch = query_current_epoch(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::PublicKeySubmission);
+        assert_eq!(
+            epoch.finish_timestamp,
+            mock_env()
+                .block
+                .time
+                .plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS)
+        );
+    }
+
+    #[test]
+    fn query_threshold() {
+        let mut deps = init_contract();
+        let state = query_current_epoch_threshold(deps.as_mut().storage).unwrap();
+        assert!(state.is_none());
+    }
 }
diff --git a/contracts/coconut-dkg/src/epoch_state/storage.rs b/contracts/coconut-dkg/src/epoch_state/storage.rs
index b0abe5fa5b..d5aac5b041 100644
--- a/contracts/coconut-dkg/src/epoch_state/storage.rs
+++ b/contracts/coconut-dkg/src/epoch_state/storage.rs
@@ -1,29 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{ContractError, ADMIN};
-use coconut_dkg_common::types::EpochState;
-use cosmwasm_std::{DepsMut, MessageInfo, Response, Storage};
+use coconut_dkg_common::types::Epoch;
 use cw_storage_plus::Item;
 
-pub(crate) const CURRENT_EPOCH_STATE: Item<'_, EpochState> = Item::new("current_epoch_state");
-
-pub(crate) fn current_epoch_state(storage: &dyn Storage) -> Result<EpochState, ContractError> {
-    CURRENT_EPOCH_STATE
-        .load(storage)
-        .map_err(|_| ContractError::EpochNotInitialised)
-}
-
-pub(crate) fn advance_epoch_state(
-    deps: DepsMut<'_>,
-    info: MessageInfo,
-) -> Result<Response, ContractError> {
-    ADMIN.assert_admin(deps.as_ref(), &info.sender)?;
-    CURRENT_EPOCH_STATE.update::<_, ContractError>(deps.storage, |mut epoch_state| {
-        // TODO: When defaulting to the first state, some action will probably need to be taken on the
-        // rest of the contract, as we're starting with a new set of signers
-        epoch_state = epoch_state.next().unwrap_or_default();
-        Ok(epoch_state)
-    })?;
-    Ok(Response::default())
-}
+pub(crate) const CURRENT_EPOCH: Item<'_, Epoch> = Item::new("current_epoch");
+pub const THRESHOLD: Item<u64> = Item::new("threshold");
diff --git a/contracts/coconut-dkg/src/epoch_state/transactions.rs b/contracts/coconut-dkg/src/epoch_state/transactions.rs
new file mode 100644
index 0000000000..e2e75a1678
--- /dev/null
+++ b/contracts/coconut-dkg/src/epoch_state/transactions.rs
@@ -0,0 +1,208 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::dealers::storage::current_dealers;
+use crate::epoch_state::storage::{CURRENT_EPOCH, THRESHOLD};
+use crate::error::ContractError;
+use coconut_dkg_common::types::{Epoch, EpochState};
+use cosmwasm_std::{DepsMut, Env, Order, Response};
+
+pub(crate) fn advance_epoch_state(deps: DepsMut<'_>, env: Env) -> Result<Response, ContractError> {
+    let epoch = CURRENT_EPOCH.load(deps.storage)?;
+    if epoch.finish_timestamp > env.block.time {
+        return Err(ContractError::EarlyEpochStateAdvancement(
+            epoch
+                .finish_timestamp
+                .minus_seconds(env.block.time.seconds())
+                .seconds(),
+        ));
+    }
+
+    let current_epoch = CURRENT_EPOCH.update::<_, ContractError>(deps.storage, |mut epoch| {
+        // TODO: When defaulting to the first state, some action will probably need to be taken on the
+        // rest of the contract, as we're starting with a new set of signers
+        epoch = Epoch::new(epoch.state.next().unwrap_or_default(), env.block.time);
+        Ok(epoch)
+    })?;
+    if current_epoch.state == EpochState::DealingExchange {
+        let current_dealer_count = current_dealers()
+            .keys(deps.storage, None, None, Order::Ascending)
+            .count();
+        // note: ceiling in integer division can be achieved via q = (x + y - 1) / y;
+        let threshold = (2 * current_dealer_count as u64 + 3 - 1) / 3;
+        THRESHOLD.save(deps.storage, &threshold)?;
+    }
+    Ok(Response::default())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::error::ContractError::EarlyEpochStateAdvancement;
+    use crate::support::tests::helpers::init_contract;
+    use coconut_dkg_common::types::{
+        DealerDetails, EpochState, DEALING_EXCHANGE_TIME_SECS, IN_PROGRESS_TIME_SECS,
+        PUBLIC_KEY_SUBMISSION_TIME_SECS, VERIFICATION_KEY_FINALIZATION_TIME_SECS,
+        VERIFICATION_KEY_SUBMISSION_TIME_SECS, VERIFICATION_KEY_VALIDATION_TIME_SECS,
+    };
+    use cosmwasm_std::testing::mock_env;
+    use cosmwasm_std::Addr;
+
+    #[test]
+    fn advance_state() {
+        let mut deps = init_contract();
+        let mut env = mock_env();
+
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::PublicKeySubmission);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS)
+        );
+
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS - 1);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(1)
+        );
+
+        env.block.time = env.block.time.plus_seconds(1);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::DealingExchange);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block.time.plus_seconds(DEALING_EXCHANGE_TIME_SECS)
+        );
+
+        env.block.time = env.block.time.plus_seconds(DEALING_EXCHANGE_TIME_SECS - 2);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(2)
+        );
+
+        env.block.time = env.block.time.plus_seconds(3);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::VerificationKeySubmission);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block
+                .time
+                .plus_seconds(VERIFICATION_KEY_SUBMISSION_TIME_SECS)
+        );
+
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_SUBMISSION_TIME_SECS - 2);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(2)
+        );
+
+        env.block.time = env.block.time.plus_seconds(3);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::VerificationKeyValidation);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block
+                .time
+                .plus_seconds(VERIFICATION_KEY_VALIDATION_TIME_SECS)
+        );
+
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_VALIDATION_TIME_SECS - 3);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(3)
+        );
+
+        env.block.time = env.block.time.plus_seconds(3);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::VerificationKeyFinalization);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block
+                .time
+                .plus_seconds(VERIFICATION_KEY_FINALIZATION_TIME_SECS)
+        );
+
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_FINALIZATION_TIME_SECS - 1);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(1)
+        );
+
+        env.block.time = env.block.time.plus_seconds(1);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::InProgress);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block.time.plus_seconds(IN_PROGRESS_TIME_SECS)
+        );
+
+        env.block.time = env.block.time.plus_seconds(IN_PROGRESS_TIME_SECS - 100);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(100)
+        );
+
+        env.block.time = env.block.time.plus_seconds(50);
+        assert_eq!(
+            advance_epoch_state(deps.as_mut(), env.clone()).unwrap_err(),
+            EarlyEpochStateAdvancement(50)
+        );
+
+        env.block.time = env.block.time.plus_seconds(100);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let epoch = CURRENT_EPOCH.load(deps.as_mut().storage).unwrap();
+        assert_eq!(epoch.state, EpochState::PublicKeySubmission);
+        assert_eq!(
+            epoch.finish_timestamp,
+            env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS)
+        );
+    }
+
+    #[test]
+    fn verify_threshold() {
+        let mut deps = init_contract();
+        let mut env = mock_env();
+
+        assert!(THRESHOLD.may_load(deps.as_mut().storage).unwrap().is_none());
+
+        for i in 1..101 {
+            let address = Addr::unchecked(format!("dealer{}", i));
+            current_dealers()
+                .save(
+                    deps.as_mut().storage,
+                    &address,
+                    &DealerDetails {
+                        address: address.clone(),
+                        bte_public_key_with_proof: "bte_public_key_with_proof".to_string(),
+                        announce_address: "127.0.0.1".to_string(),
+                        assigned_index: i,
+                    },
+                )
+                .unwrap();
+        }
+
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env).unwrap();
+        assert_eq!(
+            THRESHOLD.may_load(deps.as_mut().storage).unwrap().unwrap(),
+            67
+        );
+    }
+}
diff --git a/contracts/coconut-dkg/src/epoch_state/utils.rs b/contracts/coconut-dkg/src/epoch_state/utils.rs
index d78fd49ae3..280436ee2e 100644
--- a/contracts/coconut-dkg/src/epoch_state/utils.rs
+++ b/contracts/coconut-dkg/src/epoch_state/utils.rs
@@ -1,7 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{ContractError, CURRENT_EPOCH_STATE};
+use crate::epoch_state::storage::CURRENT_EPOCH;
+use crate::error::ContractError;
 use coconut_dkg_common::types::EpochState;
 use cosmwasm_std::Storage;
 
@@ -9,7 +10,7 @@ pub(crate) fn check_epoch_state(
     storage: &dyn Storage,
     against: EpochState,
 ) -> Result<(), ContractError> {
-    let epoch_state = CURRENT_EPOCH_STATE.load(storage)?;
+    let epoch_state = CURRENT_EPOCH.load(storage)?.state;
     if epoch_state != against {
         Err(ContractError::IncorrectEpochState {
             current_state: epoch_state.to_string(),
@@ -19,3 +20,34 @@ pub(crate) fn check_epoch_state(
         Ok(())
     }
 }
+
+#[cfg(test)]
+pub(crate) mod test {
+    use super::*;
+    use crate::support::tests::helpers::init_contract;
+    use coconut_dkg_common::types::Epoch;
+    use cosmwasm_std::testing::mock_env;
+
+    #[test]
+    pub fn check_state() {
+        let mut deps = init_contract();
+        let env = mock_env();
+
+        for fixed_state in EpochState::default().all_until(EpochState::InProgress) {
+            CURRENT_EPOCH
+                .save(
+                    deps.as_mut().storage,
+                    &Epoch::new(fixed_state, env.block.time),
+                )
+                .unwrap();
+            for against_state in EpochState::default().all_until(EpochState::InProgress) {
+                let ret = check_epoch_state(deps.as_mut().storage, against_state);
+                if fixed_state == against_state {
+                    assert!(ret.is_ok());
+                } else {
+                    assert!(ret.is_err());
+                }
+            }
+        }
+    }
+}
diff --git a/contracts/coconut-dkg/src/error.rs b/contracts/coconut-dkg/src/error.rs
index ad3a3e74ef..0baeae5edd 100644
--- a/contracts/coconut-dkg/src/error.rs
+++ b/contracts/coconut-dkg/src/error.rs
@@ -1,46 +1,31 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::{Addr, StdError, VerificationError};
+use cosmwasm_std::StdError;
 use cw_controllers::AdminError;
 use thiserror::Error;
 
 /// Custom errors for contract failure conditions.
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error(transparent)]
     Std(#[from] StdError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     Admin(#[from] AdminError),
 
     #[error("Group contract invalid address '{addr}'")]
     InvalidGroup { addr: String },
 
-    #[error("No coin was sent for the deposit, you must send {denom}")]
-    NoDepositFound { denom: String },
-
-    #[error("Received multiple coin types")]
-    MultipleDenoms,
-
-    #[error("Wrong coin denomination, you must send {denom}")]
-    WrongDenom { denom: String },
-
-    #[error("Not enough funds sent for deposit. (received {received}, minimum {minimum})")]
-    InsufficientDeposit { received: u128, minimum: u128 },
-
-    #[error("Failed to perform ed25519 signature verification - {0}. This dealer will be temporarily blacklisted now.")]
-    Ed25519VerificationError(#[from] VerificationError),
-
-    #[error("Provided ed25519 signature did not verify correctly. This dealer will be temporarily blacklisted now.")]
-    InvalidEd25519Signature,
-
     #[error("This potential dealer is not in the coconut signer group")]
     Unauthorized,
 
     #[error("This sender is already a dealer for the epoch")]
     AlreadyADealer,
 
+    #[error("Too soon to advance epoch state. {0} more seconds until it can be advanced")]
+    EarlyEpochStateAdvancement(u64),
+
     #[error("Epoch hasn't been correctly initialised!")]
     EpochNotInitialised,
 
@@ -52,11 +37,6 @@ pub enum ContractError {
         expected_state: String,
     },
 
-    // we should never ever see this error (famous last words in programming), therefore, I'd want to
-    // explicitly declare it so that when we ultimate do see it, it's gonna be more informative over "normal" panic
-    #[error("Somehow our validated address {address} is not using correct bech32 encoding")]
-    InvalidValidatedAddress { address: Addr },
-
     #[error("This sender is not a dealer for the current epoch")]
     NotADealer,
 
diff --git a/contracts/coconut-dkg/src/lib.rs b/contracts/coconut-dkg/src/lib.rs
index 7255b96ae8..de93fa7b92 100644
--- a/contracts/coconut-dkg/src/lib.rs
+++ b/contracts/coconut-dkg/src/lib.rs
@@ -1,146 +1,12 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::dealers::queries::{
-    query_current_dealers_paged, query_dealer_details, query_past_dealers_paged,
-};
-use crate::dealings::queries::query_dealings_paged;
-use crate::epoch_state::queries::query_current_epoch_state;
-use crate::error::ContractError;
-use crate::state::{State, ADMIN, MULTISIG, STATE};
-use crate::verification_key_shares::queries::query_vk_shares_paged;
-use coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
-use coconut_dkg_common::types::EpochState;
-use cosmwasm_std::{
-    entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response,
-};
-use cw4::Cw4Contract;
-use epoch_state::storage::{advance_epoch_state, CURRENT_EPOCH_STATE};
-
 mod constants;
+pub mod contract;
 mod dealers;
 mod dealings;
 mod epoch_state;
-mod error;
+pub mod error;
 mod state;
+mod support;
 mod verification_key_shares;
-
-/// Instantiate the contract.
-///
-/// `deps` contains Storage, API and Querier
-/// `env` contains block, message and contract info
-/// `msg` is the contract initialization message, sort of like a constructor call.
-#[entry_point]
-pub fn instantiate(
-    mut deps: DepsMut<'_>,
-    _env: Env,
-    _info: MessageInfo,
-    msg: InstantiateMsg,
-) -> Result<Response, ContractError> {
-    let admin_addr = deps.api.addr_validate(&msg.admin)?;
-    let multisig_addr = deps.api.addr_validate(&msg.multisig_addr)?;
-    ADMIN.set(deps.branch(), Some(admin_addr))?;
-    MULTISIG.set(deps.branch(), Some(multisig_addr.clone()))?;
-
-    let group_addr = Cw4Contract(deps.api.addr_validate(&msg.group_addr).map_err(|_| {
-        ContractError::InvalidGroup {
-            addr: msg.group_addr.clone(),
-        }
-    })?);
-
-    let state = State {
-        group_addr,
-        multisig_addr,
-        mix_denom: msg.mix_denom,
-    };
-    STATE.save(deps.storage, &state)?;
-
-    CURRENT_EPOCH_STATE.save(deps.storage, &EpochState::default())?;
-
-    Ok(Response::default())
-}
-
-/// Handle an incoming message
-#[entry_point]
-pub fn execute(
-    deps: DepsMut<'_>,
-    env: Env,
-    info: MessageInfo,
-    msg: ExecuteMsg,
-) -> Result<Response, ContractError> {
-    match msg {
-        ExecuteMsg::RegisterDealer {
-            bte_key_with_proof,
-            announce_address,
-        } => {
-            dealers::transactions::try_add_dealer(deps, info, bte_key_with_proof, announce_address)
-        }
-        ExecuteMsg::CommitDealing { dealing_bytes } => {
-            dealings::transactions::try_commit_dealings(deps, info, dealing_bytes)
-        }
-        ExecuteMsg::CommitVerificationKeyShare { share } => {
-            verification_key_shares::transactions::try_commit_verification_key_share(
-                deps, env, info, share,
-            )
-        }
-        ExecuteMsg::VerifyVerificationKeyShare { owner } => {
-            verification_key_shares::transactions::try_verify_verification_key_share(
-                deps, info, owner,
-            )
-        }
-        ExecuteMsg::AdvanceEpochState {} => advance_epoch_state(deps, info),
-    }
-}
-
-#[entry_point]
-pub fn query(deps: Deps<'_>, _env: Env, msg: QueryMsg) -> Result<QueryResponse, ContractError> {
-    let response = match msg {
-        QueryMsg::GetCurrentEpochState {} => to_binary(&query_current_epoch_state(deps.storage)?)?,
-        QueryMsg::GetDealerDetails { dealer_address } => {
-            to_binary(&query_dealer_details(deps, dealer_address)?)?
-        }
-        QueryMsg::GetCurrentDealers { limit, start_after } => {
-            to_binary(&query_current_dealers_paged(deps, start_after, limit)?)?
-        }
-        QueryMsg::GetPastDealers { limit, start_after } => {
-            to_binary(&query_past_dealers_paged(deps, start_after, limit)?)?
-        }
-        QueryMsg::GetDealing {
-            idx,
-            limit,
-            start_after,
-        } => to_binary(&query_dealings_paged(deps, idx, start_after, limit)?)?,
-        QueryMsg::GetVerificationKeys { limit, start_after } => {
-            to_binary(&query_vk_shares_paged(deps, start_after, limit)?)?
-        }
-    };
-
-    Ok(response)
-}
-
-#[entry_point]
-pub fn migrate(_deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
-    Ok(Default::default())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
-
-    #[test]
-    fn initialize_contract() {
-        let mut deps = mock_dependencies();
-        let env = mock_env();
-        let msg = InstantiateMsg {
-            group_addr: "group_addr".to_string(),
-            multisig_addr: "multisig_addr".to_string(),
-            admin: "admin".to_string(),
-            mix_denom: "nym".to_string(),
-        };
-        let info = mock_info("creator", &[]);
-
-        let res = instantiate(deps.as_mut(), env.clone(), info, msg);
-        assert!(res.is_ok())
-    }
-}
diff --git a/contracts/coconut-dkg/src/state/mod.rs b/contracts/coconut-dkg/src/state/mod.rs
index 729618ec60..533bd98a0a 100644
--- a/contracts/coconut-dkg/src/state/mod.rs
+++ b/contracts/coconut-dkg/src/state/mod.rs
@@ -10,7 +10,6 @@ use serde::{Deserialize, Serialize};
 
 // unique items
 pub const STATE: Item<State> = Item::new("state");
-pub const ADMIN: Admin = Admin::new("admin");
 pub const MULTISIG: Admin = Admin::new("multisig");
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
diff --git a/contracts/coconut-dkg/src/support/mod.rs b/contracts/coconut-dkg/src/support/mod.rs
new file mode 100644
index 0000000000..15f23f8519
--- /dev/null
+++ b/contracts/coconut-dkg/src/support/mod.rs
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+pub mod tests;
diff --git a/contracts/coconut-dkg/src/support/tests/fixtures.rs b/contracts/coconut-dkg/src/support/tests/fixtures.rs
new file mode 100644
index 0000000000..19aad555d1
--- /dev/null
+++ b/contracts/coconut-dkg/src/support/tests/fixtures.rs
@@ -0,0 +1,32 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use coconut_dkg_common::dealer::DealerDetails;
+use coconut_dkg_common::types::ContractSafeBytes;
+use coconut_dkg_common::verification_key::ContractVKShare;
+use cosmwasm_std::Addr;
+
+pub const TEST_MIX_DENOM: &str = "unym";
+
+pub fn vk_share_fixture(index: u64) -> ContractVKShare {
+    ContractVKShare {
+        share: format!("share{}", index),
+        announce_address: format!("localhost:{}", index),
+        node_index: index,
+        owner: Addr::unchecked(format!("owner{}", index)),
+        verified: index % 2 == 0,
+    }
+}
+
+pub fn dealing_bytes_fixture() -> ContractSafeBytes {
+    ContractSafeBytes(vec![])
+}
+
+pub fn dealer_details_fixture(assigned_index: u64) -> DealerDetails {
+    DealerDetails {
+        address: Addr::unchecked(format!("owner{}", assigned_index)),
+        bte_public_key_with_proof: "".to_string(),
+        announce_address: "".to_string(),
+        assigned_index,
+    }
+}
diff --git a/contracts/coconut-dkg/src/support/tests/helpers.rs b/contracts/coconut-dkg/src/support/tests/helpers.rs
new file mode 100644
index 0000000000..b59ee40bcf
--- /dev/null
+++ b/contracts/coconut-dkg/src/support/tests/helpers.rs
@@ -0,0 +1,26 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::contract::instantiate;
+use coconut_dkg_common::msg::InstantiateMsg;
+use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier};
+use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps};
+
+use super::fixtures::TEST_MIX_DENOM;
+
+pub const ADMIN_ADDRESS: &str = "admin address";
+pub const GROUP_CONTRACT: &str = "group contract address";
+pub const MULTISIG_CONTRACT: &str = "multisig contract address";
+
+pub fn init_contract() -> OwnedDeps<MemoryStorage, MockApi, MockQuerier<Empty>> {
+    let mut deps = mock_dependencies();
+    let msg = InstantiateMsg {
+        group_addr: String::from(GROUP_CONTRACT),
+        multisig_addr: String::from(MULTISIG_CONTRACT),
+        mix_denom: TEST_MIX_DENOM.to_string(),
+    };
+    let env = mock_env();
+    let info = mock_info(ADMIN_ADDRESS, &[]);
+    instantiate(deps.as_mut(), env.clone(), info, msg).unwrap();
+    deps
+}
diff --git a/contracts/coconut-dkg/src/support/tests/mod.rs b/contracts/coconut-dkg/src/support/tests/mod.rs
new file mode 100644
index 0000000000..1e96465ed5
--- /dev/null
+++ b/contracts/coconut-dkg/src/support/tests/mod.rs
@@ -0,0 +1,5 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod fixtures;
+pub mod helpers;
diff --git a/contracts/coconut-dkg/src/verification_key_shares/queries.rs b/contracts/coconut-dkg/src/verification_key_shares/queries.rs
index 6739577abb..331c42e58a 100644
--- a/contracts/coconut-dkg/src/verification_key_shares/queries.rs
+++ b/contracts/coconut-dkg/src/verification_key_shares/queries.rs
@@ -36,3 +36,142 @@ pub fn query_vk_shares_paged(
         start_next_after,
     })
 }
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::support::tests::fixtures::vk_share_fixture;
+    use crate::support::tests::helpers::init_contract;
+    use crate::verification_key_shares::storage::{
+        VERIFICATION_KEY_SHARES_PAGE_DEFAULT_LIMIT, VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT,
+    };
+    use cosmwasm_std::Addr;
+
+    #[test]
+    fn vk_shares_empty_on_init() {
+        let deps = init_contract();
+        let response = query_vk_shares_paged(deps.as_ref(), None, Option::from(2)).unwrap();
+        assert_eq!(0, response.shares.len());
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_obeys_limits() {
+        let mut deps = init_contract();
+        let limit = 2;
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(limit)).unwrap();
+        assert_eq!(limit, page1.shares.len() as u32);
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_has_default_limit() {
+        let mut deps = init_contract();
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        // query without explicitly setting a limit
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, None).unwrap();
+
+        assert_eq!(
+            VERIFICATION_KEY_SHARES_PAGE_DEFAULT_LIMIT,
+            page1.shares.len() as u32
+        );
+    }
+
+    #[test]
+    fn vk_shares_paged_retrieval_has_max_limit() {
+        let mut deps = init_contract();
+        for n in 0..1000 {
+            let vk_share = vk_share_fixture(n);
+            let sender = Addr::unchecked(format!("owner{}", n));
+            VK_SHARES
+                .save(&mut deps.storage, &sender, &vk_share)
+                .unwrap();
+        }
+
+        // query with a crazily high limit in an attempt to use too many resources
+        let crazy_limit = 1000 * VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT;
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(crazy_limit)).unwrap();
+
+        // we default to a decent sized upper bound instead
+        let expected_limit = VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT;
+        assert_eq!(expected_limit, page1.shares.len() as u32);
+    }
+
+    #[test]
+    fn vk_shares_pagination_works() {
+        let mut deps = init_contract();
+
+        let vk_share = vk_share_fixture(1);
+        let sender = Addr::unchecked(format!("owner{}", 1));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        let per_page = 2;
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+
+        // page should have 1 result on it
+        assert_eq!(1, page1.shares.len());
+
+        // save another
+        let vk_share = vk_share_fixture(2);
+        let sender = Addr::unchecked(format!("owner{}", 2));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        // page1 should have 2 results on it
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.shares.len());
+
+        let vk_share = vk_share_fixture(3);
+        let sender = Addr::unchecked(format!("owner{}", 3));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        // page1 still has 2 results
+        let page1 = query_vk_shares_paged(deps.as_ref(), None, Option::from(per_page)).unwrap();
+        assert_eq!(2, page1.shares.len());
+
+        // retrieving the next page should start after the last key on this page
+        let start_after = page1.start_next_after.unwrap();
+        let page2 = query_vk_shares_paged(
+            deps.as_ref(),
+            Option::from(start_after.to_string()),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        assert_eq!(1, page2.shares.len());
+
+        let vk_share = vk_share_fixture(4);
+        let sender = Addr::unchecked(format!("owner{}", 4));
+        VK_SHARES
+            .save(&mut deps.storage, &sender, &vk_share)
+            .unwrap();
+
+        let page2 = query_vk_shares_paged(
+            deps.as_ref(),
+            Option::from(start_after.to_string()),
+            Option::from(per_page),
+        )
+        .unwrap();
+
+        // now we have 2 pages, with 2 results on the second page
+        assert_eq!(2, page2.shares.len());
+    }
+}
diff --git a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
index d86748e7f4..69df1bad7b 100644
--- a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
+++ b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs
@@ -69,3 +69,168 @@ pub fn try_verify_verification_key_share(
 
     Ok(Response::default())
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::epoch_state::transactions::advance_epoch_state;
+    use crate::support::tests::helpers;
+    use crate::support::tests::helpers::MULTISIG_CONTRACT;
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::types::{
+        EpochState, DEALING_EXCHANGE_TIME_SECS, PUBLIC_KEY_SUBMISSION_TIME_SECS,
+        VERIFICATION_KEY_SUBMISSION_TIME_SECS, VERIFICATION_KEY_VALIDATION_TIME_SECS,
+    };
+    use cosmwasm_std::testing::{mock_env, mock_info};
+    use cw_controllers::AdminError;
+
+    #[test]
+    fn commit_vk_share() {
+        let mut deps = helpers::init_contract();
+        let mut env = mock_env();
+        let info = mock_info("requester", &[]);
+        let share = "share".to_string();
+
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::VerificationKeySubmission.to_string()
+            }
+        );
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env.block.time.plus_seconds(DEALING_EXCHANGE_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(ret, ContractError::NotADealer);
+
+        let dealer = Addr::unchecked("requester");
+        let dealer_details = DealerDetails {
+            address: dealer.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &dealer, &dealer_details)
+            .unwrap();
+
+        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
+            .unwrap();
+
+        let ret = try_commit_verification_key_share(
+            deps.as_mut(),
+            env.clone(),
+            info.clone(),
+            share.clone(),
+        )
+        .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::AlreadyCommitted {
+                commitment: String::from("verification key share")
+            }
+        );
+    }
+
+    #[test]
+    fn invalid_verify_vk_share() {
+        let mut deps = helpers::init_contract();
+        let mut env = mock_env();
+        let info = mock_info("requester", &[]);
+        let owner = Addr::unchecked("owner");
+        let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
+
+        let ret = try_verify_verification_key_share(deps.as_mut(), info.clone(), owner.clone())
+            .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::IncorrectEpochState {
+                current_state: EpochState::default().to_string(),
+                expected_state: EpochState::VerificationKeyFinalization.to_string()
+            }
+        );
+
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env.block.time.plus_seconds(DEALING_EXCHANGE_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_VALIDATION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env).unwrap();
+
+        let ret =
+            try_verify_verification_key_share(deps.as_mut(), info, owner.clone()).unwrap_err();
+        assert_eq!(ret, ContractError::Admin(AdminError::NotAdmin {}));
+
+        let ret = try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone())
+            .unwrap_err();
+        assert_eq!(
+            ret,
+            ContractError::NoCommitForOwner {
+                owner: owner.to_string()
+            }
+        );
+    }
+
+    #[test]
+    fn verify_vk_share() {
+        let mut deps = helpers::init_contract();
+        let mut env = mock_env();
+        let owner = Addr::unchecked("owner");
+        let info = mock_info(owner.as_ref(), &[]);
+        let share = "share".to_string();
+        let multisig_info = mock_info(MULTISIG_CONTRACT, &[]);
+
+        env.block.time = env.block.time.plus_seconds(PUBLIC_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env.block.time.plus_seconds(DEALING_EXCHANGE_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+
+        let dealer_details = DealerDetails {
+            address: owner.clone(),
+            bte_public_key_with_proof: String::new(),
+            announce_address: String::new(),
+            assigned_index: 1,
+        };
+        dealers_storage::current_dealers()
+            .save(deps.as_mut().storage, &owner, &dealer_details)
+            .unwrap();
+        try_commit_verification_key_share(deps.as_mut(), env.clone(), info.clone(), share.clone())
+            .unwrap();
+
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_SUBMISSION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env.clone()).unwrap();
+        env.block.time = env
+            .block
+            .time
+            .plus_seconds(VERIFICATION_KEY_VALIDATION_TIME_SECS);
+        advance_epoch_state(deps.as_mut(), env).unwrap();
+
+        try_verify_verification_key_share(deps.as_mut(), multisig_info, owner.clone()).unwrap();
+    }
+}
diff --git a/contracts/coconut-test/Cargo.toml b/contracts/coconut-test/Cargo.toml
index 3aff6fc368..f9dd795e4b 100644
--- a/contracts/coconut-test/Cargo.toml
+++ b/contracts/coconut-test/Cargo.toml
@@ -13,6 +13,7 @@ multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multi
 
 cosmwasm-std = "1.0.0"
 cosmwasm-storage = "1.0.0"
+cw3 = "0.13.4"
 cw4 = "0.13.4"
 cw-storage-plus = "0.13.4"
 cw-controllers = "0.13.4"
diff --git a/contracts/coconut-test/src/helpers.rs b/contracts/coconut-test/src/helpers.rs
index b8e8ad6d03..319e523c91 100644
--- a/contracts/coconut-test/src/helpers.rs
+++ b/contracts/coconut-test/src/helpers.rs
@@ -42,9 +42,9 @@ pub fn mock_app(init_funds: &[Coin]) -> App {
 }
 pub fn contract_dkg() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new(
-        coconut_dkg::execute,
-        coconut_dkg::instantiate,
-        coconut_dkg::query,
+        coconut_dkg::contract::execute,
+        coconut_dkg::contract::instantiate,
+        coconut_dkg::contract::query,
     );
     Box::new(contract)
 }
diff --git a/contracts/coconut-test/src/submit_vk_creates_proposal.rs b/contracts/coconut-test/src/submit_vk_creates_proposal.rs
index dd8f59b2da..1122115b6d 100644
--- a/contracts/coconut-test/src/submit_vk_creates_proposal.rs
+++ b/contracts/coconut-test/src/submit_vk_creates_proposal.rs
@@ -11,15 +11,18 @@ use coconut_dkg_common::msg::ExecuteMsg::{
     AdvanceEpochState, CommitVerificationKeyShare, RegisterDealer,
 };
 use coconut_dkg_common::msg::InstantiateMsg as DkgInstantiateMsg;
+use coconut_dkg_common::msg::QueryMsg::GetVerificationKeys;
+use coconut_dkg_common::verification_key::PagedVKSharesResponse;
 use cosmwasm_std::{coins, Addr, Decimal};
 use cw4::Member;
 use cw4_group::msg::InstantiateMsg as GroupInstantiateMsg;
 use cw_multi_test::Executor;
 use cw_utils::{Duration, Threshold};
+use multisig_contract_common::msg::ExecuteMsg::{Execute, Vote};
 use multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg;
 
 #[test]
-fn dkg_create_proposal() {
+fn dkg_proposal() {
     let init_funds = coins(10000000000, TEST_COIN_DENOM);
     let mut app = mock_app(&init_funds);
     let member1 = Member {
@@ -47,7 +50,7 @@ fn dkg_create_proposal() {
     let msg = MultisigInstantiateMsg {
         group_addr: group_contract_addr.to_string(),
         threshold: Threshold::AbsolutePercentage {
-            percentage: Decimal::from_ratio(2u128, 3u128),
+            percentage: Decimal::from_ratio(1u128, 1u128),
         },
         max_voting_period: Duration::Time(1000),
         coconut_bandwidth_contract_address: TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS.to_string(),
@@ -68,7 +71,6 @@ fn dkg_create_proposal() {
     let msg = DkgInstantiateMsg {
         group_addr: group_contract_addr.to_string(),
         multisig_addr: multisig_contract_addr.to_string(),
-        admin: Addr::unchecked(OWNER).to_string(),
         mix_denom: TEST_COIN_DENOM.to_string(),
     };
     let coconut_dkg_contract_addr = app
@@ -88,7 +90,7 @@ fn dkg_create_proposal() {
     };
     app.migrate_contract(
         Addr::unchecked(OWNER),
-        multisig_contract_addr,
+        multisig_contract_addr.clone(),
         &msg,
         multisig_code_id,
     )
@@ -106,6 +108,7 @@ fn dkg_create_proposal() {
     .unwrap();
 
     for _ in 0..2 {
+        app.update_block(|block| block.time = block.time.plus_seconds(1000));
         app.execute_contract(
             Addr::unchecked(OWNER),
             coconut_dkg_contract_addr.clone(),
@@ -115,6 +118,9 @@ fn dkg_create_proposal() {
         .unwrap();
     }
 
+    // Proposal needs to be later then the member became part of the group
+    app.update_block(|block| block.height += 1);
+
     let msg = CommitVerificationKeyShare {
         share: "share".to_string(),
     };
@@ -126,6 +132,7 @@ fn dkg_create_proposal() {
             &vec![],
         )
         .unwrap();
+
     let proposal_id = res
         .events
         .into_iter()
@@ -138,5 +145,63 @@ fn dkg_create_proposal() {
         .value
         .parse::<u64>()
         .unwrap();
-    assert_eq!(1, proposal_id);
+
+    let mut res: PagedVKSharesResponse = app
+        .wrap()
+        .query_wasm_smart(
+            coconut_dkg_contract_addr.clone(),
+            &GetVerificationKeys {
+                limit: None,
+                start_after: None,
+            },
+        )
+        .unwrap();
+    let share = res.shares.pop().unwrap();
+    assert_eq!(share.share, "share".to_string());
+    assert_eq!(share.announce_address, "127.0.0.1:8000".to_string());
+    assert_eq!(share.node_index, 1);
+    assert_eq!(share.owner, Addr::unchecked(MEMBER1));
+    assert!(!share.verified);
+
+    app.execute_contract(
+        Addr::unchecked(MEMBER1),
+        multisig_contract_addr.clone(),
+        &Vote {
+            proposal_id,
+            vote: cw3::Vote::Yes,
+        },
+        &vec![],
+    )
+    .unwrap();
+
+    for _ in 0..2 {
+        app.update_block(|block| block.time = block.time.plus_seconds(1000));
+        app.execute_contract(
+            Addr::unchecked(OWNER),
+            coconut_dkg_contract_addr.clone(),
+            &AdvanceEpochState {},
+            &vec![],
+        )
+        .unwrap();
+    }
+
+    app.execute_contract(
+        Addr::unchecked(MEMBER1),
+        multisig_contract_addr.clone(),
+        &Execute { proposal_id },
+        &vec![],
+    )
+    .unwrap();
+
+    let res: PagedVKSharesResponse = app
+        .wrap()
+        .query_wasm_smart(
+            coconut_dkg_contract_addr,
+            &GetVerificationKeys {
+                limit: None,
+                start_after: None,
+            },
+        )
+        .unwrap();
+    assert!(res.shares[0].verified);
 }
diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml
index d4d0ac43a5..6dc7273c18 100644
--- a/contracts/mixnet/Cargo.toml
+++ b/contracts/mixnet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mixnet-contract"
-version = "1.1.0"
+version = "1.1.2"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
 
diff --git a/contracts/mixnet/src/constants.rs b/contracts/mixnet/src/constants.rs
index 3d3ed82caf..882b89def4 100644
--- a/contracts/mixnet/src/constants.rs
+++ b/contracts/mixnet/src/constants.rs
@@ -35,6 +35,9 @@ pub const INTERVAL_EVENTS_MAX_RETRIEVAL_LIMIT: u32 = 250;
 pub const REWARDED_SET_DEFAULT_RETRIEVAL_LIMIT: u32 = 500;
 pub const REWARDED_SET_MAX_RETRIEVAL_LIMIT: u32 = 1000;
 
+pub const FAMILIES_DEFAULT_RETRIEVAL_LIMIT: u32 = 10;
+pub const FAMILIES_MAX_RETRIEVAL_LIMIT: u32 = 20;
+
 // storage keys
 pub(crate) const DELEGATION_PK_NAMESPACE: &str = "dl";
 pub(crate) const DELEGATION_OWNER_IDX_NAMESPACE: &str = "dlo";
@@ -69,3 +72,7 @@ pub(crate) const UNBONDED_MIXNODES_IDENTITY_IDX_NAMESPACE: &str = "umi";
 pub(crate) const REWARDING_PARAMS_KEY: &str = "rparams";
 pub(crate) const PENDING_REWARD_POOL_KEY: &str = "prp";
 pub(crate) const MIXNODES_REWARDING_PK_NAMESPACE: &str = "mnr";
+
+pub(crate) const FAMILIES_INDEX_NAMESPACE: &str = "faml2";
+pub(crate) const FAMILIES_MAP_NAMESPACE: &str = "fam2";
+pub(crate) const MEMBERS_MAP_NAMESPACE: &str = "memb2";
diff --git a/contracts/mixnet/src/contract.rs b/contracts/mixnet/src/contract.rs
index e07b7ba32a..ade53d7d89 100644
--- a/contracts/mixnet/src/contract.rs
+++ b/contracts/mixnet/src/contract.rs
@@ -1,6 +1,5 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
 use crate::constants::{INITIAL_GATEWAY_PLEDGE_AMOUNT, INITIAL_MIXNODE_PLEDGE_AMOUNT};
 use crate::interval::storage as interval_storage;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
@@ -82,6 +81,69 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, MixnetContractError> {
     match msg {
+        ExecuteMsg::AssignNodeLayer { mix_id, layer } => {
+            crate::mixnodes::transactions::assign_mixnode_layer(deps, info, mix_id, layer)
+        }
+        // families
+        ExecuteMsg::CreateFamily {
+            owner_signature,
+            label,
+        } => crate::families::transactions::try_create_family(deps, info, owner_signature, &label),
+        ExecuteMsg::JoinFamily {
+            signature,
+            family_head,
+        } => crate::families::transactions::try_join_family(deps, info, signature, family_head),
+        ExecuteMsg::LeaveFamily {
+            signature,
+            family_head,
+        } => crate::families::transactions::try_leave_family(deps, info, signature, family_head),
+        ExecuteMsg::KickFamilyMember { signature, member } => {
+            crate::families::transactions::try_head_kick_member(deps, info, signature, &member)
+        }
+        ExecuteMsg::CreateFamilyOnBehalf {
+            owner_address,
+            owner_signature,
+            label,
+        } => crate::families::transactions::try_create_family_on_behalf(
+            deps,
+            info,
+            owner_address,
+            owner_signature,
+            &label,
+        ),
+        ExecuteMsg::JoinFamilyOnBehalf {
+            member_address,
+            signature,
+            family_head,
+        } => crate::families::transactions::try_join_family_on_behalf(
+            deps,
+            info,
+            member_address,
+            signature,
+            family_head,
+        ),
+        ExecuteMsg::LeaveFamilyOnBehalf {
+            member_address,
+            signature,
+            family_head,
+        } => crate::families::transactions::try_leave_family_on_behalf(
+            deps,
+            info,
+            member_address,
+            signature,
+            family_head,
+        ),
+        ExecuteMsg::KickFamilyMemberOnBehalf {
+            head_address,
+            signature,
+            member,
+        } => crate::families::transactions::try_head_kick_member_on_behalf(
+            deps,
+            info,
+            head_address,
+            signature,
+            &member,
+        ),
         // state/sys-params-related
         ExecuteMsg::UpdateRewardingValidatorAddress { address } => {
             crate::mixnet_contract_settings::transactions::try_update_rewarding_validator_address(
@@ -129,6 +191,7 @@ pub fn execute(
         ),
         ExecuteMsg::AdvanceCurrentEpoch {
             new_rewarded_set,
+            // families_in_layer,
             expected_active_set_size,
         } => crate::interval::transactions::try_advance_epoch(
             deps,
@@ -168,6 +231,12 @@ pub fn execute(
             owner,
             owner_signature,
         ),
+        ExecuteMsg::PledgeMore {} => {
+            crate::mixnodes::transactions::try_increase_pledge(deps, env, info)
+        }
+        ExecuteMsg::PledgeMoreOnBehalf { owner } => {
+            crate::mixnodes::transactions::try_increase_pledge_on_behalf(deps, env, info, owner)
+        }
         ExecuteMsg::UnbondMixnode {} => {
             crate::mixnodes::transactions::try_remove_mixnode(deps, env, info)
         }
@@ -279,6 +348,24 @@ pub fn query(
     msg: QueryMsg,
 ) -> Result<QueryResponse, MixnetContractError> {
     let query_res = match msg {
+        QueryMsg::GetAllFamiliesPaged { limit, start_after } => to_binary(
+            &crate::families::queries::get_all_families_paged(deps.storage, start_after, limit)?,
+        ),
+        QueryMsg::GetAllMembersPaged { limit, start_after } => to_binary(
+            &crate::families::queries::get_all_members_paged(deps.storage, start_after, limit)?,
+        ),
+        QueryMsg::GetFamilyByHead { head } => to_binary(
+            &crate::families::queries::get_family_by_head(&head, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyByLabel { label } => to_binary(
+            &crate::families::queries::get_family_by_label(&label, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyMembersByHead { head } => to_binary(
+            &crate::families::queries::get_family_members_by_head(&head, deps.storage)?,
+        ),
+        QueryMsg::GetFamilyMembersByLabel { label } => to_binary(
+            &crate::families::queries::get_family_members_by_label(&label, deps.storage)?,
+        ),
         QueryMsg::GetContractVersion {} => {
             to_binary(&crate::mixnet_contract_settings::queries::query_contract_version())
         }
diff --git a/contracts/mixnet/src/families/mod.rs b/contracts/mixnet/src/families/mod.rs
new file mode 100644
index 0000000000..f355b587a7
--- /dev/null
+++ b/contracts/mixnet/src/families/mod.rs
@@ -0,0 +1,3 @@
+pub mod queries;
+pub mod storage;
+pub mod transactions;
diff --git a/contracts/mixnet/src/families/queries.rs b/contracts/mixnet/src/families/queries.rs
new file mode 100644
index 0000000000..238c38aaa7
--- /dev/null
+++ b/contracts/mixnet/src/families/queries.rs
@@ -0,0 +1,107 @@
+use std::collections::HashSet;
+
+use crate::constants::{FAMILIES_DEFAULT_RETRIEVAL_LIMIT, FAMILIES_MAX_RETRIEVAL_LIMIT};
+
+use super::storage::{families, get_family, get_members, MEMBERS};
+use cosmwasm_std::{Order, Storage};
+use cw_storage_plus::Bound;
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKeyRef};
+use mixnet_contract_common::{IdentityKey, PagedFamiliesResponse, PagedMembersResponse};
+
+pub fn get_family_by_label(
+    label: &str,
+    storage: &dyn Storage,
+) -> Result<Option<Family>, MixnetContractError> {
+    Ok(families()
+        .idx
+        .label
+        .item(storage, label.to_string())?
+        .map(|o| o.1))
+}
+
+pub fn get_family_by_head(
+    head: IdentityKeyRef<'_>,
+    storage: &dyn Storage,
+) -> Result<Family, MixnetContractError> {
+    let family_head = FamilyHead::new(head);
+    get_family(&family_head, storage)
+}
+
+pub fn get_family_members_by_head(
+    head: IdentityKeyRef<'_>,
+    storage: &dyn Storage,
+) -> Result<HashSet<String>, MixnetContractError> {
+    let family_head = FamilyHead::new(head);
+    let family = get_family(&family_head, storage)?;
+    get_members(&family, storage)
+}
+
+pub fn get_family_members_by_label(
+    label: &str,
+    storage: &dyn Storage,
+) -> Result<Option<HashSet<String>>, MixnetContractError> {
+    if let Some(family) = families()
+        .idx
+        .label
+        .item(storage, label.to_string())?
+        .map(|o| o.1)
+    {
+        Ok(Some(get_members(&family, storage)?))
+    } else {
+        Ok(None)
+    }
+}
+
+pub fn get_all_families_paged(
+    storage: &dyn Storage,
+    start_after: Option<String>,
+    limit: Option<u32>,
+) -> Result<PagedFamiliesResponse, MixnetContractError> {
+    let limit = limit
+        .unwrap_or(FAMILIES_DEFAULT_RETRIEVAL_LIMIT)
+        .min(FAMILIES_MAX_RETRIEVAL_LIMIT) as usize;
+
+    let start = start_after.map(Bound::exclusive);
+
+    let response = families()
+        .range(storage, start, None, Order::Ascending)
+        .take(limit)
+        .filter_map(|r| r.ok())
+        .map(|(_key, family)| family)
+        .collect::<Vec<Family>>();
+
+    let start_next_after = response
+        .last()
+        .map(|response| response.head_identity().to_string());
+
+    Ok(PagedFamiliesResponse {
+        families: response,
+        start_next_after,
+    })
+}
+
+pub fn get_all_members_paged(
+    storage: &dyn Storage,
+    start_after: Option<String>,
+    limit: Option<u32>,
+) -> Result<PagedMembersResponse, MixnetContractError> {
+    let limit = limit
+        .unwrap_or(FAMILIES_DEFAULT_RETRIEVAL_LIMIT)
+        .min(FAMILIES_MAX_RETRIEVAL_LIMIT) as usize;
+
+    let start = start_after.map(Bound::exclusive);
+
+    let response = MEMBERS
+        .range(storage, start, None, Order::Ascending)
+        .take(limit)
+        .filter_map(|r| r.ok())
+        .collect::<Vec<(IdentityKey, FamilyHead)>>();
+
+    let start_next_after = response.last().map(|r| r.0.clone());
+
+    Ok(PagedMembersResponse {
+        members: response,
+        start_next_after,
+    })
+}
diff --git a/contracts/mixnet/src/families/storage.rs b/contracts/mixnet/src/families/storage.rs
new file mode 100644
index 0000000000..2a99f9054e
--- /dev/null
+++ b/contracts/mixnet/src/families/storage.rs
@@ -0,0 +1,99 @@
+use std::collections::HashSet;
+
+use cosmwasm_std::{Order, StdError, Storage};
+use cw_storage_plus::{Index, IndexList, IndexedMap, Map, UniqueIndex};
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKey, IdentityKeyRef};
+
+use crate::constants::{FAMILIES_INDEX_NAMESPACE, FAMILIES_MAP_NAMESPACE, MEMBERS_MAP_NAMESPACE};
+
+pub struct FamilyIndex<'a> {
+    pub label: UniqueIndex<'a, String, Family>,
+}
+
+impl<'a> IndexList<Family> for FamilyIndex<'a> {
+    fn get_indexes(&'_ self) -> Box<dyn Iterator<Item = &'_ dyn Index<Family>> + '_> {
+        let v: Vec<&dyn Index<Family>> = vec![&self.label];
+        Box::new(v.into_iter())
+    }
+}
+
+// storage access function.
+pub fn families<'a>() -> IndexedMap<'a, String, Family, FamilyIndex<'a>> {
+    let indexes = FamilyIndex {
+        label: UniqueIndex::new(|d| d.label().to_string(), FAMILIES_INDEX_NAMESPACE),
+    };
+    IndexedMap::new(FAMILIES_MAP_NAMESPACE, indexes)
+}
+
+pub const MEMBERS: Map<IdentityKey, FamilyHead> = Map::new(MEMBERS_MAP_NAMESPACE);
+
+pub fn get_members(
+    family: &Family,
+    store: &dyn Storage,
+) -> Result<HashSet<IdentityKey>, MixnetContractError> {
+    Ok(MEMBERS
+        .range(store, None, None, Order::Ascending)
+        .filter_map(|res| res.ok())
+        .filter(|(_member, head)| head == family.head())
+        .map(|(member, _storage_key)| member)
+        .collect())
+}
+
+pub fn get_family(head: &FamilyHead, store: &dyn Storage) -> Result<Family, MixnetContractError> {
+    let key = head.identity();
+    if let Some(family) = families().may_load(store, key.to_string())? {
+        Ok(family)
+    } else {
+        Err(MixnetContractError::FamilyDoesNotExist {
+            head: head.identity().to_string(),
+        })
+    }
+}
+
+pub fn create_family(f: &Family, store: &mut dyn Storage) -> Result<(), MixnetContractError> {
+    match families().save(store, f.head_identity().to_string(), f) {
+        Ok(()) => Ok(()),
+        Err(e) => match &e {
+            StdError::GenericErr { msg } => {
+                if msg.starts_with("Violates unique constraint") {
+                    Err(MixnetContractError::FamilyWithLabelExists(
+                        f.label().to_string(),
+                    ))
+                } else {
+                    Err(e.into())
+                }
+            }
+            _ => Err(e.into()),
+        },
+    }
+}
+
+pub fn add_family_member(
+    f: &Family,
+    store: &mut dyn Storage,
+    member: IdentityKeyRef<'_>,
+) -> Result<(), MixnetContractError> {
+    Ok(MEMBERS.save(store, member.to_string(), f.head())?)
+}
+
+pub fn remove_family_member(store: &mut dyn Storage, member: IdentityKeyRef<'_>) {
+    MEMBERS.remove(store, member.to_string())
+}
+
+#[allow(dead_code)]
+pub fn is_family_member(
+    store: &dyn Storage,
+    f: &Family,
+    member: IdentityKeyRef<'_>,
+) -> Result<bool, MixnetContractError> {
+    let m = get_members(f, store)?;
+    Ok(m.contains(member))
+}
+
+pub fn is_any_member(
+    store: &dyn Storage,
+    member: IdentityKeyRef<'_>,
+) -> Result<Option<FamilyHead>, MixnetContractError> {
+    Ok(MEMBERS.may_load(store, member.to_string())?)
+}
diff --git a/contracts/mixnet/src/families/transactions.rs b/contracts/mixnet/src/families/transactions.rs
new file mode 100644
index 0000000000..7f9412f1f2
--- /dev/null
+++ b/contracts/mixnet/src/families/transactions.rs
@@ -0,0 +1,414 @@
+use crate::support::helpers::{
+    ensure_bonded, validate_family_signature, validate_node_identity_signature,
+};
+
+use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response};
+use mixnet_contract_common::families::{Family, FamilyHead};
+use mixnet_contract_common::{error::MixnetContractError, IdentityKey, IdentityKeyRef};
+
+use super::storage::{
+    add_family_member, create_family, get_family, is_any_member, is_family_member,
+    remove_family_member,
+};
+
+/// Creates a new MixNode family with senders node as head
+pub fn try_create_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_signature: String,
+    label: &str,
+) -> Result<Response, MixnetContractError> {
+    _try_create_family(deps, &info.sender, owner_signature, label, None)
+}
+
+pub fn try_create_family_on_behalf(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_address: String,
+    owner_signature: String,
+    label: &str,
+) -> Result<Response, MixnetContractError> {
+    let owner_address = deps.api.addr_validate(&owner_address)?;
+    _try_create_family(
+        deps,
+        &owner_address,
+        owner_signature,
+        label,
+        Some(info.sender),
+    )
+}
+
+fn _try_create_family(
+    deps: DepsMut,
+    owner: &Addr,
+    owner_signature: String,
+    label: &str,
+    proxy: Option<Addr>,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    validate_node_identity_signature(
+        deps.as_ref(),
+        owner,
+        &owner_signature,
+        existing_bond.identity(),
+    )?;
+
+    let family_head = FamilyHead::new(existing_bond.identity());
+
+    if let Ok(_family) = get_family(&family_head, deps.storage) {
+        return Err(MixnetContractError::FamilyCanHaveOnlyOne);
+    }
+
+    let family = Family::new(family_head, proxy, label);
+    create_family(&family, deps.storage)?;
+    Ok(Response::default())
+}
+
+pub fn try_join_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    _try_join_family(deps, &info.sender, signature, family_head)
+}
+
+pub fn try_join_family_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    member_address: String,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let member_address = deps.api.addr_validate(&member_address)?;
+    let family_head = FamilyHead::new(&family_head);
+    _try_join_family(deps, &member_address, signature, family_head)
+}
+
+fn _try_join_family(
+    deps: DepsMut,
+    owner: &Addr,
+    signature: String,
+    family_head: FamilyHead,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    if family_head.identity() == existing_bond.identity() {
+        return Err(MixnetContractError::CantJoinOwnFamily {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    if let Some(family) = is_any_member(deps.storage, existing_bond.identity())? {
+        return Err(MixnetContractError::AlreadyMemberOfFamily(
+            family.identity().to_string(),
+        ));
+    }
+
+    validate_family_signature(
+        deps.as_ref(),
+        existing_bond.identity(),
+        &signature,
+        family_head.identity(),
+    )?;
+
+    let family = get_family(&family_head, deps.storage)?;
+
+    add_family_member(&family, deps.storage, existing_bond.identity())?;
+
+    Ok(Response::default())
+}
+
+pub fn try_leave_family(
+    deps: DepsMut,
+    info: MessageInfo,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    _try_leave_family(deps, &info.sender, signature, family_head)
+}
+
+pub fn try_leave_family_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    member_address: String,
+    signature: String,
+    family_head: IdentityKey,
+) -> Result<Response, MixnetContractError> {
+    let family_head = FamilyHead::new(&family_head);
+    let member_address = deps.api.addr_validate(&member_address)?;
+    _try_leave_family(deps, &member_address, signature, family_head)
+}
+
+fn _try_leave_family(
+    deps: DepsMut,
+    owner: &Addr,
+    signature: String,
+    family_head: FamilyHead,
+) -> Result<Response, MixnetContractError> {
+    let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+        .idx
+        .owner
+        .item(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+            owner: owner.clone(),
+        })?
+        .1;
+
+    ensure_bonded(&existing_bond)?;
+
+    if family_head.identity() == existing_bond.identity() {
+        return Err(MixnetContractError::CantLeaveOwnFamily {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    let family = get_family(&family_head, deps.storage)?;
+    if !is_family_member(deps.storage, &family, existing_bond.identity())? {
+        return Err(MixnetContractError::NotAMember {
+            head: family_head.identity().to_string(),
+            member: existing_bond.identity().to_string(),
+        });
+    }
+
+    validate_family_signature(
+        deps.as_ref(),
+        existing_bond.identity(),
+        &signature,
+        family_head.identity(),
+    )?;
+
+    remove_family_member(deps.storage, existing_bond.identity());
+
+    Ok(Response::default())
+}
+
+pub fn try_head_kick_member(
+    deps: DepsMut,
+    info: MessageInfo,
+    owner_signature: String,
+    member: IdentityKeyRef,
+) -> Result<Response, MixnetContractError> {
+    _try_head_kick_member(deps, &info.sender, owner_signature, member)
+}
+
+pub fn try_head_kick_member_on_behalf(
+    deps: DepsMut,
+    _info: MessageInfo,
+    head_address: String,
+    owner_signature: String,
+    member: IdentityKeyRef,
+) -> Result<Response, MixnetContractError> {
+    let head_address = deps.api.addr_validate(&head_address)?;
+    _try_head_kick_member(deps, &head_address, owner_signature, member)
+}
+
+#[allow(unused_variables)]
+fn _try_head_kick_member(
+    deps: DepsMut,
+    owner: &Addr,
+    owner_signature: String,
+    member: IdentityKeyRef<'_>,
+) -> Result<Response, MixnetContractError> {
+    Err(MixnetContractError::NotImplemented)
+    // let existing_bond = crate::mixnodes::storage::mixnode_bonds()
+    //     .idx
+    //     .owner
+    //     .item(deps.storage, owner.clone())?
+    //     .ok_or(MixnetContractError::NoAssociatedMixNodeBond {
+    //         owner: owner.clone(),
+    //     })?
+    //     .1;
+
+    // ensure_bonded(&existing_bond)?;
+
+    // validate_node_identity_signature(
+    //     deps.as_ref(),
+    //     owner,
+    //     &owner_signature,
+    //     existing_bond.identity(),
+    // )?;
+
+    // let family_head = FamilyHead::new(existing_bond.identity());
+    // let family = get_family(&family_head, deps.storage)?;
+    // if !is_family_member(deps.storage, &family, member)? {
+    //     return Err(MixnetContractError::NotAMember {
+    //         head: family_head.identity().to_string(),
+    //         member: existing_bond.identity().to_string(),
+    //     });
+    // }
+
+    // remove_family_member(deps.storage, member);
+    // Ok(Response::default())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use crate::families::queries::{get_family_by_head, get_family_by_label};
+    use crate::families::storage::is_family_member;
+    use crate::mixnet_contract_settings::storage::minimum_mixnode_pledge;
+    use crate::support::tests::{fixtures, test_helpers};
+    use cosmwasm_std::testing::{mock_env, mock_info};
+
+    #[test]
+    fn test_family_crud() {
+        let mut deps = test_helpers::init_contract();
+        let env = mock_env();
+        let mut rng = test_helpers::test_rng();
+
+        let head = "alice";
+        let malicious_head = "timmy";
+
+        let minimum_pledge = minimum_mixnode_pledge(deps.as_ref().storage).unwrap();
+
+        let (head_mixnode, head_sig, head_keypair) =
+            test_helpers::mixnode_with_signature(&mut rng, head);
+
+        let (malicious_mixnode, malicious_sig, _malicious_keypair) =
+            test_helpers::mixnode_with_signature(&mut rng, malicious_head);
+
+        let cost_params = fixtures::mix_node_cost_params_fixture();
+
+        let member = "bob";
+        let (member_mixnode, member_sig, _) =
+            test_helpers::mixnode_with_signature(&mut rng, member);
+
+        // we are informed that we didn't send enough funds
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(head, &[minimum_pledge.clone()]),
+            head_mixnode.clone(),
+            cost_params.clone(),
+            head_sig.clone(),
+        )
+        .unwrap();
+
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(malicious_head, &[minimum_pledge.clone()]),
+            malicious_mixnode.clone(),
+            cost_params.clone(),
+            malicious_sig.clone(),
+        )
+        .unwrap();
+
+        crate::mixnodes::transactions::try_add_mixnode(
+            deps.as_mut(),
+            env.clone(),
+            mock_info(member, &[minimum_pledge.clone()]),
+            member_mixnode.clone(),
+            cost_params.clone(),
+            member_sig.clone(),
+        )
+        .unwrap();
+
+        try_create_family(
+            deps.as_mut(),
+            mock_info(head.clone(), &[]),
+            head_sig.clone(),
+            "test",
+        )
+        .unwrap();
+        let family_head = FamilyHead::new(&head_mixnode.identity_key);
+        assert!(get_family(&family_head, &deps.storage).is_ok());
+
+        let nope = try_create_family(
+            deps.as_mut(),
+            mock_info(malicious_head.clone(), &[]),
+            malicious_sig.clone(),
+            "test",
+        );
+
+        match nope {
+            Ok(_) => panic!("This should fail, since family with label already exists"),
+            Err(e) => match e {
+                MixnetContractError::FamilyWithLabelExists(label) => assert_eq!(label, "test"),
+                _ => panic!("This should return FamilyWithLabelExists"),
+            },
+        }
+
+        let family = get_family_by_label("test", &deps.storage).unwrap();
+        assert!(family.is_some());
+        assert_eq!(family.unwrap().head_identity(), family_head.identity());
+
+        let family = get_family_by_head(family_head.identity(), &deps.storage).unwrap();
+        assert_eq!(family.head_identity(), family_head.identity());
+
+        let join_signature = head_keypair
+            .private_key()
+            .sign(member_mixnode.identity_key.as_bytes())
+            .to_base58_string();
+
+        try_join_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+
+        assert!(is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        try_leave_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+        assert!(!is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        try_join_family(
+            deps.as_mut(),
+            mock_info(member, &[]),
+            join_signature.clone(),
+            head_mixnode.identity_key.clone(),
+        )
+        .unwrap();
+
+        let family = get_family(&family_head, &deps.storage).unwrap();
+
+        assert!(is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+
+        // try_head_kick_member(
+        //     deps.as_mut(),
+        //     mock_info(&head, &[]),
+        //     head_sig.clone(),
+        //     &member_mixnode.identity_key.clone(),
+        // )
+        // .unwrap();
+
+        // let family = get_family(&family_head, &deps.storage).unwrap();
+        // assert!(!is_family_member(&deps.storage, &family, &member_mixnode.identity_key).unwrap());
+    }
+}
diff --git a/contracts/mixnet/src/gateways/transactions.rs b/contracts/mixnet/src/gateways/transactions.rs
index 55973f7589..dc53817987 100644
--- a/contracts/mixnet/src/gateways/transactions.rs
+++ b/contracts/mixnet/src/gateways/transactions.rs
@@ -82,7 +82,7 @@ pub(crate) fn _try_add_gateway(
     validate_node_identity_signature(
         deps.as_ref(),
         &owner,
-        owner_signature,
+        &owner_signature,
         &gateway.identity_key,
     )?;
 
diff --git a/contracts/mixnet/src/interval/pending_events.rs b/contracts/mixnet/src/interval/pending_events.rs
index 8cb09566f2..b242944988 100644
--- a/contracts/mixnet/src/interval/pending_events.rs
+++ b/contracts/mixnet/src/interval/pending_events.rs
@@ -7,13 +7,14 @@ use crate::interval::helpers::change_interval_config;
 use crate::interval::storage;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
 use crate::mixnodes::helpers::{cleanup_post_unbond_mixnode_storage, get_mixnode_details_by_id};
+use crate::mixnodes::storage as mixnodes_storage;
 use crate::rewards::storage as rewards_storage;
 use crate::support::helpers::send_to_proxy_or_owner;
 use cosmwasm_std::{wasm_execute, Addr, Coin, DepsMut, Env, Response};
 use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::events::{
     new_active_set_update_event, new_delegation_event, new_delegation_on_unbonded_node_event,
-    new_mixnode_cost_params_update_event, new_mixnode_unbonding_event,
+    new_mixnode_cost_params_update_event, new_mixnode_unbonding_event, new_pledge_increase_event,
     new_rewarding_params_update_event, new_undelegation_event,
 };
 use mixnet_contract_common::mixnode::MixNodeCostParams;
@@ -258,6 +259,42 @@ pub(crate) fn update_active_set_size(
     Ok(Response::new().add_event(new_active_set_update_event(created_at, active_set_size)))
 }
 
+pub(crate) fn increase_pledge(
+    deps: DepsMut<'_>,
+    created_at: BlockHeight,
+    mix_id: MixId,
+    increase: Coin,
+) -> Result<Response, MixnetContractError> {
+    // note: we have already validated the amount to know it has the correct denomination
+
+    // the target node MUST exist - we have checked it at the time of putting this event onto the queue
+    // we have also verified there were no preceding unbond events
+    let mix_details = get_mixnode_details_by_id(deps.storage, mix_id)?.ok_or(
+        MixnetContractError::InconsistentState {
+            comment:
+                "mixnode getting processed to increase its pledge doesn't exist in the storage"
+                    .into(),
+        },
+    )?;
+
+    let mut updated_bond = mix_details.bond_information.clone();
+    let mut updated_rewarding = mix_details.rewarding_details;
+
+    updated_bond.original_pledge.amount += increase.amount;
+    updated_rewarding.increase_operator_uint128(increase.amount)?;
+
+    // update both, bond information and rewarding details
+    mixnodes_storage::mixnode_bonds().replace(
+        deps.storage,
+        mix_id,
+        Some(&updated_bond),
+        Some(&mix_details.bond_information),
+    )?;
+    rewards_storage::MIXNODE_REWARDING.save(deps.storage, mix_id, &updated_rewarding)?;
+
+    Ok(Response::new().add_event(new_pledge_increase_event(created_at, mix_id, &increase)))
+}
+
 impl ContractExecutableEvent for PendingEpochEventData {
     fn execute(self, deps: DepsMut<'_>, env: &Env) -> Result<Response, MixnetContractError> {
         // note that the basic validation on all those events was already performed before
@@ -274,6 +311,9 @@ impl ContractExecutableEvent for PendingEpochEventData {
                 mix_id,
                 proxy,
             } => undelegate(deps, self.created_at, owner, mix_id, proxy),
+            PendingEpochEventKind::PledgeMore { mix_id, amount } => {
+                increase_pledge(deps, self.created_at, mix_id, amount)
+            }
             PendingEpochEventKind::UnbondMixnode { mix_id } => {
                 unbond_mixnode(deps, env, self.created_at, mix_id)
             }
@@ -1135,6 +1175,228 @@ mod tests {
         }
     }
 
+    #[cfg(test)]
+    mod increasing_pledge {
+        use super::*;
+        use cosmwasm_std::Uint128;
+        use mixnet_contract_common::rewarding::helpers::truncate_reward_amount;
+
+        #[test]
+        fn returns_hard_error_if_mixnode_doesnt_exist() {
+            // this should have never happened so hard error MUST be thrown here
+            let mut test = TestSetup::new();
+
+            let amount = test.coin(123);
+            let res = increase_pledge(test.deps_mut(), 123, 1, amount);
+            assert!(matches!(
+                res,
+                Err(MixnetContractError::InconsistentState { .. })
+            ));
+        }
+
+        #[test]
+        fn updates_stored_bond_information_and_rewarding_details() {
+            let mut test = TestSetup::new();
+            let mix_id = test.add_dummy_mixnode("mix-owner", None);
+
+            let old_details = get_mixnode_details_by_id(test.deps().storage, mix_id)
+                .unwrap()
+                .unwrap();
+
+            let amount = test.coin(12345);
+            increase_pledge(test.deps_mut(), 123, mix_id, amount.clone()).unwrap();
+
+            let updated_details = get_mixnode_details_by_id(test.deps().storage, mix_id)
+                .unwrap()
+                .unwrap();
+
+            assert_eq!(
+                updated_details.bond_information.original_pledge.amount,
+                old_details.bond_information.original_pledge.amount + amount.amount
+            );
+
+            assert_eq!(
+                updated_details.rewarding_details.operator,
+                old_details.rewarding_details.operator
+                    + Decimal::from_atomics(amount.amount, 0).unwrap()
+            );
+        }
+
+        #[test]
+        fn without_any_events_in_between_is_equivalent_to_pledging_the_same_amount_immediately() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000);
+            let pledge2 = Uint128::new(50_000_000);
+            let pledge3 = Uint128::new(200_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111u128, mix_id_repledge);
+
+            test.add_immediate_delegation("alice", 123_456_789u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111u128, mix_id_full_pledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            let dist1 =
+                test.reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+            let dist2 =
+                test.reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+            assert_eq!(dist1, dist2)
+        }
+
+        #[test]
+        fn correctly_increases_future_rewards() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000_000);
+            let pledge2 = Uint128::new(50_000_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_repledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge]);
+
+            let dist =
+                test.reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let pledge3 = Uint128::new(200_000_000_000) + truncate_reward_amount(dist.operator);
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_full_pledge);
+
+            let lost_operator = dist.operator
+                - Decimal::from_atomics(truncate_reward_amount(dist.operator), 0).unwrap();
+            let lost_delegates = dist.delegates
+                - Decimal::from_atomics(truncate_reward_amount(dist.delegates), 0).unwrap();
+
+            // add the tiny bit of lost precision manually
+            let mut mix_rewarding_full = test.mix_rewarding(mix_id_full_pledge);
+            mix_rewarding_full.delegates += lost_delegates;
+            mix_rewarding_full.operator += lost_operator;
+            rewards_storage::MIXNODE_REWARDING
+                .save(
+                    test.deps_mut().storage,
+                    mix_id_full_pledge,
+                    &mix_rewarding_full,
+                )
+                .unwrap();
+
+            test.add_immediate_delegation(
+                "dave",
+                truncate_reward_amount(dist.delegates).u128(),
+                mix_id_full_pledge,
+            );
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            // go through few epochs of rewarding
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist1 = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                let dist2 = test
+                    .reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+                assert_eq!(dist1, dist2)
+            }
+        }
+
+        #[test]
+        fn correctly_increases_future_rewards_with_more_passed_epochs() {
+            let mut test = TestSetup::new();
+            let pledge1 = Uint128::new(150_000_000_000);
+            let pledge2 = Uint128::new(50_000_000_000);
+
+            let mix_id_repledge = test.add_dummy_mixnode("mix-owner1", Some(pledge1));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_repledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_repledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_repledge);
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge]);
+
+            let mut cumulative_op_reward = Decimal::zero();
+            let mut cumulative_del_reward = Decimal::zero();
+
+            // go few epochs of rewarding before adding more pledge
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                cumulative_op_reward += dist.operator;
+                cumulative_del_reward += dist.delegates;
+            }
+
+            let increase = test.coin(pledge2.u128());
+            increase_pledge(test.deps_mut(), 123, mix_id_repledge, increase).unwrap();
+
+            let pledge3 =
+                Uint128::new(200_000_000_000) + truncate_reward_amount(cumulative_op_reward);
+            let mix_id_full_pledge = test.add_dummy_mixnode("mix-owner2", Some(pledge3));
+
+            test.add_immediate_delegation("alice", 123_456_789_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("bob", 500_000_000_000u128, mix_id_full_pledge);
+            test.add_immediate_delegation("carol", 111_111_111_000u128, mix_id_full_pledge);
+
+            let lost_operator = cumulative_op_reward
+                - Decimal::from_atomics(truncate_reward_amount(cumulative_op_reward), 0).unwrap();
+            let lost_delegates = cumulative_del_reward
+                - Decimal::from_atomics(truncate_reward_amount(cumulative_del_reward), 0).unwrap();
+
+            // add the tiny bit of lost precision manually
+            let mut mix_rewarding_full = test.mix_rewarding(mix_id_full_pledge);
+            mix_rewarding_full.delegates += lost_delegates;
+            mix_rewarding_full.operator += lost_operator;
+            rewards_storage::MIXNODE_REWARDING
+                .save(
+                    test.deps_mut().storage,
+                    mix_id_full_pledge,
+                    &mix_rewarding_full,
+                )
+                .unwrap();
+
+            test.add_immediate_delegation(
+                "dave",
+                truncate_reward_amount(cumulative_del_reward).u128(),
+                mix_id_full_pledge,
+            );
+
+            test.skip_to_next_epoch_end();
+            test.update_rewarded_set(vec![mix_id_repledge, mix_id_full_pledge]);
+
+            // go through few more epochs of rewarding
+            for _ in 0..500 {
+                test.skip_to_next_epoch_end();
+                let dist1 = test
+                    .reward_with_distribution(mix_id_repledge, test_helpers::performance(100.0));
+                let dist2 = test
+                    .reward_with_distribution(mix_id_full_pledge, test_helpers::performance(100.0));
+
+                assert_eq!(dist1, dist2)
+            }
+        }
+    }
+
     #[test]
     fn updating_active_set_updates_rewarding_params() {
         let mut test = TestSetup::new();
diff --git a/contracts/mixnet/src/interval/transactions.rs b/contracts/mixnet/src/interval/transactions.rs
index 705f36804a..a55978e4e4 100644
--- a/contracts/mixnet/src/interval/transactions.rs
+++ b/contracts/mixnet/src/interval/transactions.rs
@@ -5,6 +5,7 @@ use super::storage;
 use crate::interval::helpers::change_interval_config;
 use crate::interval::pending_events::ContractExecutableEvent;
 use crate::interval::storage::push_new_interval_event;
+use crate::mixnodes::transactions::update_mixnode_layer;
 use crate::rewards;
 use crate::rewards::storage as rewards_storage;
 use crate::support::helpers::{ensure_is_authorized, ensure_is_owner};
@@ -16,7 +17,7 @@ use mixnet_contract_common::events::{
     new_reconcile_pending_events,
 };
 use mixnet_contract_common::pending_events::PendingIntervalEventKind;
-use mixnet_contract_common::MixId;
+use mixnet_contract_common::{LayerAssignment, MixId};
 use std::collections::BTreeSet;
 
 // those two should be called in separate tx (from advancing epoch),
@@ -202,7 +203,7 @@ pub fn try_advance_epoch(
     mut deps: DepsMut<'_>,
     env: Env,
     info: MessageInfo,
-    new_rewarded_set: Vec<MixId>,
+    layer_assignments: Vec<LayerAssignment>,
     expected_active_set_size: u32,
 ) -> Result<Response, MixnetContractError> {
     // Only rewarding validator can attempt to advance epoch
@@ -247,12 +248,18 @@ pub fn try_advance_epoch(
     }
 
     let updated_interval = current_interval.advance_epoch();
-    let num_nodes = new_rewarded_set.len();
+    let num_nodes = layer_assignments.len();
+
+    let new_rewarded_set = layer_assignments.iter().map(|l| l.mix_id()).collect();
 
     // finally save updated interval and the rewarded set
     storage::save_interval(deps.storage, &updated_interval)?;
     update_rewarded_set(deps.storage, new_rewarded_set, expected_active_set_size)?;
 
+    for a in layer_assignments {
+        update_mixnode_layer(a.mix_id(), a.layer(), deps.storage)?;
+    }
+
     Ok(response.add_event(new_advance_epoch_event(updated_interval, num_nodes as u32)))
 }
 
@@ -1133,30 +1140,40 @@ mod tests {
     #[cfg(test)]
     mod advancing_epoch {
         use super::*;
+        use crate::mixnodes::queries::query_mixnode_details;
         use crate::rewards::models::RewardPoolChange;
         use crate::support::tests::fixtures::TEST_COIN_DENOM;
         use cosmwasm_std::testing::mock_info;
-        use cosmwasm_std::{coin, coins, BankMsg, Decimal, Empty, SubMsg};
+        use cosmwasm_std::{coin, coins, BankMsg, Decimal, Empty, SubMsg, Uint128};
         use mixnet_contract_common::events::{
             new_delegation_on_unbonded_node_event, new_rewarding_params_update_event,
         };
         use mixnet_contract_common::reward_params::IntervalRewardingParamsUpdate;
-        use mixnet_contract_common::RewardedSetNodeStatus;
+        use mixnet_contract_common::{Layer, RewardedSetNodeStatus};
 
         #[test]
         fn can_only_be_performed_by_specified_rewarding_validator() {
             let mut test = TestSetup::new();
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
             let current_active_set = test.rewarding_params().active_set_size;
             let some_sender = mock_info("foomper", &[]);
 
             test.skip_to_current_epoch_end();
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let env = test.env();
             let res = try_advance_epoch(
                 test.deps_mut(),
                 env,
                 some_sender,
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                 current_active_set,
             );
             assert_eq!(res, Err(MixnetContractError::Unauthorized));
@@ -1168,9 +1185,10 @@ mod tests {
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             );
+            println!("{:?}", res);
             assert!(res.is_ok())
         }
 
@@ -1179,13 +1197,23 @@ mod tests {
             let mut test = TestSetup::new();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let env = test.env();
             let sender = test.rewarding_validator();
             let res = try_advance_epoch(
                 test.deps_mut(),
                 env,
                 sender.clone(),
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                 current_active_set,
             );
             assert!(matches!(
@@ -1193,6 +1221,24 @@ mod tests {
                 Err(MixnetContractError::EpochInProgress { .. })
             ));
 
+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 1).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::One
+            );
+
+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 2).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::Two
+            );
+
+            let mixnode_1 = query_mixnode_details(test.deps.as_ref(), 3).unwrap();
+            assert_eq!(
+                mixnode_1.mixnode_details.unwrap().bond_information.layer,
+                Layer::Three
+            );
+
             // sanity check
             test.skip_to_current_epoch_end();
             let env = test.env();
@@ -1200,7 +1246,7 @@ mod tests {
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             );
             assert!(res.is_ok())
@@ -1211,17 +1257,27 @@ mod tests {
             let mut test = TestSetup::new();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
             push_n_dummy_epoch_actions(&mut test, 10);
             push_n_dummy_interval_actions(&mut test, 10);
             test.skip_to_current_epoch_end();
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let env = test.env();
             let sender = test.rewarding_validator();
             try_advance_epoch(
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             )
             .unwrap();
@@ -1237,17 +1293,27 @@ mod tests {
             let mut test = TestSetup::new();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
             push_n_dummy_epoch_actions(&mut test, 10);
             push_n_dummy_interval_actions(&mut test, 10);
             test.skip_to_current_interval_end();
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let env = test.env();
             let sender = test.rewarding_validator();
             try_advance_epoch(
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             )
             .unwrap();
@@ -1264,6 +1330,10 @@ mod tests {
             let env = test.env();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
             let mut expected_events = Vec::new();
             let mut expected_messages: Vec<SubMsg<Empty>> = Vec::new();
 
@@ -1310,13 +1380,19 @@ mod tests {
 
             test.skip_to_current_interval_end();
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let env = test.env();
             let sender = test.rewarding_validator();
             let res = try_advance_epoch(
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             )
             .unwrap();
@@ -1343,6 +1419,10 @@ mod tests {
             let mut test = TestSetup::new();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
             let start_params = test.rewarding_params();
 
             let pool_update = Decimal::from_atomics(100_000_000u32, 0).unwrap();
@@ -1357,6 +1437,12 @@ mod tests {
                 )
                 .unwrap();
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             // end of epoch - nothing has happened
             let sender = test.rewarding_validator();
             test.skip_to_current_epoch_end();
@@ -1365,7 +1451,7 @@ mod tests {
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments.clone(),
                 current_active_set,
             )
             .unwrap();
@@ -1384,7 +1470,7 @@ mod tests {
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             )
             .unwrap();
@@ -1413,10 +1499,20 @@ mod tests {
             let mut test = TestSetup::new();
             let current_active_set = test.rewarding_params().active_set_size;
 
+            test.add_dummy_mixnode("1", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("2", Some(Uint128::new(100000000)));
+            test.add_dummy_mixnode("3", Some(Uint128::new(100000000)));
+
             let interval_pre = test.current_interval();
             let rewarded_set_pre = test.rewarded_set();
             assert!(rewarded_set_pre.is_empty());
 
+            let layer_assignments = vec![
+                LayerAssignment::new(1, Layer::One),
+                LayerAssignment::new(2, Layer::Two),
+                LayerAssignment::new(3, Layer::Three),
+            ];
+
             let sender = test.rewarding_validator();
             test.skip_to_current_interval_end();
             let env = test.env();
@@ -1424,7 +1520,7 @@ mod tests {
                 test.deps_mut(),
                 env,
                 sender,
-                vec![1, 2, 3],
+                layer_assignments,
                 current_active_set,
             )
             .unwrap();
diff --git a/contracts/mixnet/src/lib.rs b/contracts/mixnet/src/lib.rs
index c22e7dc1a1..6f420d3541 100644
--- a/contracts/mixnet/src/lib.rs
+++ b/contracts/mixnet/src/lib.rs
@@ -7,6 +7,7 @@
 mod constants;
 pub mod contract;
 mod delegations;
+mod families;
 mod gateways;
 mod interval;
 mod mixnet_contract_settings;
diff --git a/contracts/mixnet/src/mixnet_contract_settings/storage.rs b/contracts/mixnet/src/mixnet_contract_settings/storage.rs
index 990c5e604d..45037a2ed5 100644
--- a/contracts/mixnet/src/mixnet_contract_settings/storage.rs
+++ b/contracts/mixnet/src/mixnet_contract_settings/storage.rs
@@ -37,7 +37,6 @@ pub(crate) fn minimum_delegation_stake(
         .map(|state| state.params.minimum_mixnode_delegation)?)
 }
 
-#[allow(unused)]
 pub(crate) fn rewarding_denom(storage: &dyn Storage) -> Result<String, MixnetContractError> {
     Ok(CONTRACT_STATE
         .load(storage)
diff --git a/contracts/mixnet/src/mixnodes/helpers.rs b/contracts/mixnet/src/mixnodes/helpers.rs
index 8244f67b13..383dbc6224 100644
--- a/contracts/mixnet/src/mixnodes/helpers.rs
+++ b/contracts/mixnet/src/mixnodes/helpers.rs
@@ -147,7 +147,7 @@ pub(crate) fn cleanup_post_unbond_mixnode_storage(
 }
 
 #[cfg(test)]
-mod tests {
+pub(crate) mod tests {
     use super::*;
     use crate::support::tests::fixtures::{
         mix_node_cost_params_fixture, mix_node_fixture, TEST_COIN_DENOM,
@@ -155,13 +155,13 @@ mod tests {
     use crate::support::tests::test_helpers::TestSetup;
     use cosmwasm_std::coin;
 
-    const OWNER_EXISTS: &str = "mix-owner-existing";
-    const OWNER_UNBONDING: &str = "mix-owner-unbonding";
-    const OWNER_UNBONDED: &str = "mix-owner-unbonded";
-    const OWNER_UNBONDED_LEFTOVER: &str = "mix-owner-unbonded-leftover";
+    pub(crate) const OWNER_EXISTS: &str = "mix-owner-existing";
+    pub(crate) const OWNER_UNBONDING: &str = "mix-owner-unbonding";
+    pub(crate) const OWNER_UNBONDED: &str = "mix-owner-unbonded";
+    pub(crate) const OWNER_UNBONDED_LEFTOVER: &str = "mix-owner-unbonded-leftover";
 
     // create a mixnode that is bonded, unbonded, in the process of unbonding and unbonded with leftover mix rewarding details
-    fn setup_mix_combinations(test: &mut TestSetup) -> Vec<MixId> {
+    pub(crate) fn setup_mix_combinations(test: &mut TestSetup) -> Vec<MixId> {
         let mix_id_exists = test.add_dummy_mixnode(OWNER_EXISTS, None);
         let mix_id_unbonding = test.add_dummy_mixnode(OWNER_UNBONDING, None);
         let mix_id_unbonded = test.add_dummy_mixnode(OWNER_UNBONDED, None);
diff --git a/contracts/mixnet/src/mixnodes/transactions.rs b/contracts/mixnet/src/mixnodes/transactions.rs
index 0a1e816ffd..1d0da0449f 100644
--- a/contracts/mixnet/src/mixnodes/transactions.rs
+++ b/contracts/mixnet/src/mixnodes/transactions.rs
@@ -5,20 +5,54 @@ use super::storage;
 use crate::interval::storage as interval_storage;
 use crate::interval::storage::push_new_interval_event;
 use crate::mixnet_contract_settings::storage as mixnet_params_storage;
-use crate::mixnodes::helpers::{must_get_mixnode_bond_by_owner, save_new_mixnode};
-use crate::support::helpers::{
-    ensure_bonded, ensure_no_existing_bond, ensure_proxy_match, validate_node_identity_signature,
-    validate_pledge,
+use crate::mixnet_contract_settings::storage::rewarding_denom;
+use crate::mixnodes::helpers::{
+    get_mixnode_details_by_owner, must_get_mixnode_bond_by_owner, save_new_mixnode,
 };
-use cosmwasm_std::{Addr, Coin, DepsMut, Env, MessageInfo, Response};
+use crate::support::helpers::{
+    ensure_bonded, ensure_is_authorized, ensure_no_existing_bond, ensure_proxy_match,
+    validate_node_identity_signature, validate_pledge,
+};
+use cosmwasm_std::{coin, Addr, Coin, DepsMut, Env, MessageInfo, Response, Storage};
 use mixnet_contract_common::error::MixnetContractError;
 use mixnet_contract_common::events::{
     new_mixnode_bonding_event, new_mixnode_config_update_event,
     new_mixnode_pending_cost_params_update_event, new_pending_mixnode_unbonding_event,
+    new_pending_pledge_increase_event,
 };
 use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
 use mixnet_contract_common::pending_events::{PendingEpochEventKind, PendingIntervalEventKind};
-use mixnet_contract_common::MixNode;
+use mixnet_contract_common::{Layer, MixId, MixNode};
+
+pub(crate) fn update_mixnode_layer(
+    mix_id: MixId,
+    layer: Layer,
+    storage: &mut dyn Storage,
+) -> Result<(), MixnetContractError> {
+    let bond = if let Some(bond_information) = storage::mixnode_bonds().may_load(storage, mix_id)? {
+        bond_information
+    } else {
+        return Err(MixnetContractError::MixNodeBondNotFound { mix_id });
+    };
+    let mut updated_bond = bond.clone();
+    updated_bond.layer = layer;
+
+    storage::mixnode_bonds().replace(storage, bond.mix_id, Some(&updated_bond), Some(&bond))?;
+    Ok(())
+}
+
+pub fn assign_mixnode_layer(
+    deps: DepsMut<'_>,
+    info: MessageInfo,
+    mix_id: MixId,
+    layer: Layer,
+) -> Result<Response, MixnetContractError> {
+    ensure_is_authorized(info.sender, deps.storage)?;
+
+    update_mixnode_layer(mix_id, layer, deps.storage)?;
+
+    Ok(Response::default())
+}
 
 pub fn try_add_mixnode(
     deps: DepsMut<'_>,
@@ -92,7 +126,7 @@ fn _try_add_mixnode(
     validate_node_identity_signature(
         deps.as_ref(),
         &owner,
-        owner_signature,
+        &owner_signature,
         &mixnode.identity_key,
     )?;
 
@@ -117,6 +151,54 @@ fn _try_add_mixnode(
     )))
 }
 
+pub fn try_increase_pledge(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+) -> Result<Response, MixnetContractError> {
+    _try_increase_pledge(deps, env, info.funds, info.sender, None)
+}
+
+pub fn try_increase_pledge_on_behalf(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    owner: String,
+) -> Result<Response, MixnetContractError> {
+    let proxy = info.sender;
+    let owner = deps.api.addr_validate(&owner)?;
+    _try_increase_pledge(deps, env, info.funds, owner, Some(proxy))
+}
+
+pub fn _try_increase_pledge(
+    deps: DepsMut<'_>,
+    env: Env,
+    increase: Vec<Coin>,
+    owner: Addr,
+    proxy: Option<Addr>,
+) -> Result<Response, MixnetContractError> {
+    let mix_details = get_mixnode_details_by_owner(deps.storage, owner.clone())?
+        .ok_or(MixnetContractError::NoAssociatedMixNodeBond { owner })?;
+    let mix_id = mix_details.mix_id();
+
+    ensure_proxy_match(&proxy, &mix_details.bond_information.proxy)?;
+    ensure_bonded(&mix_details.bond_information)?;
+
+    let rewarding_denom = rewarding_denom(deps.storage)?;
+    let pledge_increase = validate_pledge(increase, coin(1, rewarding_denom))?;
+
+    let cosmos_event = new_pending_pledge_increase_event(mix_id, &pledge_increase);
+
+    // push the event to execute it at the end of the epoch
+    let epoch_event = PendingEpochEventKind::PledgeMore {
+        mix_id,
+        amount: pledge_increase,
+    };
+    interval_storage::push_new_epoch_event(deps.storage, &env, epoch_event)?;
+
+    Ok(Response::new().add_event(cosmos_event))
+}
+
 pub fn try_remove_mixnode_on_behalf(
     deps: DepsMut<'_>,
     env: Env,
@@ -307,7 +389,7 @@ pub mod tests {
 
         // if we don't send enough funds
         let info = mock_info(sender, &[insufficient_pledge.clone()]);
-        let (mixnode, sig) = test_helpers::mixnode_with_signature(&mut rng, sender);
+        let (mixnode, sig, _) = test_helpers::mixnode_with_signature(&mut rng, sender);
         let cost_params = fixtures::mix_node_cost_params_fixture();
 
         // we are informed that we didn't send enough funds
@@ -375,7 +457,7 @@ pub mod tests {
         );
 
         let info = mock_info(sender2, &tests::fixtures::good_mixnode_pledge());
-        let (mixnode, sig) = test_helpers::mixnode_with_signature(&mut rng, sender2);
+        let (mixnode, sig, _) = test_helpers::mixnode_with_signature(&mut rng, sender2);
 
         let result = try_add_mixnode(
             deps.as_mut(),
@@ -680,4 +762,187 @@ pub mod tests {
         )
         .is_err());
     }
+
+    #[cfg(test)]
+    mod increasing_mixnode_pledge {
+        use super::*;
+        use crate::mixnodes::helpers::tests::{
+            setup_mix_combinations, OWNER_UNBONDED, OWNER_UNBONDED_LEFTOVER, OWNER_UNBONDING,
+        };
+        use crate::support::tests::test_helpers::TestSetup;
+
+        #[test]
+        fn is_not_allowed_if_account_doesnt_own_mixnode() {
+            let mut test = TestSetup::new();
+            let env = test.env();
+            let sender = mock_info("not-mix-owner", &[]);
+
+            let res = try_increase_pledge(test.deps_mut(), env, sender);
+            assert_eq!(
+                res,
+                Err(MixnetContractError::NoAssociatedMixNodeBond {
+                    owner: Addr::unchecked("not-mix-owner")
+                })
+            )
+        }
+
+        #[test]
+        fn is_not_allowed_if_theres_proxy_mismatch() {
+            let mut test = TestSetup::new();
+            let env = test.env();
+
+            let owner_without_proxy = Addr::unchecked("no-proxy");
+            let owner_with_proxy = Addr::unchecked("with-proxy");
+            let proxy = Addr::unchecked("proxy");
+            let wrong_proxy = Addr::unchecked("unrelated-proxy");
+
+            test.add_dummy_mixnode(owner_without_proxy.as_str(), None);
+            test.add_dummy_mixnode_with_proxy(owner_with_proxy.as_str(), None, proxy.clone());
+
+            let res = _try_increase_pledge(
+                test.deps_mut(),
+                env.clone(),
+                Vec::new(),
+                owner_without_proxy.clone(),
+                Some(proxy),
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::ProxyMismatch {
+                    existing: "None".to_string(),
+                    incoming: "proxy".to_string()
+                })
+            );
+
+            let res = _try_increase_pledge(
+                test.deps_mut(),
+                env.clone(),
+                Vec::new(),
+                owner_with_proxy.clone(),
+                None,
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::ProxyMismatch {
+                    existing: "proxy".to_string(),
+                    incoming: "None".to_string()
+                })
+            );
+
+            let res = _try_increase_pledge(
+                test.deps_mut(),
+                env,
+                Vec::new(),
+                owner_with_proxy.clone(),
+                Some(wrong_proxy),
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::ProxyMismatch {
+                    existing: "proxy".to_string(),
+                    incoming: "unrelated-proxy".to_string()
+                })
+            )
+        }
+
+        #[test]
+        fn is_not_allowed_if_mixnode_has_unbonded_or_is_unbonding() {
+            let mut test = TestSetup::new();
+            let env = test.env();
+
+            // TODO: I dislike this cross-test access, but it provides us with exactly what we need
+            // perhaps it should be refactored a bit?
+            let owner_unbonding = Addr::unchecked(OWNER_UNBONDING);
+            let owner_unbonded = Addr::unchecked(OWNER_UNBONDED);
+            let owner_unbonded_leftover = Addr::unchecked(OWNER_UNBONDED_LEFTOVER);
+
+            let ids = setup_mix_combinations(&mut test);
+            let mix_id_unbonding = ids[1];
+
+            let res = try_increase_pledge(
+                test.deps_mut(),
+                env.clone(),
+                mock_info(owner_unbonding.as_str(), &[]),
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::MixnodeIsUnbonding {
+                    mix_id: mix_id_unbonding
+                })
+            );
+
+            // if the nodes are gone we treat them as tey never existed in the first place
+            // (regardless of if there's some leftover data)
+            let res = try_increase_pledge(
+                test.deps_mut(),
+                env.clone(),
+                mock_info(owner_unbonded_leftover.as_str(), &[]),
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::NoAssociatedMixNodeBond {
+                    owner: owner_unbonded_leftover
+                })
+            );
+
+            let res = try_increase_pledge(
+                test.deps_mut(),
+                env,
+                mock_info(owner_unbonded.as_str(), &[]),
+            );
+            assert_eq!(
+                res,
+                Err(MixnetContractError::NoAssociatedMixNodeBond {
+                    owner: owner_unbonded
+                })
+            )
+        }
+
+        #[test]
+        fn is_not_allowed_if_no_tokens_were_sent() {
+            let mut test = TestSetup::new();
+            let env = test.env();
+            let owner = "mix-owner";
+
+            test.add_dummy_mixnode(owner, None);
+
+            let sender_empty = mock_info(owner, &[]);
+            let res = try_increase_pledge(test.deps_mut(), env.clone(), sender_empty);
+            assert_eq!(res, Err(MixnetContractError::NoBondFound));
+
+            let sender_zero = mock_info(owner, &[test.coin(0)]);
+            let res = try_increase_pledge(test.deps_mut(), env, sender_zero);
+            assert_eq!(
+                res,
+                Err(MixnetContractError::InsufficientPledge {
+                    received: test.coin(0),
+                    minimum: test.coin(1)
+                })
+            )
+        }
+
+        #[test]
+        fn with_valid_information_creates_pending_event() {
+            let mut test = TestSetup::new();
+            let env = test.env();
+            let owner = "mix-owner";
+            let mix_id = test.add_dummy_mixnode(owner, None);
+
+            let events = test.pending_epoch_events();
+            assert!(events.is_empty());
+
+            let sender = mock_info(owner, &[test.coin(1000)]);
+            try_increase_pledge(test.deps_mut(), env, sender).unwrap();
+
+            let events = test.pending_epoch_events();
+
+            assert_eq!(
+                events[0].kind,
+                PendingEpochEventKind::PledgeMore {
+                    mix_id,
+                    amount: test.coin(1000)
+                }
+            );
+        }
+    }
 }
diff --git a/contracts/mixnet/src/rewards/transactions.rs b/contracts/mixnet/src/rewards/transactions.rs
index e25e4c1bd8..d1552bb50b 100644
--- a/contracts/mixnet/src/rewards/transactions.rs
+++ b/contracts/mixnet/src/rewards/transactions.rs
@@ -408,7 +408,7 @@ pub mod tests {
             let env = test.env();
 
             // note: we don't have to test for cases where `is_unbonding` is set to true on a mixnode
-            // since before performing the validator-api should clear out the event queue
+            // since before performing the nym-api should clear out the event queue
 
             // manually adjust delegation info as to indicate the rewarding information shouldnt get removed
             let mut rewarding_details = storage::MIXNODE_REWARDING
diff --git a/contracts/mixnet/src/support/helpers.rs b/contracts/mixnet/src/support/helpers.rs
index 9ec82ac2b8..ee47b48f3a 100644
--- a/contracts/mixnet/src/support/helpers.rs
+++ b/contracts/mixnet/src/support/helpers.rs
@@ -194,14 +194,30 @@ pub(crate) fn ensure_no_existing_bond(
     Ok(())
 }
 
-pub(crate) fn validate_node_identity_signature(
+pub fn validate_node_identity_signature(
     deps: Deps<'_>,
     owner: &Addr,
-    signature: String,
+    signature: &str,
     identity: IdentityKeyRef<'_>,
 ) -> Result<(), MixnetContractError> {
-    let owner_bytes = owner.as_bytes();
+    validate_signature(deps, owner.as_bytes(), signature, identity)
+}
 
+pub fn validate_family_signature(
+    deps: Deps<'_>,
+    family_member: IdentityKeyRef<'_>,
+    signature: &str,
+    family_head: IdentityKeyRef<'_>,
+) -> Result<(), MixnetContractError> {
+    validate_signature(deps, family_member.as_bytes(), signature, family_head)
+}
+
+pub(crate) fn validate_signature(
+    deps: Deps<'_>,
+    signed_bytes: &[u8],
+    signature: &str,
+    identity: IdentityKeyRef<'_>,
+) -> Result<(), MixnetContractError> {
     let mut identity_bytes = [0u8; 32];
     let mut signature_bytes = [0u8; 64];
 
@@ -226,7 +242,7 @@ pub(crate) fn validate_node_identity_signature(
 
     let res = deps
         .api
-        .ed25519_verify(owner_bytes, &signature_bytes, &identity_bytes)
+        .ed25519_verify(signed_bytes, &signature_bytes, &identity_bytes)
         .map_err(cosmwasm_std::StdError::verification_err)?;
     if !res {
         Err(MixnetContractError::InvalidEd25519Signature)
@@ -276,12 +292,7 @@ mod tests {
             Err(MixnetContractError::MalformedEd25519IdentityKey(
                 "buffer provided to decode base58 encoded string into was too small".into()
             )),
-            validate_node_identity_signature(
-                deps.as_ref(),
-                &address1,
-                sig_addr1_key1.clone(),
-                long_bs58,
-            )
+            validate_node_identity_signature(deps.as_ref(), &address1, &sig_addr1_key1, long_bs58,)
         );
 
         assert_eq!(
@@ -300,12 +311,7 @@ mod tests {
             Err(MixnetContractError::MalformedEd25519IdentityKey(
                 "Too few bytes provided for the public key".into()
             )),
-            validate_node_identity_signature(
-                deps.as_ref(),
-                &address1,
-                sig_addr1_key1.clone(),
-                short_bs58,
-            )
+            validate_node_identity_signature(deps.as_ref(), &address1, &sig_addr1_key1, short_bs58,)
         );
 
         assert_eq!(
@@ -325,7 +331,7 @@ mod tests {
             validate_node_identity_signature(
                 deps.as_ref(),
                 &address1,
-                sig_addr1_key1.clone(),
+                &sig_addr1_key1,
                 &keypair2.public_key().to_base58_string(),
             )
         );
@@ -335,7 +341,7 @@ mod tests {
             validate_node_identity_signature(
                 deps.as_ref(),
                 &address1,
-                sig_addr2_key1,
+                &sig_addr2_key1,
                 &keypair1.public_key().to_base58_string(),
             )
         );
@@ -345,7 +351,7 @@ mod tests {
             validate_node_identity_signature(
                 deps.as_ref(),
                 &address2,
-                sig_addr1_key1.clone(),
+                &sig_addr1_key1,
                 &keypair1.public_key().to_base58_string(),
             )
         );
@@ -355,7 +361,7 @@ mod tests {
             validate_node_identity_signature(
                 deps.as_ref(),
                 &address1,
-                sig_addr1_key2,
+                &sig_addr1_key2,
                 &keypair1.public_key().to_base58_string(),
             )
         );
@@ -363,7 +369,7 @@ mod tests {
         assert!(validate_node_identity_signature(
             deps.as_ref(),
             &address1,
-            sig_addr1_key1,
+            &sig_addr1_key1,
             &keypair1.public_key().to_base58_string(),
         )
         .is_ok());
diff --git a/contracts/mixnet/src/support/tests/mod.rs b/contracts/mixnet/src/support/tests/mod.rs
index a7cf4a3875..9f03f9c93c 100644
--- a/contracts/mixnet/src/support/tests/mod.rs
+++ b/contracts/mixnet/src/support/tests/mod.rs
@@ -28,6 +28,9 @@ pub mod test_helpers {
     use crate::mixnodes::transactions::{
         try_add_mixnode, try_add_mixnode_on_behalf, try_remove_mixnode,
     };
+    use crate::rewards::queries::{
+        query_pending_delegator_reward, query_pending_mixnode_operator_reward,
+    };
     use crate::rewards::storage as rewards_storage;
     use crate::rewards::transactions::try_reward_mixnode;
     use crate::support::tests;
@@ -37,12 +40,13 @@ pub mod test_helpers {
     use cosmwasm_std::testing::mock_info;
     use cosmwasm_std::testing::MockApi;
     use cosmwasm_std::testing::MockQuerier;
-    use cosmwasm_std::{Addr, BankMsg, CosmosMsg, Storage};
+    use cosmwasm_std::{coin, Addr, BankMsg, CosmosMsg, Storage};
     use cosmwasm_std::{Coin, Order};
     use cosmwasm_std::{Decimal, Empty, MemoryStorage};
     use cosmwasm_std::{Deps, OwnedDeps};
     use cosmwasm_std::{DepsMut, MessageInfo};
     use cosmwasm_std::{Env, Response, Timestamp, Uint128};
+    use crypto::asymmetric::identity::KeyPair;
     use mixnet_contract_common::events::{
         may_find_attribute, MixnetEventType, DELEGATES_REWARD_KEY, OPERATOR_REWARD_KEY,
     };
@@ -138,6 +142,10 @@ pub mod test_helpers {
                 .vesting_contract_address
         }
 
+        pub fn coin(&self, amount: u128) -> Coin {
+            coin(amount, rewarding_denom(self.deps().storage).unwrap())
+        }
+
         pub fn current_interval(&self) -> Interval {
             interval_storage::current_interval(self.deps().storage).unwrap()
         }
@@ -308,6 +316,22 @@ pub mod test_helpers {
             .unwrap();
         }
 
+        #[allow(unused)]
+        pub fn pending_operator_reward(&mut self, mix: MixId) -> Decimal {
+            query_pending_mixnode_operator_reward(self.deps(), mix)
+                .unwrap()
+                .amount_earned_detailed
+                .expect("no reward!")
+        }
+
+        #[allow(unused)]
+        pub fn pending_delegator_reward(&mut self, delegator: &str, target: MixId) -> Decimal {
+            query_pending_delegator_reward(self.deps(), delegator.into(), target, None)
+                .unwrap()
+                .amount_earned_detailed
+                .expect("no reward!")
+        }
+
         pub fn skip_to_next_epoch_end(&mut self) {
             self.skip_to_next_epoch();
             self.skip_to_current_epoch_end();
@@ -337,8 +361,19 @@ pub mod test_helpers {
             self.env.block.time = Timestamp::from_seconds(epoch_end as u64 + 1);
             let advanced = interval.advance_epoch();
 
-            if interval.current_epoch_id() != interval.epochs_in_interval() {
+            assert_eq!(
+                interval.current_epoch_absolute_id() + 1,
+                advanced.current_epoch_absolute_id()
+            );
+
+            if interval.current_epoch_id() != interval.epochs_in_interval() - 1 {
                 assert_eq!(interval.current_epoch_id() + 1, advanced.current_epoch_id())
+            } else {
+                assert_eq!(advanced.current_epoch_id(), 0);
+                assert_eq!(
+                    interval.current_interval_id() + 1,
+                    advanced.current_interval_id()
+                )
             }
 
             interval_storage::save_interval(self.deps_mut().storage, &advanced).unwrap()
@@ -522,7 +557,7 @@ pub mod test_helpers {
     pub fn mixnode_with_signature(
         mut rng: impl RngCore + CryptoRng,
         sender: &str,
-    ) -> (MixNode, String) {
+    ) -> (MixNode, String, KeyPair) {
         let keypair = crypto::asymmetric::identity::KeyPair::new(&mut rng);
         let legit_sphinx_key = crypto::asymmetric::encryption::KeyPair::new(&mut rng);
         let owner_signature = keypair
@@ -540,6 +575,7 @@ pub mod test_helpers {
                 ..tests::fixtures::mix_node_fixture()
             },
             owner_signature,
+            keypair,
         )
     }
 
diff --git a/contracts/mixnet/v2-changes.md b/contracts/mixnet/v2-changes.md
index ecb290703c..dc09e6784a 100644
--- a/contracts/mixnet/v2-changes.md
+++ b/contracts/mixnet/v2-changes.md
@@ -898,6 +898,6 @@ As with everything in this module, storage was also completely revamped. The cha
 
 ## Final remarks
 
-As mentioned during multiple chats, I think the migration the rest of our codebase is going to be a huge undertaking mostly because of how many aspects of the system this change is affecting. From the top of my head, we'd need to definitely change our `nymd client` (and as a result `validator-api`, `clients`, etc.) and also the vesting contract.
+As mentioned during multiple chats, I think the migration the rest of our codebase is going to be a huge undertaking mostly because of how many aspects of the system this change is affecting. From the top of my head, we'd need to definitely change our `nyxd client` (and as a result `validator-api`, `clients`, etc.) and also the vesting contract.
 
 With the latter case (and with the current mixnet contract), it's going to be even trickier given that the current contract is already live. We will need to adjust how the values are stored, i.e. mixnodes are now indexed by `NodeId` as opposed to `IdentityKey`. My recommendation would be to create a migration such that it would "cancel" / "return" (you name it) all existing delegations and bonds so that the users would have to make new ones under the new contract.
diff --git a/contracts/multisig/cw3-flex-multisig/src/error.rs b/contracts/multisig/cw3-flex-multisig/src/error.rs
index f7addae37b..75a546ca0e 100644
--- a/contracts/multisig/cw3-flex-multisig/src/error.rs
+++ b/contracts/multisig/cw3-flex-multisig/src/error.rs
@@ -5,10 +5,10 @@ use thiserror::Error;
 
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error(transparent)]
     Std(#[from] StdError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     Threshold(#[from] ThresholdError),
 
     #[error("Group contract invalid address '{addr}'")]
diff --git a/contracts/multisig/cw4-group/src/error.rs b/contracts/multisig/cw4-group/src/error.rs
index 82a84fe833..8c88fb2255 100644
--- a/contracts/multisig/cw4-group/src/error.rs
+++ b/contracts/multisig/cw4-group/src/error.rs
@@ -5,13 +5,13 @@ use cw_controllers::{AdminError, HookError};
 
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
-    #[error("{0}")]
+    #[error(transparent)]
     Std(#[from] StdError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     Hook(#[from] HookError),
 
-    #[error("{0}")]
+    #[error(transparent)]
     Admin(#[from] AdminError),
 
     #[error("Unauthorized")]
diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml
index e13491a4f6..dd8d2966f0 100644
--- a/contracts/vesting/Cargo.toml
+++ b/contracts/vesting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vesting-contract"
-version = "1.1.0"
+version = "1.1.2"
 authors = ["Drazen Urch <durch@users.noreply.github.com>"]
 edition = "2021"
 
diff --git a/contracts/vesting/src/contract.rs b/contracts/vesting/src/contract.rs
index 5efb3d750a..4a528b41d9 100644
--- a/contracts/vesting/src/contract.rs
+++ b/contracts/vesting/src/contract.rs
@@ -5,7 +5,7 @@ use crate::storage::{
     MIXNET_CONTRACT_ADDRESS, MIX_DENOM,
 };
 use crate::traits::{
-    DelegatingAccount, GatewayBondingAccount, MixnodeBondingAccount, VestingAccount,
+    DelegatingAccount, GatewayBondingAccount, MixnodeBondingAccount, NodeFamilies, VestingAccount,
 };
 use crate::vesting::{populate_vesting_periods, Account};
 use contracts_common::ContractBuildInformation;
@@ -60,6 +60,21 @@ pub fn execute(
     msg: ExecuteMsg,
 ) -> Result<Response, ContractError> {
     match msg {
+        ExecuteMsg::CreateFamily {
+            owner_signature,
+            label,
+        } => try_create_family(info, deps, owner_signature, label),
+        ExecuteMsg::JoinFamily {
+            signature,
+            family_head,
+        } => try_join_family(info, deps, signature, family_head),
+        ExecuteMsg::LeaveFamily {
+            signature,
+            family_head,
+        } => try_leave_family(info, deps, signature, family_head),
+        ExecuteMsg::KickFamilyMember { signature, member } => {
+            try_kick_family_member(info, deps, signature, member)
+        }
         ExecuteMsg::UpdateLockedPledgeCap { address, cap } => {
             try_update_locked_pledge_cap(address, cap, info, deps)
         }
@@ -121,6 +136,7 @@ pub fn execute(
             env,
             deps,
         ),
+        ExecuteMsg::PledgeMore { amount } => try_pledge_more(deps, env, info, amount),
         ExecuteMsg::UnbondMixnode {} => try_unbond_mixnode(info, deps),
         ExecuteMsg::TrackUnbondMixnode { owner, amount } => {
             try_track_unbond_mixnode(&owner, amount, info, deps)
@@ -143,6 +159,43 @@ pub fn execute(
     }
 }
 
+pub fn try_create_family(
+    info: MessageInfo,
+    deps: DepsMut,
+    owner_signature: String,
+    label: String,
+) -> Result<Response, ContractError> {
+    let account = account_from_address(info.sender.as_ref(), deps.storage, deps.api)?;
+    account.try_create_family(deps.storage, owner_signature, label)
+}
+pub fn try_join_family(
+    info: MessageInfo,
+    deps: DepsMut,
+    signature: String,
+    family_head: String,
+) -> Result<Response, ContractError> {
+    let account = account_from_address(info.sender.as_ref(), deps.storage, deps.api)?;
+    account.try_join_family(deps.storage, signature, &family_head)
+}
+pub fn try_leave_family(
+    info: MessageInfo,
+    deps: DepsMut,
+    signature: String,
+    family_head: String,
+) -> Result<Response, ContractError> {
+    let account = account_from_address(info.sender.as_ref(), deps.storage, deps.api)?;
+    account.try_leave_family(deps.storage, signature, &family_head)
+}
+pub fn try_kick_family_member(
+    info: MessageInfo,
+    deps: DepsMut,
+    signature: String,
+    member: String,
+) -> Result<Response, ContractError> {
+    let account = account_from_address(info.sender.as_ref(), deps.storage, deps.api)?;
+    account.try_head_kick_member(deps.storage, signature, &member)
+}
+
 /// Update locked_pledge_cap, the hard cap for staking/bonding with unvested tokens.
 ///
 /// Callable by ADMIN only, see [instantiate].
@@ -331,6 +384,19 @@ pub fn try_bond_mixnode(
     )
 }
 
+pub fn try_pledge_more(
+    deps: DepsMut<'_>,
+    env: Env,
+    info: MessageInfo,
+    amount: Coin,
+) -> Result<Response, ContractError> {
+    let mix_denom = MIX_DENOM.load(deps.storage)?;
+    let additional_pledge = validate_funds(&[amount], mix_denom)?;
+
+    let account = account_from_address(info.sender.as_str(), deps.storage, deps.api)?;
+    account.try_pledge_additional_tokens(additional_pledge, &env, deps.storage)
+}
+
 /// Unbond a mixnode, sends [mixnet_contract_common::ExecuteMsg::UnbondMixnodeOnBehalf] to [crate::storage::MIXNET_CONTRACT_ADDRESS].
 pub fn try_unbond_mixnode(info: MessageInfo, deps: DepsMut<'_>) -> Result<Response, ContractError> {
     let account = account_from_address(info.sender.as_str(), deps.storage, deps.api)?;
diff --git a/contracts/vesting/src/traits/bonding_account.rs b/contracts/vesting/src/traits/bonding_account.rs
index 36c248e393..491378d630 100644
--- a/contracts/vesting/src/traits/bonding_account.rs
+++ b/contracts/vesting/src/traits/bonding_account.rs
@@ -18,6 +18,13 @@ pub trait MixnodeBondingAccount {
         storage: &mut dyn Storage,
     ) -> Result<Response, ContractError>;
 
+    fn try_pledge_additional_tokens(
+        &self,
+        additional_pledge: Coin,
+        env: &Env,
+        storage: &mut dyn Storage,
+    ) -> Result<Response, ContractError>;
+
     fn try_unbond_mixnode(&self, storage: &dyn Storage) -> Result<Response, ContractError>;
 
     fn try_track_unbond_mixnode(
diff --git a/contracts/vesting/src/traits/mod.rs b/contracts/vesting/src/traits/mod.rs
index 60cff028d4..d1126bb92c 100644
--- a/contracts/vesting/src/traits/mod.rs
+++ b/contracts/vesting/src/traits/mod.rs
@@ -1,7 +1,9 @@
 pub mod bonding_account;
 pub mod delegating_account;
+pub mod node_families;
 pub mod vesting_account;
 
 pub use self::bonding_account::{GatewayBondingAccount, MixnodeBondingAccount};
 pub use self::delegating_account::DelegatingAccount;
+pub use self::node_families::NodeFamilies;
 pub use self::vesting_account::VestingAccount;
diff --git a/contracts/vesting/src/traits/node_families.rs b/contracts/vesting/src/traits/node_families.rs
new file mode 100644
index 0000000000..274ac41f94
--- /dev/null
+++ b/contracts/vesting/src/traits/node_families.rs
@@ -0,0 +1,33 @@
+use crate::errors::ContractError;
+use cosmwasm_std::{Response, Storage};
+use mixnet_contract_common::IdentityKeyRef;
+
+pub trait NodeFamilies {
+    fn try_create_family(
+        &self,
+        storage: &dyn Storage,
+        owner_signature: String,
+        label: String,
+    ) -> Result<Response, ContractError>;
+
+    fn try_join_family(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        family_head: IdentityKeyRef,
+    ) -> Result<Response, ContractError>;
+
+    fn try_leave_family(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        family_head: IdentityKeyRef,
+    ) -> Result<Response, ContractError>;
+
+    fn try_head_kick_member(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        member: IdentityKeyRef<'_>,
+    ) -> Result<Response, ContractError>;
+}
diff --git a/contracts/vesting/src/vesting/account/mixnode_bonding_account.rs b/contracts/vesting/src/vesting/account/mixnode_bonding_account.rs
index e3aec82584..74917a16c7 100644
--- a/contracts/vesting/src/vesting/account/mixnode_bonding_account.rs
+++ b/contracts/vesting/src/vesting/account/mixnode_bonding_account.rs
@@ -12,7 +12,8 @@ use mixnet_contract_common::mixnode::MixNodeCostParams;
 use mixnet_contract_common::{ExecuteMsg as MixnetExecuteMsg, MixNode};
 use vesting_contract_common::events::{
     new_vesting_mixnode_bonding_event, new_vesting_mixnode_unbonding_event,
-    new_vesting_update_mixnode_config_event, new_vesting_update_mixnode_cost_params_event,
+    new_vesting_pledge_more_event, new_vesting_update_mixnode_config_event,
+    new_vesting_update_mixnode_cost_params_event,
 };
 use vesting_contract_common::PledgeData;
 
@@ -84,6 +85,64 @@ impl MixnodeBondingAccount for Account {
             .add_event(new_vesting_mixnode_bonding_event()))
     }
 
+    fn try_pledge_additional_tokens(
+        &self,
+        additional_pledge: Coin,
+        env: &Env,
+        storage: &mut dyn Storage,
+    ) -> Result<Response, ContractError> {
+        let current_balance = self.load_balance(storage)?;
+        let total_pledged_after =
+            self.total_pledged_locked(storage, env)? + additional_pledge.amount;
+        let locked_pledge_cap = self.absolute_pledge_cap()?;
+
+        if locked_pledge_cap < total_pledged_after {
+            return Err(ContractError::LockedPledgeCapReached {
+                current: total_pledged_after,
+                cap: locked_pledge_cap,
+            });
+        }
+
+        if current_balance < additional_pledge.amount {
+            return Err(ContractError::InsufficientBalance(
+                self.owner_address().as_str().to_string(),
+                current_balance.u128(),
+            ));
+        }
+
+        let mut pledge_data = if let Some(pledge_data) = self.load_mixnode_pledge(storage)? {
+            pledge_data
+        } else {
+            return Err(ContractError::NoBondFound(
+                self.owner_address().as_str().to_string(),
+            ));
+        };
+
+        // need a second pair of eyes here to make sure updating existing timestamp on pledge data
+        // is not going to have some unexpected consequences
+        pledge_data.amount.amount += additional_pledge.amount;
+        pledge_data.block_time = env.block.time;
+
+        let msg = MixnetExecuteMsg::PledgeMoreOnBehalf {
+            owner: self.owner_address().into_string(),
+        };
+
+        let new_balance = Uint128::new(current_balance.u128() - additional_pledge.amount.u128());
+
+        let pledge_more_mag = wasm_execute(
+            MIXNET_CONTRACT_ADDRESS.load(storage)?,
+            &msg,
+            vec![additional_pledge],
+        )?;
+
+        self.save_balance(new_balance, storage)?;
+        self.save_mixnode_pledge(pledge_data, storage)?;
+
+        Ok(Response::new()
+            .add_message(pledge_more_mag)
+            .add_event(new_vesting_pledge_more_event()))
+    }
+
     fn try_unbond_mixnode(&self, storage: &dyn Storage) -> Result<Response, ContractError> {
         let msg = MixnetExecuteMsg::UnbondMixnodeOnBehalf {
             owner: self.owner_address().into_string(),
diff --git a/contracts/vesting/src/vesting/account/mod.rs b/contracts/vesting/src/vesting/account/mod.rs
index 71663247b7..a368431689 100644
--- a/contracts/vesting/src/vesting/account/mod.rs
+++ b/contracts/vesting/src/vesting/account/mod.rs
@@ -16,6 +16,7 @@ use vesting_contract_common::{Period, PledgeCap, PledgeData};
 mod delegating_account;
 mod gateway_bonding_account;
 mod mixnode_bonding_account;
+mod node_families;
 mod vesting_account;
 
 fn generate_storage_key(storage: &mut dyn Storage) -> Result<u32, ContractError> {
diff --git a/contracts/vesting/src/vesting/account/node_families.rs b/contracts/vesting/src/vesting/account/node_families.rs
new file mode 100644
index 0000000000..a83efdabf9
--- /dev/null
+++ b/contracts/vesting/src/vesting/account/node_families.rs
@@ -0,0 +1,74 @@
+use super::Account;
+use crate::{errors::ContractError, storage::MIXNET_CONTRACT_ADDRESS, traits::NodeFamilies};
+use cosmwasm_std::{wasm_execute, Response, Storage};
+use mixnet_contract_common::{ExecuteMsg as MixnetExecuteMsg, IdentityKeyRef};
+
+impl NodeFamilies for Account {
+    fn try_create_family(
+        &self,
+        storage: &dyn Storage,
+        owner_signature: String,
+        label: String,
+    ) -> Result<Response, ContractError> {
+        let msg = MixnetExecuteMsg::CreateFamilyOnBehalf {
+            owner_address: self.owner_address().to_string(),
+            owner_signature,
+            label,
+        };
+
+        let msg = wasm_execute(MIXNET_CONTRACT_ADDRESS.load(storage)?, &msg, vec![])?;
+
+        Ok(Response::new().add_message(msg))
+    }
+
+    fn try_join_family(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        family_head: IdentityKeyRef,
+    ) -> Result<Response, ContractError> {
+        let msg = MixnetExecuteMsg::JoinFamilyOnBehalf {
+            member_address: self.owner_address().to_string(),
+            signature,
+            family_head: family_head.to_string(),
+        };
+
+        let msg = wasm_execute(MIXNET_CONTRACT_ADDRESS.load(storage)?, &msg, vec![])?;
+
+        Ok(Response::new().add_message(msg))
+    }
+
+    fn try_leave_family(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        family_head: IdentityKeyRef,
+    ) -> Result<Response, ContractError> {
+        let msg = MixnetExecuteMsg::LeaveFamilyOnBehalf {
+            member_address: self.owner_address().to_string(),
+            signature,
+            family_head: family_head.to_string(),
+        };
+
+        let msg = wasm_execute(MIXNET_CONTRACT_ADDRESS.load(storage)?, &msg, vec![])?;
+
+        Ok(Response::new().add_message(msg))
+    }
+
+    fn try_head_kick_member(
+        &self,
+        storage: &dyn Storage,
+        signature: String,
+        member: IdentityKeyRef<'_>,
+    ) -> Result<Response, ContractError> {
+        let msg = MixnetExecuteMsg::KickFamilyMemberOnBehalf {
+            head_address: self.owner_address().to_string(),
+            signature,
+            member: member.to_string(),
+        };
+
+        let msg = wasm_execute(MIXNET_CONTRACT_ADDRESS.load(storage)?, &msg, vec![])?;
+
+        Ok(Response::new().add_message(msg))
+    }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c756e2ebd..7108925d69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     container_name: genesis_validator
     volumes:
       - "genesis_volume:/genesis_volume"
-      - "genesis_nymd:/root/.nymd"
+      - "genesis_nyxd:/root/.nyxd"
     environment: *NETWORK
     networks:
       localnet:
@@ -34,7 +34,7 @@ services:
       - "2317:1317"
     volumes:
       - "genesis_volume:/genesis_volume"
-      - "secondary_nymd:/root/.nymd"
+      - "secondary_nyxd:/root/.nyxd"
     environment: *NETWORK
     networks:
       localnet:
@@ -120,8 +120,8 @@ services:
 
 volumes:
   genesis_volume:
-  genesis_nymd:
-  secondary_nymd:
+  genesis_nyxd:
+  secondary_nyxd:
 
 #        contract_volume:
 #        mongo_data:
diff --git a/docker/typescript_client/upload_contract/package-lock.json b/docker/typescript_client/upload_contract/package-lock.json
index a87087b263..5afb3c4577 100644
--- a/docker/typescript_client/upload_contract/package-lock.json
+++ b/docker/typescript_client/upload_contract/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@nymproject/nym-validator-client": "0.18.0",
         "@types/node": "^14.14.22",
-        "nodemon": "^2.0.7",
+        "nodemon": "^2.0.20",
         "save-dev": "0.0.1-security",
         "tasktimer": "^3.0.0",
         "ts-node": "^9.1.1"
@@ -309,25 +309,6 @@
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@tsconfig/recommended": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.1.tgz",
@@ -349,81 +330,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "node_modules/ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-      "dependencies": {
-        "string-width": "^3.0.0"
-      }
-    },
-    "node_modules/ansi-align/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-align/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-    },
-    "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-align/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-align/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -507,27 +413,6 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
-    "node_modules/boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "dependencies": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -558,84 +443,6 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chalk/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
@@ -656,11 +463,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
     "node_modules/cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -670,61 +472,10 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/create-hash": {
       "version": "1.2.0",
@@ -756,14 +507,6 @@
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -772,30 +515,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
-    },
     "node_modules/define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -815,22 +534,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-    },
     "node_modules/elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -845,27 +548,6 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -919,17 +601,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -941,20 +612,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
-      "dependencies": {
-        "ini": "1.3.7"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/globalthis": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
@@ -969,32 +626,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
-    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -1003,14 +634,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -1043,42 +666,16 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-    },
     "node_modules/ignore-by-default": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
       "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk="
     },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "node_modules/ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
-    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -1090,17 +687,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1109,14 +695,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -1128,29 +706,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
-      "dependencies": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -1159,32 +714,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
-    },
     "node_modules/isomorphic-ws": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
@@ -1198,30 +727,6 @@
       "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
       "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/libsodium": {
       "version": "0.7.10",
       "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz",
@@ -1240,36 +745,6 @@
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
       "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
     },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -1285,14 +760,6 @@
         "safe-buffer": "^5.1.2"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -1304,9 +771,9 @@
       "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1314,32 +781,26 @@
         "node": "*"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/nodemon": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz",
-      "integrity": "sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==",
-      "hasInstallScript": true,
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+      "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
       "dependencies": {
-        "chokidar": "^3.2.2",
-        "debug": "^3.2.6",
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
         "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.0.4",
-        "pstree.remy": "^1.1.7",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
         "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
-        "undefsafe": "^2.0.3",
-        "update-notifier": "^4.1.0"
+        "undefsafe": "^2.0.5"
       },
       "bin": {
         "nodemon": "bin/nodemon.js"
@@ -1374,14 +835,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -1390,44 +843,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/pako": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
@@ -1459,14 +874,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/prettier": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
@@ -1514,26 +921,6 @@
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
       "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="
     },
-    "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -1542,20 +929,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -1585,36 +958,6 @@
       "resolved": "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz",
       "integrity": "sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ=="
     },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -1656,25 +999,6 @@
         "semver": "bin/semver"
       }
     },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-diff/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -1687,10 +1011,24 @@
         "sha.js": "bin.js"
       }
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    "node_modules/simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
     "node_modules/source-map": {
       "version": "0.6.1",
@@ -1717,38 +1055,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -1776,25 +1082,6 @@
         "eventemitter3": "^4.0.0"
       }
     },
-    "node_modules/term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1842,22 +1129,6 @@
         "typescript": ">=2.7"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "node_modules/typescript": {
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
@@ -1871,106 +1142,15 @@
       }
     },
     "node_modules/undefsafe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
-      "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
-      "dependencies": {
-        "debug": "^2.2.0"
-      }
-    },
-    "node_modules/undefsafe/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/undefsafe/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
-      "dependencies": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "node_modules/widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "dependencies": {
-        "string-width": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "node_modules/ws": {
       "version": "7.5.7",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
@@ -1991,14 +1171,6 @@
         }
       }
     },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/xstream": {
       "version": "11.14.0",
       "resolved": "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz",
@@ -2266,19 +1438,6 @@
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
       "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
-    },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "requires": {
-        "defer-to-connect": "^1.0.1"
-      }
-    },
     "@tsconfig/recommended": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.1.tgz",
@@ -2300,62 +1459,6 @@
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
-    "ansi-align": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
-      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
-      "requires": {
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
@@ -2421,21 +1524,6 @@
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
       "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
     },
-    "boxen": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
-      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
-      "requires": {
-        "ansi-align": "^3.0.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^3.0.0",
-        "cli-boxes": "^2.2.0",
-        "string-width": "^4.1.0",
-        "term-size": "^2.1.0",
-        "type-fest": "^0.8.1",
-        "widest-line": "^3.1.0"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2463,64 +1551,6 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        }
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
-    "chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "chokidar": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
@@ -2536,11 +1566,6 @@
         "readdirp": "~3.6.0"
       }
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2550,49 +1575,10 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "cli-boxes": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz",
-      "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
-    },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      }
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "create-hash": {
       "version": "1.2.0",
@@ -2624,11 +1610,6 @@
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
-    },
     "debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -2637,24 +1618,6 @@
         "ms": "^2.1.1"
       }
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-    },
-    "defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -2668,19 +1631,6 @@
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
-    "duplexer3": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
-    },
     "elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -2695,24 +1645,6 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="
-    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -2742,14 +1674,6 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "optional": true
     },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
     "glob-parent": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -2758,14 +1682,6 @@
         "is-glob": "^4.0.1"
       }
     },
-    "global-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
-      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
-      "requires": {
-        "ini": "1.3.7"
-      }
-    },
     "globalthis": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
@@ -2774,39 +1690,11 @@
         "define-properties": "^1.1.3"
       }
     },
-    "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="
-    },
     "hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -2836,36 +1724,16 @@
         "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
-    },
     "ignore-by-default": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
       "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk="
     },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
-    },
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "ini": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
-      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
-    },
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -2874,24 +1742,11 @@
         "binary-extensions": "^2.0.0"
       }
     },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
@@ -2900,45 +1755,11 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-installed-globally": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
-      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
-      "requires": {
-        "global-dirs": "^2.0.1",
-        "is-path-inside": "^3.0.1"
-      }
-    },
-    "is-npm": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
-      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="
-    },
     "isomorphic-ws": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
@@ -2950,27 +1771,6 @@
       "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
       "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
     },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "libsodium": {
       "version": "0.7.10",
       "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz",
@@ -2989,26 +1789,6 @@
       "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
       "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
     },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
     "make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -3024,11 +1804,6 @@
         "safe-buffer": "^5.1.2"
       }
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -3040,38 +1815,33 @@
       "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
-    "minimist": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-    },
     "ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "nodemon": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz",
-      "integrity": "sha512-egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
+      "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
       "requires": {
-        "chokidar": "^3.2.2",
-        "debug": "^3.2.6",
+        "chokidar": "^3.5.2",
+        "debug": "^3.2.7",
         "ignore-by-default": "^1.0.1",
-        "minimatch": "^3.0.4",
-        "pstree.remy": "^1.1.7",
+        "minimatch": "^3.1.2",
+        "pstree.remy": "^1.1.8",
         "semver": "^5.7.1",
+        "simple-update-notifier": "^1.0.7",
         "supports-color": "^5.5.0",
         "touch": "^3.1.0",
-        "undefsafe": "^2.0.3",
-        "update-notifier": "^4.1.0"
+        "undefsafe": "^2.0.5"
       }
     },
     "nopt": {
@@ -3087,47 +1857,11 @@
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
-    "normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
     },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
-    },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
     "pako": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
@@ -3150,11 +1884,6 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-    },
     "prettier": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
@@ -3193,23 +1922,6 @@
       "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
       "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w=="
     },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -3218,17 +1930,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      }
-    },
     "readable-stream": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
@@ -3252,30 +1953,6 @@
       "resolved": "https://registry.npmjs.org/readonly-date/-/readonly-date-1.0.0.tgz",
       "integrity": "sha512-tMKIV7hlk0h4mO3JTmmVuIlJVXjKk3Sep9Bf5OH0O+758ruuVkUy2J9SttDLm91IEX/WHlXPSpxMGjPj4beMIQ=="
     },
-    "registry-auth-token": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz",
-      "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==",
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -3300,21 +1977,6 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
     },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-        }
-      }
-    },
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -3324,10 +1986,20 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    "simple-update-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
+      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "requires": {
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
+        }
+      }
     },
     "source-map": {
       "version": "0.6.1",
@@ -3351,29 +2023,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
-    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -3395,16 +2044,6 @@
         "eventemitter3": "^4.0.0"
       }
     },
-    "term-size": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="
-    },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3434,123 +2073,27 @@
         "yn": "3.1.1"
       }
     },
-    "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
     "typescript": {
       "version": "4.3.5",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
       "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="
     },
     "undefsafe": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz",
-      "integrity": "sha512-nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==",
-      "requires": {
-        "debug": "^2.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
-      }
-    },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
-    "update-notifier": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz",
-      "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==",
-      "requires": {
-        "boxen": "^4.2.0",
-        "chalk": "^3.0.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.3.1",
-        "is-npm": "^4.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.0.0",
-        "pupa": "^2.0.1",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      }
-    },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
+      "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA=="
     },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "widest-line": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
-      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
-      "requires": {
-        "string-width": "^4.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "ws": {
       "version": "7.5.7",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
       "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
       "requires": {}
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="
-    },
     "xstream": {
       "version": "11.14.0",
       "resolved": "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz",
diff --git a/docker/typescript_client/upload_contract/package.json b/docker/typescript_client/upload_contract/package.json
index b52590cc53..7ae335c578 100644
--- a/docker/typescript_client/upload_contract/package.json
+++ b/docker/typescript_client/upload_contract/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@types/node": "^14.14.22",
-    "nodemon": "^2.0.7",
+    "nodemon": "^2.0.20",
     "@nymproject/nym-validator-client" : "0.18.0",
     "save-dev": "0.0.1-security",
     "tasktimer": "^3.0.0",
diff --git a/docker/validator/init_and_start.sh b/docker/validator/init_and_start.sh
index 722e7224d2..a1e8820fbc 100755
--- a/docker/validator/init_and_start.sh
+++ b/docker/validator/init_and_start.sh
@@ -7,39 +7,39 @@ cd /root
 
 if [ "$1" = "genesis" ]; then
   if [ ! -f "/root/.nymd/config/genesis.json" ]; then
-    ./nymd init nymnet --chain-id nymnet 2> /dev/null
+    ./nyxd init nymnet --chain-id nymnet 2> /dev/null
     # staking/governance token is hardcoded in config, change this
-    sed -i "s/\"stake\"/\"u${STAKE_DENOM}\"/" /root/.nymd/config/genesis.json
-    sed -i 's/minimum-gas-prices = ""/minimum-gas-prices = "0.025u'"${DENOM}"'"/' /root/.nymd/config/app.toml
-    sed -i '0,/enable = false/s//enable = true/g' /root/.nymd/config/app.toml
-    sed -i 's/cors_allowed_origins = \[\]/cors_allowed_origins = \["*"\]/' /root/.nymd/config/config.toml
-    sed -i 's/create_empty_blocks = true/create_empty_blocks = false/' /root/.nymd/config/config.toml
-    sed -i 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/' /root/.nymd/config/config.toml
+    sed -i "s/\"stake\"/\"u${STAKE_DENOM}\"/" /root/.nyxd/config/genesis.json
+    sed -i 's/minimum-gas-prices = ""/minimum-gas-prices = "0.025u'"${DENOM}"'"/' /root/.nyxd/config/app.toml
+    sed -i '0,/enable = false/s//enable = true/g' /root/.nyxd/config/app.toml
+    sed -i 's/cors_allowed_origins = \[\]/cors_allowed_origins = \["*"\]/' /root/.nyxd/config/config.toml
+    sed -i 's/create_empty_blocks = true/create_empty_blocks = false/' /root/.nyxd/config/config.toml
+    sed -i 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/' /root/.nyxd/config/config.toml
 
 #    create accounts
-    yes "${PASSPHRASE}" | ./nymd keys add node_admin 2>&1 >/dev/null | tail -n 1 > /root/.nymd/mnemonic
-    yes "${PASSPHRASE}" | ./nymd keys add secondary 2>&1 >/dev/null | tail -n 1 > /root/.nymd/secondary_mnemonic
-    cp /root/.nymd/mnemonic /genesis_volume/genesis_mnemonic
-    cp /root/.nymd/secondary_mnemonic /genesis_volume/secondary_mnemonic
+    yes "${PASSPHRASE}" | ./nyxd keys add node_admin 2>&1 >/dev/null | tail -n 1 > /root/.nyxd/mnemonic
+    yes "${PASSPHRASE}" | ./nyxd keys add secondary 2>&1 >/dev/null | tail -n 1 > /root/.nyxd/secondary_mnemonic
+    cp /root/.nyxd/mnemonic /genesis_volume/genesis_mnemonic
+    cp /root/.nyxd/secondary_mnemonic /genesis_volume/secondary_mnemonic
 
 #    add genesis accounts with some initial tokens
-    GENESIS_ADDRESS=$(yes "${PASSPHRASE}" | ./nymd keys show node_admin -a)
-    SECONDARY_ADDRESS=$(yes "${PASSPHRASE}" | ./nymd keys show secondary -a)
-    yes "${PASSPHRASE}" | ./nymd add-genesis-account "${GENESIS_ADDRESS}" 1000000000000000u"${DENOM}",1000000000000000u"${STAKE_DENOM}"
-    yes "${PASSPHRASE}" | ./nymd add-genesis-account "${SECONDARY_ADDRESS}" 1000000000000000u"${DENOM}",1000000000000000u"${STAKE_DENOM}"
+    GENESIS_ADDRESS=$(yes "${PASSPHRASE}" | ./nyxd keys show node_admin -a)
+    SECONDARY_ADDRESS=$(yes "${PASSPHRASE}" | ./nyxd keys show secondary -a)
+    yes "${PASSPHRASE}" | ./nyxd add-genesis-account "${GENESIS_ADDRESS}" 1000000000000000u"${DENOM}",1000000000000000u"${STAKE_DENOM}"
+    yes "${PASSPHRASE}" | ./nyxd add-genesis-account "${SECONDARY_ADDRESS}" 1000000000000000u"${DENOM}",1000000000000000u"${STAKE_DENOM}"
 
-    yes "${PASSPHRASE}" | ./nymd gentx node_admin 1000000000u"${STAKE_DENOM}" --chain-id nymnet 2> /dev/null
-    ./nymd collect-gentxs 2> /dev/null
-    ./nymd validate-genesis > /dev/null
-    cp /root/.nymd/config/genesis.json /genesis_volume/genesis.json
+    yes "${PASSPHRASE}" | ./nyxd gentx node_admin 1000000000u"${STAKE_DENOM}" --chain-id nymnet 2> /dev/null
+    ./nyxd collect-gentxs 2> /dev/null
+    ./nyxd validate-genesis > /dev/null
+    cp /root/.nyxd/config/genesis.json /genesis_volume/genesis.json
   else
     echo "Validator already initialized, starting with the existing configuration."
     echo "If you want to re-init the validator, destroy the existing container"
 	fi
-	./nymd start
+	./nyxd start
 elif [ "$1" = "secondary" ]; then
   if [ ! -f "/root/.nymd/config/genesis.json" ]; then
-    ./nymd init nymnet --chain-id nym-secondary 2> /dev/null
+    ./nyxd init nymnet --chain-id nym-secondary 2> /dev/null
 
     # Wait until the genesis node writes the genesis.json to the shared volume
     while ! [ -s /genesis_volume/genesis.json ]; do
@@ -49,29 +49,29 @@ elif [ "$1" = "secondary" ]; then
 # wait for the actual validator to start up
     sleep 5
 
-    cp /genesis_volume/genesis.json /root/.nymd/config/genesis.json
-    GENESIS_PEER=$(cat /root/.nymd/config/genesis.json | grep '"memo"' | cut -d'"' -f 4)
-    GENESIS_IP=$(cat /root/.nymd/config/genesis.json | grep '"memo"' | cut -d'@' -f2 | cut -d: -f1)
-    sed -i 's/persistent_peers = ""/persistent_peers = "'"${GENESIS_PEER}"'"/' /root/.nymd/config/config.toml
-    sed -i 's/minimum-gas-prices = ""/minimum-gas-prices = "0.025u'"${BECH32_PREFIX}"'"/' /root/.nymd/config/app.toml
-    sed -i '0,/enable = false/s//enable = true/g' /root/.nymd/config/app.toml
-    sed -i 's/cors_allowed_origins = \[\]/cors_allowed_origins = \["*"\]/' /root/.nymd/config/config.toml
-    sed -i 's/create_empty_blocks = true/create_empty_blocks = false/' /root/.nymd/config/config.toml
-    sed -i 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/' /root/.nymd/config/config.toml
+    cp /genesis_volume/genesis.json /root/.nyxd/config/genesis.json
+    GENESIS_PEER=$(cat /root/.nyxd/config/genesis.json | grep '"memo"' | cut -d'"' -f 4)
+    GENESIS_IP=$(cat /root/.nyxd/config/genesis.json | grep '"memo"' | cut -d'@' -f2 | cut -d: -f1)
+    sed -i 's/persistent_peers = ""/persistent_peers = "'"${GENESIS_PEER}"'"/' /root/.nyxd/config/config.toml
+    sed -i 's/minimum-gas-prices = ""/minimum-gas-prices = "0.025u'"${BECH32_PREFIX}"'"/' /root/.nyxd/config/app.toml
+    sed -i '0,/enable = false/s//enable = true/g' /root/.nyxd/config/app.toml
+    sed -i 's/cors_allowed_origins = \[\]/cors_allowed_origins = \["*"\]/' /root/.nyxd/config/config.toml
+    sed -i 's/create_empty_blocks = true/create_empty_blocks = false/' /root/.nyxd/config/config.toml
+    sed -i 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/' /root/.nyxd/config/config.toml
 
 #    import mnemonic generated by the genesis validator (have a local copy for ease of use)
-    cp  /genesis_volume/secondary_mnemonic /root/.nymd/mnemonic
-    { cat /root/.nymd/mnemonic; echo "${PASSPHRASE}"; echo "${PASSPHRASE}"; } | ./nymd keys add node_admin --recover #> /dev/null
-    ./nymd validate-genesis > /dev/null
+    cp  /genesis_volume/secondary_mnemonic /root/.nyxd/mnemonic
+    { cat /root/.nyxd/mnemonic; echo "${PASSPHRASE}"; echo "${PASSPHRASE}"; } | ./nyxd keys add node_admin --recover #> /dev/null
+    ./nyxd validate-genesis > /dev/null
 
 #    create validator
 #  don't even ask about those sleeps...
-  { echo "${PASSPHRASE}"; sleep 10; yes; sleep 10; } | ./nymd tx staking create-validator --amount=10000000u"${STAKE_DENOM}" --fees 100000u"${DENOM}" --pubkey="$(./nymd tendermint show-validator)" --moniker="secondary" --commission-rate="0.10" --commission-max-rate="0.20" --commission-max-change-rate="0.01" --min-self-delegation="1" --chain-id=nymnet --from=node_admin -b async --node http://"${GENESIS_IP}":26657
+  { echo "${PASSPHRASE}"; sleep 10; yes; sleep 10; } | ./nyxd tx staking create-validator --amount=10000000u"${STAKE_DENOM}" --fees 100000u"${DENOM}" --pubkey="$(./nyxd tendermint show-validator)" --moniker="secondary" --commission-rate="0.10" --commission-max-rate="0.20" --commission-max-change-rate="0.01" --min-self-delegation="1" --chain-id=nymnet --from=node_admin -b async --node http://"${GENESIS_IP}":26657
   else
     echo "Validator already initialized, starting with the existing configuration."
     echo "If you want to re-init the validator, destroy the existing container"
   fi
-	./nymd start
+	./nyxd start
 else
 	echo "Wrong command. Usage: ./$0 [genesis/secondary]"
 fi
diff --git a/docker/validator/setup.sh b/docker/validator/setup.sh
index efd40f0e14..4b176fb04e 100755
--- a/docker/validator/setup.sh
+++ b/docker/validator/setup.sh
@@ -8,7 +8,7 @@ git checkout "${WASMD_VERSION}"
 WASMD_COMMIT_HASH=$(git rev-parse HEAD)
 mkdir build
 go build \
-    -o build/nymd -mod=readonly -tags "netgo,ledger" \
+    -o build/nyxd -mod=readonly -tags "netgo,ledger" \
     -ldflags "-X github.com/cosmos/cosmos-sdk/version.Name=nymd \
     -X github.com/cosmos/cosmos-sdk/version.AppName=nymd \
     -X github.com/CosmWasm/wasmd/app.NodeDir=.nymd \
diff --git a/envs/mainnet.env b/envs/mainnet.env
index d53b7f4b8b..3a8ec4b17c 100644
--- a/envs/mainnet.env
+++ b/envs/mainnet.env
@@ -9,7 +9,7 @@ MIX_DENOM_DISPLAY=nym
 STAKE_DENOM=unyx
 STAKE_DENOM_DISPLAY=nyx
 DENOMS_EXPONENT=6
-MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
+MIXNET_CONTRACT_ADDRESS=n17srjznxl9dvzdkpwpw24gg668wc73val88a6m5ajg6ankwvz9wtst0cznr
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
 BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
@@ -17,5 +17,5 @@ MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 COCONUT_DKG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
 REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
 STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
-NYMD_VALIDATOR="https://rpc.nyx.nodes.guru/"
+nyxd_VALIDATOR="https://rpc.nymtech.net";
 API_VALIDATOR="https://validator.nymtech.net/api/"
diff --git a/envs/qa-qwerty.env b/envs/qa-qwerty.env
index 26e5b0fe1f..6bb6895d72 100644
--- a/envs/qa-qwerty.env
+++ b/envs/qa-qwerty.env
@@ -12,9 +12,10 @@ DENOMS_EXPONENT=6
 MIXNET_CONTRACT_ADDRESS=n14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sjyvg3g
 VESTING_CONTRACT_ADDRESS=n1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrq73f2nw
 BANDWIDTH_CLAIM_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
-MULTISIG_CONTRACT_ADDRESS=n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0
+COCONUT_BANDWIDTH_CONTRACT_ADDRESS=n12ckdkm3q7eytefs7rwu4ue3t9hxgvl9v08jddmtwgct2ve0pv50q0t8dlt
+MULTISIG_CONTRACT_ADDRESS=n14krxe8ukzagwhvec0rmteexu62w8k9kp9sra9ww6em2hnmzcukqsa0utc8
+COCONUT_DKG_CONTRACT_ADDRESS=n1rl5n6cxuz2hdy3f7d9hsnw8zn0zwwwr0r4dxfz7tktgpgkcnz9zshmvksc
 REWARDING_VALIDATOR_ADDRESS=n10yyd98e2tuwu0f7ypz9dy3hhjw7v772q6287gy
 STATISTICS_SERVICE_DOMAIN_ADDRESS="https://mainnet-stats.nymte.ch:8090"
-NYMD_VALIDATOR="https://qwerty-validator.qa.nymte.ch/"
+NYXD_VALIDATOR="https://qwerty-validator.qa.nymte.ch/"
 API_VALIDATOR="https://qwerty-validator-api.qa.nymte.ch/api"
diff --git a/envs/qa.env b/envs/qa.env
index 64511fa922..999850f798 100644
--- a/envs/qa.env
+++ b/envs/qa.env
@@ -17,5 +17,5 @@ MULTISIG_CONTRACT_ADDRESS=n17p9rzwnnfxcjp32un9ug7yhhzgtkhvl988qccs
 COCONUT_DKG_CONTRACT_ADDRESS=n17p9rzwnnfxcjp32un9ug7yhhzgtkhvl988qccs
 REWARDING_VALIDATOR_ADDRESS=n1tfzd4qz3a45u8p4mr5zmzv66457uwjgcl05jdq
 STATISTICS_SERVICE_DOMAIN_ADDRESS="http://0.0.0.0"
-NYMD_VALIDATOR="https://qa-validator.nymtech.net"
+NYXD_VALIDATOR="https://qa-validator.nymtech.net"
 API_VALIDATOR="https://qa-validator-api.nymtech.net/api"
diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml
index cc665b1f83..129423cf7f 100644
--- a/explorer-api/Cargo.toml
+++ b/explorer-api/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4.19", features = ["serde"] }
-clap = { version = "3.2", features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 humantime-serde = "1.0"
 isocountry = "0.3.2"
 itertools = "0.10.3"
@@ -25,10 +25,13 @@ thiserror = "1.0.29"
 tokio = {version = "1.21.2", features = ["full"] }
 maxminddb = "0.23.0"
 dotenv = "0.15.0"
+rand = "0.8.5"
+rand_seeder = "0.2.3"
+rand_pcg = "0.3.1"
 
 mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract" }
 contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" }
 network-defaults = { path = "../common/network-defaults" }
 logging = { path = "../common/logging"}
 task = { path = "../common/task" }
-validator-client = { path = "../common/client-libs/validator-client", features=["nymd-client"] }
+validator-client = { path = "../common/client-libs/validator-client", features=["nyxd-client"] }
diff --git a/explorer-api/src/client.rs b/explorer-api/src/client.rs
index 129a394d31..ca9449f971 100644
--- a/explorer-api/src/client.rs
+++ b/explorer-api/src/client.rs
@@ -1,10 +1,10 @@
 use network_defaults::{
-    var_names::{API_VALIDATOR, NYMD_VALIDATOR},
+    var_names::{NYM_API, NYXD},
     NymNetworkDetails,
 };
 use reqwest::Url;
 use std::{str::FromStr, sync::Arc};
-use validator_client::nymd::QueryNymdClient;
+use validator_client::nyxd::QueryNyxdClient;
 
 // since this is just a query client, we don't need any locking mechanism to keep sequence numbers in check
 // nor we need to access any of its methods taking mutable reference (like updating api URL)
@@ -12,7 +12,7 @@ use validator_client::nymd::QueryNymdClient;
 
 #[derive(Clone)]
 pub(crate) struct ThreadsafeValidatorClient(
-    pub(crate) Arc<validator_client::Client<QueryNymdClient>>,
+    pub(crate) Arc<validator_client::Client<QueryNyxdClient>>,
 );
 
 impl ThreadsafeValidatorClient {
@@ -21,22 +21,22 @@ impl ThreadsafeValidatorClient {
     }
 
     pub(crate) fn api_endpoint(&self) -> &Url {
-        self.0.validator_api.current_url()
+        self.0.nym_api.current_url()
     }
 }
 
 pub(crate) fn new_validator_client() -> ThreadsafeValidatorClient {
-    let nymd_url = Url::from_str(&std::env::var(NYMD_VALIDATOR).expect("nymd validator not set"))
-        .expect("nymd validator not in url format");
-    let api_url = Url::from_str(&std::env::var(API_VALIDATOR).expect("nymd validator not set"))
-        .expect("nymd validator not in url format");
+    let nyxd_url = Url::from_str(&std::env::var(NYXD).expect("nyxd validator not set"))
+        .expect("nyxd validator not in url format");
+    let api_url = Url::from_str(&std::env::var(NYM_API).expect("nyxd validator not set"))
+        .expect("nyxd validator not in url format");
 
     let details = NymNetworkDetails::new_from_env();
     let client_config = validator_client::Config::try_from_nym_network_details(&details)
         .expect("failed to construct valid validator client config with the provided network")
-        .with_urls(nymd_url, api_url);
+        .with_urls(nyxd_url, api_url);
 
     ThreadsafeValidatorClient(Arc::new(
-        validator_client::Client::new_query(client_config).expect("Failed to connect to nymd!"),
+        validator_client::Client::new_query(client_config).expect("Failed to connect to nyxd!"),
     ))
 }
diff --git a/explorer-api/src/country_statistics/distribution.rs b/explorer-api/src/country_statistics/distribution.rs
index f48e87eebb..93d12067b6 100644
--- a/explorer-api/src/country_statistics/distribution.rs
+++ b/explorer-api/src/country_statistics/distribution.rs
@@ -1,5 +1,5 @@
 use log::info;
-use task::ShutdownListener;
+use task::TaskClient;
 
 use crate::country_statistics::country_nodes_distribution::CountryNodesDistribution;
 use crate::COUNTRY_DATA_REFRESH_INTERVAL;
@@ -8,11 +8,11 @@ use crate::state::ExplorerApiStateContext;
 
 pub(crate) struct CountryStatisticsDistributionTask {
     state: ExplorerApiStateContext,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl CountryStatisticsDistributionTask {
-    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: ShutdownListener) -> Self {
+    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: TaskClient) -> Self {
         CountryStatisticsDistributionTask { state, shutdown }
     }
 
diff --git a/explorer-api/src/country_statistics/geolocate.rs b/explorer-api/src/country_statistics/geolocate.rs
index c77a61a9a1..0ae79985c7 100644
--- a/explorer-api/src/country_statistics/geolocate.rs
+++ b/explorer-api/src/country_statistics/geolocate.rs
@@ -4,15 +4,15 @@
 use crate::mix_nodes::location::Location;
 use crate::state::ExplorerApiStateContext;
 use log::{info, warn};
-use task::ShutdownListener;
+use task::TaskClient;
 
 pub(crate) struct GeoLocateTask {
     state: ExplorerApiStateContext,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl GeoLocateTask {
-    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: ShutdownListener) -> Self {
+    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: TaskClient) -> Self {
         GeoLocateTask { state, shutdown }
     }
 
diff --git a/explorer-api/src/main.rs b/explorer-api/src/main.rs
index 47dddf9f54..ecfde18949 100644
--- a/explorer-api/src/main.rs
+++ b/explorer-api/src/main.rs
@@ -8,7 +8,7 @@ use dotenv::dotenv;
 use log::info;
 use logging::setup_logging;
 use network_defaults::setup_env;
-use task::ShutdownNotifier;
+use task::{wait_for_signal, TaskManager};
 
 mod buy_terms;
 pub(crate) mod cache;
@@ -35,7 +35,7 @@ async fn main() {
     dotenv().ok();
     setup_logging();
     let args = commands::Cli::parse();
-    setup_env(args.config_env_file);
+    setup_env(args.config_env_file.as_ref());
     let mut explorer_api = ExplorerApi::new();
     explorer_api.run().await;
 }
@@ -54,10 +54,10 @@ impl ExplorerApi {
     async fn run(&mut self) {
         info!("Explorer API starting up...");
 
-        let validator_api_url = self.state.inner.validator_client.api_endpoint();
-        info!("Using validator API - {}", validator_api_url);
+        let nym_api_url = self.state.inner.validator_client.api_endpoint();
+        info!("Using validator API - {}", nym_api_url);
 
-        let shutdown = ShutdownNotifier::default();
+        let shutdown = TaskManager::default();
 
         // spawn concurrent tasks
         crate::tasks::ExplorerApiTasks::new(self.state.clone(), shutdown.subscribe()).start();
@@ -78,7 +78,7 @@ impl ExplorerApi {
         self.wait_for_interrupt(shutdown).await
     }
 
-    async fn wait_for_interrupt(&self, mut shutdown: ShutdownNotifier) {
+    async fn wait_for_interrupt(&self, mut shutdown: TaskManager) {
         wait_for_signal().await;
 
         log::info!("Sending shutdown");
@@ -88,31 +88,3 @@ impl ExplorerApi {
         log::info!("Stopping explorer API");
     }
 }
-
-#[cfg(unix)]
-async fn wait_for_signal() {
-    use tokio::signal::unix::{signal, SignalKind};
-    let mut sigterm = signal(SignalKind::terminate()).expect("Failed to setup SIGTERM channel");
-    let mut sigquit = signal(SignalKind::quit()).expect("Failed to setup SIGQUIT channel");
-
-    tokio::select! {
-        _ = tokio::signal::ctrl_c() => {
-            log::info!("Received SIGINT");
-        },
-        _ = sigterm.recv() => {
-            log::info!("Received SIGTERM");
-        }
-        _ = sigquit.recv() => {
-            log::info!("Received SIGQUIT");
-        }
-    }
-}
-
-#[cfg(not(unix))]
-async fn wait_for_signal() {
-    tokio::select! {
-        _ = tokio::signal::ctrl_c() => {
-            log::info!("Received SIGINT");
-        },
-    }
-}
diff --git a/explorer-api/src/mix_node/delegations.rs b/explorer-api/src/mix_node/delegations.rs
index 3d061c942a..00c55446e8 100644
--- a/explorer-api/src/mix_node/delegations.rs
+++ b/explorer-api/src/mix_node/delegations.rs
@@ -12,7 +12,7 @@ pub(crate) async fn get_single_mixnode_delegations(
 ) -> Vec<Delegation> {
     match client
         .0
-        .get_all_nymd_single_mixnode_delegations(mix_id)
+        .get_all_nyxd_single_mixnode_delegations(mix_id)
         .await
     {
         Ok(result) => result,
diff --git a/explorer-api/src/mix_node/econ_stats.rs b/explorer-api/src/mix_node/econ_stats.rs
index cde29d3a86..30d89a29b2 100644
--- a/explorer-api/src/mix_node/econ_stats.rs
+++ b/explorer-api/src/mix_node/econ_stats.rs
@@ -13,31 +13,26 @@ pub(crate) async fn retrieve_mixnode_econ_stats(
 ) -> Option<EconomicDynamicsStats> {
     let stake_saturation = client
         .0
-        .validator_api
+        .nym_api
         .get_mixnode_stake_saturation(mix_id)
         .await
         .ok()?;
 
     let inclusion_probability = client
         .0
-        .validator_api
+        .nym_api
         .get_mixnode_inclusion_probability(mix_id)
         .await
         .ok()?;
 
     let reward_estimation = client
         .0
-        .validator_api
+        .nym_api
         .get_mixnode_reward_estimation(mix_id)
         .await
         .ok()?;
 
-    let uptime_response = client
-        .0
-        .validator_api
-        .get_mixnode_avg_uptime(mix_id)
-        .await
-        .ok()?;
+    let uptime_response = client.0.nym_api.get_mixnode_avg_uptime(mix_id).await.ok()?;
 
     Some(EconomicDynamicsStats {
         stake_saturation: best_effort_small_dec_to_f64(stake_saturation.saturation) as f32,
diff --git a/explorer-api/src/mix_node/models.rs b/explorer-api/src/mix_node/models.rs
index ef894e4b40..92f4dbe8aa 100644
--- a/explorer-api/src/mix_node/models.rs
+++ b/explorer-api/src/mix_node/models.rs
@@ -40,6 +40,7 @@ pub(crate) struct PrettyDetailedMixNodeBond {
     pub estimated_delegators_apy: f64,
     pub operating_cost: Coin,
     pub profit_margin_percent: Percent,
+    pub family_id: Option<u16>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
diff --git a/explorer-api/src/mix_nodes/mod.rs b/explorer-api/src/mix_nodes/mod.rs
index 82c2aedd1f..e2aced241a 100644
--- a/explorer-api/src/mix_nodes/mod.rs
+++ b/explorer-api/src/mix_nodes/mod.rs
@@ -6,6 +6,7 @@ use std::time::Duration;
 pub(crate) mod http;
 pub(crate) mod location;
 pub(crate) mod models;
+pub(crate) mod utils;
 
 pub(crate) const CACHE_REFRESH_RATE: Duration = Duration::from_secs(30);
 pub(crate) const CACHE_ENTRY_TTL: Duration = Duration::from_secs(60);
diff --git a/explorer-api/src/mix_nodes/models.rs b/explorer-api/src/mix_nodes/models.rs
index 8dc9c96ac3..fdbd99e467 100644
--- a/explorer-api/src/mix_nodes/models.rs
+++ b/explorer-api/src/mix_nodes/models.rs
@@ -13,6 +13,7 @@ use tokio::sync::{RwLock, RwLockReadGuard};
 use crate::helpers::best_effort_small_dec_to_f64;
 use validator_client::models::MixNodeBondAnnotated;
 
+use super::utils::family_numerical_id;
 use crate::mix_node::models::{MixnodeStatus, PrettyDetailedMixNodeBond};
 use crate::mix_nodes::location::{Location, LocationCache, LocationCacheItem};
 use crate::mix_nodes::CACHE_ENTRY_TTL;
@@ -140,6 +141,8 @@ impl ThreadsafeMixNodesCache {
         let denom = &node.mixnode_details.original_pledge().denom;
         let rewarding_info = &node.mixnode_details.rewarding_details;
 
+        let family_id = node.family.as_ref().map(family_numerical_id);
+
         PrettyDetailedMixNodeBond {
             mix_id,
             location: location.and_then(|l| l.location.clone()),
@@ -157,6 +160,7 @@ impl ThreadsafeMixNodesCache {
             estimated_delegators_apy: best_effort_small_dec_to_f64(node.estimated_delegators_apy),
             operating_cost: rewarding_info.cost_params.interval_operating_cost.clone(),
             profit_margin_percent: rewarding_info.cost_params.profit_margin_percent,
+            family_id,
         }
     }
 
diff --git a/explorer-api/src/mix_nodes/utils.rs b/explorer-api/src/mix_nodes/utils.rs
index a151ec318a..e1040dda62 100644
--- a/explorer-api/src/mix_nodes/utils.rs
+++ b/explorer-api/src/mix_nodes/utils.rs
@@ -1,9 +1,15 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use mixnet_contract_common::families::FamilyHead;
+use rand::Rng;
+use rand_pcg::Pcg64;
+use rand_seeder::Seeder;
+
 use crate::mix_nodes::location::GeoLocation;
 use isocountry::CountryCode;
 
+#[allow(dead_code)]
 pub(crate) fn map_2_letter_to_3_letter_country_code(geo: &GeoLocation) -> String {
     match CountryCode::for_alpha2(&geo.country_code) {
         Ok(three_letter_country_code) => three_letter_country_code.alpha3().to_string(),
@@ -16,3 +22,10 @@ pub(crate) fn map_2_letter_to_3_letter_country_code(geo: &GeoLocation) -> String
         }
     }
 }
+
+// We don't need numerical IDs anywhere, so to avoid modifying the contract storage again and
+//  since this is for explorer ergonomics, it will generate a deterministic random u16 based on the family Identity.
+pub(crate) fn family_numerical_id(fh: &FamilyHead) -> u16 {
+    let mut rng: Pcg64 = Seeder::from(fh.identity()).make_rng();
+    rng.gen()
+}
diff --git a/explorer-api/src/tasks.rs b/explorer-api/src/tasks.rs
index 08d43fb805..6452405761 100644
--- a/explorer-api/src/tasks.rs
+++ b/explorer-api/src/tasks.rs
@@ -4,10 +4,10 @@
 use std::future::Future;
 
 use mixnet_contract_common::GatewayBond;
-use task::ShutdownListener;
+use task::TaskClient;
 use validator_client::models::MixNodeBondAnnotated;
-use validator_client::nymd::error::NymdError;
-use validator_client::nymd::{Paging, QueryNymdClient, ValidatorResponse};
+use validator_client::nyxd::error::NyxdError;
+use validator_client::nyxd::{Paging, QueryNyxdClient, ValidatorResponse};
 use validator_client::ValidatorClientError;
 
 use crate::mix_nodes::CACHE_REFRESH_RATE;
@@ -15,24 +15,24 @@ use crate::state::ExplorerApiStateContext;
 
 pub(crate) struct ExplorerApiTasks {
     state: ExplorerApiStateContext,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl ExplorerApiTasks {
-    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: ShutdownListener) -> Self {
+    pub(crate) fn new(state: ExplorerApiStateContext, shutdown: TaskClient) -> Self {
         ExplorerApiTasks { state, shutdown }
     }
 
     // a helper to remove duplicate code when grabbing active/rewarded/all mixnodes
     async fn retrieve_mixnodes<'a, F, Fut>(&'a self, f: F) -> Vec<MixNodeBondAnnotated>
     where
-        F: FnOnce(&'a validator_client::Client<QueryNymdClient>) -> Fut,
+        F: FnOnce(&'a validator_client::Client<QueryNyxdClient>) -> Fut,
         Fut: Future<Output = Result<Vec<MixNodeBondAnnotated>, ValidatorClientError>>,
     {
         let bonds = match f(&self.state.inner.validator_client.0).await {
             Ok(result) => result,
-            Err(e) => {
-                error!("Unable to retrieve mixnode bonds: {:?}", e);
+            Err(err) => {
+                error!("Unable to retrieve mixnode bonds: {err}");
                 vec![]
             }
         };
@@ -57,14 +57,14 @@ impl ExplorerApiTasks {
             .await
     }
 
-    async fn retrieve_all_validators(&self) -> Result<ValidatorResponse, NymdError> {
+    async fn retrieve_all_validators(&self) -> Result<ValidatorResponse, NyxdError> {
         info!("About to retrieve all validators...");
         let height = self
             .state
             .inner
             .validator_client
             .0
-            .nymd
+            .nyxd
             .get_current_block_height()
             .await?;
         let response: ValidatorResponse = self
@@ -72,7 +72,7 @@ impl ExplorerApiTasks {
             .inner
             .validator_client
             .0
-            .nymd
+            .nyxd
             .get_validators(height.value(), Paging::All)
             .await?;
         info!("Fetched {} validators", response.validators.len());
@@ -115,8 +115,8 @@ impl ExplorerApiTasks {
     async fn update_validators_cache(&self) {
         match self.retrieve_all_validators().await {
             Ok(response) => self.state.inner.validators.update_cache(response).await,
-            Err(e) => {
-                error!("Failed to get validators: {:?}", e)
+            Err(err) => {
+                error!("Failed to get validators: {err}")
             }
         }
     }
@@ -124,8 +124,8 @@ impl ExplorerApiTasks {
     async fn update_gateways_cache(&self) {
         match self.retrieve_all_gateways().await {
             Ok(response) => self.state.inner.gateways.update_cache(response).await,
-            Err(e) => {
-                error!("Failed to get gateways: {:?}", e)
+            Err(err) => {
+                error!("Failed to get gateways: {err}")
             }
         }
     }
diff --git a/explorer-api/src/validators/models.rs b/explorer-api/src/validators/models.rs
index cc68b58f40..a66052fbbb 100644
--- a/explorer-api/src/validators/models.rs
+++ b/explorer-api/src/validators/models.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use serde::Serialize;
 use tokio::sync::RwLock;
 
-use validator_client::nymd::ValidatorResponse;
+use validator_client::nyxd::ValidatorResponse;
 
 use crate::cache::Cache;
 
diff --git a/explorer/.env.prod b/explorer/.env.prod
index e053bd085a..70bd50c7ca 100644
--- a/explorer/.env.prod
+++ b/explorer/.env.prod
@@ -1,6 +1,6 @@
 EXPLORER_API_URL=https://explorer.nymtech.net/api/v1
-VALIDATOR_API_URL=https://validator.nymtech.net
-VALIDATOR_URL=https://rpc.nyx.nodes.guru
+NYM_API_URL=https://validator.nymtech.net
+VALIDATOR_URL=https://rpc.nymtech.net
 BIG_DIPPER_URL=https://blocks.nymtech.net
 CURRENCY_DENOM=unym
 CURRENCY_STAKING_DENOM=unyx
diff --git a/explorer/.env.qa b/explorer/.env.qa
index 60b30e1bd1..dd7052ce4d 100644
--- a/explorer/.env.qa
+++ b/explorer/.env.qa
@@ -1,5 +1,5 @@
 EXPLORER_API_URL=https://qa-explorer.nymtech.net/api/v1
-VALIDATOR_API_URL=https://qa-validator-api.nymtech.net
+NYM_API_URL=https://qa-validator-api.nymtech.net
 VALIDATOR_URL=https://qa-validator.nymtech.net
 BIG_DIPPER_URL=https://qa-blocks.nymtech.net
 CURRENCY_DENOM=unym
diff --git a/explorer/src/api/constants.ts b/explorer/src/api/constants.ts
index fb7216b64f..dc6124c53d 100644
--- a/explorer/src/api/constants.ts
+++ b/explorer/src/api/constants.ts
@@ -1,6 +1,6 @@
 // master APIs
 export const API_BASE_URL = process.env.EXPLORER_API_URL;
-export const VALIDATOR_API_BASE_URL = process.env.VALIDATOR_API_URL;
+export const NYM_API_BASE_URL = process.env.NYM_API_URL;
 export const VALIDATOR_BASE_URL = process.env.VALIDATOR_URL;
 export const BIG_DIPPER = process.env.BIG_DIPPER_URL;
 
@@ -9,12 +9,12 @@ export const OVERVIEW_API = `${API_BASE_URL}/overview`;
 export const MIXNODE_PING = `${API_BASE_URL}/ping`;
 export const MIXNODES_API = `${API_BASE_URL}/mix-nodes`;
 export const MIXNODE_API = `${API_BASE_URL}/mix-node`;
-export const GATEWAYS_API = `${VALIDATOR_API_BASE_URL}/api/v1/gateways`;
+export const GATEWAYS_API = `${NYM_API_BASE_URL}/api/v1/gateways`;
 export const VALIDATORS_API = `${VALIDATOR_BASE_URL}/validators`;
-export const BLOCK_API = `${VALIDATOR_API_BASE_URL}/block`;
+export const BLOCK_API = `${NYM_API_BASE_URL}/block`;
 export const COUNTRY_DATA_API = `${API_BASE_URL}/countries`;
-export const UPTIME_STORY_API = `${VALIDATOR_API_BASE_URL}/api/v1/status/mixnode`; // add ID then '/history' to this.
-export const UPTIME_STORY_API_GATEWAY = `${VALIDATOR_API_BASE_URL}/api/v1/status/gateway`; // add ID then '/history' or '/report' to this.
+export const UPTIME_STORY_API = `${NYM_API_BASE_URL}/api/v1/status/mixnode`; // add ID then '/history' to this.
+export const UPTIME_STORY_API_GATEWAY = `${NYM_API_BASE_URL}/api/v1/status/gateway`; // add ID then '/history' or '/report' to this.
 
 // errors
 export const MIXNODE_API_ERROR = "We're having trouble finding that record, please try again or Contact Us.";
diff --git a/explorer/src/components/TableToolbar.tsx b/explorer/src/components/TableToolbar.tsx
index 7452b4707a..7426433868 100644
--- a/explorer/src/components/TableToolbar.tsx
+++ b/explorer/src/components/TableToolbar.tsx
@@ -4,6 +4,8 @@ import Select, { SelectChangeEvent } from '@mui/material/Select';
 import { Filters } from './Filters/Filters';
 import { useIsMobile } from '../hooks/useIsMobile';
 
+const fieldsHeight = '42.25px';
+
 type TableToolBarProps = {
   onChangeSearch: (arg: string) => void;
   onChangePageSize: (event: SelectChangeEvent<string>) => void;
@@ -35,7 +37,7 @@ export const TableToolbar: React.FC<TableToolBarProps> = ({
       }}
     >
       <Box sx={{ display: 'flex', flexDirection: isMobile ? 'column-reverse' : 'row', alignItems: 'middle' }}>
-        <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
+        <Box sx={{ display: 'flex', justifyContent: 'space-between', height: fieldsHeight }}>
           {childrenBefore}
           <Select
             labelId="simple-select-label"
@@ -65,6 +67,9 @@ export const TableToolbar: React.FC<TableToolBarProps> = ({
           sx={{
             width: isMobile ? '100%' : 200,
             marginBottom: isMobile ? 2 : 0,
+            '& > :not(style)': {
+              height: fieldsHeight,
+            },
           }}
           value={searchTerm}
           data-testid="search-box"
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index 8be0948a85..a6cd9279d7 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-gateway"
-version = "1.1.1"
+version = "1.1.4"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
@@ -19,18 +19,19 @@ anyhow = "1.0.53"
 async-trait = { version = "0.1.51" }
 bip39 = "1.0.1"
 bs58 = "0.4.0"
-clap = { version = "3.2", features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 colored = "2.0"
 dashmap = "4.0"
 dirs = "4.0"
 dotenv = "0.15.0"
 futures = "0.3"
 humantime-serde = "1.0.1"
+lazy_static = "1.4.0"
 log = "0.4"
 once_cell = "1.7.2"
 pretty_env_logger = "0.4"
 rand = "0.7"
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 sqlx = { version = "0.5", features = [
     "runtime-tokio-rustls",
     "sqlite",
@@ -51,12 +52,13 @@ tokio-util = { version = "0.7.3", features = ["codec"] }
 url = { version = "2.2", features = ["serde"] }
 
 # internal
+build-information = { path = "../common/build-information" }
 coconut-interface = { path = "../common/coconut-interface", optional = true }
 credentials = { path = "../common/credentials" }
 config = { path = "../common/config" }
 crypto = { path = "../common/crypto" }
 completions = { path = "../common/completions" }
-logging = { path = "../common/logging"}
+logging = { path = "../common/logging" }
 gateway-requests = { path = "gateway-requests" }
 mixnet-client = { path = "../common/client-libs/mixnet-client" }
 mixnode-common = { path = "../common/mixnode-common" }
@@ -64,18 +66,21 @@ network-defaults = { path = "../common/network-defaults" }
 nymsphinx = { path = "../common/nymsphinx" }
 pemstore = { path = "../common/pemstore" }
 statistics-common = { path = "../common/statistics" }
-validator-api-requests = { path = "../validator-api/validator-api-requests" }
+nym-api-requests = { path = "../nym-api/nym-api-requests" }
 validator-client = { path = "../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 version-checker = { path = "../common/version-checker" }
+nym-types = { path = "../common/types" }
+serde_json = "1"
+atty = "0.2"
 
 [features]
 coconut = [
     "coconut-interface",
     "gateway-requests/coconut",
     "credentials/coconut",
-    "validator-api-requests/coconut",
+    "nym-api-requests/coconut",
 ]
 
 [build-dependencies]
@@ -86,9 +91,3 @@ sqlx = { version = "0.5", features = [
     "macros",
     "migrate",
 ] }
-vergen = { version = "5", default-features = false, features = [
-    "build",
-    "git",
-    "rustc",
-    "cargo",
-] }
diff --git a/gateway/build.rs b/gateway/build.rs
index 16bdf16335..98ad043036 100644
--- a/gateway/build.rs
+++ b/gateway/build.rs
@@ -1,6 +1,5 @@
 use sqlx::{Connection, SqliteConnection};
 use std::env;
-use vergen::{vergen, Config};
 
 #[tokio::main]
 async fn main() {
@@ -23,6 +22,4 @@ async fn main() {
     // for some strange reason we need to add a leading `/` to the windows path even though it's
     // not a valid windows path... but hey, it works...
     println!("cargo:rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
-
-    vergen(Config::default()).expect("failed to extract build metadata")
 }
diff --git a/gateway/gateway-requests/src/registration/handshake/shared_key.rs b/gateway/gateway-requests/src/registration/handshake/shared_key.rs
index 3fc014db51..b030bfb67e 100644
--- a/gateway/gateway-requests/src/registration/handshake/shared_key.rs
+++ b/gateway/gateway-requests/src/registration/handshake/shared_key.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{GatewayMacSize, GatewayRequestsError};
@@ -10,7 +10,7 @@ use crypto::hmac::{compute_keyed_hmac, recompute_keyed_hmac_and_verify_tag};
 use crypto::symmetric::stream_cipher::{self, CipherKey, KeySizeUser, IV};
 use nymsphinx::params::{GatewayEncryptionAlgorithm, GatewayIntegrityHmacAlgorithm};
 use pemstore::traits::PemStorableKey;
-use std::fmt::{self, Display, Formatter};
+use thiserror::Error;
 
 // shared key is as long as the encryption key and the MAC key combined.
 pub type SharedKeySize = Sum<EncryptionKeySize, MacKeySize>;
@@ -28,37 +28,23 @@ pub struct SharedKeys {
     mac_key: MacKey,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub enum SharedKeyConversionError {
-    DecodeError(bs58::decode::Error),
-    BytesOfInvalidLengthError,
-    StringOfInvalidLengthError,
+    #[error("the string representation of the shared keys was malformed - {0}")]
+    DecodeError(#[from] bs58::decode::Error),
+    #[error(
+        "the received shared keys had invalid size. Got: {received}, but expected: {expected}"
+    )]
+    InvalidSharedKeysSize { received: usize, expected: usize },
 }
 
-impl Display for SharedKeyConversionError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            SharedKeyConversionError::DecodeError(err) => write!(
-                f,
-                "encountered error while decoding the byte sequence: {}",
-                err
-            ),
-            SharedKeyConversionError::BytesOfInvalidLengthError => {
-                write!(f, "provided bytes have invalid length")
-            }
-            SharedKeyConversionError::StringOfInvalidLengthError => {
-                write!(f, "provided string has invalid length")
-            }
-        }
-    }
-}
-
-impl std::error::Error for SharedKeyConversionError {}
-
 impl SharedKeys {
     pub fn try_from_bytes(bytes: &[u8]) -> Result<Self, SharedKeyConversionError> {
         if bytes.len() != SharedKeySize::to_usize() {
-            return Err(SharedKeyConversionError::BytesOfInvalidLengthError);
+            return Err(SharedKeyConversionError::InvalidSharedKeysSize {
+                received: bytes.len(),
+                expected: SharedKeySize::to_usize(),
+            });
         }
 
         let encryption_key =
@@ -157,15 +143,7 @@ impl SharedKeys {
     pub fn try_from_base58_string<S: Into<String>>(
         val: S,
     ) -> Result<Self, SharedKeyConversionError> {
-        let decoded = match bs58::decode(val.into()).into_vec() {
-            Ok(decoded) => decoded,
-            Err(err) => return Err(SharedKeyConversionError::DecodeError(err)),
-        };
-
-        if decoded.len() != SharedKeySize::to_usize() {
-            return Err(SharedKeyConversionError::StringOfInvalidLengthError);
-        }
-
+        let decoded = bs58::decode(val.into()).into_vec()?;
         SharedKeys::try_from_bytes(&decoded)
     }
 
diff --git a/gateway/gateway-requests/src/types.rs b/gateway/gateway-requests/src/types.rs
index f73f85bca5..3d93800c73 100644
--- a/gateway/gateway-requests/src/types.rs
+++ b/gateway/gateway-requests/src/types.rs
@@ -99,7 +99,7 @@ impl fmt::Display for GatewayRequestsError {
             MalformedSphinxPacket => write!(f, "received sphinx packet was malformed"),
             MalformedEncryption => write!(f, "the received encrypted data was malformed"),
             InvalidPacketMode => write!(f, "provided packet mode is invalid"),
-            InvalidMixPacket(err) => write!(f, "provided mix packet was malformed - {}", err)
+            InvalidMixPacket(err) => write!(f, "provided mix packet was malformed - {err}")
         }
     }
 }
diff --git a/gateway/src/commands/init.rs b/gateway/src/commands/init.rs
index 5def9bf642..040698e582 100644
--- a/gateway/src/commands/init.rs
+++ b/gateway/src/commands/init.rs
@@ -1,13 +1,17 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     commands::{override_config, OverrideConfig},
     config::{persistence::pathfinder::GatewayPathfinder, Config},
+    OutputFormat,
 };
 use clap::Args;
 use config::NymConfig;
 use crypto::asymmetric::{encryption, identity};
+use std::net::IpAddr;
+use std::path::PathBuf;
+use validator_client::nyxd;
 
 #[derive(Args, Clone)]
 pub struct Init {
@@ -17,11 +21,11 @@ pub struct Init {
 
     /// The custom host on which the gateway will be running for receiving sphinx packets
     #[clap(long)]
-    host: String,
+    host: IpAddr,
 
     /// The wallet address you will use to bond this gateway, e.g. nymt1z9egw0knv47nmur0p8vk4rcx59h9gg4zuxrrr9
     #[clap(long)]
-    wallet_address: String,
+    wallet_address: nyxd::AccountId,
 
     /// The port on which the gateway will be listening for sphinx packets
     #[clap(long)]
@@ -33,36 +37,46 @@ pub struct Init {
 
     /// The host that will be reported to the directory server
     #[clap(long)]
+    // TODO: could this be changed to `Option<url::Url>`?
     announce_host: Option<String>,
 
     /// Path to sqlite database containing all gateway persistent data
     #[clap(long)]
-    datastore: Option<String>,
+    datastore: Option<PathBuf>,
 
-    /// Comma separated list of endpoints of the validators APIs
-    #[clap(long)]
-    validator_apis: Option<String>,
+    /// Comma separated list of endpoints of nym APIs
+    #[clap(long, alias = "validator_apis", value_delimiter = ',')]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Comma separated list of endpoints of the validator
-    #[clap(long)]
-    validators: Option<String>,
+    #[cfg(feature = "coconut")]
+    #[clap(
+        long,
+        alias = "validators",
+        alias = "nymd_validators",
+        value_delimiter = ','
+    )]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nyxd_urls: Option<Vec<url::Url>>,
 
     /// Cosmos wallet mnemonic needed for double spending protection
     #[clap(long)]
-    mnemonic: Option<String>,
+    mnemonic: Option<bip39::Mnemonic>,
 
-    /// Set this gateway to work in a enabled credentials mode that would disallow clients to bypass bandwidth credential requirement
+    /// Set this gateway to work only with coconut credentials; that would disallow clients to
+    /// bypass bandwidth credential requirement
     #[cfg(feature = "coconut")]
     #[clap(long)]
-    enabled_credentials_mode: Option<bool>,
+    only_coconut_credentials: bool,
 
     /// Enable/disable gateway anonymized statistics that get sent to a statistics aggregator server
     #[clap(long)]
-    enabled_statistics: Option<bool>,
+    enabled_statistics: bool,
 
     /// URL where a statistics aggregator is running. The default value is a Nym aggregator server
     #[clap(long)]
-    statistics_service_url: Option<String>,
+    statistics_service_url: Option<url::Url>,
 }
 
 impl From<Init> for OverrideConfig {
@@ -74,20 +88,21 @@ impl From<Init> for OverrideConfig {
             clients_port: init_config.clients_port,
             datastore: init_config.datastore,
             announce_host: init_config.announce_host,
-            validator_apis: init_config.validator_apis,
-            validators: init_config.validators,
+            nym_apis: init_config.nym_apis,
             mnemonic: init_config.mnemonic,
 
-            #[cfg(feature = "coconut")]
-            enabled_credentials_mode: init_config.enabled_credentials_mode,
-
             enabled_statistics: init_config.enabled_statistics,
             statistics_service_url: init_config.statistics_service_url,
+
+            #[cfg(feature = "coconut")]
+            nyxd_urls: init_config.nyxd_urls,
+            #[cfg(feature = "coconut")]
+            only_coconut_credentials: init_config.only_coconut_credentials,
         }
     }
 }
 
-pub async fn execute(args: &Init) {
+pub async fn execute(args: &Init, output: OutputFormat) {
     println!("Initialising gateway {}...", args.id);
 
     let already_init = if Config::default_config_file_path(Some(&args.id)).exists() {
@@ -143,7 +158,7 @@ pub async fn execute(args: &Init) {
 
     crate::node::create_gateway(config)
         .await
-        .print_node_details();
+        .print_node_details(output);
 }
 
 #[cfg(test)]
@@ -158,19 +173,20 @@ mod tests {
     async fn create_gateway_with_in_mem_storage() {
         let args = Init {
             id: "foo-id".to_string(),
-            host: "foo-host".to_string(),
-            wallet_address: "n1z9egw0knv47nmur0p8vk4rcx59h9gg4zjx9ede".to_string(),
+            host: "1.1.1.1".parse().unwrap(),
+            wallet_address: "n1z9egw0knv47nmur0p8vk4rcx59h9gg4zjx9ede".parse().unwrap(),
             mix_port: Some(42),
             clients_port: Some(43),
             announce_host: Some("foo-announce-host".to_string()),
-            datastore: Some("foo-datastore".to_string()),
-            validator_apis: None,
-            validators: None,
+            datastore: Some("/foo-datastore".parse().unwrap()),
+            nym_apis: None,
             mnemonic: None,
             statistics_service_url: None,
-            enabled_statistics: None,
+            enabled_statistics: false,
             #[cfg(feature = "coconut")]
-            enabled_credentials_mode: None,
+            nyxd_urls: None,
+            #[cfg(feature = "coconut")]
+            only_coconut_credentials: false,
         };
         std::env::set_var(BECH32_PREFIX, "n");
 
diff --git a/gateway/src/commands/mod.rs b/gateway/src/commands/mod.rs
index 223a77db8f..aaf587c8ae 100644
--- a/gateway/src/commands/mod.rs
+++ b/gateway/src/commands/mod.rs
@@ -1,19 +1,18 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use std::{process, str::FromStr};
-
 use crate::{config::Config, Cli};
 use clap::CommandFactory;
 use clap::Subcommand;
 use colored::Colorize;
 use completions::{fig_generate, ArgShell};
-use config::parse_validators;
+use config::OptionalSet;
 use crypto::bech32_address_validation;
-use network_defaults::mainnet::read_var_if_not_default;
-use network_defaults::var_names::{
-    API_VALIDATOR, BECH32_PREFIX, CONFIGURED, NYMD_VALIDATOR, STATISTICS_SERVICE_DOMAIN_ADDRESS,
-};
+use network_defaults::var_names::{BECH32_PREFIX, NYM_API, STATISTICS_SERVICE_DOMAIN_ADDRESS};
+use std::net::IpAddr;
+use std::path::PathBuf;
+use std::process;
+use validator_client::nyxd::{self};
 
 pub(crate) mod init;
 pub(crate) mod node_details;
@@ -47,51 +46,47 @@ pub(crate) enum Commands {
 
 // Configuration that can be overridden.
 pub(crate) struct OverrideConfig {
-    host: Option<String>,
-    wallet_address: Option<String>,
+    host: Option<IpAddr>,
+    wallet_address: Option<nyxd::AccountId>,
     mix_port: Option<u16>,
     clients_port: Option<u16>,
-    datastore: Option<String>,
+    datastore: Option<PathBuf>,
     announce_host: Option<String>,
-    enabled_statistics: Option<bool>,
-    statistics_service_url: Option<String>,
-    validator_apis: Option<String>,
-    validators: Option<String>,
-    mnemonic: Option<String>,
+    enabled_statistics: bool,
+    statistics_service_url: Option<url::Url>,
+    nym_apis: Option<Vec<url::Url>>,
+    mnemonic: Option<bip39::Mnemonic>,
 
     #[cfg(feature = "coconut")]
-    enabled_credentials_mode: Option<bool>,
+    nyxd_urls: Option<Vec<url::Url>>,
+    #[cfg(feature = "coconut")]
+    only_coconut_credentials: bool,
 }
 
 pub(crate) async fn execute(args: Cli) {
     let bin_name = "nym-gateway";
 
+    let output = args.output();
+
     match &args.command {
-        Commands::Init(m) => init::execute(m).await,
-        Commands::NodeDetails(m) => node_details::execute(m).await,
-        Commands::Run(m) => run::execute(m).await,
+        Commands::Init(m) => init::execute(m, output.clone()).await,
+        Commands::NodeDetails(m) => node_details::execute(m, output.clone()).await,
+        Commands::Run(m) => run::execute(m, output.clone()).await,
         Commands::Sign(m) => sign::execute(m),
         Commands::Upgrade(m) => upgrade::execute(m).await,
-        Commands::Completions(s) => s.generate(&mut crate::Cli::into_app(), bin_name),
-        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name),
+        Commands::Completions(s) => s.generate(&mut crate::Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::command(), bin_name),
     }
 }
 
 pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Config {
+    // special case that I'm not sure could be easily handled with the trait
     let mut was_host_overridden = false;
     if let Some(host) = args.host {
         config = config.with_listening_address(host);
         was_host_overridden = true;
     }
 
-    if let Some(mix_port) = args.mix_port {
-        config = config.with_mix_port(mix_port);
-    }
-
-    if let Some(clients_port) = args.clients_port {
-        config = config.with_clients_port(clients_port);
-    }
-
     if let Some(announce_host) = args.announce_host {
         config = config.with_announce_address(announce_host);
     } else if was_host_overridden {
@@ -99,63 +94,43 @@ pub(crate) fn override_config(mut config: Config, args: OverrideConfig) -> Confi
         config = config.announce_host_from_listening_host();
     }
 
-    if let Some(enabled_statistics) = args.enabled_statistics {
-        config = config.with_enabled_statistics(enabled_statistics);
-    }
-
-    if let Some(raw_url) = args.statistics_service_url {
-        config = config.with_custom_statistics_service_url(
-            raw_url
-                .parse()
-                .expect("the provided statistics service url is invalid!"),
-        );
-    } else if std::env::var(CONFIGURED).is_ok() {
-        if let Some(raw_url) = read_var_if_not_default(STATISTICS_SERVICE_DOMAIN_ADDRESS) {
-            config = config.with_custom_statistics_service_url(
-                raw_url
-                    .parse()
-                    .expect("the provided statistics service url is invalid"),
-            );
-        }
-    }
-
-    if let Some(raw_validators) = args.validator_apis {
-        config = config.with_custom_validator_apis(parse_validators(&raw_validators));
-    } else if std::env::var(CONFIGURED).is_ok() {
-        if let Some(raw_validators) = read_var_if_not_default(API_VALIDATOR) {
-            config = config.with_custom_validator_apis(::config::parse_validators(&raw_validators))
-        }
-    }
-
-    if let Some(ref raw_validators) = args.validators {
-        config = config.with_custom_validator_nymd(parse_validators(raw_validators));
-    } else if std::env::var(CONFIGURED).is_ok() {
-        if let Some(raw_validators) = read_var_if_not_default(NYMD_VALIDATOR) {
-            config = config.with_custom_validator_nymd(::config::parse_validators(&raw_validators))
-        }
-    }
-
-    if let Some(wallet_address) = args.wallet_address {
-        let trimmed = wallet_address.trim();
-        validate_bech32_address_or_exit(trimmed);
-        config = config.with_wallet_address(trimmed);
-    }
-
-    if let Some(datastore_path) = args.datastore {
-        config = config.with_custom_persistent_store(datastore_path);
-    }
-
-    if let Some(cosmos_mnemonic) = args.mnemonic {
-        config = config.with_cosmos_mnemonic(
-            bip39::Mnemonic::from_str(&cosmos_mnemonic).expect("Provided mnemonic is invalid"),
-        );
-    }
+    config = config
+        .with_optional(Config::with_mix_port, args.mix_port)
+        .with_optional(Config::with_clients_port, args.clients_port)
+        .with_optional_custom_env(
+            Config::with_custom_nym_apis,
+            args.nym_apis,
+            NYM_API,
+            config::parse_urls,
+        )
+        .with_enabled_statistics(args.enabled_statistics)
+        .with_optional_env(
+            Config::with_custom_statistics_service_url,
+            args.statistics_service_url,
+            STATISTICS_SERVICE_DOMAIN_ADDRESS,
+        )
+        .with_optional(
+            |cfg, wallet_address| {
+                validate_bech32_address_or_exit(wallet_address.as_ref());
+                cfg.with_wallet_address(wallet_address)
+            },
+            args.wallet_address,
+        )
+        .with_optional(Config::with_custom_persistent_store, args.datastore)
+        .with_optional(Config::with_cosmos_mnemonic, args.mnemonic);
 
     #[cfg(feature = "coconut")]
     {
-        if let Some(enabled_credentials_mode) = args.enabled_credentials_mode {
-            config = config.with_disabled_credentials_mode(!enabled_credentials_mode);
-        }
+        use network_defaults::var_names::NYXD;
+
+        config = config
+            .with_optional_custom_env(
+                Config::with_custom_validator_nyxd,
+                args.nyxd_urls,
+                NYXD,
+                config::parse_urls,
+            )
+            .with_only_coconut_credentials(args.only_coconut_credentials);
     }
 
     config
@@ -167,7 +142,7 @@ pub(crate) fn validate_bech32_address_or_exit(address: &str) {
     if let Err(bech32_address_validation::Bech32Error::DecodeFailed(err)) =
         bech32_address_validation::try_bech32_decode(address)
     {
-        let error_message = format!("Error: wallet address decoding failed: {}", err).red();
+        let error_message = format!("Error: wallet address decoding failed: {err}").red();
         println!("{}", error_message);
         println!("Exiting...");
         process::exit(1);
@@ -176,7 +151,7 @@ pub(crate) fn validate_bech32_address_or_exit(address: &str) {
     if let Err(bech32_address_validation::Bech32Error::WrongPrefix(err)) =
         bech32_address_validation::validate_bech32_prefix(&prefix, address)
     {
-        let error_message = format!("Error: wallet address type is wrong, {}", err).red();
+        let error_message = format!("Error: wallet address type is wrong, {err}").red();
         println!("{}", error_message);
         println!("Exiting...");
         process::exit(1);
diff --git a/gateway/src/commands/node_details.rs b/gateway/src/commands/node_details.rs
index 15602113c1..d936400d77 100644
--- a/gateway/src/commands/node_details.rs
+++ b/gateway/src/commands/node_details.rs
@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::config::Config;
+use crate::{config::Config, OutputFormat};
 use clap::Args;
 use config::NymConfig;
 use log::error;
@@ -13,7 +13,7 @@ pub struct NodeDetails {
     id: String,
 }
 
-pub async fn execute(args: &NodeDetails) {
+pub async fn execute(args: &NodeDetails, output: OutputFormat) {
     let config = match Config::load_from_file(Some(&args.id)) {
         Ok(cfg) => cfg,
         Err(err) => {
@@ -28,5 +28,5 @@ pub async fn execute(args: &NodeDetails) {
 
     crate::node::create_gateway(config)
         .await
-        .print_node_details();
+        .print_node_details(output);
 }
diff --git a/gateway/src/commands/run.rs b/gateway/src/commands/run.rs
index 96a12278c3..45a496f511 100644
--- a/gateway/src/commands/run.rs
+++ b/gateway/src/commands/run.rs
@@ -1,13 +1,17 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
     commands::{override_config, version_check, OverrideConfig},
     config::Config,
+    OutputFormat,
 };
 use clap::Args;
 use config::NymConfig;
 use log::*;
+use std::net::IpAddr;
+use std::path::PathBuf;
+use validator_client::nyxd;
 
 #[derive(Args, Clone)]
 pub struct Run {
@@ -17,11 +21,11 @@ pub struct Run {
 
     /// The custom host on which the gateway will be running for receiving sphinx packets
     #[clap(long)]
-    host: Option<String>,
+    host: Option<IpAddr>,
 
     /// The wallet address you will use to bond this gateway, e.g. nymt1z9egw0knv47nmur0p8vk4rcx59h9gg4zuxrrr9
     #[clap(long)]
-    wallet_address: Option<String>,
+    wallet_address: Option<nyxd::AccountId>,
 
     /// The port on which the gateway will be listening for sphinx packets
     #[clap(long)]
@@ -33,36 +37,46 @@ pub struct Run {
 
     /// The host that will be reported to the directory server
     #[clap(long)]
+    // TODO: could this be changed to `Option<url::Url>`?
     announce_host: Option<String>,
 
     /// Path to sqlite database containing all gateway persistent data
     #[clap(long)]
-    datastore: Option<String>,
+    datastore: Option<PathBuf>,
 
-    /// Comma separated list of endpoints of the validators APIs
-    #[clap(long)]
-    validator_apis: Option<String>,
+    /// Comma separated list of endpoints of nym APIs
+    #[clap(long, alias = "validator_apis", value_delimiter = ',')]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nym_apis: Option<Vec<url::Url>>,
 
     /// Comma separated list of endpoints of the validator
-    #[clap(long)]
-    validators: Option<String>,
+    #[cfg(feature = "coconut")]
+    #[clap(
+        long,
+        alias = "validators",
+        alias = "nymd_validators",
+        value_delimiter = ','
+    )]
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    nyxd_urls: Option<Vec<url::Url>>,
 
     /// Cosmos wallet mnemonic
     #[clap(long)]
-    mnemonic: Option<String>,
+    mnemonic: Option<bip39::Mnemonic>,
 
-    /// Set this gateway to work in a enabled credentials mode that would disallow clients to bypass bandwidth credential requirement
+    /// Set this gateway to work only with coconut credentials; that would disallow clients to
+    /// bypass bandwidth credential requirement
     #[cfg(feature = "coconut")]
     #[clap(long)]
-    enabled_credentials_mode: Option<bool>,
+    only_coconut_credentials: bool,
 
     /// Enable/disable gateway anonymized statistics that get sent to a statistics aggregator server
     #[clap(long)]
-    enabled_statistics: Option<bool>,
+    enabled_statistics: bool,
 
     /// URL where a statistics aggregator is running. The default value is a Nym aggregator server
     #[clap(long)]
-    statistics_service_url: Option<String>,
+    statistics_service_url: Option<url::Url>,
 }
 
 impl From<Run> for OverrideConfig {
@@ -74,15 +88,16 @@ impl From<Run> for OverrideConfig {
             clients_port: run_config.clients_port,
             datastore: run_config.datastore,
             announce_host: run_config.announce_host,
-            validator_apis: run_config.validator_apis,
-            validators: run_config.validators,
+            nym_apis: run_config.nym_apis,
             mnemonic: run_config.mnemonic,
 
-            #[cfg(feature = "coconut")]
-            enabled_credentials_mode: run_config.enabled_credentials_mode,
-
             enabled_statistics: run_config.enabled_statistics,
             statistics_service_url: run_config.statistics_service_url,
+
+            #[cfg(feature = "coconut")]
+            nyxd_urls: run_config.nyxd_urls,
+            #[cfg(feature = "coconut")]
+            only_coconut_credentials: run_config.only_coconut_credentials,
         }
     }
 }
@@ -102,7 +117,7 @@ fn special_addresses() -> Vec<&'static str> {
     vec!["localhost", "127.0.0.1", "0.0.0.0", "::1", "[::1]"]
 }
 
-pub async fn execute(args: &Run) {
+pub async fn execute(args: &Run, output: OutputFormat) {
     println!("Starting gateway {}...", args.id);
 
     let mut config = match Config::load_from_file(Some(&args.id)) {
@@ -132,7 +147,7 @@ pub async fn execute(args: &Run) {
     println!(
         "\nTo bond your gateway you will need to install the Nym wallet, go to https://nymtech.net/get-involved and select the Download button.\n\
          Select the correct version and install it to your machine. You will need to provide the following: \n ");
-    gateway.print_node_details();
+    gateway.print_node_details(output);
 
     gateway.run().await;
 }
diff --git a/gateway/src/commands/sign.rs b/gateway/src/commands/sign.rs
index 17d6eebfd4..c04d937e2c 100644
--- a/gateway/src/commands/sign.rs
+++ b/gateway/src/commands/sign.rs
@@ -1,8 +1,9 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::commands::validate_bech32_address_or_exit;
 use crate::{
-    commands::{validate_bech32_address_or_exit, version_check},
+    commands::version_check,
     config::{persistence::pathfinder::GatewayPathfinder, Config},
 };
 use anyhow::{anyhow, Result};
@@ -10,9 +11,10 @@ use clap::{ArgGroup, Args};
 use config::NymConfig;
 use crypto::asymmetric::identity;
 use log::error;
+use validator_client::nyxd;
 
 #[derive(Args, Clone)]
-#[clap(group(ArgGroup::new("sign").required(true).args(&["address", "text"])))]
+#[clap(group(ArgGroup::new("sign").required(true).args(&["wallet_address", "text"])))]
 pub struct Sign {
     /// The id of the mixnode you want to sign with
     #[clap(long)]
@@ -20,7 +22,7 @@ pub struct Sign {
 
     /// Signs your blockchain address with your identity key
     #[clap(long)]
-    address: Option<String>,
+    wallet_address: Option<nyxd::AccountId>,
 
     /// Signs an arbitrary piece of text with your identity key
     #[clap(long)]
@@ -29,7 +31,7 @@ pub struct Sign {
 
 enum SignedTarget {
     Text(String),
-    Address(String),
+    Address(nyxd::AccountId),
 }
 
 impl TryFrom<Sign> for SignedTarget {
@@ -38,7 +40,7 @@ impl TryFrom<Sign> for SignedTarget {
     fn try_from(args: Sign) -> Result<Self, Self::Error> {
         if let Some(text) = args.text {
             Ok(SignedTarget::Text(text))
-        } else if let Some(address) = args.address {
+        } else if let Some(address) = args.wallet_address {
             Ok(SignedTarget::Address(address))
         } else {
             // This is unreachable, and hopefully clap will support it explicitly by outputting an
@@ -58,15 +60,12 @@ pub fn load_identity_keys(pathfinder: &GatewayPathfinder) -> identity::KeyPair {
     identity_keypair
 }
 
-fn print_signed_address(private_key: &identity::PrivateKey, raw_address: &str) {
-    let trimmed = raw_address.trim();
-    validate_bech32_address_or_exit(trimmed);
-    let signature = private_key.sign_text(trimmed);
+fn print_signed_address(private_key: &identity::PrivateKey, wallet_address: nyxd::AccountId) {
+    // perform extra validation to ensure we have correct prefix
+    validate_bech32_address_or_exit(wallet_address.as_ref());
 
-    println!(
-        "The base58-encoded signature on '{}' is: {}",
-        trimmed, signature
-    );
+    let signature = private_key.sign_text(wallet_address.as_ref());
+    println!("The base58-encoded signature on '{wallet_address}' is: {signature}",);
 }
 
 fn print_signed_text(private_key: &identity::PrivateKey, text: &str) {
@@ -104,7 +103,7 @@ pub fn execute(args: &Sign) {
     let signed_target = match SignedTarget::try_from(args.clone()) {
         Ok(s) => s,
         Err(err) => {
-            error!("{}", err);
+            error!("{err}");
             return;
         }
     };
@@ -113,6 +112,6 @@ pub fn execute(args: &Sign) {
 
     match signed_target {
         SignedTarget::Text(text) => print_signed_text(identity_keypair.private_key(), &text),
-        SignedTarget::Address(addr) => print_signed_address(identity_keypair.private_key(), &addr),
+        SignedTarget::Address(addr) => print_signed_address(identity_keypair.private_key(), addr),
     }
 }
diff --git a/gateway/src/commands/upgrade.rs b/gateway/src/commands/upgrade.rs
index 7d8e5481a6..6f61401248 100644
--- a/gateway/src/commands/upgrade.rs
+++ b/gateway/src/commands/upgrade.rs
@@ -57,7 +57,7 @@ fn unsupported_upgrade(current_version: &Version, config_version: &Version) -> !
 
 fn parse_config_version(config: &Config) -> Version {
     let version = Version::parse(config.get_version()).unwrap_or_else(|err| {
-        eprintln!("failed to parse client version! - {:?}", err);
+        eprintln!("failed to parse client version! - {err}");
         process::exit(1)
     });
 
@@ -103,10 +103,10 @@ fn minor_0_12_upgrade(
 
     print_start_upgrade(config_version, &to_version);
 
-    let upgraded_config = config.with_custom_version(to_version.to_string().as_ref());
+    let upgraded_config = config.with_custom_version(to_version.to_string());
 
     upgraded_config.save_to_file(None).unwrap_or_else(|err| {
-        eprintln!("failed to overwrite config file! - {:?}", err);
+        eprintln!("failed to overwrite config file! - {err}");
         print_failed_upgrade(config_version, &to_version);
         process::exit(1);
     });
@@ -140,7 +140,7 @@ pub async fn execute(args: &Upgrade) {
     let package_version = parse_package_version();
 
     let existing_config = Config::load_from_file(Some(&args.id)).unwrap_or_else(|err| {
-        eprintln!("failed to load existing config file! - {:?}", err);
+        eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });
 
diff --git a/gateway/src/config/mod.rs b/gateway/src/config/mod.rs
index 30812e140f..f4211ee56a 100644
--- a/gateway/src/config/mod.rs
+++ b/gateway/src/config/mod.rs
@@ -4,13 +4,14 @@
 use crate::config::template::config_template;
 use config::defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
 use config::NymConfig;
-use log::error;
+use network_defaults::mainnet::{NYM_API, NYXD_URL, STATISTICS_SERVICE_DOMAIN_ADDRESS};
 use serde::{Deserialize, Serialize};
 use std::net::IpAddr;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
 use url::Url;
+use validator_client::nyxd;
 
 pub mod persistence;
 mod template;
@@ -128,8 +129,8 @@ impl Config {
     }
 
     #[cfg(feature = "coconut")]
-    pub fn with_disabled_credentials_mode(mut self, disabled_credentials_mode: bool) -> Self {
-        self.gateway.disabled_credentials_mode = disabled_credentials_mode;
+    pub fn with_only_coconut_credentials(mut self, only_coconut_credentials: bool) -> Self {
+        self.gateway.only_coconut_credentials = only_coconut_credentials;
         self
     }
 
@@ -143,13 +144,14 @@ impl Config {
         self
     }
 
-    pub fn with_custom_validator_apis(mut self, validator_api_urls: Vec<Url>) -> Self {
-        self.gateway.validator_api_urls = validator_api_urls;
+    pub fn with_custom_nym_apis(mut self, nym_api_urls: Vec<Url>) -> Self {
+        self.gateway.nym_api_urls = nym_api_urls;
         self
     }
 
-    pub fn with_custom_validator_nymd(mut self, validator_nymd_urls: Vec<Url>) -> Self {
-        self.gateway.validator_nymd_urls = validator_nymd_urls;
+    #[cfg(feature = "coconut")]
+    pub fn with_custom_validator_nyxd(mut self, validator_nyxd_urls: Vec<Url>) -> Self {
+        self.gateway.nyxd_urls = validator_nyxd_urls;
         self
     }
 
@@ -158,16 +160,8 @@ impl Config {
         self
     }
 
-    pub fn with_listening_address<S: Into<String>>(mut self, listening_address: S) -> Self {
-        let listening_address_string = listening_address.into();
-        if let Ok(ip_addr) = listening_address_string.parse() {
-            self.gateway.listening_address = ip_addr;
-        } else {
-            error!(
-                "failed to change listening address. the provided value ({}) was invalid",
-                listening_address_string
-            );
-        }
+    pub fn with_listening_address(mut self, listening_address: IpAddr) -> Self {
+        self.gateway.listening_address = listening_address;
         self
     }
 
@@ -191,18 +185,18 @@ impl Config {
         self
     }
 
-    pub fn with_custom_persistent_store<S: Into<String>>(mut self, store_dir: S) -> Self {
-        self.gateway.persistent_storage = PathBuf::from(store_dir.into());
+    pub fn with_custom_persistent_store(mut self, store_dir: PathBuf) -> Self {
+        self.gateway.persistent_storage = store_dir;
         self
     }
 
-    pub fn with_custom_version(mut self, version: &str) -> Self {
-        self.gateway.version = version.to_string();
+    pub fn with_custom_version<S: Into<String>>(mut self, version: S) -> Self {
+        self.gateway.version = version.into();
         self
     }
 
-    pub fn with_wallet_address(mut self, wallet_address: &str) -> Self {
-        self.gateway.wallet_address = wallet_address.to_string();
+    pub fn with_wallet_address(mut self, wallet_address: nyxd::AccountId) -> Self {
+        self.gateway.wallet_address = Some(wallet_address);
         self
     }
 
@@ -211,8 +205,8 @@ impl Config {
         self.config_directory().join(Self::config_file_name())
     }
 
-    pub fn get_disabled_credentials_mode(&self) -> bool {
-        self.gateway.disabled_credentials_mode
+    pub fn get_only_coconut_credentials(&self) -> bool {
+        self.gateway.only_coconut_credentials
     }
 
     pub fn get_private_identity_key_file(&self) -> PathBuf {
@@ -239,13 +233,13 @@ impl Config {
         self.gateway.statistics_service_url.clone()
     }
 
-    pub fn get_validator_api_endpoints(&self) -> Vec<Url> {
-        self.gateway.validator_api_urls.clone()
+    pub fn get_nym_api_endpoints(&self) -> Vec<Url> {
+        self.gateway.nym_api_urls.clone()
     }
 
     #[cfg(feature = "coconut")]
-    pub fn get_validator_nymd_endpoints(&self) -> Vec<Url> {
-        self.gateway.validator_nymd_urls.clone()
+    pub fn get_nyxd_urls(&self) -> Vec<Url> {
+        self.gateway.nyxd_urls.clone()
     }
 
     #[cfg(feature = "coconut")]
@@ -301,8 +295,8 @@ impl Config {
         &self.gateway.version
     }
 
-    pub fn get_wallet_address(&self) -> &str {
-        &self.gateway.wallet_address
+    pub fn get_wallet_address(&self) -> Option<nyxd::AccountId> {
+        self.gateway.wallet_address.clone()
     }
 }
 
@@ -315,10 +309,10 @@ pub struct Gateway {
     /// ID specifies the human readable ID of this particular gateway.
     id: String,
 
-    /// Indicates whether this gateway is running in a disabled credentials mode, thus allowing clients
-    /// to claim bandwidth without presenting bandwidth credentials.
+    /// Indicates whether this gateway is accepting only coconut credentials for accessing the
+    /// the mixnet, or if it also accepts non-paying clients
     #[serde(default)]
-    disabled_credentials_mode: bool,
+    only_coconut_credentials: bool,
 
     /// Address to which this mixnode will bind to and will be listening for packets.
     #[serde(default = "bind_all_address")]
@@ -352,17 +346,19 @@ pub struct Gateway {
     /// Path to file containing public sphinx key.
     public_sphinx_key_file: PathBuf,
 
-    /// Wheather gateway collects and sends anonymized statistics
+    /// Whether gateway collects and sends anonymized statistics
     enabled_statistics: bool,
 
     /// Domain address of the statistics service
     statistics_service_url: Url,
 
-    /// Addresses to APIs running on validator from which the node gets the view of the network.
-    validator_api_urls: Vec<Url>,
+    /// Addresses to APIs from which the node gets the view of the network.
+    #[serde(alias = "validator_api_urls")]
+    nym_api_urls: Vec<Url>,
 
     /// Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-    validator_nymd_urls: Vec<Url>,
+    #[serde(alias = "validator_nymd_urls")]
+    nyxd_urls: Vec<Url>,
 
     /// Mnemonic of a cosmos wallet used in checking for double spending.
     cosmos_mnemonic: bip39::Mnemonic,
@@ -376,7 +372,8 @@ pub struct Gateway {
     persistent_storage: PathBuf,
 
     /// The Cosmos wallet address that will control this gateway
-    wallet_address: String,
+    // the only reason this is an Option is because of the lack of existence of a sane default value
+    wallet_address: Option<nyxd::AccountId>,
 }
 
 impl Gateway {
@@ -406,7 +403,7 @@ impl Default for Gateway {
         Gateway {
             version: env!("CARGO_PKG_VERSION").to_string(),
             id: "".to_string(),
-            disabled_credentials_mode: true,
+            only_coconut_credentials: false,
             listening_address: bind_all_address(),
             announce_address: "127.0.0.1".to_string(),
             mix_port: DEFAULT_MIX_LISTENING_PORT,
@@ -416,13 +413,13 @@ impl Default for Gateway {
             private_sphinx_key_file: Default::default(),
             public_sphinx_key_file: Default::default(),
             enabled_statistics: false,
-            statistics_service_url: Url::from_str("http://127.0.0.1").unwrap(),
-            validator_api_urls: vec![],
-            validator_nymd_urls: vec![],
+            statistics_service_url: Url::from_str(STATISTICS_SERVICE_DOMAIN_ADDRESS).expect("Invalid default statistics service URL"),
+            nym_api_urls: vec![Url::from_str(NYM_API).expect("Invalid default API URL")],
+            nyxd_urls: vec![Url::from_str(NYXD_URL).expect("Invalid default nyxd URL")],
             cosmos_mnemonic: bip39::Mnemonic::from_str("exact antique hybrid width raise anchor puzzle degree fee quit long crack net vague hip despair write put useless civil mechanic broom music day").unwrap(),
             nym_root_directory: Config::default_root_directory(),
             persistent_storage: Default::default(),
-            wallet_address: "nymXXXXXXXX".to_string(),
+            wallet_address: None,
         }
     }
 }
diff --git a/gateway/src/config/template.rs b/gateway/src/config/template.rs
index f7082fd629..2690c38385 100644
--- a/gateway/src/config/template.rs
+++ b/gateway/src/config/template.rs
@@ -19,9 +19,9 @@ version = '{{ gateway.version }}'
 # Human readable ID of this particular gateway.
 id = '{{ gateway.id }}'
 
-# Indicates whether this gateway is running in a disabled credentials mode, thus allowing clients
-# to claim bandwidth without presenting bandwidth credentials.
-disabled_credentials_mode = {{ gateway.disabled_credentials_mode }}
+# Indicates whether this gateway is accepting only coconut credentials for accessing the
+# the mixnet, or if it also accepts non-paying clients
+only_coconut_credentials = {{ gateway.only_coconut_credentials }}
 
 # Socket address to which this gateway will bind to and will be listening for packets.
 listening_address = '{{ gateway.listening_address }}'
@@ -60,15 +60,15 @@ enabled_statistics = {{ gateway.enabled_statistics }}
 statistics_service_url = '{{ gateway.statistics_service_url }}'
 
 # Addresses to APIs running on validator from which the node gets the view of the network.
-validator_api_urls = [
-    {{#each gateway.validator_api_urls }}
+nym_api_urls = [
+    {{#each gateway.nym_api_urls }}
         '{{this}}',
     {{/each}}
 ]
 
-# Addresses to validators which the node uses to check for double spending of ERC20 tokens.
-validator_nymd_urls = [
-    {{#each gateway.validator_nymd_urls }}
+# Addresses to validators which the node uses to check for double spending of nym tokens.
+nyxd_urls = [
+    {{#each gateway.nyxd_urls }}
         '{{this}}',
     {{/each}}
 ]
diff --git a/gateway/src/main.rs b/gateway/src/main.rs
index bfcfd0e563..218a497719 100644
--- a/gateway/src/main.rs
+++ b/gateway/src/main.rs
@@ -1,43 +1,71 @@
 // Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use clap::{crate_version, Parser};
+use build_information::BinaryBuildInformation;
+use clap::{crate_version, Parser, ValueEnum};
+use lazy_static::lazy_static;
 use logging::setup_logging;
 use network_defaults::setup_env;
-use once_cell::sync::OnceCell;
 
 mod commands;
 mod config;
 mod node;
 
-static LONG_VERSION: OnceCell<String> = OnceCell::new();
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
+}
 
-// Helper for passing LONG_ABOUT to clap
-fn long_version_static() -> &'static str {
-    LONG_VERSION.get().expect("Failed to get long about text")
+// Helper for passing LONG_VERSION to clap
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
+}
+
+#[derive(Clone, ValueEnum)]
+pub enum OutputFormat {
+    Json,
+    Text,
+}
+
+impl Default for OutputFormat {
+    fn default() -> Self {
+        OutputFormat::Text
+    }
 }
 
 #[derive(Parser)]
-#[clap(author = "Nymtech", version, about, long_version = long_version_static())]
+#[clap(author = "Nymtech", version, about, long_version = pretty_build_info_static())]
 struct Cli {
     /// Path pointing to an env file that configures the gateway.
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
+    #[clap(short, long)]
+    pub(crate) output: Option<OutputFormat>,
+
     #[clap(subcommand)]
     command: commands::Commands,
 }
 
+impl Cli {
+    fn output(&self) -> OutputFormat {
+        if let Some(ref output) = self.output {
+            output.clone()
+        } else {
+            OutputFormat::default()
+        }
+    }
+}
+
 #[tokio::main]
 async fn main() {
     setup_logging();
-    println!("{}", banner());
-    LONG_VERSION
-        .set(long_version())
-        .expect("Failed to set long about text");
+    if atty::is(atty::Stream::Stdout) {
+        println!("{}", banner());
+    }
 
     let args = Cli::parse();
-    setup_env(args.config_env_file.clone());
+    setup_env(args.config_env_file.as_ref());
     commands::execute(args).await;
 }
 
@@ -58,37 +86,6 @@ fn banner() -> String {
     )
 }
 
-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE")
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -96,9 +93,6 @@ mod tests {
 
     #[test]
     fn verify_cli() {
-        LONG_VERSION
-            .set(long_version())
-            .expect("Failed to set long about text");
         Cli::command().debug_assert();
     }
 }
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
index 3f31f238cf..38036741ce 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
@@ -45,19 +45,19 @@ pub(crate) enum RequestHandlingError {
     #[error("Provided bandwidth credential did not verify correctly on {0}")]
     InvalidBandwidthCredential(String),
 
-    #[error("This gateway is not running in the disabled credentials mode")]
-    NotInDisabledCredentialsMode,
+    #[error("This gateway is only accepting coconut credentials for bandwidth")]
+    OnlyCoconutCredentials,
 
-    #[error("Nymd Error - {0}")]
-    NymdError(#[from] validator_client::nymd::error::NymdError),
+    #[error("Nyxd Error - {0}")]
+    NyxdError(#[from] validator_client::nyxd::error::NyxdError),
 
     #[cfg(feature = "coconut")]
     #[error("Validator API error - {0}")]
     APIError(#[from] validator_client::ValidatorClientError),
 
     #[cfg(feature = "coconut")]
-    #[error("Not enough validator API endpoints provided. Needed {needed}, received {received}")]
-    NotEnoughValidatorAPIs { received: usize, needed: usize },
+    #[error("Not enough nym API endpoints provided. Needed {needed}, received {received}")]
+    NotEnoughNymAPIs { received: usize, needed: usize },
 
     #[cfg(feature = "coconut")]
     #[error("There was a problem with the proposal id: {reason}")]
@@ -182,7 +182,7 @@ where
     /// * `mix_packet`: packet received from the client that should get forwarded into the network.
     fn forward_packet(&self, mix_packet: MixPacket) {
         if let Err(err) = self.inner.outbound_mix_sender.unbounded_send(mix_packet) {
-            error!("We failed to forward requested mix packet - {}. Presumably our mix forwarder has crashed. We cannot continue.", err);
+            error!("We failed to forward requested mix packet - {err}. Presumably our mix forwarder has crashed. We cannot continue.");
             process::exit(1);
         }
     }
@@ -309,8 +309,8 @@ where
     async fn handle_claim_testnet_bandwidth(
         &mut self,
     ) -> Result<ServerResponse, RequestHandlingError> {
-        if !self.inner.disabled_credentials_mode {
-            return Err(RequestHandlingError::NotInDisabledCredentialsMode);
+        if self.inner.only_coconut_credentials {
+            return Err(RequestHandlingError::OnlyCoconutCredentials);
         }
 
         self.increase_bandwidth(FREE_TESTNET_BANDWIDTH_VALUE)
@@ -426,7 +426,7 @@ where
                         None => break,
                         Some(Ok(socket_msg)) => socket_msg,
                         Some(Err(err)) => {
-                            error!("failed to obtain message from websocket stream! stopping connection handler: {}", err);
+                            error!("failed to obtain message from websocket stream! stopping connection handler: {err}");
                             break;
                         }
                     };
@@ -438,8 +438,7 @@ where
                     if let Some(response) = self.handle_request(socket_msg).await {
                         if let Err(err) = self.inner.send_websocket_message(response).await {
                             warn!(
-                                "Failed to send message over websocket: {}. Assuming the connection is dead.",
-                                err
+                                "Failed to send message over websocket: {err}. Assuming the connection is dead.",
                             );
                             break;
                         }
@@ -447,8 +446,8 @@ where
                 },
                 mix_messages = self.mix_receiver.next() => {
                     let mix_messages = mix_messages.expect("sender was unexpectedly closed! this shouldn't have ever happened!");
-                    if let Err(e) = self.inner.push_packets_to_client(self.client.shared_keys, mix_messages).await {
-                        warn!("failed to send the unwrapped sphinx packets back to the client - {:?}, assuming the connection is dead", e);
+                    if let Err(err) = self.inner.push_packets_to_client(self.client.shared_keys, mix_messages).await {
+                        warn!("failed to send the unwrapped sphinx packets back to the client - {err}, assuming the connection is dead");
                         break;
                     }
                 }
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
index e83c23e5e9..4f12446330 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs
@@ -7,10 +7,10 @@ use log::*;
 
 use coconut_interface::{Credential, VerificationKey};
 use validator_client::{
-    nymd::{
+    nyxd::{
         cosmwasm_client::logs::{find_attribute, BANDWIDTH_PROPOSAL_ID},
         traits::{CoconutBandwidthSigningClient, MultisigQueryClient, MultisigSigningClient},
-        Coin, Fee, SigningNymdClient,
+        Coin, Fee, SigningNyxdClient,
     },
     Client, CoconutApiClient,
 };
@@ -21,8 +21,8 @@ const ONE_HOUR_SEC: u64 = 3600;
 const MAX_FEEGRANT_UNYM: u128 = 10000;
 
 pub(crate) struct CoconutVerifier {
-    api_clients: Vec<CoconutApiClient>,
-    nymd_client: Client<SigningNymdClient>,
+    nym_api_clients: Vec<CoconutApiClient>,
+    nyxd_client: Client<SigningNyxdClient>,
     mix_denom_base: String,
     aggregated_verification_key: VerificationKey,
 }
@@ -30,19 +30,19 @@ pub(crate) struct CoconutVerifier {
 impl CoconutVerifier {
     pub fn new(
         api_clients: Vec<CoconutApiClient>,
-        nymd_client: Client<SigningNymdClient>,
+        nyxd_client: Client<SigningNyxdClient>,
         mix_denom_base: String,
         aggregated_verification_key: VerificationKey,
     ) -> Result<Self, RequestHandlingError> {
         if api_clients.is_empty() {
-            return Err(RequestHandlingError::NotEnoughValidatorAPIs {
+            return Err(RequestHandlingError::NotEnoughNymAPIs {
                 received: 0,
                 needed: 1,
             });
         }
         Ok(CoconutVerifier {
-            api_clients,
-            nymd_client,
+            nym_api_clients: api_clients,
+            nyxd_client,
             mix_denom_base,
             aggregated_verification_key,
         })
@@ -58,15 +58,15 @@ impl CoconutVerifier {
         let revoke_fee = Some(Fee::Auto(Some(1.5)));
 
         let res = self
-            .nymd_client
-            .nymd
+            .nyxd_client
+            .nyxd
             .spend_credential(
                 Coin::new(
                     credential.voucher_value().into(),
                     self.mix_denom_base.clone(),
                 ),
                 credential.blinded_serial_number(),
-                self.nymd_client.nymd.address().to_string(),
+                self.nyxd_client.nyxd.address().to_string(),
                 None,
             )
             .await?;
@@ -80,21 +80,21 @@ impl CoconutVerifier {
                 reason: String::from("proposal id could not be parsed to u64"),
             })?;
 
-        let proposal = self.nymd_client.nymd.get_proposal(proposal_id).await?;
+        let proposal = self.nyxd_client.nyxd.get_proposal(proposal_id).await?;
         if !credential.has_blinded_serial_number(&proposal.description)? {
             return Err(RequestHandlingError::ProposalIdError {
                 reason: String::from("proposal has different serial number"),
             });
         }
 
-        let req = validator_api_requests::coconut::VerifyCredentialBody::new(
+        let req = nym_api_requests::coconut::VerifyCredentialBody::new(
             credential.clone(),
             proposal_id,
-            self.nymd_client.nymd.address().clone(),
+            self.nyxd_client.nyxd.address().clone(),
         );
-        for client in self.api_clients.iter() {
-            self.nymd_client
-                .nymd
+        for client in self.nym_api_clients.iter() {
+            self.nyxd_client
+                .nyxd
                 .grant_allowance(
                     &client.cosmos_address,
                     vec![Coin::new(MAX_FEEGRANT_UNYM, self.mix_denom_base.clone())],
@@ -106,8 +106,8 @@ impl CoconutVerifier {
                 )
                 .await?;
             let ret = client.api_client.verify_bandwidth_credential(&req).await;
-            self.nymd_client
-                .nymd
+            self.nyxd_client
+                .nyxd
                 .revoke_allowance(
                     &client.cosmos_address,
                     "Cleanup the previous allowance for releasing funds".to_string(),
@@ -115,12 +115,12 @@ impl CoconutVerifier {
                 )
                 .await?;
             if !ret?.verification_result {
-                debug!("Validator {} didn't accept the credential. It will probably vote No on the spending proposal", client.api_client.validator_api.current_url());
+                debug!("Validator {} didn't accept the credential. It will probably vote No on the spending proposal", client.api_client.nym_api_client.current_url());
             }
         }
 
-        self.nymd_client
-            .nymd
+        self.nyxd_client
+            .nyxd
             .execute_proposal(proposal_id, None)
             .await?;
 
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs
index e60159c564..f6365376c5 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs
@@ -8,8 +8,8 @@ use credentials::token::bandwidth::TokenCredential;
 use crypto::asymmetric::identity::{PublicKey, Signature, SIGNATURE_LENGTH};
 use network_defaults::{ETH_EVENT_NAME, ETH_MIN_BLOCK_DEPTH};
 use std::str::FromStr;
-use validator_client::nymd::traits::MixnetQueryClient;
-use validator_client::nymd::{AccountId, NymdClient, SigningNymdClient};
+use validator_client::nxmd::traits::MixnetQueryClient;
+use validator_client::nyxd::{AccountId, NyxdClient, SigningNyxdClient};
 use web3::contract::tokens::Detokenize;
 use web3::contract::{Contract, Error};
 use web3::transports::Http;
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
index 14116c948b..9dd99eb23b 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
@@ -70,7 +70,7 @@ impl InitialAuthenticationError {
 pub(crate) struct FreshHandler<R, S, St> {
     rng: R,
     local_identity: Arc<identity::KeyPair>,
-    pub(crate) disabled_credentials_mode: bool,
+    pub(crate) only_coconut_credentials: bool,
     pub(crate) active_clients_store: ActiveClientsStore,
     pub(crate) outbound_mix_sender: MixForwardingSender,
     pub(crate) socket_connection: SocketStream<S>,
@@ -93,7 +93,7 @@ where
     pub(crate) fn new(
         rng: R,
         conn: S,
-        disabled_credentials_mode: bool,
+        only_coconut_credentials: bool,
         outbound_mix_sender: MixForwardingSender,
         local_identity: Arc<identity::KeyPair>,
         storage: St,
@@ -103,7 +103,7 @@ where
         FreshHandler {
             rng,
             active_clients_store,
-            disabled_credentials_mode,
+            only_coconut_credentials,
             outbound_mix_sender,
             socket_connection: SocketStream::RawTcp(conn),
             local_identity,
@@ -350,7 +350,7 @@ where
         match client_protocol {
             None => {
                 warn!("the client we're connected to has not specified its protocol version. It's probably running version < 1.1.X, but that's still fine for now. It will become a hard error in 1.2.0");
-                // note: in 1.2.0 we will have to return a hard error here
+                // note: in +1.2.0 we will have to return a hard error here
                 Ok(())
             }
             Some(v) if v != PROTOCOL_VERSION => {
@@ -586,7 +586,7 @@ where
             let msg = match msg {
                 Ok(msg) => msg,
                 Err(err) => {
-                    error!("failed to obtain message from websocket stream! stopping connection handler: {}", err);
+                    error!("failed to obtain message from websocket stream! stopping connection handler: {err}");
                     break;
                 }
             };
@@ -605,7 +605,7 @@ where
                             if let Err(err) =
                                 self.send_websocket_message(err.into_error_message()).await
                             {
-                                debug!("Failed to send authentication error response - {}", err);
+                                debug!("Failed to send authentication error response - {err}");
                                 return None;
                             }
                         }
@@ -614,7 +614,7 @@ where
                                 .send_websocket_message(auth_result.server_response.into())
                                 .await
                             {
-                                debug!("Failed to send authentication response - {}", err);
+                                debug!("Failed to send authentication response - {err}");
                                 return None;
                             }
 
diff --git a/gateway/src/node/client_handling/websocket/listener.rs b/gateway/src/node/client_handling/websocket/listener.rs
index 7e3fdbc5d9..580ec61750 100644
--- a/gateway/src/node/client_handling/websocket/listener.rs
+++ b/gateway/src/node/client_handling/websocket/listener.rs
@@ -19,7 +19,7 @@ use crate::node::client_handling::websocket::connection_handler::coconut::Coconu
 pub(crate) struct Listener {
     address: SocketAddr,
     local_identity: Arc<identity::KeyPair>,
-    disabled_credentials_mode: bool,
+    only_coconut_credentials: bool,
 
     #[cfg(feature = "coconut")]
     pub(crate) coconut_verifier: Arc<CoconutVerifier>,
@@ -29,13 +29,13 @@ impl Listener {
     pub(crate) fn new(
         address: SocketAddr,
         local_identity: Arc<identity::KeyPair>,
-        disabled_credentials_mode: bool,
+        only_coconut_credentials: bool,
         #[cfg(feature = "coconut")] coconut_verifier: Arc<CoconutVerifier>,
     ) -> Self {
         Listener {
             address,
             local_identity,
-            disabled_credentials_mode,
+            only_coconut_credentials,
             #[cfg(feature = "coconut")]
             coconut_verifier,
         }
@@ -55,7 +55,7 @@ impl Listener {
         let tcp_listener = match tokio::net::TcpListener::bind(self.address).await {
             Ok(listener) => listener,
             Err(err) => {
-                error!("Failed to bind the websocket to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address, err);
+                error!("Failed to bind the websocket to {} - {err}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address);
                 process::exit(1);
             }
         };
@@ -69,7 +69,7 @@ impl Listener {
                     let handle = FreshHandler::new(
                         OsRng,
                         socket,
-                        self.disabled_credentials_mode,
+                        self.only_coconut_credentials,
                         outbound_mix_sender.clone(),
                         Arc::clone(&self.local_identity),
                         storage.clone(),
@@ -79,7 +79,7 @@ impl Listener {
                     );
                     tokio::spawn(async move { handle.start_handling().await });
                 }
-                Err(e) => warn!("failed to get client: {:?}", e),
+                Err(err) => warn!("failed to get client: {err}"),
             }
         }
     }
diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
index 8dd85d9ded..5db66bd7cc 100644
--- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
+++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
@@ -142,7 +142,7 @@ impl<St: Storage> ConnectionHandler<St> {
                 .store_processed_packet_payload(client_address, unsent_plaintext)
                 .await
             {
-                Err(err) => error!("Failed to store client data - {}", err),
+                Err(err) => error!("Failed to store client data - {err}"),
                 Ok(_) => trace!("Stored packet for {}", client_address),
             },
             Ok(_) => trace!("Pushed received packet to {}", client_address),
@@ -163,8 +163,8 @@ impl<St: Storage> ConnectionHandler<St> {
 
         let processed_final_hop = match self.packet_processor.process_received(framed_sphinx_packet)
         {
-            Err(e) => {
-                debug!("We failed to process received sphinx packet - {:?}", e);
+            Err(err) => {
+                debug!("We failed to process received sphinx packet - {err}");
                 return;
             }
             Ok(processed_final_hop) => processed_final_hop,
diff --git a/gateway/src/node/mixnet_handling/receiver/listener.rs b/gateway/src/node/mixnet_handling/receiver/listener.rs
index 1cb1f2850e..d301dc692b 100644
--- a/gateway/src/node/mixnet_handling/receiver/listener.rs
+++ b/gateway/src/node/mixnet_handling/receiver/listener.rs
@@ -26,7 +26,7 @@ impl Listener {
         let tcp_listener = match tokio::net::TcpListener::bind(self.address).await {
             Ok(listener) => listener,
             Err(err) => {
-                error!("Failed to bind to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address, err);
+                error!("Failed to bind to {} - {err}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address);
                 process::exit(1);
             }
         };
@@ -37,7 +37,7 @@ impl Listener {
                     let handler = connection_handler.clone();
                     tokio::spawn(handler.handle_connection(socket, remote_addr));
                 }
-                Err(e) => warn!("failed to get client: {:?}", e),
+                Err(err) => warn!("failed to get client: {err}"),
             }
         }
     }
diff --git a/gateway/src/node/mixnet_handling/receiver/packet_processing.rs b/gateway/src/node/mixnet_handling/receiver/packet_processing.rs
index af9970cb47..a344f475f1 100644
--- a/gateway/src/node/mixnet_handling/receiver/packet_processing.rs
+++ b/gateway/src/node/mixnet_handling/receiver/packet_processing.rs
@@ -6,21 +6,17 @@ use mixnode_common::packet_processor::error::MixProcessingError;
 pub use mixnode_common::packet_processor::processor::MixProcessingResult;
 use mixnode_common::packet_processor::processor::{ProcessedFinalHop, SphinxPacketProcessor};
 use nymsphinx::framing::packet::FramedSphinxPacket;
+use thiserror::Error;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum GatewayProcessingError {
-    PacketProcessingError(MixProcessingError),
+    #[error("failed to process received mix packet - {0}")]
+    PacketProcessingError(#[from] MixProcessingError),
+
+    #[error("received a forward hop mix packet")]
     ForwardHopReceivedError,
 }
 
-impl From<MixProcessingError> for GatewayProcessingError {
-    fn from(e: MixProcessingError) -> Self {
-        use GatewayProcessingError::*;
-
-        PacketProcessingError(e)
-    }
-}
-
 // PacketProcessor contains all data required to correctly unwrap and store sphinx packets
 #[derive(Clone)]
 pub struct PacketProcessor {
diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs
index 8c2a541f12..9021c6336b 100644
--- a/gateway/src/node/mod.rs
+++ b/gateway/src/node/mod.rs
@@ -1,19 +1,20 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::commands::sign::load_identity_keys;
+use self::storage::PersistentStorage;
 use crate::commands::validate_bech32_address_or_exit;
+use crate::config::persistence::pathfinder::GatewayPathfinder;
 use crate::config::Config;
 use crate::node::client_handling::active_clients::ActiveClientsStore;
 use crate::node::client_handling::websocket;
 use crate::node::mixnet_handling::receiver::connection_handler::ConnectionHandler;
 use crate::node::statistics::collector::GatewayStatisticsCollector;
 use crate::node::storage::Storage;
+use crate::{commands::sign::load_identity_keys, OutputFormat};
+use colored::Colorize;
 use crypto::asymmetric::{encryption, identity};
 use log::*;
 use mixnet_client::forwarder::{MixForwardingSender, PacketForwarder};
-#[cfg(feature = "coconut")]
-use network_defaults::NymNetworkDetails;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 use statistics_common::collector::StatisticsSender;
@@ -21,16 +22,15 @@ use std::net::SocketAddr;
 use std::process;
 use std::sync::Arc;
 
-use crate::config::persistence::pathfinder::GatewayPathfinder;
 #[cfg(feature = "coconut")]
 use crate::node::client_handling::websocket::connection_handler::coconut::CoconutVerifier;
 #[cfg(feature = "coconut")]
 use credentials::coconut::utils::obtain_aggregate_verification_key;
 #[cfg(feature = "coconut")]
+use network_defaults::NymNetworkDetails;
+#[cfg(feature = "coconut")]
 use validator_client::{Client, CoconutApiClient};
 
-use self::storage::PersistentStorage;
-
 pub(crate) mod client_handling;
 pub(crate) mod mixnet_handling;
 pub(crate) mod statistics;
@@ -46,7 +46,7 @@ async fn initialise_storage(config: &Config) -> PersistentStorage {
     let path = config.get_persistent_store_path();
     let retrieval_limit = config.get_message_retrieval_limit();
     match PersistentStorage::init(path, retrieval_limit).await {
-        Err(err) => panic!("failed to initialise gateway storage - {}", err),
+        Err(err) => panic!("failed to initialise gateway storage - {err}"),
         Ok(storage) => storage,
     }
 }
@@ -117,38 +117,44 @@ where
     fn generate_owner_signature(&self) -> String {
         let pathfinder = GatewayPathfinder::new_from_config(&self.config);
         let identity_keypair = load_identity_keys(&pathfinder);
-        let address = self.config.get_wallet_address();
-        validate_bech32_address_or_exit(address);
-        let verification_code = identity_keypair.private_key().sign_text(address);
+        let Some(address) = self.config.get_wallet_address() else {
+            let error_message = "Error: gateway hasn't set its wallet address".red();
+            println!("{error_message}");
+            println!("Exiting...");
+            process::exit(1);
+        };
+        // perform extra validation to ensure we have correct prefix
+        validate_bech32_address_or_exit(address.as_ref());
+        let verification_code = identity_keypair.private_key().sign_text(address.as_ref());
         verification_code
     }
 
-    pub(crate) fn print_node_details(&self) {
-        println!(
-            "Identity Key: {}",
-            self.identity_keypair.public_key().to_base58_string()
-        );
-        println!(
-            "Sphinx Key: {}",
-            self.sphinx_keypair.public_key().to_base58_string()
-        );
-        println!("Owner Signature: {}", self.generate_owner_signature());
-        println!(
-            "Host: {} (bind address: {})",
-            self.config.get_announce_address(),
-            self.config.get_listening_address()
-        );
-        println!("Version: {}", self.config.get_version());
-        println!(
-            "Mix Port: {}, Clients port: {}",
-            self.config.get_mix_port(),
-            self.config.get_clients_port()
-        );
+    pub(crate) fn print_node_details(&self, output: OutputFormat) {
+        let node_details = nym_types::gateway::GatewayNodeDetailsResponse {
+            identity_key: self.identity_keypair.public_key().to_base58_string(),
+            sphinx_key: self.sphinx_keypair.public_key().to_base58_string(),
+            owner_signature: self.generate_owner_signature(),
+            announce_address: self.config.get_announce_address(),
+            bind_address: self.config.get_listening_address().to_string(),
+            version: self.config.get_version().to_string(),
+            mix_port: self.config.get_mix_port(),
+            clients_port: self.config.get_clients_port(),
+            data_store: self
+                .config
+                .get_persistent_store_path()
+                .to_str()
+                .unwrap_or(".")
+                .to_string(),
+        };
 
-        println!(
-            "Data store is at: {:?}",
-            self.config.get_persistent_store_path()
-        );
+        match output {
+            OutputFormat::Json => println!(
+                "{}",
+                serde_json::to_string(&node_details)
+                    .unwrap_or_else(|_| "Could not serialize node details".to_string())
+            ),
+            OutputFormat::Text => println!("{}", node_details),
+        }
     }
 
     fn start_mix_socket_listener(
@@ -192,7 +198,7 @@ where
         websocket::Listener::new(
             listening_address,
             Arc::clone(&self.identity_keypair),
-            self.config.get_disabled_credentials_mode(),
+            self.config.get_only_coconut_credentials(),
             #[cfg(feature = "coconut")]
             coconut_verifier,
         )
@@ -230,21 +236,21 @@ where
         );
     }
 
-    fn random_api_client(&self) -> validator_client::ApiClient {
-        let endpoints = self.config.get_validator_api_endpoints();
-        let validator_api = endpoints
+    fn random_api_client(&self) -> validator_client::NymApiClient {
+        let endpoints = self.config.get_nym_api_endpoints();
+        let nym_api = endpoints
             .choose(&mut thread_rng())
             .expect("The list of validator apis is empty");
 
-        validator_client::ApiClient::new(validator_api.clone())
+        validator_client::NymApiClient::new(nym_api.clone())
     }
 
     #[cfg(feature = "coconut")]
-    fn random_nymd_client(
+    fn random_nyxd_client(
         &self,
-    ) -> validator_client::Client<validator_client::nymd::SigningNymdClient> {
-        let endpoints = self.config.get_validator_nymd_endpoints();
-        let validator_nymd = endpoints
+    ) -> validator_client::Client<validator_client::nyxd::SigningNyxdClient> {
+        let endpoints = self.config.get_nyxd_urls();
+        let validator_nyxd = endpoints
             .choose(&mut thread_rng())
             .expect("The list of validators is empty");
 
@@ -257,8 +263,8 @@ where
         let mut client = Client::new_signing(client_config, self.config.get_cosmos_mnemonic())
             .expect("Could not connect with mnemonic");
         client
-            .change_nymd(validator_nymd.clone())
-            .expect("Could not use the random nymd URL");
+            .change_nyxd(validator_nyxd.clone())
+            .expect("Could not use the random nyxd URL");
         client
     }
 
@@ -269,7 +275,7 @@ where
         let existing_gateways = match validator_client.get_cached_gateways().await {
             Ok(gateways) => gateways,
             Err(err) => {
-                error!("failed to grab initial network gateways - {}\n Please try to startup again in few minutes", err);
+                error!("failed to grab initial network gateways - {err}\n Please try to startup again in few minutes");
                 process::exit(1);
             }
         };
@@ -299,8 +305,8 @@ where
 
         #[cfg(feature = "coconut")]
         let coconut_verifier = {
-            let nymd_client = self.random_nymd_client();
-            let api_clients = CoconutApiClient::all_coconut_api_clients(&nymd_client)
+            let nyxd_client = self.random_nyxd_client();
+            let api_clients = CoconutApiClient::all_coconut_api_clients(&nyxd_client)
                 .await
                 .expect("Could not query all api clients");
             let validators_verification_key = obtain_aggregate_verification_key(&api_clients)
@@ -308,7 +314,7 @@ where
                 .expect("failed to contact validators to obtain their verification keys");
             CoconutVerifier::new(
                 api_clients,
-                nymd_client,
+                nyxd_client,
                 std::env::var(network_defaults::var_names::MIX_DENOM)
                     .expect("mix denom base not set"),
                 validators_verification_key,
diff --git a/gateway/src/node/storage/mod.rs b/gateway/src/node/storage/mod.rs
index aeed709455..cbb7c27f90 100644
--- a/gateway/src/node/storage/mod.rs
+++ b/gateway/src/node/storage/mod.rs
@@ -173,13 +173,13 @@ impl PersistentStorage {
         let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
             Ok(db) => db,
             Err(err) => {
-                error!("Failed to connect to SQLx database: {}", err);
+                error!("Failed to connect to SQLx database: {err}");
                 return Err(err.into());
             }
         };
 
         if let Err(err) = sqlx::migrate!("./migrations").run(&connection_pool).await {
-            error!("Failed to perform migration on the SQLx database: {}", err);
+            error!("Failed to perform migration on the SQLx database: {err}");
             return Err(err.into());
         }
 
diff --git a/integrations/bity/Cargo.toml b/integrations/bity/Cargo.toml
index feae848a70..327d3aeeaa 100644
--- a/integrations/bity/Cargo.toml
+++ b/integrations/bity/Cargo.toml
@@ -15,7 +15,7 @@ cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegr
 
 nym-cli-commands = { path = "../../common/commands" }
 validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 
 [dev-dependencies]
diff --git a/integrations/bity/src/lib.rs b/integrations/bity/src/lib.rs
index 9af11eecfb..232d686e3e 100644
--- a/integrations/bity/src/lib.rs
+++ b/integrations/bity/src/lib.rs
@@ -8,7 +8,7 @@ mod tests {
     use crate::{sign, verify};
     use cosmrs::AccountId;
     use std::str::FromStr;
-    use validator_client::nymd::wallet::DirectSecp256k1HdWallet;
+    use validator_client::nyxd::wallet::DirectSecp256k1HdWallet;
 
     fn get_order(prefix: &str) -> anyhow::Result<(OrderSignature, String)> {
         let mnemonic = "crush minute paddle tobacco message debate cabin peace bar jacket execute twenty winner view sure mask popular couch penalty fragile demise fresh pizza stove";
diff --git a/integrations/bity/src/sign/mod.rs b/integrations/bity/src/sign/mod.rs
index feed824868..65de7536c6 100644
--- a/integrations/bity/src/sign/mod.rs
+++ b/integrations/bity/src/sign/mod.rs
@@ -1,13 +1,13 @@
 use crate::order::OrderSignature;
-use validator_client::nymd::error::NymdError;
-use validator_client::nymd::wallet::{AccountData, DirectSecp256k1HdWallet};
+use validator_client::nyxd::error::NyxdError;
+use validator_client::nyxd::wallet::{AccountData, DirectSecp256k1HdWallet};
 
 /// Signs an order message to purchase Nym with Bity
 pub fn sign_order(
     wallet: &DirectSecp256k1HdWallet,
     signer: &AccountData,
     message: String,
-) -> Result<OrderSignature, NymdError> {
+) -> Result<OrderSignature, NyxdError> {
     Ok(OrderSignature {
         account_id: signer.address().clone(),
         public_key: signer.public_key(),
diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml
index 0806354403..1fd23fa6dd 100644
--- a/mixnode/Cargo.toml
+++ b/mixnode/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-mixnode"
-version = "1.1.1"
+version = "1.1.4"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
@@ -18,7 +18,7 @@ rust-version = "1.58.1"
 [dependencies]
 anyhow = "1.0.40"
 bs58 = "0.4.0"
-clap = { version = "3.2", features = ["cargo", "derive"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 colored = "2.0"
 cupid = "0.6.1"
 dirs = "4.0"
@@ -31,13 +31,16 @@ pretty_env_logger = "0.4.0"
 rand = "0.7.3"
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
 serde = { version="1.0", features = ["derive"] }
+serde_json = "1.0"
 sysinfo = "0.24.1"
 tokio = { version="1.21.2", features = ["rt-multi-thread", "net", "signal"] }
 tokio-util = { version="0.7.3", features = ["codec"] }
 toml = "0.5.8"
 url = { version = "2.2", features = ["serde"] }
+atty = "0.2"
 
 ## internal
+build-information = { path = "../common/build-information" }
 config = { path="../common/config" }
 crypto = { path="../common/crypto" }
 completions = { path="../common/completions" }
@@ -48,6 +51,7 @@ nonexhaustive-delayqueue = { path="../common/nonexhaustive-delayqueue" }
 nymsphinx = { path="../common/nymsphinx" }
 pemstore = { path="../common/pemstore" }
 task = { path = "../common/task" }
+nym-types = { path = "../common/types" }
 topology = { path="../common/topology" }
 validator-client = { path="../common/client-libs/validator-client" }
 version-checker = { path="../common/version-checker" }
@@ -57,6 +61,3 @@ tokio = { version="1.21.2", features = ["rt-multi-thread", "net", "signal", "tes
 
 nymsphinx-types = { path = "../common/nymsphinx/types" }
 nymsphinx-params = { path = "../common/nymsphinx/params" }
-
-[build-dependencies]
-vergen = { version = "5", default-features = false, features = ["build", "git", "rustc", "cargo"] }
diff --git a/mixnode/build.rs b/mixnode/build.rs
deleted file mode 100644
index 01b3a20dc6..0000000000
--- a/mixnode/build.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use vergen::{vergen, Config};
-
-fn main() {
-    vergen(Config::default()).expect("failed to extract build metadata")
-}
diff --git a/mixnode/src/commands/describe.rs b/mixnode/src/commands/describe.rs
index 2bab09b8c9..5b66eb8d87 100644
--- a/mixnode/src/commands/describe.rs
+++ b/mixnode/src/commands/describe.rs
@@ -1,3 +1,6 @@
+// Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
 use crate::config::Config;
 use crate::node::node_description::NodeDescription;
 use clap::Args;
@@ -11,45 +14,64 @@ pub(crate) struct Describe {
     /// The id of the mixnode you want to describe
     #[clap(long)]
     id: String,
+
+    /// Human readable name of this node
+    #[clap(long)]
+    name: Option<String>,
+
+    /// Description of this node
+    #[clap(long)]
+    description: Option<String>,
+
+    /// Link associated with this node, for example `https://mixnode.yourdomain.com`
+    #[clap(long)]
+    link: Option<String>,
+
+    /// Physical location of this node, for example `City: London, Country: UK`
+    #[clap(long)]
+    location: Option<String>,
 }
 
-pub(crate) fn execute(args: &Describe) {
+fn read_user_input() -> String {
+    io::stdout().flush().unwrap();
+    let mut buf = String::new();
+    io::stdin().read_line(&mut buf).unwrap();
+    buf.trim().to_string()
+}
+
+pub(crate) fn execute(args: Describe) {
     // ensure that the mixnode has in fact been initialized
     match Config::load_from_file(Some(&args.id)) {
         Ok(cfg) => cfg,
         Err(err) => {
-            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {})", &args.id, err);
+            error!("Failed to load config for {}. Are you sure you have run `init` before? (Error was: {err})", &args.id);
             return;
         }
     };
 
-    // get input from the user
-    print!("name: ");
-    io::stdout().flush().unwrap();
-    let mut name_buf = String::new();
-    io::stdin().read_line(&mut name_buf).unwrap();
-    let name = name_buf.trim().to_string();
-
-    print!("description: ");
-    io::stdout().flush().unwrap();
-    let mut desc_buf = String::new();
-    io::stdin().read_line(&mut desc_buf).unwrap();
-    let description = desc_buf.trim().to_string();
-
     let example_url = "https://mixnode.yourdomain.com".bright_cyan();
     let example_location = "City: London, Country: UK";
 
-    print!("link, e.g. {}: ", example_url);
-    io::stdout().flush().unwrap();
-    let mut link_buf = String::new();
-    io::stdin().read_line(&mut link_buf).unwrap();
-    let link = link_buf.trim().to_string();
+    // get input from the user if not provided via the arguments
+    let name = args.name.unwrap_or_else(|| {
+        print!("name: ");
+        read_user_input()
+    });
 
-    print!("location, e.g. {}: ", example_location);
-    io::stdout().flush().unwrap();
-    let mut location_buf = String::new();
-    io::stdin().read_line(&mut location_buf).unwrap();
-    let location = location_buf.trim().to_string();
+    let description = args.description.unwrap_or_else(|| {
+        print!("description: ");
+        read_user_input()
+    });
+
+    let link = args.link.unwrap_or_else(|| {
+        print!("link, e.g. {example_url}: ");
+        read_user_input()
+    });
+
+    let location = args.location.unwrap_or_else(|| {
+        print!("location, e.g. {example_location}: ");
+        read_user_input()
+    });
 
     let node_description = NodeDescription {
         name,
diff --git a/mixnode/src/commands/init.rs b/mixnode/src/commands/init.rs
index 7d848c7849..7639572158 100644
--- a/mixnode/src/commands/init.rs
+++ b/mixnode/src/commands/init.rs
@@ -1,14 +1,16 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use super::OverrideConfig;
 use crate::config::Config;
 use crate::node::MixNode;
+use crate::OutputFormat;
 use crate::{commands::override_config, config::persistence::pathfinder::MixNodePathfinder};
 use clap::Args;
 use config::NymConfig;
 use crypto::asymmetric::{encryption, identity};
-
-use super::OverrideConfig;
+use std::net::IpAddr;
+use validator_client::nyxd;
 
 #[derive(Args, Clone)]
 pub(crate) struct Init {
@@ -18,11 +20,11 @@ pub(crate) struct Init {
 
     /// The host on which the mixnode will be running
     #[clap(long)]
-    host: String,
+    host: IpAddr,
 
     /// The wallet address you will use to bond this mixnode, e.g. nymt1z9egw0knv47nmur0p8vk4rcx59h9gg4zuxrrr9
     #[clap(long)]
-    wallet_address: String,
+    wallet_address: nyxd::AccountId,
 
     /// The port on which the mixnode will be listening for mix packets
     #[clap(long)]
@@ -40,9 +42,10 @@ pub(crate) struct Init {
     #[clap(long)]
     announce_host: Option<String>,
 
-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
+    /// Comma separated list of nym-api endpoints of the validators
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    #[clap(long, alias = "validators", value_delimiter = ',')]
+    nym_apis: Option<Vec<url::Url>>,
 }
 
 impl From<Init> for OverrideConfig {
@@ -55,18 +58,18 @@ impl From<Init> for OverrideConfig {
             verloc_port: init_config.verloc_port,
             http_api_port: init_config.http_api_port,
             announce_host: init_config.announce_host,
-            validators: init_config.validators,
+            nym_apis: init_config.nym_apis,
         }
     }
 }
 
-pub(crate) fn execute(args: &Init) {
+pub(crate) fn execute(args: &Init, output: OutputFormat) {
     let override_config_fields = OverrideConfig::from(args.clone());
     let id = &override_config_fields.id;
-    println!("Initialising mixnode {}...", id);
+    eprintln!("Initialising mixnode {}...", id);
 
     let already_init = if Config::default_config_file_path(Some(id)).exists() {
-        println!("Mixnode \"{}\" was already initialised before! Config information will be overwritten (but keys will be kept)!", id);
+        eprintln!("Mixnode \"{}\" was already initialised before! Config information will be overwritten (but keys will be kept)!", id);
         true
     } else {
         false
@@ -99,16 +102,15 @@ pub(crate) fn execute(args: &Init) {
             ),
         )
         .expect("Failed to save sphinx keys");
-
-        println!("Saved mixnet identity and sphinx keypairs");
+        eprintln!("Saved mixnet identity and sphinx keypairs");
     }
 
     let config_save_location = config.get_config_file_save_location();
     config
         .save_to_file(None)
         .expect("Failed to save the config file");
-    println!("Saved configuration file to {:?}", config_save_location);
-    println!("Mixnode configuration completed.\n\n\n");
+    eprintln!("Saved configuration file to {:?}", config_save_location);
+    eprintln!("Mixnode configuration completed.\n\n\n");
 
-    MixNode::new(config).print_node_details()
+    MixNode::new(config).print_node_details(output)
 }
diff --git a/mixnode/src/commands/mod.rs b/mixnode/src/commands/mod.rs
index f716953c11..30a1cacfaa 100644
--- a/mixnode/src/commands/mod.rs
+++ b/mixnode/src/commands/mod.rs
@@ -1,19 +1,17 @@
 // Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use std::process;
-
 use crate::{config::Config, Cli};
 use clap::CommandFactory;
 use clap::Subcommand;
 use colored::Colorize;
 use completions::{fig_generate, ArgShell};
-use config::defaults::mainnet::read_var_if_not_default;
-use config::{
-    defaults::var_names::{API_VALIDATOR, BECH32_PREFIX, CONFIGURED},
-    parse_validators,
-};
+use config::defaults::var_names::{BECH32_PREFIX, NYM_API};
+use config::OptionalSet;
 use crypto::bech32_address_validation;
+use std::net::IpAddr;
+use std::process;
+use validator_client::nyxd;
 
 mod describe;
 mod init;
@@ -52,71 +50,64 @@ pub(crate) enum Commands {
 // Configuration that can be overridden.
 struct OverrideConfig {
     id: String,
-    host: Option<String>,
-    wallet_address: Option<String>,
+    host: Option<IpAddr>,
+    wallet_address: Option<nyxd::AccountId>,
     mix_port: Option<u16>,
     verloc_port: Option<u16>,
     http_api_port: Option<u16>,
     announce_host: Option<String>,
-    validators: Option<String>,
+    nym_apis: Option<Vec<url::Url>>,
 }
 
 pub(crate) async fn execute(args: Cli) {
     let bin_name = "nym-mixnode";
 
-    match &args.command {
+    let output = args.output();
+
+    match args.command {
         Commands::Describe(m) => describe::execute(m),
-        Commands::Init(m) => init::execute(m),
-        Commands::Run(m) => run::execute(m).await,
-        Commands::Sign(m) => sign::execute(m),
-        Commands::Upgrade(m) => upgrade::execute(m),
-        Commands::NodeDetails(m) => node_details::execute(m),
-        Commands::Completions(s) => s.generate(&mut crate::Cli::into_app(), bin_name),
-        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name),
+        Commands::Init(m) => init::execute(&m, output),
+        Commands::Run(m) => run::execute(&m, output).await,
+        Commands::Sign(m) => sign::execute(&m),
+        Commands::Upgrade(m) => upgrade::execute(&m),
+        Commands::NodeDetails(m) => node_details::execute(&m, output),
+        Commands::Completions(s) => s.generate(&mut crate::Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::command(), bin_name),
     }
 }
 
 fn override_config(mut config: Config, args: OverrideConfig) -> Config {
+    // special case that I'm not sure could be easily handled with the trait
     let mut was_host_overridden = false;
     if let Some(host) = args.host {
         config = config.with_listening_address(host);
         was_host_overridden = true;
     }
 
-    if let Some(port) = args.mix_port {
-        config = config.with_mix_port(port);
-    }
-
-    if let Some(port) = args.verloc_port {
-        config = config.with_verloc_port(port);
-    }
-
-    if let Some(port) = args.http_api_port {
-        config = config.with_http_api_port(port);
-    }
-
-    if let Some(ref raw_validators) = args.validators {
-        config = config.with_custom_validator_apis(parse_validators(raw_validators));
-    } else if std::env::var(CONFIGURED).is_ok() {
-        if let Some(raw_validators) = read_var_if_not_default(API_VALIDATOR) {
-            config = config.with_custom_validator_apis(::config::parse_validators(&raw_validators))
-        }
-    }
-
-    if let Some(ref announce_host) = args.announce_host {
+    if let Some(announce_host) = args.announce_host {
         config = config.with_announce_address(announce_host);
     } else if was_host_overridden {
         // make sure our 'announce-host' always defaults to 'host'
         config = config.announce_address_from_listening_address()
     }
 
-    if let Some(ref wallet_address) = args.wallet_address {
-        let trimmed = wallet_address.trim();
-        validate_bech32_address_or_exit(trimmed);
-        config = config.with_wallet_address(trimmed);
-    }
-
     config
+        .with_optional(Config::with_mix_port, args.mix_port)
+        .with_optional(Config::with_verloc_port, args.verloc_port)
+        .with_optional(Config::with_http_api_port, args.http_api_port)
+        .with_optional_custom_env(
+            Config::with_custom_nym_apis,
+            args.nym_apis,
+            NYM_API,
+            config::parse_urls,
+        )
+        .with_optional(
+            |cfg, wallet_address| {
+                validate_bech32_address_or_exit(wallet_address.as_ref());
+                cfg.with_wallet_address(wallet_address)
+            },
+            args.wallet_address,
+        )
 }
 
 /// Ensures that a given bech32 address is valid, or exits
@@ -125,18 +116,18 @@ pub(crate) fn validate_bech32_address_or_exit(address: &str) {
     if let Err(bech32_address_validation::Bech32Error::DecodeFailed(err)) =
         bech32_address_validation::try_bech32_decode(address)
     {
-        let error_message = format!("Error: wallet address decoding failed: {}", err).red();
-        println!("{}", error_message);
-        println!("Exiting...");
+        let error_message = format!("Error: wallet address decoding failed: {err}").red();
+        error!("{}", error_message);
+        error!("Exiting...");
         process::exit(1);
     }
 
     if let Err(bech32_address_validation::Bech32Error::WrongPrefix(err)) =
         bech32_address_validation::validate_bech32_prefix(&prefix, address)
     {
-        let error_message = format!("Error: wallet address type is wrong, {}", err).red();
-        println!("{}", error_message);
-        println!("Exiting...");
+        let error_message = format!("Error: wallet address type is wrong, {err}").red();
+        error!("{}", error_message);
+        error!("Exiting...");
         process::exit(1);
     }
 }
diff --git a/mixnode/src/commands/node_details.rs b/mixnode/src/commands/node_details.rs
index 471b3bde94..cdc0d5162a 100644
--- a/mixnode/src/commands/node_details.rs
+++ b/mixnode/src/commands/node_details.rs
@@ -3,6 +3,7 @@
 
 use crate::config::Config;
 use crate::node::MixNode;
+use crate::OutputFormat;
 use clap::Args;
 use config::NymConfig;
 
@@ -13,7 +14,7 @@ pub(crate) struct NodeDetails {
     id: String,
 }
 
-pub(crate) fn execute(args: &NodeDetails) {
+pub(crate) fn execute(args: &NodeDetails, output: OutputFormat) {
     let config = match Config::load_from_file(Some(&args.id)) {
         Ok(cfg) => cfg,
         Err(err) => {
@@ -26,5 +27,5 @@ pub(crate) fn execute(args: &NodeDetails) {
         }
     };
 
-    MixNode::new(config).print_node_details()
+    MixNode::new(config).print_node_details(output)
 }
diff --git a/mixnode/src/commands/run.rs b/mixnode/src/commands/run.rs
index c0106034b9..72d10fe024 100644
--- a/mixnode/src/commands/run.rs
+++ b/mixnode/src/commands/run.rs
@@ -1,13 +1,15 @@
 // Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use super::OverrideConfig;
 use crate::commands::{override_config, version_check};
 use crate::config::Config;
 use crate::node::MixNode;
+use crate::OutputFormat;
 use clap::Args;
 use config::NymConfig;
-
-use super::OverrideConfig;
+use std::net::IpAddr;
+use validator_client::nyxd;
 
 #[derive(Args, Clone)]
 pub(crate) struct Run {
@@ -17,11 +19,11 @@ pub(crate) struct Run {
 
     /// The custom host on which the mixnode will be running
     #[clap(long)]
-    host: Option<String>,
+    host: Option<IpAddr>,
 
     /// The wallet address you will use to bond this mixnode, e.g. nymt1z9egw0knv47nmur0p8vk4rcx59h9gg4zuxrrr9
     #[clap(long)]
-    wallet_address: Option<String>,
+    wallet_address: Option<nyxd::AccountId>,
 
     /// The port on which the mixnode will be listening for mix packets
     #[clap(long)]
@@ -39,9 +41,10 @@ pub(crate) struct Run {
     #[clap(long)]
     announce_host: Option<String>,
 
-    /// Comma separated list of rest endpoints of the validators
-    #[clap(long)]
-    validators: Option<String>,
+    /// Comma separated list of nym-api endpoints of the validators
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    #[clap(long, alias = "validators", value_delimiter = ',')]
+    nym_apis: Option<Vec<url::Url>>,
 }
 
 impl From<Run> for OverrideConfig {
@@ -54,7 +57,7 @@ impl From<Run> for OverrideConfig {
             verloc_port: run_config.verloc_port,
             http_api_port: run_config.http_api_port,
             announce_host: run_config.announce_host,
-            validators: run_config.validators,
+            nym_apis: run_config.nym_apis,
         }
     }
 }
@@ -74,8 +77,8 @@ fn special_addresses() -> Vec<&'static str> {
     vec!["localhost", "127.0.0.1", "0.0.0.0", "::1", "[::1]"]
 }
 
-pub(crate) async fn execute(args: &Run) {
-    println!("Starting mixnode {}...", args.id);
+pub(crate) async fn execute(args: &Run, output: OutputFormat) {
+    eprintln!("Starting mixnode {}...", args.id);
 
     let mut config = match Config::load_from_file(Some(&args.id)) {
         Ok(cfg) => cfg,
@@ -102,10 +105,10 @@ pub(crate) async fn execute(args: &Run) {
 
     let mut mixnode = MixNode::new(config);
 
-    println!(
+    eprintln!(
         "\nTo bond your mixnode you will need to install the Nym wallet, go to https://nymtech.net/get-involved and select the Download button.\n\
          Select the correct version and install it to your machine. You will need to provide the following: \n ");
-    mixnode.print_node_details();
+    mixnode.print_node_details(output);
 
     mixnode.run().await
 }
diff --git a/mixnode/src/commands/sign.rs b/mixnode/src/commands/sign.rs
index 46158a9b42..f78a45b2d1 100644
--- a/mixnode/src/commands/sign.rs
+++ b/mixnode/src/commands/sign.rs
@@ -1,4 +1,4 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use std::convert::TryFrom;
@@ -11,19 +11,21 @@ use clap::{ArgGroup, Args};
 use config::NymConfig;
 use crypto::asymmetric::identity;
 use log::error;
+use validator_client::nyxd;
 
 use super::version_check;
 
 #[derive(Args, Clone)]
-#[clap(group(ArgGroup::new("sign").required(true).args(&["address", "text"])))]
+#[clap(group(ArgGroup::new("sign").required(true).args(&["wallet_address", "text"])))]
 pub(crate) struct Sign {
     /// The id of the mixnode you want to sign with
     #[clap(long)]
     id: String,
 
     /// Signs your blockchain address with your identity key
-    #[clap(long)]
-    address: Option<String>,
+    // the alias here is included for backwards compatibility (1.1.4 and before)
+    #[clap(long, alias = "address")]
+    wallet_address: Option<nyxd::AccountId>,
 
     /// Signs an arbitrary piece of text with your identity key
     #[clap(long)]
@@ -32,7 +34,7 @@ pub(crate) struct Sign {
 
 enum SignedTarget {
     Text(String),
-    Address(String),
+    Address(nyxd::AccountId),
 }
 
 impl TryFrom<Sign> for SignedTarget {
@@ -41,7 +43,7 @@ impl TryFrom<Sign> for SignedTarget {
     fn try_from(args: Sign) -> Result<Self, Self::Error> {
         if let Some(text) = args.text {
             Ok(SignedTarget::Text(text))
-        } else if let Some(address) = args.address {
+        } else if let Some(address) = args.wallet_address {
             Ok(SignedTarget::Address(address))
         } else {
             // This is unreachable, and hopefully clap will support it explicitly by outputting an
@@ -52,15 +54,12 @@ impl TryFrom<Sign> for SignedTarget {
     }
 }
 
-fn print_signed_address(private_key: &identity::PrivateKey, raw_address: &str) {
-    let trimmed = raw_address.trim();
-    validate_bech32_address_or_exit(trimmed);
-    let signature = private_key.sign_text(trimmed);
+fn print_signed_address(private_key: &identity::PrivateKey, wallet_address: nyxd::AccountId) {
+    // perform extra validation to ensure we have correct prefix
+    validate_bech32_address_or_exit(wallet_address.as_ref());
 
-    println!(
-        "The base58-encoded signature on '{}' is: {}",
-        trimmed, signature
-    );
+    let signature = private_key.sign_text(wallet_address.as_ref());
+    println!("The base58-encoded signature on '{wallet_address}' is: {signature}",);
 }
 
 fn print_signed_text(private_key: &identity::PrivateKey, text: &str) {
@@ -107,6 +106,6 @@ pub(crate) fn execute(args: &Sign) {
 
     match signed_target {
         SignedTarget::Text(text) => print_signed_text(identity_keypair.private_key(), &text),
-        SignedTarget::Address(addr) => print_signed_address(identity_keypair.private_key(), &addr),
+        SignedTarget::Address(addr) => print_signed_address(identity_keypair.private_key(), addr),
     }
 }
diff --git a/mixnode/src/commands/upgrade.rs b/mixnode/src/commands/upgrade.rs
index d104d47988..d11996830a 100644
--- a/mixnode/src/commands/upgrade.rs
+++ b/mixnode/src/commands/upgrade.rs
@@ -57,7 +57,7 @@ fn unsupported_upgrade(config_version: &Version, package_version: &Version) -> !
 
 fn parse_config_version(config: &Config) -> Version {
     let version = Version::parse(config.get_version()).unwrap_or_else(|err| {
-        eprintln!("failed to parse client version! - {:?}", err);
+        eprintln!("failed to parse client version! - {err}");
         process::exit(1)
     });
 
@@ -106,7 +106,7 @@ fn minor_0_12_upgrade(
     let upgraded_config = config.with_custom_version(to_version.to_string().as_ref());
 
     upgraded_config.save_to_file(None).unwrap_or_else(|err| {
-        eprintln!("failed to overwrite config file! - {:?}", err);
+        eprintln!("failed to overwrite config file! - {err}");
         print_failed_upgrade(config_version, &to_version);
         process::exit(1);
     });
@@ -140,7 +140,7 @@ pub(crate) fn execute(args: &Upgrade) {
     let package_version = parse_package_version();
 
     let existing_config = Config::load_from_file(Some(&args.id)).unwrap_or_else(|err| {
-        eprintln!("failed to load existing config file! - {:?}", err);
+        eprintln!("failed to load existing config file! - {err}");
         process::exit(1)
     });
 
diff --git a/mixnode/src/config/mod.rs b/mixnode/src/config/mod.rs
index 23a80a5127..2b69e45725 100644
--- a/mixnode/src/config/mod.rs
+++ b/mixnode/src/config/mod.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::template::config_template;
+use config::defaults::mainnet::NYM_API;
 use config::defaults::{
     DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
@@ -12,6 +13,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
 use url::Url;
+use validator_client::nyxd;
 
 pub mod persistence;
 mod template;
@@ -154,21 +156,13 @@ impl Config {
         self
     }
 
-    pub fn with_custom_validator_apis(mut self, validator_api_urls: Vec<Url>) -> Self {
-        self.mixnode.validator_api_urls = validator_api_urls;
+    pub fn with_custom_nym_apis(mut self, nym_api_urls: Vec<Url>) -> Self {
+        self.mixnode.nym_api_urls = nym_api_urls;
         self
     }
 
-    pub fn with_listening_address<S: Into<String>>(mut self, listening_address: S) -> Self {
-        let listening_address_string = listening_address.into();
-        if let Ok(ip_addr) = listening_address_string.parse() {
-            self.mixnode.listening_address = ip_addr
-        } else {
-            error!(
-                "failed to change listening address. the provided value ({}) was invalid",
-                listening_address_string
-            )
-        }
+    pub fn with_listening_address(mut self, listening_address: IpAddr) -> Self {
+        self.mixnode.listening_address = listening_address;
         self
     }
 
@@ -202,8 +196,8 @@ impl Config {
         self
     }
 
-    pub fn with_wallet_address(mut self, wallet_address: &str) -> Self {
-        self.mixnode.wallet_address = wallet_address.to_string();
+    pub fn with_wallet_address(mut self, wallet_address: nyxd::AccountId) -> Self {
+        self.mixnode.wallet_address = Some(wallet_address);
         self
     }
 
@@ -232,8 +226,8 @@ impl Config {
         self.mixnode.public_sphinx_key_file.clone()
     }
 
-    pub fn get_validator_api_endpoints(&self) -> Vec<Url> {
-        self.mixnode.validator_api_urls.clone()
+    pub fn get_nym_api_endpoints(&self) -> Vec<Url> {
+        self.mixnode.nym_api_urls.clone()
     }
 
     pub fn get_node_stats_logging_delay(&self) -> Duration {
@@ -316,8 +310,8 @@ impl Config {
         self.verloc.retry_timeout
     }
 
-    pub fn get_wallet_address(&self) -> &str {
-        &self.mixnode.wallet_address
+    pub fn get_wallet_address(&self) -> Option<nyxd::AccountId> {
+        self.mixnode.wallet_address.clone()
     }
 }
 
@@ -368,15 +362,16 @@ struct MixNode {
     /// Path to file containing public sphinx key.
     public_sphinx_key_file: PathBuf,
 
-    /// Addresses to APIs running on validator from which the node gets the view of the network.
-    validator_api_urls: Vec<Url>,
+    /// Addresses to nym APIs from which the node gets the view of the network.
+    nym_api_urls: Vec<Url>,
 
     /// nym_home_directory specifies absolute path to the home nym MixNodes directory.
     /// It is expected to use default value and hence .toml file should not redefine this field.
     nym_root_directory: PathBuf,
 
     /// The Cosmos wallet address that will control this mixnode
-    wallet_address: String,
+    // the only reason this is an Option is because of the lack of existence of a sane default value
+    wallet_address: Option<nyxd::AccountId>,
 }
 
 impl MixNode {
@@ -411,9 +406,9 @@ impl Default for MixNode {
             public_identity_key_file: Default::default(),
             private_sphinx_key_file: Default::default(),
             public_sphinx_key_file: Default::default(),
-            validator_api_urls: vec![],
+            nym_api_urls: vec![Url::from_str(NYM_API).expect("Invalid default API URL")],
             nym_root_directory: Config::default_root_directory(),
-            wallet_address: "nymXXXXXXXX".to_string(),
+            wallet_address: None,
         }
     }
 }
diff --git a/mixnode/src/config/template.rs b/mixnode/src/config/template.rs
index 2af12a195b..f222275083 100644
--- a/mixnode/src/config/template.rs
+++ b/mixnode/src/config/template.rs
@@ -54,8 +54,8 @@ verloc_port = {{ mixnode.verloc_port }}
 http_api_port = {{ mixnode.http_api_port }}
 
 # Addresses to APIs running on validator from which the node gets the view of the network.
-validator_api_urls = [
-    {{#each mixnode.validator_api_urls }}
+nym_api_urls = [
+    {{#each mixnode.nym_api_urls }}
         '{{this}}',
     {{/each}}
 ]
diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs
index ac0b99c1bf..11e06b8569 100644
--- a/mixnode/src/main.rs
+++ b/mixnode/src/main.rs
@@ -1,11 +1,12 @@
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
 #[macro_use]
 extern crate rocket;
 
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
 use ::config::defaults::setup_env;
-use clap::{crate_version, Parser};
+use build_information::BinaryBuildInformation;
+use clap::{crate_version, Parser, ValueEnum};
 use lazy_static::lazy_static;
 use logging::setup_logging;
 
@@ -14,32 +15,60 @@ mod config;
 mod node;
 
 lazy_static! {
-    pub static ref LONG_VERSION: String = long_version();
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
 }
 
 // Helper for passing LONG_VERSION to clap
-fn long_version_static() -> &'static str {
-    &LONG_VERSION
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
+}
+
+#[derive(Clone, ValueEnum)]
+enum OutputFormat {
+    Json,
+    Text,
+}
+
+impl Default for OutputFormat {
+    fn default() -> Self {
+        OutputFormat::Text
+    }
 }
 
 #[derive(Parser)]
-#[clap(author = "Nymtech", version, about, long_version = long_version_static())]
+#[clap(author = "Nymtech", version, about, long_version = pretty_build_info_static())]
 struct Cli {
     /// Path pointing to an env file that configures the mixnode.
     #[clap(short, long)]
     pub(crate) config_env_file: Option<std::path::PathBuf>,
 
+    #[clap(short, long)]
+    pub(crate) output: Option<OutputFormat>,
+
     #[clap(subcommand)]
     command: commands::Commands,
 }
 
+impl Cli {
+    fn output(&self) -> OutputFormat {
+        if let Some(ref output) = self.output {
+            output.clone()
+        } else {
+            OutputFormat::default()
+        }
+    }
+}
+
 #[tokio::main]
 async fn main() {
     setup_logging();
-    println!("{}", banner());
+    if atty::is(atty::Stream::Stdout) {
+        println!("{}", banner());
+    }
 
     let args = Cli::parse();
-    setup_env(args.config_env_file.clone());
+    setup_env(args.config_env_file.as_ref());
     commands::execute(args).await;
 }
 
@@ -60,37 +89,6 @@ fn banner() -> String {
     )
 }
 
-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE")
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/mixnode/src/node/listener/connection_handler/mod.rs b/mixnode/src/node/listener/connection_handler/mod.rs
index c9baaecacf..52203c89ab 100644
--- a/mixnode/src/node/listener/connection_handler/mod.rs
+++ b/mixnode/src/node/listener/connection_handler/mod.rs
@@ -5,7 +5,7 @@ use crate::node::listener::connection_handler::packet_processing::{
     MixProcessingResult, PacketProcessor,
 };
 use crate::node::packet_delayforwarder::PacketDelayForwardSender;
-use crate::node::ShutdownListener;
+use crate::node::TaskClient;
 use futures::StreamExt;
 use log::{error, info};
 use nymsphinx::forwarding::packet::MixPacket;
@@ -58,7 +58,7 @@ impl ConnectionHandler {
         // all processing such, key caching, etc. was done.
         // however, if it was a forward hop, we still need to delay it
         match self.packet_processor.process_received(framed_sphinx_packet) {
-            Err(e) => debug!("We failed to process received sphinx packet - {:?}", e),
+            Err(err) => debug!("We failed to process received sphinx packet - {err}"),
             Ok(res) => match res {
                 MixProcessingResult::ForwardHop(forward_packet, delay) => {
                     self.delay_and_forward_packet(forward_packet, delay)
@@ -74,7 +74,7 @@ impl ConnectionHandler {
         self,
         conn: TcpStream,
         remote: SocketAddr,
-        mut shutdown: ShutdownListener,
+        mut shutdown: TaskClient,
     ) {
         debug!("Starting connection handler for {:?}", remote);
         let mut framed_conn = Framed::new(conn, SphinxCodec);
diff --git a/mixnode/src/node/listener/mod.rs b/mixnode/src/node/listener/mod.rs
index a1542fba79..18ab26bc63 100644
--- a/mixnode/src/node/listener/mod.rs
+++ b/mixnode/src/node/listener/mod.rs
@@ -8,17 +8,17 @@ use std::process;
 use tokio::net::TcpListener;
 use tokio::task::JoinHandle;
 
-use super::ShutdownListener;
+use super::TaskClient;
 
 pub(crate) mod connection_handler;
 
 pub(crate) struct Listener {
     address: SocketAddr,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl Listener {
-    pub(crate) fn new(address: SocketAddr, shutdown: ShutdownListener) -> Self {
+    pub(crate) fn new(address: SocketAddr, shutdown: TaskClient) -> Self {
         Listener { address, shutdown }
     }
 
@@ -27,7 +27,7 @@ impl Listener {
         let listener = match TcpListener::bind(self.address).await {
             Ok(listener) => listener,
             Err(err) => {
-                error!("Failed to bind to {} - {}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address, err);
+                error!("Failed to bind to {} - {err}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?", self.address);
                 process::exit(1);
             }
         };
@@ -40,7 +40,7 @@ impl Listener {
                             let handler = connection_handler.clone();
                             tokio::spawn(handler.handle_connection(socket, remote_addr, self.shutdown.clone()));
                         }
-                        Err(err) => warn!("Failed to accept incoming connection - {:?}", err),
+                        Err(err) => warn!("Failed to accept incoming connection - {err}"),
                     }
                 },
                 _ = self.shutdown.recv() => {
diff --git a/mixnode/src/node/mod.rs b/mixnode/src/node/mod.rs
index 0bca9b31b0..0198b1fa6b 100644
--- a/mixnode/src/node/mod.rs
+++ b/mixnode/src/node/mod.rs
@@ -17,7 +17,9 @@ use crate::node::listener::Listener;
 use crate::node::node_description::NodeDescription;
 use crate::node::node_statistics::SharedNodeStats;
 use crate::node::packet_delayforwarder::{DelayForwarder, PacketDelayForwardSender};
+use crate::OutputFormat;
 use ::crypto::asymmetric::{encryption, identity};
+use colored::Colorize;
 use config::NymConfig;
 use log::{error, info, warn};
 use mixnode_common::verloc::{self, AtomicVerlocResult, VerlocMeasurer};
@@ -26,7 +28,7 @@ use rand::thread_rng;
 use std::net::SocketAddr;
 use std::process;
 use std::sync::Arc;
-use task::{wait_for_signal, ShutdownListener, ShutdownNotifier};
+use task::{wait_for_signal, TaskClient, TaskManager};
 use version_checker::parse_version;
 
 mod http;
@@ -87,39 +89,41 @@ impl MixNode {
     fn generate_owner_signature(&self) -> String {
         let pathfinder = MixNodePathfinder::new_from_config(&self.config);
         let identity_keypair = Self::load_identity_keys(&pathfinder);
-        let address = self.config.get_wallet_address();
-        validate_bech32_address_or_exit(address);
-        let verification_code = identity_keypair.private_key().sign_text(address);
+        let Some(address) = self.config.get_wallet_address() else {
+            let error_message = "Error: mixnode hasn't set its wallet address".red();
+            println!("{error_message}");
+            println!("Exiting...");
+            process::exit(1);
+        };
+        // perform extra validation to ensure we have correct prefix
+        validate_bech32_address_or_exit(address.as_ref());
+        let verification_code = identity_keypair.private_key().sign_text(address.as_ref());
         verification_code
     }
 
     /// Prints relevant node details to the console
-    pub(crate) fn print_node_details(&self) {
-        println!(
-            "Identity Key: {}",
-            self.identity_keypair.public_key().to_base58_string()
-        );
-        println!(
-            "Sphinx Key: {}",
-            self.sphinx_keypair.public_key().to_base58_string()
-        );
-        println!("Owner Signature: {}", self.generate_owner_signature());
-        println!(
-            "Host: {} (bind address: {})",
-            self.config.get_announce_address(),
-            self.config.get_listening_address()
-        );
-        println!("Version: {}", self.config.get_version());
-        println!(
-            "Mix Port: {}, Verloc port: {}, Http Port: {}\n",
-            self.config.get_mix_port(),
-            self.config.get_verloc_port(),
-            self.config.get_http_api_port()
-        );
-        println!(
-            "You are bonding to wallet address: {}\n\n",
-            self.config.get_wallet_address()
-        );
+    pub(crate) fn print_node_details(&self, output: OutputFormat) {
+        let node_details = nym_types::mixnode::MixnodeNodeDetailsResponse {
+            identity_key: self.identity_keypair.public_key().to_base58_string(),
+            sphinx_key: self.sphinx_keypair.public_key().to_base58_string(),
+            owner_signature: self.generate_owner_signature(),
+            announce_address: self.config.get_announce_address(),
+            bind_address: self.config.get_listening_address().to_string(),
+            version: self.config.get_version().to_string(),
+            mix_port: self.config.get_mix_port(),
+            http_api_port: self.config.get_http_api_port(),
+            verloc_port: self.config.get_verloc_port(),
+            wallet_address: self.config.get_wallet_address().map(|x| x.to_string()),
+        };
+
+        match output {
+            OutputFormat::Json => println!(
+                "{}",
+                serde_json::to_string(&node_details)
+                    .unwrap_or_else(|_| "Could not serialize node details".to_string())
+            ),
+            OutputFormat::Text => println!("{}", node_details),
+        }
     }
 
     fn start_http_api(
@@ -153,7 +157,7 @@ impl MixNode {
 
     fn start_node_stats_controller(
         &self,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> (SharedNodeStats, node_statistics::UpdateSender) {
         info!("Starting node stats controller...");
         let controller = node_statistics::Controller::new(
@@ -171,7 +175,7 @@ impl MixNode {
         &self,
         node_stats_update_sender: node_statistics::UpdateSender,
         delay_forwarding_channel: PacketDelayForwardSender,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
         info!("Starting socket listener...");
 
@@ -191,7 +195,7 @@ impl MixNode {
     fn start_packet_delay_forwarder(
         &mut self,
         node_stats_update_sender: node_statistics::UpdateSender,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> PacketDelayForwardSender {
         info!("Starting packet delay-forwarder...");
 
@@ -215,7 +219,7 @@ impl MixNode {
         packet_sender
     }
 
-    fn start_verloc_measurements(&self, shutdown: ShutdownListener) -> AtomicVerlocResult {
+    fn start_verloc_measurements(&self, shutdown: TaskClient) -> AtomicVerlocResult {
         info!("Starting the round-trip-time measurer...");
 
         // this is a sanity check to make sure we didn't mess up with the minimum version at some point
@@ -245,7 +249,7 @@ impl MixNode {
             .tested_nodes_batch_size(self.config.get_measurement_tested_nodes_batch_size())
             .testing_interval(self.config.get_measurement_testing_interval())
             .retry_timeout(self.config.get_measurement_retry_timeout())
-            .validator_api_urls(self.config.get_validator_api_endpoints())
+            .nym_api_urls(self.config.get_nym_api_endpoints())
             .build();
 
         let mut verloc_measurer =
@@ -255,13 +259,13 @@ impl MixNode {
         atomic_verloc_results
     }
 
-    fn random_api_client(&self) -> validator_client::ApiClient {
-        let endpoints = self.config.get_validator_api_endpoints();
-        let validator_api = endpoints
+    fn random_api_client(&self) -> validator_client::NymApiClient {
+        let endpoints = self.config.get_nym_api_endpoints();
+        let nym_api = endpoints
             .choose(&mut thread_rng())
             .expect("The list of validator apis is empty");
 
-        validator_client::ApiClient::new(validator_api.clone())
+        validator_client::NymApiClient::new(nym_api.clone())
     }
 
     // TODO: ask DH whether this function still makes sense in ^0.10
@@ -288,7 +292,7 @@ impl MixNode {
             .map(|node| node.bond_information.mix_node.identity_key.clone())
     }
 
-    async fn wait_for_interrupt(&self, mut shutdown: ShutdownNotifier) {
+    async fn wait_for_interrupt(&self, mut shutdown: TaskManager) {
         wait_for_signal().await;
 
         log::info!("Sending shutdown");
@@ -315,7 +319,7 @@ impl MixNode {
             }
         }
 
-        let shutdown = ShutdownNotifier::default();
+        let shutdown = TaskManager::default();
 
         let (node_stats_pointer, node_stats_update_sender) =
             self.start_node_stats_controller(shutdown.subscribe());
diff --git a/mixnode/src/node/node_statistics.rs b/mixnode/src/node/node_statistics.rs
index 86f98401ab..2fa8c39b8e 100644
--- a/mixnode/src/node/node_statistics.rs
+++ b/mixnode/src/node/node_statistics.rs
@@ -9,7 +9,7 @@ use std::sync::Arc;
 use std::time::{Duration, SystemTime};
 use tokio::sync::{RwLock, RwLockReadGuard};
 
-use super::ShutdownListener;
+use super::TaskClient;
 
 // convenience aliases
 type PacketsMap = HashMap<String, u64>;
@@ -211,14 +211,14 @@ impl CurrentPacketData {
 struct UpdateHandler {
     current_data: CurrentPacketData,
     update_receiver: PacketDataReceiver,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl UpdateHandler {
     fn new(
         current_data: CurrentPacketData,
         update_receiver: PacketDataReceiver,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Self {
         UpdateHandler {
             current_data,
@@ -293,7 +293,7 @@ struct StatsUpdater {
     updating_delay: Duration,
     current_packet_data: CurrentPacketData,
     current_stats: SharedNodeStats,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl StatsUpdater {
@@ -301,7 +301,7 @@ impl StatsUpdater {
         updating_delay: Duration,
         current_packet_data: CurrentPacketData,
         current_stats: SharedNodeStats,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Self {
         StatsUpdater {
             updating_delay,
@@ -335,11 +335,11 @@ impl StatsUpdater {
 struct PacketStatsConsoleLogger {
     logging_delay: Duration,
     stats: SharedNodeStats,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl PacketStatsConsoleLogger {
-    fn new(logging_delay: Duration, stats: SharedNodeStats, shutdown: ShutdownListener) -> Self {
+    fn new(logging_delay: Duration, stats: SharedNodeStats, shutdown: TaskClient) -> Self {
         PacketStatsConsoleLogger {
             logging_delay,
             stats,
@@ -451,7 +451,7 @@ impl Controller {
     pub(crate) fn new(
         logging_delay: Duration,
         stats_updating_delay: Duration,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> Self {
         let (sender, receiver) = mpsc::unbounded();
         let shared_packet_data = CurrentPacketData::new();
@@ -503,13 +503,13 @@ impl Controller {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use task::ShutdownNotifier;
+    use task::TaskManager;
 
     #[tokio::test]
     async fn node_stats_reported_are_received() {
         let logging_delay = Duration::from_millis(20);
         let stats_updating_delay = Duration::from_millis(10);
-        let shutdown = ShutdownNotifier::default();
+        let shutdown = TaskManager::default();
         let node_stats_controller =
             Controller::new(logging_delay, stats_updating_delay, shutdown.subscribe());
 
diff --git a/mixnode/src/node/packet_delayforwarder.rs b/mixnode/src/node/packet_delayforwarder.rs
index 9be8175bed..da098bcdf9 100644
--- a/mixnode/src/node/packet_delayforwarder.rs
+++ b/mixnode/src/node/packet_delayforwarder.rs
@@ -9,7 +9,7 @@ use nymsphinx::forwarding::packet::MixPacket;
 use std::io;
 use tokio::time::Instant;
 
-use super::ShutdownListener;
+use super::TaskClient;
 
 // Delay + MixPacket vs Instant + MixPacket
 
@@ -28,7 +28,7 @@ where
     packet_sender: PacketDelayForwardSender,
     packet_receiver: PacketDelayForwardReceiver,
     node_stats_update_sender: UpdateSender,
-    shutdown: ShutdownListener,
+    shutdown: TaskClient,
 }
 
 impl<C> DelayForwarder<C>
@@ -38,7 +38,7 @@ where
     pub(crate) fn new(
         client: C,
         node_stats_update_sender: UpdateSender,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) -> DelayForwarder<C> {
         let (packet_sender, packet_receiver) = mpsc::unbounded();
 
@@ -134,7 +134,7 @@ mod tests {
     use std::sync::{Arc, Mutex};
     use std::time::Duration;
 
-    use task::ShutdownNotifier;
+    use task::TaskManager;
 
     use nymsphinx::addressing::nodes::NymNodeRoutingAddress;
     use nymsphinx_params::packet_sizes::PacketSize;
@@ -194,7 +194,7 @@ mod tests {
         ];
         SphinxPacketBuilder::new()
             .with_payload_size(size.payload_size())
-            .build_packet(b"foomp".to_vec(), &route, &destination, &delays)
+            .build_packet(b"foomp", &route, &destination, &delays)
             .unwrap()
     }
 
@@ -205,7 +205,7 @@ mod tests {
         let node_stats_update_sender = UpdateSender::new(stats_sender);
         let client = TestClient::default();
         let client_packets_sent = client.packets_sent.clone();
-        let shutdown = ShutdownNotifier::default();
+        let shutdown = TaskManager::default();
         let mut delay_forwarder =
             DelayForwarder::new(client, node_stats_update_sender, shutdown.subscribe());
         let packet_sender = delay_forwarder.sender();
diff --git a/validator-api/Cargo.toml b/nym-api/Cargo.toml
similarity index 92%
rename from validator-api/Cargo.toml
rename to nym-api/Cargo.toml
index 1207d6a145..b89227f868 100644
--- a/validator-api/Cargo.toml
+++ b/nym-api/Cargo.toml
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 
 [package]
-name = "nym-validator-api"
-version = "1.1.1"
+name = "nym-api"
+version = "1.1.4"
 authors = [
     "Dave Hrycyszyn <futurechimp@users.noreply.github.com>",
     "Jędrzej Stuczyński <andrew@nymtech.net>",
@@ -17,13 +17,15 @@ rust-version = "1.56"
 [dependencies]
 async-trait = "0.1.52"
 bs58 = {version = "0.4.0", optional = true }
+bip39 = "1"
 cfg-if = "1.0"
-clap = { version = "3.2", features = ["cargo"] }
+clap = { version = "4.0", features = ["cargo", "derive"] }
 console-subscriber = { version = "0.1.1", optional = true } # validator-api needs to be built with RUSTFLAGS="--cfg tokio_unstable"
 dirs = "4.0"
 dotenv = "0.15.0"
 futures = "0.3.24"
 humantime-serde = "1.0"
+lazy_static = "1.4.0"
 log = "0.4.17"
 pin-project = "1.0"
 pretty_env_logger = "0.4.0"
@@ -63,6 +65,7 @@ rocket_okapi = { version = "0.8.0-rc.2", features = ["swagger"] }
 schemars = { version = "0.8", features = ["preserve_order"] }
 
 ## internal
+build-information = { path = "../common/build-information" }
 coconut-bandwidth-contract-common = { path = "../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg", optional = true }
 coconut-interface = { path = "../common/coconut-interface", optional = true }
@@ -84,9 +87,9 @@ nymsphinx = { path = "../common/nymsphinx" }
 pemstore = { path = "../common/pemstore", optional = true }
 task = { path = "../common/task" }
 topology = { path = "../common/topology" }
-validator-api-requests = { path = "validator-api-requests" }
+nym-api-requests = { path = "nym-api-requests" }
 validator-client = { path = "../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 version-checker = { path = "../common/version-checker" }
 
@@ -97,7 +100,7 @@ coconut = [
     "cw3",
     "gateway-client/coconut",
     "credentials/coconut",
-    "validator-api-requests/coconut",
+    "nym-api-requests/coconut",
     "nymcoconut",
     "coconut-dkg-common",
     "dkg",
@@ -115,12 +118,6 @@ sqlx = { version = "0.6.2", features = [
     "macros",
     "migrate",
 ] }
-vergen = { version = "7", default-features = false, features = [
-    "build",
-    "git",
-    "rustc",
-    "cargo",
-] }
 
 [dev-dependencies]
 cw3 = "0.13.4"
diff --git a/validator-api/README.md b/nym-api/README.md
similarity index 100%
rename from validator-api/README.md
rename to nym-api/README.md
diff --git a/validator-api/Rocket.toml b/nym-api/Rocket.toml
similarity index 100%
rename from validator-api/Rocket.toml
rename to nym-api/Rocket.toml
diff --git a/validator-api/build.rs b/nym-api/build.rs
similarity index 81%
rename from validator-api/build.rs
rename to nym-api/build.rs
index 1e967f0aab..cdd97f9505 100644
--- a/validator-api/build.rs
+++ b/nym-api/build.rs
@@ -1,11 +1,10 @@
 use sqlx::{Connection, SqliteConnection};
 use std::env;
-use vergen::{vergen, Config};
 
 #[tokio::main]
 async fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
-    let database_path = format!("{}/validator-api-example.sqlite", out_dir);
+    let database_path = format!("{}/nym-api-example.sqlite", out_dir);
 
     let mut conn = SqliteConnection::connect(&format!("sqlite://{}?mode=rwc", database_path))
         .await
@@ -23,6 +22,4 @@ async fn main() {
     // for some strange reason we need to add a leading `/` to the windows path even though it's
     // not a valid windows path... but hey, it works...
     println!("cargo:rustc-env=DATABASE_URL=sqlite:///{}", &database_path);
-
-    vergen(Config::default()).expect("failed to extract build metadata")
 }
diff --git a/validator-api/migrations/20210722120000_create_initial_tables.sql b/nym-api/migrations/20210722120000_create_initial_tables.sql
similarity index 100%
rename from validator-api/migrations/20210722120000_create_initial_tables.sql
rename to nym-api/migrations/20210722120000_create_initial_tables.sql
diff --git a/validator-api/migrations/20210819120000_monitor_runs.sql b/nym-api/migrations/20210819120000_monitor_runs.sql
similarity index 100%
rename from validator-api/migrations/20210819120000_monitor_runs.sql
rename to nym-api/migrations/20210819120000_monitor_runs.sql
diff --git a/validator-api/migrations/20210824120000_rewarding_data.sql b/nym-api/migrations/20210824120000_rewarding_data.sql
similarity index 100%
rename from validator-api/migrations/20210824120000_rewarding_data.sql
rename to nym-api/migrations/20210824120000_rewarding_data.sql
diff --git a/validator-api/migrations/20211018120000_core_nodes_testing.sql b/nym-api/migrations/20211018120000_core_nodes_testing.sql
similarity index 100%
rename from validator-api/migrations/20211018120000_core_nodes_testing.sql
rename to nym-api/migrations/20211018120000_core_nodes_testing.sql
diff --git a/validator-api/migrations/20211101110000_no_gateway_rewarding.sql b/nym-api/migrations/20211101110000_no_gateway_rewarding.sql
similarity index 100%
rename from validator-api/migrations/20211101110000_no_gateway_rewarding.sql
rename to nym-api/migrations/20211101110000_no_gateway_rewarding.sql
diff --git a/validator-api/migrations/20220121120000_epoch_interval_renaming.sql b/nym-api/migrations/20220121120000_epoch_interval_renaming.sql
similarity index 100%
rename from validator-api/migrations/20220121120000_epoch_interval_renaming.sql
rename to nym-api/migrations/20220121120000_epoch_interval_renaming.sql
diff --git a/validator-api/migrations/20220323120000_drop_foreign_keys_constraints.sql b/nym-api/migrations/20220323120000_drop_foreign_keys_constraints.sql
similarity index 100%
rename from validator-api/migrations/20220323120000_drop_foreign_keys_constraints.sql
rename to nym-api/migrations/20220323120000_drop_foreign_keys_constraints.sql
diff --git a/validator-api/migrations/20220325120000_signed_deposits.sql b/nym-api/migrations/20220325120000_signed_deposits.sql
similarity index 100%
rename from validator-api/migrations/20220325120000_signed_deposits.sql
rename to nym-api/migrations/20220325120000_signed_deposits.sql
diff --git a/validator-api/migrations/20220410222400_add_timestamp_indexes.sql b/nym-api/migrations/20220410222400_add_timestamp_indexes.sql
similarity index 100%
rename from validator-api/migrations/20220410222400_add_timestamp_indexes.sql
rename to nym-api/migrations/20220410222400_add_timestamp_indexes.sql
diff --git a/validator-api/migrations/20220804120000_mixnet_contract_v2.sql b/nym-api/migrations/20220804120000_mixnet_contract_v2.sql
similarity index 100%
rename from validator-api/migrations/20220804120000_mixnet_contract_v2.sql
rename to nym-api/migrations/20220804120000_mixnet_contract_v2.sql
diff --git a/validator-api/validator-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml
similarity index 95%
rename from validator-api/validator-api-requests/Cargo.toml
rename to nym-api/nym-api-requests/Cargo.toml
index ecd29e78a4..6787dcacfa 100644
--- a/validator-api/validator-api-requests/Cargo.toml
+++ b/nym-api/nym-api-requests/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "validator-api-requests"
+name = "nym-api-requests"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/validator-api/validator-api-requests/src/coconut.rs b/nym-api/nym-api-requests/src/coconut.rs
similarity index 100%
rename from validator-api/validator-api-requests/src/coconut.rs
rename to nym-api/nym-api-requests/src/coconut.rs
diff --git a/validator-api/validator-api-requests/src/lib.rs b/nym-api/nym-api-requests/src/lib.rs
similarity index 100%
rename from validator-api/validator-api-requests/src/lib.rs
rename to nym-api/nym-api-requests/src/lib.rs
diff --git a/validator-api/validator-api-requests/src/models.rs b/nym-api/nym-api-requests/src/models.rs
similarity index 98%
rename from validator-api/validator-api-requests/src/models.rs
rename to nym-api/nym-api-requests/src/models.rs
index 046e4152b3..df5fe07768 100644
--- a/validator-api/validator-api-requests/src/models.rs
+++ b/nym-api/nym-api-requests/src/models.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cosmwasm_std::{Coin, Decimal};
+use mixnet_contract_common::families::FamilyHead;
 use mixnet_contract_common::mixnode::MixNodeDetails;
 use mixnet_contract_common::reward_params::{Performance, RewardingParams};
 use mixnet_contract_common::rewarding::RewardEstimate;
@@ -100,6 +101,7 @@ pub struct MixNodeBondAnnotated {
     pub performance: Performance,
     pub estimated_operator_apy: Decimal,
     pub estimated_delegators_apy: Decimal,
+    pub family: Option<FamilyHead>,
 }
 
 impl MixNodeBondAnnotated {
@@ -112,7 +114,7 @@ impl MixNodeBondAnnotated {
     }
 }
 
-#[derive(Deserialize, JsonSchema)]
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ComputeRewardEstParam {
     pub performance: Option<Performance>,
     pub active_in_rewarded_set: Option<bool>,
diff --git a/validator-api/src/coconut/client.rs b/nym-api/src/coconut/client.rs
similarity index 84%
rename from validator-api/src/coconut/client.rs
rename to nym-api/src/coconut/client.rs
index 41fffd4856..48788a03be 100644
--- a/validator-api/src/coconut/client.rs
+++ b/nym-api/src/coconut/client.rs
@@ -4,12 +4,13 @@
 use crate::coconut::error::Result;
 use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse;
 use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
-use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, EpochState};
+use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, Epoch};
 use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
 use contracts_common::dealings::ContractSafeBytes;
 use cw3::ProposalResponse;
-use validator_client::nymd::cosmwasm_client::types::ExecuteResult;
-use validator_client::nymd::{AccountId, Fee, TxResponse};
+use dkg::Threshold;
+use validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
+use validator_client::nyxd::{AccountId, Fee, TxResponse};
 
 #[async_trait]
 pub trait Client {
@@ -21,7 +22,8 @@ pub trait Client {
         &self,
         blinded_serial_number: String,
     ) -> Result<SpendCredentialResponse>;
-    async fn get_current_epoch_state(&self) -> Result<EpochState>;
+    async fn get_current_epoch(&self) -> Result<Epoch>;
+    async fn get_current_epoch_threshold(&self) -> Result<Option<Threshold>>;
     async fn get_self_registered_dealer_details(&self) -> Result<DealerDetailsResponse>;
     async fn get_current_dealers(&self) -> Result<Vec<DealerDetails>>;
     async fn get_dealings(&self, idx: usize) -> Result<Vec<ContractDealing>>;
@@ -29,6 +31,7 @@ pub trait Client {
     async fn vote_proposal(&self, proposal_id: u64, vote_yes: bool, fee: Option<Fee>)
         -> Result<()>;
     async fn execute_proposal(&self, proposal_id: u64) -> Result<()>;
+    async fn advance_epoch_state(&self) -> Result<()>;
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
diff --git a/validator-api/src/coconut/comm.rs b/nym-api/src/coconut/comm.rs
similarity index 74%
rename from validator-api/src/coconut/comm.rs
rename to nym-api/src/coconut/comm.rs
index 42a428f153..75a15f9bc0 100644
--- a/validator-api/src/coconut/comm.rs
+++ b/nym-api/src/coconut/comm.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::coconut::error::Result;
-use crate::nymd_client::Client;
+use crate::nyxd_client::Client;
 use coconut_interface::VerificationKey;
 use credentials::coconut::utils::obtain_aggregate_verification_key;
-use validator_client::nymd::SigningNymdClient;
+use validator_client::nyxd::SigningNyxdClient;
 use validator_client::CoconutApiClient;
 
 #[async_trait]
@@ -14,19 +14,19 @@ pub trait APICommunicationChannel {
 }
 
 pub(crate) struct QueryCommunicationChannel {
-    nymd_client: Client<SigningNymdClient>,
+    nyxd_client: Client<SigningNyxdClient>,
 }
 
 impl QueryCommunicationChannel {
-    pub fn new(nymd_client: Client<SigningNymdClient>) -> Self {
-        QueryCommunicationChannel { nymd_client }
+    pub fn new(nyxd_client: Client<SigningNyxdClient>) -> Self {
+        QueryCommunicationChannel { nyxd_client }
     }
 }
 
 #[async_trait]
 impl APICommunicationChannel for QueryCommunicationChannel {
     async fn aggregated_verification_key(&self) -> Result<VerificationKey> {
-        let client = self.nymd_client.0.read().await;
+        let client = self.nyxd_client.0.read().await;
         let coconut_api_clients = CoconutApiClient::all_coconut_api_clients(&client).await?;
         let vk = obtain_aggregate_verification_key(&coconut_api_clients).await?;
         Ok(vk)
diff --git a/validator-api/src/coconut/deposit.rs b/nym-api/src/coconut/deposit.rs
similarity index 93%
rename from validator-api/src/coconut/deposit.rs
rename to nym-api/src/coconut/deposit.rs
index 8dba92a705..06656ab725 100644
--- a/validator-api/src/coconut/deposit.rs
+++ b/nym-api/src/coconut/deposit.rs
@@ -8,8 +8,8 @@ use coconut_bandwidth_contract_common::events::{
 use credentials::coconut::bandwidth::BandwidthVoucher;
 use crypto::asymmetric::encryption;
 use crypto::asymmetric::identity::{self, Signature};
-use validator_api_requests::coconut::BlindSignRequestBody;
-use validator_client::nymd::TxResponse;
+use nym_api_requests::coconut::BlindSignRequestBody;
+use validator_client::nyxd::TxResponse;
 
 use super::error::{CoconutError, Result};
 
@@ -99,8 +99,8 @@ mod test {
     use nymcoconut::{prepare_blind_sign, BlindSignRequest, Parameters};
     use rand_07::rngs::OsRng;
     use std::str::FromStr;
-    use validator_client::nymd::tx::Hash;
-    use validator_client::nymd::{Event, Tag};
+    use validator_client::nyxd::tx::Hash;
+    use validator_client::nyxd::{Event, Tag};
 
     #[tokio::test]
     async fn extract_encryption_key_test() {
@@ -164,17 +164,13 @@ mod test {
         let err = extract_encryption_key(&req, tx_entry.clone())
             .await
             .unwrap_err();
-        assert_eq!(
-            err.to_string(),
+
+        assert!(matches!(
+            err,
             CoconutError::Ed25519ParseError(
-                // this is really just a useless, dummy error value needed to generate the error type
-                // and get its string representation
-                crypto::asymmetric::identity::Ed25519RecoveryError::MalformedBytes(
-                    crypto::asymmetric::identity::SignatureError::new(),
-                ),
+                crypto::asymmetric::identity::Ed25519RecoveryError::MalformedSignatureString { .. }
             )
-            .to_string()
-        );
+        ));
 
         let correct_request = BlindSignRequestBody::new(
             &blind_sign_req,
@@ -279,17 +275,13 @@ mod test {
         let err = extract_encryption_key(&correct_request, tx_entry.clone())
             .await
             .unwrap_err();
-        assert_eq!(
-            err.to_string(),
+
+        assert!(matches!(
+            err,
             CoconutError::Ed25519ParseError(
-                // this is really just a useless, dummy error value needed to generate the error type
-                // and get its string representation
-                crypto::asymmetric::identity::Ed25519RecoveryError::MalformedBytes(
-                    crypto::asymmetric::identity::SignatureError::new(),
-                ),
+                crypto::asymmetric::identity::Ed25519RecoveryError::MalformedPublicKeyString { .. }
             )
-            .to_string(),
-        );
+        ));
 
         tx_entry.tx_result.events.get_mut(0).unwrap().attributes = vec![
             Tag {
@@ -338,15 +330,13 @@ mod test {
         let err = extract_encryption_key(&correct_request, tx_entry.clone())
             .await
             .unwrap_err();
-        assert_eq!(
-            err.to_string(),
+
+        assert!(matches!(
+            err,
             CoconutError::X25519ParseError(
-                // this is really just a useless, dummy error value needed to generate the error type
-                // and get its string representation
-                crypto::asymmetric::encryption::KeyRecoveryError::InvalidPublicKeyBytes,
+                crypto::asymmetric::encryption::KeyRecoveryError::MalformedPublicKeyString { .. }
             )
-            .to_string(),
-        );
+        ));
 
         let expected_encryption_key = "HxnTpWTkgigSTAysVKLE8pEiUULHdTT1BxFfzfJvQRi6";
         tx_entry.tx_result.events.get_mut(0).unwrap().attributes = vec![
diff --git a/validator-api/src/coconut/dkg/client.rs b/nym-api/src/coconut/dkg/client.rs
similarity index 83%
rename from validator-api/src/coconut/dkg/client.rs
rename to nym-api/src/coconut/dkg/client.rs
index 6850dabc1c..6243b5ec2c 100644
--- a/validator-api/src/coconut/dkg/client.rs
+++ b/nym-api/src/coconut/dkg/client.rs
@@ -4,13 +4,14 @@
 use crate::coconut::client::Client;
 use crate::coconut::error::CoconutError;
 use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
-use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, EpochState, NodeIndex};
+use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, Epoch, NodeIndex};
 use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
 use contracts_common::dealings::ContractSafeBytes;
 use cw3::ProposalResponse;
-use validator_client::nymd::cosmwasm_client::logs::{find_attribute, NODE_INDEX};
-use validator_client::nymd::cosmwasm_client::types::ExecuteResult;
-use validator_client::nymd::AccountId;
+use dkg::Threshold;
+use validator_client::nyxd::cosmwasm_client::logs::{find_attribute, NODE_INDEX};
+use validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
+use validator_client::nyxd::AccountId;
 
 pub(crate) struct DkgClient {
     inner: Box<dyn Client + Send + Sync>,
@@ -21,12 +22,12 @@ impl DkgClient {
     // Until we determine why that is, retry the query a few more times
     const RETRIES: usize = 3;
 
-    pub(crate) fn new<C>(nymd_client: C) -> Self
+    pub(crate) fn new<C>(nyxd_client: C) -> Self
     where
         C: Client + Send + Sync + 'static,
     {
         DkgClient {
-            inner: Box::new(nymd_client),
+            inner: Box::new(nyxd_client),
         }
     }
 
@@ -34,17 +35,23 @@ impl DkgClient {
         self.inner.address().await
     }
 
-    pub(crate) async fn get_current_epoch_state(&self) -> Result<EpochState, CoconutError> {
-        let mut ret = self.inner.get_current_epoch_state().await;
+    pub(crate) async fn get_current_epoch(&self) -> Result<Epoch, CoconutError> {
+        let mut ret = self.inner.get_current_epoch().await;
         for _ in 0..Self::RETRIES {
             if ret.is_ok() {
                 return ret;
             }
-            ret = self.inner.get_current_epoch_state().await;
+            ret = self.inner.get_current_epoch().await;
         }
         ret
     }
 
+    pub(crate) async fn get_current_epoch_threshold(
+        &self,
+    ) -> Result<Option<Threshold>, CoconutError> {
+        self.inner.get_current_epoch_threshold().await
+    }
+
     pub(crate) async fn get_self_registered_dealer_details(
         &self,
     ) -> Result<DealerDetailsResponse, CoconutError> {
@@ -79,6 +86,10 @@ impl DkgClient {
         self.inner.list_proposals().await
     }
 
+    pub(crate) async fn advance_epoch_state(&self) -> Result<(), CoconutError> {
+        self.inner.advance_epoch_state().await
+    }
+
     pub(crate) async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
diff --git a/validator-api/src/coconut/dkg/complaints.rs b/nym-api/src/coconut/dkg/complaints.rs
similarity index 51%
rename from validator-api/src/coconut/dkg/complaints.rs
rename to nym-api/src/coconut/dkg/complaints.rs
index 8a95645a30..4ef0d32ce0 100644
--- a/validator-api/src/coconut/dkg/complaints.rs
+++ b/nym-api/src/coconut/dkg/complaints.rs
@@ -1,11 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use dkg::error::DkgError;
+use serde::{Deserialize, Serialize};
 
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub(crate) enum ComplaintReason {
     MalformedBTEPublicKey,
+    InvalidBTEPublicKey,
     MissingDealing,
-    MalformedDealing(DkgError),
-    DealingVerificationError(DkgError),
+    MalformedDealing,
+    DealingVerificationError,
 }
diff --git a/validator-api/src/coconut/dkg/controller.rs b/nym-api/src/coconut/dkg/controller.rs
similarity index 69%
rename from validator-api/src/coconut/dkg/controller.rs
rename to nym-api/src/coconut/dkg/controller.rs
index 9058dc558b..ad60cf2027 100644
--- a/validator-api/src/coconut/dkg/controller.rs
+++ b/nym-api/src/coconut/dkg/controller.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::{ConsistentState, State};
+use crate::coconut::dkg::state::{ConsistentState, PersistentState, State};
 use crate::coconut::dkg::verification_key::{
     verification_key_finalization, verification_key_validation,
 };
@@ -11,17 +11,17 @@ use crate::coconut::dkg::{
     verification_key::verification_key_submission,
 };
 use crate::coconut::keypair::KeyPair as CoconutKeyPair;
-use crate::{nymd_client, Config};
+use crate::{nyxd_client, Config};
 use anyhow::Result;
 use coconut_dkg_common::types::EpochState;
 use dkg::bte::keys::KeyPair as DkgKeyPair;
 use rand::rngs::OsRng;
 use rand::RngCore;
 use std::path::PathBuf;
-use std::time::Duration;
-use task::ShutdownListener;
+use std::time::{Duration, SystemTime};
+use task::TaskClient;
 use tokio::time::interval;
-use validator_client::nymd::SigningNymdClient;
+use validator_client::nyxd::SigningNyxdClient;
 
 pub(crate) fn init_keypair(config: &Config) -> Result<()> {
     let mut rng = OsRng;
@@ -49,7 +49,7 @@ pub(crate) struct DkgController<R> {
 impl<R: RngCore + Clone> DkgController<R> {
     pub(crate) async fn new(
         config: &Config,
-        nymd_client: nymd_client::Client<SigningNymdClient>,
+        nyxd_client: nyxd_client::Client<SigningNyxdClient>,
         coconut_keypair: CoconutKeyPair,
         rng: R,
     ) -> Result<Self> {
@@ -63,28 +63,36 @@ impl<R: RngCore + Clone> DkgController<R> {
         )) {
             coconut_keypair.set(coconut_keypair_value).await;
         }
+        let persistent_state =
+            PersistentState::load_from_file(config.persistent_state_path()).unwrap_or_default();
 
         Ok(DkgController {
-            dkg_client: DkgClient::new(nymd_client),
+            dkg_client: DkgClient::new(nyxd_client),
             secret_key_path: config.secret_key_path(),
             verification_key_path: config.verification_key_path(),
-            state: State::new(config.get_announce_address(), dkg_keypair, coconut_keypair),
+            state: State::new(
+                config.persistent_state_path(),
+                persistent_state,
+                config.get_announce_address(),
+                dkg_keypair,
+                coconut_keypair,
+            ),
             rng,
             polling_rate: config.get_dkg_contract_polling_rate(),
         })
     }
 
-    async fn handle_epoch_state(&mut self) {
-        match self.dkg_client.get_current_epoch_state().await {
+    pub(crate) async fn handle_epoch_state(&mut self) {
+        match self.dkg_client.get_current_epoch().await {
             Err(e) => warn!("Could not get current epoch state {}", e),
-            Ok(epoch_state) => {
-                if let Err(e) = self.state.is_consistent(epoch_state).await {
+            Ok(epoch) => {
+                if let Err(e) = self.state.is_consistent(epoch.state).await {
                     error!(
                         "Epoch state is corrupted - {}, the process should be terminated",
                         e
                     );
                 }
-                let ret = match epoch_state {
+                let ret = match epoch.state {
                     EpochState::PublicKeySubmission => {
                         public_key_submission(&self.dkg_client, &mut self.state).await
                     }
@@ -114,12 +122,28 @@ impl<R: RngCore + Clone> DkgController<R> {
                 };
                 if let Err(e) = ret {
                     warn!("Could not handle this iteration for the epoch state: {}", e);
+                } else if epoch.state != EpochState::InProgress {
+                    let persistent_state = PersistentState::from(&self.state);
+                    if let Err(e) =
+                        persistent_state.save_to_file(self.state.persistent_state_path())
+                    {
+                        warn!("Could not backup the state for this iteration: {}", e);
+                    }
+                }
+                if let Ok(current_timestamp) =
+                    SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
+                {
+                    if current_timestamp.as_secs() >= epoch.finish_timestamp.seconds() {
+                        // We try advancing the epoch state, on a best-effort basis
+                        info!("Trying to advance the epoch");
+                        self.dkg_client.advance_epoch_state().await.ok();
+                    }
                 }
             }
         }
     }
 
-    pub(crate) async fn run(mut self, mut shutdown: ShutdownListener) {
+    pub(crate) async fn run(mut self, mut shutdown: TaskClient) {
         let mut interval = interval(self.polling_rate);
         while !shutdown.is_shutdown() {
             tokio::select! {
diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs
new file mode 100644
index 0000000000..a32176c9b0
--- /dev/null
+++ b/nym-api/src/coconut/dkg/dealing.rs
@@ -0,0 +1,207 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::coconut::dkg::client::DkgClient;
+use crate::coconut::dkg::state::{ConsistentState, State};
+use crate::coconut::error::CoconutError;
+use coconut_dkg_common::types::TOTAL_DEALINGS;
+use contracts_common::dealings::ContractSafeBytes;
+use dkg::bte::setup;
+use dkg::Dealing;
+use rand::RngCore;
+
+pub(crate) async fn dealing_exchange(
+    dkg_client: &DkgClient,
+    state: &mut State,
+    rng: impl RngCore + Clone,
+) -> Result<(), CoconutError> {
+    if state.receiver_index().is_some() {
+        return Ok(());
+    }
+
+    let dealers = dkg_client.get_current_dealers().await?;
+    let threshold = dkg_client.get_current_epoch_threshold().await?;
+    state.set_dealers(dealers);
+    state.set_threshold(threshold);
+    let receivers = state.current_dealers_by_idx();
+    let params = setup();
+    let dealer_index = state.node_index_value()?;
+    let receiver_index = receivers
+        .keys()
+        .position(|node_index| *node_index == dealer_index);
+    for _ in 0..TOTAL_DEALINGS {
+        let (dealing, _) = Dealing::create(
+            rng.clone(),
+            &params,
+            dealer_index,
+            state.threshold()?,
+            &receivers,
+            None,
+        );
+        dkg_client
+            .submit_dealing(ContractSafeBytes::from(&dealing))
+            .await?;
+    }
+
+    info!("DKG: Finished submitting dealing");
+    state.set_receiver_index(receiver_index);
+
+    Ok(())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::coconut::dkg::complaints::ComplaintReason;
+    use crate::coconut::dkg::state::PersistentState;
+    use crate::coconut::tests::DummyClient;
+    use crate::coconut::KeyPair;
+    use coconut_dkg_common::dealer::DealerDetails;
+    use cosmwasm_std::Addr;
+    use dkg::bte::keys::KeyPair as DkgKeyPair;
+    use dkg::bte::Params;
+    use rand::rngs::OsRng;
+    use std::collections::HashMap;
+    use std::path::PathBuf;
+    use std::str::FromStr;
+    use std::sync::{Arc, RwLock};
+    use url::Url;
+    use validator_client::nyxd::AccountId;
+
+    const TEST_VALIDATORS_ADDRESS: [&str; 3] = [
+        "n1aq9kakfgwqcufr23lsv644apavcntrsqsk4yus",
+        "n1s9l3xr4g0rglvk4yctktmck3h4eq0gp6z2e20v",
+        "n19kl4py32vsk297dm93ezem992cdyzdy4zuc2x6",
+    ];
+
+    fn insert_dealers(
+        params: &Params,
+        dealer_details_db: &Arc<RwLock<HashMap<String, DealerDetails>>>,
+    ) -> Vec<DkgKeyPair> {
+        let mut keypairs = vec![];
+        for (idx, addr) in TEST_VALIDATORS_ADDRESS.iter().enumerate() {
+            let keypair = DkgKeyPair::new(params, OsRng);
+            let bte_public_key_with_proof =
+                bs58::encode(&keypair.public_key().to_bytes()).into_string();
+            keypairs.push(keypair);
+            dealer_details_db.write().unwrap().insert(
+                addr.to_string(),
+                DealerDetails {
+                    address: Addr::unchecked(*addr),
+                    bte_public_key_with_proof,
+                    announce_address: format!("localhost:80{}", idx),
+                    assigned_index: (idx + 1) as u64,
+                },
+            );
+        }
+        keypairs
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn exchange_dealing() {
+        let self_index = 2;
+        let dealer_details_db = Arc::new(RwLock::new(HashMap::new()));
+        let dealings_db = Arc::new(RwLock::new(HashMap::new()));
+        let threshold_db = Arc::new(RwLock::new(Some(2)));
+        let dkg_client = DkgClient::new(
+            DummyClient::new(AccountId::from_str(TEST_VALIDATORS_ADDRESS[0]).unwrap())
+                .with_dealer_details(&dealer_details_db)
+                .with_dealings(&dealings_db)
+                .with_threshold(&threshold_db),
+        );
+        let params = setup();
+        let mut state = State::new(
+            PathBuf::default(),
+            PersistentState::default(),
+            Url::parse("localhost:8000").unwrap(),
+            DkgKeyPair::new(&params, OsRng),
+            KeyPair::new(),
+        );
+        state.set_node_index(Some(self_index));
+        let keypairs = insert_dealers(&params, &dealer_details_db);
+
+        dealing_exchange(&dkg_client, &mut state, OsRng)
+            .await
+            .unwrap();
+
+        assert_eq!(
+            state.current_dealers_by_idx().values().collect::<Vec<_>>(),
+            keypairs
+                .iter()
+                .map(|k| k.public_key().public_key())
+                .collect::<Vec<_>>()
+        );
+        assert_eq!(state.threshold().unwrap(), 2);
+        assert_eq!(state.receiver_index().unwrap(), 1);
+        let dealings = dealings_db
+            .read()
+            .unwrap()
+            .get(TEST_VALIDATORS_ADDRESS[0])
+            .unwrap()
+            .clone();
+        assert_eq!(dealings.len(), TOTAL_DEALINGS);
+
+        dealing_exchange(&dkg_client, &mut state, OsRng)
+            .await
+            .unwrap();
+        let new_dealings = dealings_db
+            .read()
+            .unwrap()
+            .get(TEST_VALIDATORS_ADDRESS[0])
+            .unwrap()
+            .clone();
+        assert_eq!(dealings, new_dealings);
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn invalid_bte_proof_dealing_posted() {
+        let self_index = 2;
+        let dealer_details_db = Arc::new(RwLock::new(HashMap::new()));
+        let dealings_db = Arc::new(RwLock::new(HashMap::new()));
+        let threshold_db = Arc::new(RwLock::new(Some(2)));
+        let dkg_client = DkgClient::new(
+            DummyClient::new(AccountId::from_str(TEST_VALIDATORS_ADDRESS[0]).unwrap())
+                .with_dealer_details(&dealer_details_db)
+                .with_dealings(&dealings_db)
+                .with_threshold(&threshold_db),
+        );
+        let params = setup();
+        let mut state = State::new(
+            PathBuf::default(),
+            PersistentState::default(),
+            Url::parse("localhost:8000").unwrap(),
+            DkgKeyPair::new(&params, OsRng),
+            KeyPair::new(),
+        );
+        state.set_node_index(Some(self_index));
+        insert_dealers(&params, &dealer_details_db);
+
+        dealer_details_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[1].to_string())
+            .and_modify(|details| {
+                let mut bytes = bs58::decode(details.bte_public_key_with_proof.clone())
+                    .into_vec()
+                    .unwrap();
+                let last_byte = bytes.last_mut().unwrap();
+                *last_byte += 1;
+                details.bte_public_key_with_proof = bs58::encode(&bytes).into_string();
+            });
+
+        dealing_exchange(&dkg_client, &mut state, OsRng)
+            .await
+            .unwrap();
+        assert_eq!(
+            *state
+                .all_dealers()
+                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[1]))
+                .unwrap()
+                .as_ref()
+                .unwrap_err(),
+            ComplaintReason::InvalidBTEPublicKey
+        );
+    }
+}
diff --git a/validator-api/src/coconut/dkg/mod.rs b/nym-api/src/coconut/dkg/mod.rs
similarity index 100%
rename from validator-api/src/coconut/dkg/mod.rs
rename to nym-api/src/coconut/dkg/mod.rs
diff --git a/nym-api/src/coconut/dkg/public_key.rs b/nym-api/src/coconut/dkg/public_key.rs
new file mode 100644
index 0000000000..aa3fa72330
--- /dev/null
+++ b/nym-api/src/coconut/dkg/public_key.rs
@@ -0,0 +1,88 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::coconut::dkg::client::DkgClient;
+use crate::coconut::dkg::state::State;
+use crate::coconut::error::CoconutError;
+
+pub(crate) async fn public_key_submission(
+    dkg_client: &DkgClient,
+    state: &mut State,
+) -> Result<(), CoconutError> {
+    if state.node_index().is_some() {
+        return Ok(());
+    }
+
+    let bte_key = bs58::encode(&state.dkg_keypair().public_key().to_bytes()).into_string();
+    let index = if let Some(details) = dkg_client
+        .get_self_registered_dealer_details()
+        .await?
+        .details
+    {
+        details.assigned_index
+    } else {
+        dkg_client
+            .register_dealer(bte_key, state.announce_address().to_string())
+            .await?
+    };
+    state.set_node_index(Some(index));
+    info!("DKG: Using node index {}", index);
+
+    Ok(())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::coconut::dkg::state::PersistentState;
+    use crate::coconut::tests::DummyClient;
+    use crate::coconut::KeyPair;
+    use dkg::bte::keys::KeyPair as DkgKeyPair;
+    use rand::rngs::OsRng;
+    use std::path::PathBuf;
+    use std::str::FromStr;
+    use url::Url;
+    use validator_client::nyxd::AccountId;
+
+    const TEST_VALIDATOR_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn submit_public_key() {
+        let dkg_client = DkgClient::new(DummyClient::new(
+            AccountId::from_str(TEST_VALIDATOR_ADDRESS).unwrap(),
+        ));
+        let mut state = State::new(
+            PathBuf::default(),
+            PersistentState::default(),
+            Url::parse("localhost:8000").unwrap(),
+            DkgKeyPair::new(&dkg::bte::setup(), OsRng),
+            KeyPair::new(),
+        );
+
+        assert!(dkg_client
+            .get_self_registered_dealer_details()
+            .await
+            .unwrap()
+            .details
+            .is_none());
+        public_key_submission(&dkg_client, &mut state)
+            .await
+            .unwrap();
+        let client_idx = dkg_client
+            .get_self_registered_dealer_details()
+            .await
+            .unwrap()
+            .details
+            .unwrap()
+            .assigned_index;
+        assert_eq!(state.node_index().unwrap(), client_idx);
+
+        // keeps the same index from chain, not calling register_dealer again
+        state.set_node_index(None);
+        public_key_submission(&dkg_client, &mut state)
+            .await
+            .unwrap();
+        assert_eq!(state.node_index().unwrap(), client_idx);
+    }
+}
diff --git a/validator-api/src/coconut/dkg/state.rs b/nym-api/src/coconut/dkg/state.rs
similarity index 66%
rename from validator-api/src/coconut/dkg/state.rs
rename to nym-api/src/coconut/dkg/state.rs
index f6be2bc8a7..9ba1dfaffd 100644
--- a/validator-api/src/coconut/dkg/state.rs
+++ b/nym-api/src/coconut/dkg/state.rs
@@ -9,13 +9,33 @@ use coconut_dkg_common::types::EpochState;
 use cosmwasm_std::Addr;
 use dkg::bte::{keys::KeyPair as DkgKeyPair, PublicKey, PublicKeyWithProof};
 use dkg::{NodeIndex, RecoveredVerificationKeys, Threshold};
+use serde::de::Error;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::collections::BTreeMap;
+use std::path::PathBuf;
 use url::Url;
 
+fn bte_pk_serialize<S: Serializer>(
+    val: &PublicKeyWithProof,
+    serializer: S,
+) -> Result<S::Ok, S::Error> {
+    val.to_bytes().serialize(serializer)
+}
+
+fn bte_pk_deserialize<'de, D>(deserializer: D) -> Result<PublicKeyWithProof, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let vec: Vec<u8> = Deserialize::deserialize(deserializer)?;
+    PublicKeyWithProof::try_from_bytes(&vec).map_err(|err| Error::custom(format_args!("{:?}", err)))
+}
+
 // note: each dealer is also a receiver which simplifies some logic significantly
-#[derive(Debug)]
+#[derive(Clone, Deserialize, Debug, Serialize)]
 pub(crate) struct DkgParticipant {
     pub(crate) _address: Addr,
+    #[serde(serialize_with = "bte_pk_serialize")]
+    #[serde(deserialize_with = "bte_pk_deserialize")]
     pub(crate) bte_public_key_with_proof: PublicKeyWithProof,
     pub(crate) assigned_index: NodeIndex,
 }
@@ -30,6 +50,10 @@ impl TryFrom<DealerDetails> for DkgParticipant {
             .map_err(|_| ComplaintReason::MalformedBTEPublicKey)?
             .map_err(|_| ComplaintReason::MalformedBTEPublicKey)?;
 
+        if !bte_public_key_with_proof.verify() {
+            return Err(ComplaintReason::InvalidBTEPublicKey);
+        }
+
         Ok(DkgParticipant {
             _address: dealer.address,
             bte_public_key_with_proof,
@@ -67,20 +91,6 @@ pub(crate) trait ConsistentState {
     }
 }
 
-pub(crate) struct State {
-    announce_address: Url,
-    dkg_keypair: DkgKeyPair,
-    coconut_keypair: CoconutKeyPair,
-    node_index: Option<NodeIndex>,
-    dealers: BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>>,
-    receiver_index: Option<usize>,
-    threshold: Option<Threshold>,
-    recovered_vks: Vec<RecoveredVerificationKeys>,
-    proposal_id: Option<u64>,
-    voted_vks: bool,
-    executed_proposal: bool,
-}
-
 #[async_trait]
 impl ConsistentState for State {
     fn node_index_value(&self) -> Result<NodeIndex, CoconutError> {
@@ -127,27 +137,110 @@ impl ConsistentState for State {
     }
 }
 
+fn vks_serialize<S: Serializer>(
+    val: &[RecoveredVerificationKeys],
+    serializer: S,
+) -> Result<S::Ok, S::Error> {
+    let vec: Vec<Vec<u8>> = val.iter().map(|vk| vk.to_bytes()).collect();
+    vec.serialize(serializer)
+}
+
+fn vks_deserialize<'de, D>(deserializer: D) -> Result<Vec<RecoveredVerificationKeys>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let vec: Vec<Vec<u8>> = Deserialize::deserialize(deserializer)?;
+    vec.into_iter()
+        .map(|b| {
+            RecoveredVerificationKeys::try_from_bytes(&b)
+                .map_err(|err| D::Error::custom(format_args!("{:?}", err)))
+        })
+        .collect()
+}
+
+#[derive(Default, Deserialize, Serialize)]
+pub(crate) struct PersistentState {
+    node_index: Option<NodeIndex>,
+    dealers: BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>>,
+    receiver_index: Option<usize>,
+    threshold: Option<Threshold>,
+    #[serde(serialize_with = "vks_serialize")]
+    #[serde(deserialize_with = "vks_deserialize")]
+    recovered_vks: Vec<RecoveredVerificationKeys>,
+    proposal_id: Option<u64>,
+    voted_vks: bool,
+    executed_proposal: bool,
+}
+
+impl From<&State> for PersistentState {
+    fn from(s: &State) -> Self {
+        PersistentState {
+            node_index: s.node_index,
+            dealers: s.dealers.clone(),
+            receiver_index: s.receiver_index,
+            threshold: s.threshold,
+            recovered_vks: s.recovered_vks.clone(),
+            proposal_id: s.proposal_id,
+            voted_vks: s.voted_vks,
+            executed_proposal: s.executed_proposal,
+        }
+    }
+}
+
+impl PersistentState {
+    pub fn save_to_file(&self, path: PathBuf) -> Result<(), CoconutError> {
+        std::fs::write(path, serde_json::to_string(self)?)?;
+        Ok(())
+    }
+
+    pub fn load_from_file(path: PathBuf) -> Result<Self, CoconutError> {
+        Ok(serde_json::from_str(&std::fs::read_to_string(path)?)?)
+    }
+}
+
+pub(crate) struct State {
+    persistent_state_path: PathBuf,
+    announce_address: Url,
+    dkg_keypair: DkgKeyPair,
+    coconut_keypair: CoconutKeyPair,
+    node_index: Option<NodeIndex>,
+    dealers: BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>>,
+    receiver_index: Option<usize>,
+    threshold: Option<Threshold>,
+    recovered_vks: Vec<RecoveredVerificationKeys>,
+    proposal_id: Option<u64>,
+    voted_vks: bool,
+    executed_proposal: bool,
+}
+
 impl State {
     pub fn new(
+        persistent_state_path: PathBuf,
+        persistent_state: PersistentState,
         announce_address: Url,
         dkg_keypair: DkgKeyPair,
         coconut_keypair: CoconutKeyPair,
     ) -> Self {
         State {
+            persistent_state_path,
             announce_address,
             dkg_keypair,
             coconut_keypair,
-            node_index: None,
-            dealers: BTreeMap::new(),
-            receiver_index: None,
-            threshold: None,
-            recovered_vks: vec![],
-            proposal_id: None,
-            voted_vks: false,
-            executed_proposal: false,
+            node_index: persistent_state.node_index,
+            dealers: persistent_state.dealers,
+            receiver_index: persistent_state.receiver_index,
+            threshold: persistent_state.threshold,
+            recovered_vks: persistent_state.recovered_vks,
+            proposal_id: persistent_state.proposal_id,
+            voted_vks: persistent_state.voted_vks,
+            executed_proposal: persistent_state.executed_proposal,
         }
     }
 
+    pub fn persistent_state_path(&self) -> PathBuf {
+        self.persistent_state_path.clone()
+    }
+
     pub fn announce_address(&self) -> &Url {
         &self.announce_address
     }
@@ -214,8 +307,8 @@ impl State {
         self.coconut_keypair.set(coconut_keypair).await
     }
 
-    pub fn set_node_index(&mut self, node_index: NodeIndex) {
-        self.node_index = Some(node_index);
+    pub fn set_node_index(&mut self, node_index: Option<NodeIndex>) {
+        self.node_index = node_index;
     }
 
     pub fn set_dealers(&mut self, dealers: Vec<DealerDetails>) {
@@ -240,8 +333,8 @@ impl State {
         self.receiver_index = receiver_index;
     }
 
-    pub fn set_threshold(&mut self, threshold: Threshold) {
-        self.threshold = Some(threshold);
+    pub fn set_threshold(&mut self, threshold: Option<Threshold>) {
+        self.threshold = threshold;
     }
 
     pub fn set_proposal_id(&mut self, proposal_id: u64) {
@@ -255,4 +348,9 @@ impl State {
     pub fn set_executed_proposal(&mut self) {
         self.executed_proposal = true;
     }
+
+    #[cfg(test)]
+    pub fn all_dealers(&self) -> &BTreeMap<Addr, Result<DkgParticipant, ComplaintReason>> {
+        &self.dealers
+    }
 }
diff --git a/nym-api/src/coconut/dkg/verification_key.rs b/nym-api/src/coconut/dkg/verification_key.rs
new file mode 100644
index 0000000000..2d19ec43b6
--- /dev/null
+++ b/nym-api/src/coconut/dkg/verification_key.rs
@@ -0,0 +1,691 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::coconut::dkg::client::DkgClient;
+use crate::coconut::dkg::complaints::ComplaintReason;
+use crate::coconut::dkg::state::{ConsistentState, State};
+use crate::coconut::error::CoconutError;
+use coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID;
+use coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS};
+use coconut_dkg_common::verification_key::owner_from_cosmos_msgs;
+use coconut_interface::KeyPair as CoconutKeyPair;
+use cosmwasm_std::Addr;
+use credentials::coconut::bandwidth::{PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
+use cw3::{ProposalResponse, Status};
+use dkg::bte::{decrypt_share, setup};
+use dkg::{combine_shares, try_recover_verification_keys, Dealing, Threshold};
+use nymcoconut::tests::helpers::transpose_matrix;
+use nymcoconut::{check_vk_pairing, Base58, KeyPair, Parameters, SecretKey, VerificationKey};
+use pemstore::KeyPairPath;
+use std::collections::BTreeMap;
+use validator_client::nyxd::cosmwasm_client::logs::find_attribute;
+
+// Filter the dealers based on what dealing they posted (or not) in the contract
+async fn deterministic_filter_dealers(
+    dkg_client: &DkgClient,
+    state: &mut State,
+    threshold: Threshold,
+) -> Result<Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>, CoconutError> {
+    let mut dealings_maps = vec![];
+    let initial_dealers_by_addr = state.current_dealers_by_addr();
+    let initial_receivers = state.current_dealers_by_idx();
+    let params = setup();
+
+    for idx in 0..TOTAL_DEALINGS {
+        let dealings = dkg_client.get_dealings(idx).await?;
+        let dealings_map =
+            BTreeMap::from_iter(dealings.into_iter().filter_map(|contract_dealing| {
+                match Dealing::try_from(&contract_dealing.dealing) {
+                    Ok(dealing) => {
+                        if dealing
+                            .verify(&params, threshold, &initial_receivers, None)
+                            .is_err()
+                        {
+                            state.mark_bad_dealer(
+                                &contract_dealing.dealer,
+                                ComplaintReason::DealingVerificationError,
+                            );
+                            None
+                        } else if let Some(idx) =
+                            initial_dealers_by_addr.get(&contract_dealing.dealer)
+                        {
+                            Some((*idx, (contract_dealing.dealer, dealing)))
+                        } else {
+                            None
+                        }
+                    }
+                    Err(_) => {
+                        state.mark_bad_dealer(
+                            &contract_dealing.dealer,
+                            ComplaintReason::MalformedDealing,
+                        );
+                        None
+                    }
+                }
+            }));
+        dealings_maps.push(dealings_map);
+    }
+    for (addr, _) in initial_dealers_by_addr.iter() {
+        for dealings_map in dealings_maps.iter() {
+            if !dealings_map.iter().any(|(_, (address, _))| address == addr) {
+                state.mark_bad_dealer(addr, ComplaintReason::MissingDealing);
+                break;
+            }
+        }
+    }
+
+    Ok(dealings_maps)
+}
+
+fn derive_partial_keypair(
+    state: &mut State,
+    threshold: Threshold,
+    dealings_maps: Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>,
+) -> Result<KeyPair, CoconutError> {
+    let filtered_receivers_by_idx = state.current_dealers_by_idx();
+    let filtered_dealers_by_addr = state.current_dealers_by_addr();
+    let dk = state.dkg_keypair().private_key();
+    let node_index_value = state.receiver_index_value()?;
+    let mut scalars = vec![];
+    let mut recovered_vks = vec![];
+    for dealings_map in dealings_maps.into_iter() {
+        let filtered_dealings: Vec<_> = dealings_map
+            .into_iter()
+            .filter_map(|(_, (addr, dealing))| {
+                if filtered_dealers_by_addr.keys().any(|a| addr == *a) {
+                    Some(dealing)
+                } else {
+                    None
+                }
+            })
+            .collect();
+        let recovered = try_recover_verification_keys(
+            &filtered_dealings,
+            threshold,
+            &filtered_receivers_by_idx,
+        )?;
+        recovered_vks.push(recovered);
+
+        let shares = filtered_dealings
+            .iter()
+            .map(|dealing| decrypt_share(dk, node_index_value, &dealing.ciphertexts, None))
+            .collect::<Result<_, _>>()?;
+        let scalar = combine_shares(
+            shares,
+            &filtered_receivers_by_idx
+                .keys()
+                .copied()
+                .collect::<Vec<_>>(),
+        )?;
+        scalars.push(scalar);
+    }
+    state.set_recovered_vks(recovered_vks);
+
+    let params = Parameters::new(PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES)?;
+    let x = scalars.pop().unwrap();
+    let sk = SecretKey::create_from_raw(x, scalars);
+    let vk = sk.verification_key(&params);
+
+    Ok(CoconutKeyPair::from_keys(sk, vk))
+}
+
+pub(crate) async fn verification_key_submission(
+    dkg_client: &DkgClient,
+    state: &mut State,
+    keypair_path: &KeyPairPath,
+) -> Result<(), CoconutError> {
+    if state.coconut_keypair_is_some().await {
+        return Ok(());
+    }
+
+    let threshold = state.threshold()?;
+    let dealings_maps = deterministic_filter_dealers(dkg_client, state, threshold).await?;
+    let coconut_keypair = derive_partial_keypair(state, threshold, dealings_maps)?;
+    let vk_share = coconut_keypair.verification_key().to_bs58();
+    pemstore::store_keypair(&coconut_keypair, keypair_path)?;
+    let res = dkg_client.submit_verification_key_share(vk_share).await?;
+    let proposal_id = find_attribute(&res.logs, "wasm", DKG_PROPOSAL_ID)
+        .ok_or(CoconutError::ProposalIdError {
+            reason: String::from("proposal id not found"),
+        })?
+        .value
+        .parse::<u64>()
+        .map_err(|_| CoconutError::ProposalIdError {
+            reason: String::from("proposal id could not be parsed to u64"),
+        })?;
+    state.set_proposal_id(proposal_id);
+    state.set_coconut_keypair(coconut_keypair).await;
+    info!("DKG: Submitted own verification key");
+
+    Ok(())
+}
+
+fn validate_proposal(proposal: &ProposalResponse) -> Option<(Addr, u64)> {
+    if proposal.status == Status::Open {
+        if let Some(owner) = owner_from_cosmos_msgs(&proposal.msgs) {
+            return Some((owner, proposal.id));
+        }
+    }
+    None
+}
+
+pub(crate) async fn verification_key_validation(
+    dkg_client: &DkgClient,
+    state: &mut State,
+) -> Result<(), CoconutError> {
+    if state.voted_vks() {
+        return Ok(());
+    }
+
+    let vk_shares = dkg_client.get_verification_key_shares().await?;
+    let proposal_ids = BTreeMap::from_iter(
+        dkg_client
+            .list_proposals()
+            .await?
+            .iter()
+            .filter_map(validate_proposal),
+    );
+    let filtered_receivers_by_idx: Vec<_> =
+        state.current_dealers_by_idx().keys().copied().collect();
+    let recovered_partials: Vec<_> = state
+        .recovered_vks()
+        .iter()
+        .map(|recovered_vk| recovered_vk.recovered_partials.clone())
+        .collect();
+    let recovered_partials = transpose_matrix(recovered_partials);
+    let params = Parameters::new(PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES)?;
+    for contract_share in vk_shares {
+        if let Some(proposal_id) = proposal_ids.get(&contract_share.owner).copied() {
+            match VerificationKey::try_from_bs58(contract_share.share) {
+                Ok(vk) => {
+                    if let Some(idx) = filtered_receivers_by_idx
+                        .iter()
+                        .position(|node_index| contract_share.node_index == *node_index)
+                    {
+                        if !check_vk_pairing(&params, &recovered_partials[idx], &vk) {
+                            dkg_client
+                                .vote_verification_key_share(proposal_id, false)
+                                .await?;
+                        } else {
+                            dkg_client
+                                .vote_verification_key_share(proposal_id, true)
+                                .await?;
+                        }
+                    }
+                }
+                Err(_) => {
+                    dkg_client
+                        .vote_verification_key_share(proposal_id, false)
+                        .await?
+                }
+            }
+        }
+    }
+    state.set_voted_vks();
+    info!("DKG: Validated the other verification keys");
+    Ok(())
+}
+
+pub(crate) async fn verification_key_finalization(
+    dkg_client: &DkgClient,
+    state: &mut State,
+) -> Result<(), CoconutError> {
+    if state.executed_proposal() {
+        return Ok(());
+    }
+
+    let proposal_id = state.proposal_id_value()?;
+    dkg_client
+        .execute_verification_key_share(proposal_id)
+        .await?;
+    state.set_executed_proposal();
+    info!("DKG: Finalized own verification key on chain");
+
+    Ok(())
+}
+
+#[cfg(test)]
+pub(crate) mod tests {
+    use super::*;
+    use crate::coconut::dkg::dealing::dealing_exchange;
+    use crate::coconut::dkg::public_key::public_key_submission;
+    use crate::coconut::dkg::state::PersistentState;
+    use crate::coconut::tests::DummyClient;
+    use crate::coconut::KeyPair;
+    use coconut_dkg_common::dealer::DealerDetails;
+    use coconut_dkg_common::verification_key::ContractVKShare;
+    use contracts_common::dealings::ContractSafeBytes;
+    use dkg::bte::keys::KeyPair as DkgKeyPair;
+    use rand::rngs::OsRng;
+    use rand::Rng;
+    use std::collections::HashMap;
+    use std::env::temp_dir;
+    use std::path::PathBuf;
+    use std::str::FromStr;
+    use std::sync::{Arc, RwLock};
+    use url::Url;
+    use validator_client::nyxd::AccountId;
+
+    struct MockContractDb {
+        dealer_details_db: Arc<RwLock<HashMap<String, DealerDetails>>>,
+        dealings_db: Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
+        proposal_db: Arc<RwLock<HashMap<u64, ProposalResponse>>>,
+        verification_share_db: Arc<RwLock<HashMap<String, ContractVKShare>>>,
+        threshold_db: Arc<RwLock<Option<Threshold>>>,
+    }
+
+    impl MockContractDb {
+        pub fn new() -> Self {
+            MockContractDb {
+                dealer_details_db: Arc::new(Default::default()),
+                dealings_db: Arc::new(Default::default()),
+                proposal_db: Arc::new(Default::default()),
+                verification_share_db: Arc::new(Default::default()),
+                threshold_db: Arc::new(RwLock::new(Some(2))),
+            }
+        }
+    }
+
+    const TEST_VALIDATORS_ADDRESS: [&str; 3] = [
+        "n1aq9kakfgwqcufr23lsv644apavcntrsqsk4yus",
+        "n1s9l3xr4g0rglvk4yctktmck3h4eq0gp6z2e20v",
+        "n19kl4py32vsk297dm93ezem992cdyzdy4zuc2x6",
+    ];
+
+    async fn prepare_clients_and_states(db: &MockContractDb) -> Vec<(DkgClient, State)> {
+        let params = setup();
+        let mut clients_and_states = vec![];
+
+        for addr in TEST_VALIDATORS_ADDRESS {
+            let dkg_client = DkgClient::new(
+                DummyClient::new(AccountId::from_str(addr).unwrap())
+                    .with_dealer_details(&db.dealer_details_db)
+                    .with_dealings(&db.dealings_db)
+                    .with_proposal_db(&db.proposal_db)
+                    .with_verification_share(&db.verification_share_db)
+                    .with_threshold(&db.threshold_db),
+            );
+            let keypair = DkgKeyPair::new(&params, OsRng);
+            let state = State::new(
+                PathBuf::default(),
+                PersistentState::default(),
+                Url::parse("localhost:8000").unwrap(),
+                keypair,
+                KeyPair::new(),
+            );
+            clients_and_states.push((dkg_client, state));
+        }
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            public_key_submission(dkg_client, state).await.unwrap();
+        }
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            dealing_exchange(dkg_client, state, OsRng).await.unwrap();
+        }
+        clients_and_states
+    }
+
+    async fn prepare_clients_and_states_with_submission(
+        db: &MockContractDb,
+    ) -> Vec<(DkgClient, State)> {
+        let mut clients_and_states = prepare_clients_and_states(db).await;
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            let random_file: usize = OsRng.gen();
+            let private_key_path = temp_dir().join(format!("private{}.pem", random_file));
+            let public_key_path = temp_dir().join(format!("public{}.pem", random_file));
+            let keypair_path = KeyPairPath::new(private_key_path.clone(), public_key_path.clone());
+            verification_key_submission(dkg_client, state, &keypair_path)
+                .await
+                .unwrap();
+            std::fs::remove_file(private_key_path).unwrap();
+            std::fs::remove_file(public_key_path).unwrap();
+        }
+        clients_and_states
+    }
+
+    async fn prepare_clients_and_states_with_validation(
+        db: &MockContractDb,
+    ) -> Vec<(DkgClient, State)> {
+        let mut clients_and_states = prepare_clients_and_states_with_submission(db).await;
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            verification_key_validation(dkg_client, state)
+                .await
+                .unwrap();
+        }
+        clients_and_states
+    }
+
+    async fn prepare_clients_and_states_with_finalization(
+        db: &MockContractDb,
+    ) -> Vec<(DkgClient, State)> {
+        let mut clients_and_states = prepare_clients_and_states_with_validation(db).await;
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            verification_key_finalization(dkg_client, state)
+                .await
+                .unwrap();
+        }
+        clients_and_states
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_all_good() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert_eq!(filtered.len(), TOTAL_DEALINGS);
+            for mapping in filtered.iter() {
+                assert_eq!(mapping.len(), 3);
+            }
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_one_bad_dealing() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+
+        // corrupt just one dealing
+        db.dealings_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|dealings| {
+                let mut last = dealings.pop().unwrap();
+                last.0.pop();
+                dealings.push(last);
+            });
+
+        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert_eq!(filtered.len(), TOTAL_DEALINGS);
+            let corrupted_status = state
+                .all_dealers()
+                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
+                .unwrap()
+                .as_ref()
+                .unwrap_err();
+            assert_eq!(*corrupted_status, ComplaintReason::MissingDealing);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_all_bad_dealings() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+
+        // corrupt all dealings of one address
+        db.dealings_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|dealings| {
+                dealings.iter_mut().for_each(|dealing| {
+                    dealing.0.pop();
+                });
+            });
+
+        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert_eq!(filtered.len(), TOTAL_DEALINGS);
+            for mapping in filtered.iter() {
+                assert_eq!(mapping.len(), 2);
+            }
+            let corrupted_status = state
+                .all_dealers()
+                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
+                .unwrap()
+                .as_ref()
+                .unwrap_err();
+            assert_eq!(*corrupted_status, ComplaintReason::MissingDealing);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_malformed_dealing() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+
+        // corrupt just one dealing
+        db.dealings_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|dealings| {
+                let mut last = dealings.pop().unwrap();
+                last.0.pop();
+                dealings.push(last);
+            });
+
+        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
+            deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            // second filter will leave behind the bad dealer and surface why it was left out
+            // in the first place
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert_eq!(filtered.len(), TOTAL_DEALINGS);
+            let corrupted_status = state
+                .all_dealers()
+                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
+                .unwrap()
+                .as_ref()
+                .unwrap_err();
+            assert_eq!(*corrupted_status, ComplaintReason::MalformedDealing);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn check_dealers_filter_dealing_verification_error() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+
+        // corrupt just one dealing
+        db.dealings_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|dealings| {
+                let mut last = dealings.pop().unwrap();
+                last.0.pop();
+                last.0.push(42);
+                dealings.push(last);
+            });
+
+        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
+            deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            // second filter will leave behind the bad dealer and surface why it was left out
+            // in the first place
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert_eq!(filtered.len(), TOTAL_DEALINGS);
+            let corrupted_status = state
+                .all_dealers()
+                .get(&Addr::unchecked(TEST_VALIDATORS_ADDRESS[0]))
+                .unwrap()
+                .as_ref()
+                .unwrap_err();
+            assert_eq!(*corrupted_status, ComplaintReason::DealingVerificationError);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn partial_keypair_derivation() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert!(derive_partial_keypair(state, 2, filtered).is_ok());
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn partial_keypair_derivation_with_threshold() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states(&db).await;
+
+        // corrupt just one dealing
+        db.dealings_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|dealings| {
+                let mut last = dealings.pop().unwrap();
+                last.0.pop();
+                dealings.push(last);
+            });
+
+        for (dkg_client, state) in clients_and_states.iter_mut().skip(1) {
+            let filtered = deterministic_filter_dealers(dkg_client, state, 2)
+                .await
+                .unwrap();
+            assert!(derive_partial_keypair(state, 2, filtered).is_ok());
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn submit_verification_key() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
+
+        for (_, state) in clients_and_states.iter_mut() {
+            assert!(db
+                .proposal_db
+                .read()
+                .unwrap()
+                .contains_key(&state.proposal_id_value().unwrap()));
+            assert!(state.coconut_keypair_is_some().await);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states_with_validation(&db).await;
+        for (_, state) in clients_and_states.iter_mut() {
+            let proposal = db
+                .proposal_db
+                .read()
+                .unwrap()
+                .get(&state.proposal_id_value().unwrap())
+                .unwrap()
+                .clone();
+            assert_eq!(proposal.status, Status::Passed);
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key_malformed_share() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
+
+        db.verification_share_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|share| share.share.push('x'));
+
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            verification_key_validation(dkg_client, state)
+                .await
+                .unwrap();
+        }
+
+        for (idx, (_, state)) in clients_and_states.iter().enumerate() {
+            let proposal = db
+                .proposal_db
+                .read()
+                .unwrap()
+                .get(&state.proposal_id_value().unwrap())
+                .unwrap()
+                .clone();
+            if idx == 0 {
+                assert_eq!(proposal.status, Status::Rejected);
+            } else {
+                assert_eq!(proposal.status, Status::Passed);
+            }
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn validate_verification_key_unpaired_share() {
+        let db = MockContractDb::new();
+        let mut clients_and_states = prepare_clients_and_states_with_submission(&db).await;
+
+        let second_share = db
+            .verification_share_db
+            .write()
+            .unwrap()
+            .get(TEST_VALIDATORS_ADDRESS[1])
+            .unwrap()
+            .share
+            .clone();
+        db.verification_share_db
+            .write()
+            .unwrap()
+            .entry(TEST_VALIDATORS_ADDRESS[0].to_string())
+            .and_modify(|share| share.share = second_share);
+
+        for (dkg_client, state) in clients_and_states.iter_mut() {
+            verification_key_validation(dkg_client, state)
+                .await
+                .unwrap();
+        }
+
+        for (idx, (_, state)) in clients_and_states.iter().enumerate() {
+            let proposal = db
+                .proposal_db
+                .read()
+                .unwrap()
+                .get(&state.proposal_id_value().unwrap())
+                .unwrap()
+                .clone();
+            if idx == 0 {
+                assert_eq!(proposal.status, Status::Rejected);
+            } else {
+                assert_eq!(proposal.status, Status::Passed);
+            }
+        }
+    }
+
+    #[tokio::test]
+    #[ignore] // expensive test
+    async fn finalize_verification_key() {
+        let db = MockContractDb::new();
+        let clients_and_states = prepare_clients_and_states_with_finalization(&db).await;
+
+        for (_, state) in clients_and_states.iter() {
+            let proposal = db
+                .proposal_db
+                .read()
+                .unwrap()
+                .get(&state.proposal_id_value().unwrap())
+                .unwrap()
+                .clone();
+            assert_eq!(proposal.status, Status::Executed);
+        }
+    }
+}
diff --git a/validator-api/src/coconut/error.rs b/nym-api/src/coconut/error.rs
similarity index 88%
rename from validator-api/src/coconut/error.rs
rename to nym-api/src/coconut/error.rs
index 9b6fadf957..dc484e691e 100644
--- a/validator-api/src/coconut/error.rs
+++ b/nym-api/src/coconut/error.rs
@@ -12,28 +12,31 @@ use crypto::asymmetric::{
     identity::{Ed25519RecoveryError, SignatureError},
 };
 use dkg::error::DkgError;
-use validator_client::nymd::error::NymdError;
+use validator_client::nyxd::error::NyxdError;
 
-use crate::node_status_api::models::ValidatorApiStorageError;
+use crate::node_status_api::models::NymApiStorageError;
 
 pub type Result<T> = std::result::Result<T, CoconutError>;
 
 #[derive(Debug, Error)]
 pub enum CoconutError {
-    #[error("{0}")]
+    #[error(transparent)]
     IOError(#[from] std::io::Error),
 
-    #[error("Could not parse Ed25519 data")]
+    #[error(transparent)]
+    SerdeJsonError(#[from] serde_json::Error),
+
+    #[error("Could not parse Ed25519 data - {0}")]
     Ed25519ParseError(#[from] Ed25519RecoveryError),
 
-    #[error("Could not parse X25519 data")]
+    #[error("Could not parse X25519 data - {0}")]
     X25519ParseError(#[from] KeyRecoveryError),
 
     #[error("Could not parse tx hash in request body")]
     TxHashParseError,
 
-    #[error("Nymd error - {0}")]
-    NymdError(#[from] NymdError),
+    #[error("Nyxd error - {0}")]
+    NyxdError(#[from] NyxdError),
 
     #[error("Validator client error - {0}")]
     ValidatorClientError(#[from] validator_client::ValidatorClientError),
@@ -74,7 +77,7 @@ pub enum CoconutError {
     CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError),
 
     #[error("Storage error - {0}")]
-    StorageError(#[from] ValidatorApiStorageError),
+    StorageError(#[from] NymApiStorageError),
 
     #[error("Credentials error - {0}")]
     CredentialsError(#[from] credentials::error::Error),
diff --git a/validator-api/src/coconut/keypair.rs b/nym-api/src/coconut/keypair.rs
similarity index 100%
rename from validator-api/src/coconut/keypair.rs
rename to nym-api/src/coconut/keypair.rs
diff --git a/validator-api/src/coconut/mod.rs b/nym-api/src/coconut/mod.rs
similarity index 91%
rename from validator-api/src/coconut/mod.rs
rename to nym-api/src/coconut/mod.rs
index 94bc96608d..6fa4b2ed58 100644
--- a/validator-api/src/coconut/mod.rs
+++ b/nym-api/src/coconut/mod.rs
@@ -8,12 +8,12 @@ pub(crate) mod dkg;
 pub(crate) mod error;
 pub(crate) mod keypair;
 #[cfg(test)]
-mod tests;
+pub(crate) mod tests;
 
 use crate::coconut::client::Client as LocalClient;
 use crate::coconut::deposit::extract_encryption_key;
 use crate::coconut::error::{CoconutError, Result};
-use crate::ValidatorApiStorage;
+use crate::NymApiStorage;
 
 use coconut_bandwidth_contract_common::spend_credential::{
     funds_from_cosmos_msgs, SpendCredentialStatus,
@@ -22,19 +22,19 @@ use coconut_interface::KeyPair as CoconutKeyPair;
 use coconut_interface::{
     Attribute, BlindSignRequest, BlindedSignature, Parameters, VerificationKey,
 };
-use config::defaults::VALIDATOR_API_VERSION;
+use config::defaults::NYM_API_VERSION;
 use credentials::coconut::params::{
-    ValidatorApiCredentialEncryptionAlgorithm, ValidatorApiCredentialHkdfAlgorithm,
+    NymApiCredentialEncryptionAlgorithm, NymApiCredentialHkdfAlgorithm,
 };
 use crypto::asymmetric::encryption;
 use crypto::shared_key::new_ephemeral_shared_key;
 use crypto::symmetric::stream_cipher;
 use keypair::KeyPair;
-use validator_api_requests::coconut::{
+use nym_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
-use validator_client::nymd::{Coin, Fee};
-use validator_client::validator_api::routes::{BANDWIDTH, COCONUT_ROUTES};
+use validator_client::nym_api::routes::{BANDWIDTH, COCONUT_ROUTES};
+use validator_client::nyxd::{Coin, Fee};
 
 use getset::{CopyGetters, Getters};
 use rand_07::rngs::OsRng;
@@ -51,7 +51,7 @@ pub struct State {
     mix_denom: String,
     key_pair: KeyPair,
     comm_channel: Arc<dyn APICommunicationChannel + Send + Sync>,
-    storage: ValidatorApiStorage,
+    storage: NymApiStorage,
     rng: Arc<Mutex<OsRng>>,
 }
 
@@ -61,7 +61,7 @@ impl State {
         mix_denom: String,
         key_pair: KeyPair,
         comm_channel: D,
-        storage: ValidatorApiStorage,
+        storage: NymApiStorage,
     ) -> Self
     where
         C: LocalClient + Send + Sync + 'static,
@@ -100,16 +100,16 @@ impl State {
         let (keypair, shared_key) = {
             let mut rng = *self.rng.lock().await;
             new_ephemeral_shared_key::<
-                ValidatorApiCredentialEncryptionAlgorithm,
-                ValidatorApiCredentialHkdfAlgorithm,
+                NymApiCredentialEncryptionAlgorithm,
+                NymApiCredentialHkdfAlgorithm,
                 _,
             >(&mut rng, remote_key)
         };
 
         let chunk_data = signature.to_bytes();
 
-        let zero_iv = stream_cipher::zero_iv::<ValidatorApiCredentialEncryptionAlgorithm>();
-        let encrypted_data = stream_cipher::encrypt::<ValidatorApiCredentialEncryptionAlgorithm>(
+        let zero_iv = stream_cipher::zero_iv::<NymApiCredentialEncryptionAlgorithm>();
+        let encrypted_data = stream_cipher::encrypt::<NymApiCredentialEncryptionAlgorithm>(
             &shared_key,
             &zero_iv,
             &chunk_data,
@@ -169,7 +169,7 @@ impl InternalSignRequest {
         mix_denom: String,
         key_pair: KeyPair,
         comm_channel: D,
-        storage: ValidatorApiStorage,
+        storage: NymApiStorage,
     ) -> AdHoc
     where
         C: LocalClient + Send + Sync + 'static,
@@ -179,10 +179,7 @@ impl InternalSignRequest {
         AdHoc::on_ignite("Internal Sign Request Stage", |rocket| async {
             rocket.manage(state).mount(
                 // this format! is so ugly...
-                format!(
-                    "/{}/{}/{}",
-                    VALIDATOR_API_VERSION, COCONUT_ROUTES, BANDWIDTH
-                ),
+                format!("/{}/{}/{}", NYM_API_VERSION, COCONUT_ROUTES, BANDWIDTH),
                 routes![
                     post_blind_sign,
                     post_partial_bandwidth_credential,
diff --git a/validator-api/src/coconut/tests.rs b/nym-api/src/coconut/tests.rs
similarity index 76%
rename from validator-api/src/coconut/tests.rs
rename to nym-api/src/coconut/tests.rs
index 842194b913..49f58e8c47 100644
--- a/validator-api/src/coconut/tests.rs
+++ b/nym-api/src/coconut/tests.rs
@@ -15,69 +15,133 @@ use config::defaults::VOUCHER_INFO;
 use cosmwasm_std::{to_binary, Addr, CosmosMsg, Decimal, WasmMsg};
 use credentials::coconut::bandwidth::BandwidthVoucher;
 use credentials::coconut::params::{
-    ValidatorApiCredentialEncryptionAlgorithm, ValidatorApiCredentialHkdfAlgorithm,
+    NymApiCredentialEncryptionAlgorithm, NymApiCredentialHkdfAlgorithm,
 };
 use crypto::shared_key::recompute_shared_key;
 use crypto::symmetric::stream_cipher;
+use nym_api_requests::coconut::{
+    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
+};
 use nymcoconut::tests::helpers::theta_from_keys_and_attributes;
 use nymcoconut::{
     prepare_blind_sign, ttp_keygen, Base58, BlindSignRequest, BlindedSignature, Parameters,
 };
-use validator_api_requests::coconut::{
-    BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
-};
-use validator_client::nymd::Coin;
-use validator_client::nymd::{tx::Hash, AccountId, DeliverTx, Event, Fee, Tag, TxResponse};
-use validator_client::validator_api::routes::{
+use validator_client::nym_api::routes::{
     API_VERSION, BANDWIDTH, COCONUT_BLIND_SIGN, COCONUT_PARTIAL_BANDWIDTH_CREDENTIAL,
     COCONUT_ROUTES, COCONUT_VERIFY_BANDWIDTH_CREDENTIAL,
 };
+use validator_client::nyxd::Coin;
+use validator_client::nyxd::{tx::Hash, AccountId, DeliverTx, Event, Fee, Tag, TxResponse};
 
 use crate::coconut::State;
-use crate::ValidatorApiStorage;
+use crate::NymApiStorage;
 use async_trait::async_trait;
-use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
-use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, EpochState};
+use coconut_dkg_common::dealer::{
+    ContractDealing, DealerDetails, DealerDetailsResponse, DealerType,
+};
+use coconut_dkg_common::event_attributes::{DKG_PROPOSAL_ID, NODE_INDEX};
+use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, Epoch, TOTAL_DEALINGS};
 use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
 use contracts_common::dealings::ContractSafeBytes;
 use crypto::asymmetric::{encryption, identity};
 use cw3::ProposalResponse;
+use dkg::Threshold;
 use rand_07::rngs::OsRng;
+use rand_07::Rng;
 use rocket::http::Status;
 use rocket::local::asynchronous::Client;
 use std::collections::HashMap;
 use std::str::FromStr;
 use std::sync::{Arc, RwLock};
-use validator_client::nymd::cosmwasm_client::types::ExecuteResult;
+use validator_client::nyxd::cosmwasm_client::logs::Log;
+use validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
 
 const TEST_COIN_DENOM: &str = "unym";
 const TEST_REWARDING_VALIDATOR_ADDRESS: &str = "n19lc9u84cz0yz3fww5283nucc9yvr8gsjmgeul0";
 
 #[derive(Clone, Debug)]
-struct DummyClient {
+pub(crate) struct DummyClient {
     validator_address: AccountId,
     tx_db: Arc<RwLock<HashMap<String, TxResponse>>>,
     proposal_db: Arc<RwLock<HashMap<u64, ProposalResponse>>>,
     spent_credential_db: Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
+
+    epoch: Arc<RwLock<Epoch>>,
+    dealer_details: Arc<RwLock<HashMap<String, DealerDetails>>>,
+    threshold: Arc<RwLock<Option<Threshold>>>,
+    dealings: Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
+    verification_share: Arc<RwLock<HashMap<String, ContractVKShare>>>,
 }
 
 impl DummyClient {
-    pub fn new(
-        validator_address: AccountId,
-        tx_db: &Arc<RwLock<HashMap<String, TxResponse>>>,
-        proposal_db: &Arc<RwLock<HashMap<u64, ProposalResponse>>>,
-        spent_credential_db: &Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
-    ) -> Self {
-        let tx_db = Arc::clone(tx_db);
-        let proposal_db = Arc::clone(proposal_db);
-        let spent_credential_db = Arc::clone(spent_credential_db);
+    pub fn new(validator_address: AccountId) -> Self {
         Self {
             validator_address,
-            tx_db,
-            proposal_db,
-            spent_credential_db,
+            tx_db: Arc::new(RwLock::new(HashMap::new())),
+            proposal_db: Arc::new(RwLock::new(HashMap::new())),
+            spent_credential_db: Arc::new(RwLock::new(HashMap::new())),
+            epoch: Arc::new(RwLock::new(Epoch::default())),
+            dealer_details: Arc::new(RwLock::new(HashMap::new())),
+            threshold: Arc::new(RwLock::new(None)),
+            dealings: Arc::new(RwLock::new(HashMap::new())),
+            verification_share: Arc::new(RwLock::new(HashMap::new())),
         }
     }
+
+    pub fn with_tx_db(mut self, tx_db: &Arc<RwLock<HashMap<String, TxResponse>>>) -> Self {
+        self.tx_db = Arc::clone(tx_db);
+        self
+    }
+
+    pub fn with_proposal_db(
+        mut self,
+        proposal_db: &Arc<RwLock<HashMap<u64, ProposalResponse>>>,
+    ) -> Self {
+        self.proposal_db = Arc::clone(proposal_db);
+        self
+    }
+
+    pub fn with_spent_credential_db(
+        mut self,
+        spent_credential_db: &Arc<RwLock<HashMap<String, SpendCredentialResponse>>>,
+    ) -> Self {
+        self.spent_credential_db = Arc::clone(spent_credential_db);
+        self
+    }
+
+    pub fn _with_epoch(mut self, epoch: &Arc<RwLock<Epoch>>) -> Self {
+        self.epoch = Arc::clone(epoch);
+        self
+    }
+
+    pub fn with_dealer_details(
+        mut self,
+        dealer_details: &Arc<RwLock<HashMap<String, DealerDetails>>>,
+    ) -> Self {
+        self.dealer_details = Arc::clone(dealer_details);
+        self
+    }
+
+    pub fn with_threshold(mut self, threshold: &Arc<RwLock<Option<Threshold>>>) -> Self {
+        self.threshold = Arc::clone(threshold);
+        self
+    }
+
+    pub fn with_dealings(
+        mut self,
+        dealings: &Arc<RwLock<HashMap<String, Vec<ContractSafeBytes>>>>,
+    ) -> Self {
+        self.dealings = Arc::clone(dealings);
+        self
+    }
+
+    pub fn with_verification_share(
+        mut self,
+        verification_share: &Arc<RwLock<HashMap<String, ContractVKShare>>>,
+    ) -> Self {
+        self.verification_share = Arc::clone(verification_share);
+        self
+    }
 }
 
 #[async_trait]
@@ -107,7 +171,7 @@ impl super::client::Client for DummyClient {
     }
 
     async fn list_proposals(&self) -> Result<Vec<ProposalResponse>> {
-        todo!()
+        Ok(self.proposal_db.read().unwrap().values().cloned().collect())
     }
 
     async fn get_spent_credential(
@@ -124,24 +188,57 @@ impl super::client::Client for DummyClient {
             })
     }
 
-    async fn get_current_epoch_state(&self) -> Result<EpochState> {
-        todo!()
+    async fn get_current_epoch(&self) -> Result<Epoch> {
+        Ok(*self.epoch.read().unwrap())
+    }
+
+    async fn get_current_epoch_threshold(&self) -> Result<Option<Threshold>> {
+        Ok(*self.threshold.read().unwrap())
     }
 
     async fn get_self_registered_dealer_details(&self) -> Result<DealerDetailsResponse> {
-        todo!()
+        Ok(DealerDetailsResponse {
+            details: self
+                .dealer_details
+                .read()
+                .unwrap()
+                .get(self.validator_address.as_ref())
+                .cloned(),
+            dealer_type: DealerType::Current,
+        })
     }
 
     async fn get_current_dealers(&self) -> Result<Vec<DealerDetails>> {
-        todo!()
+        Ok(self
+            .dealer_details
+            .read()
+            .unwrap()
+            .values()
+            .cloned()
+            .collect())
     }
 
-    async fn get_dealings(&self, _idx: usize) -> Result<Vec<ContractDealing>> {
-        todo!()
+    async fn get_dealings(&self, idx: usize) -> Result<Vec<ContractDealing>> {
+        Ok(self
+            .dealings
+            .read()
+            .unwrap()
+            .iter()
+            .map(|(dealer, dealings)| ContractDealing {
+                dealing: dealings.get(idx).unwrap().clone(),
+                dealer: Addr::unchecked(dealer),
+            })
+            .collect())
     }
 
     async fn get_verification_key_shares(&self) -> Result<Vec<ContractVKShare>> {
-        todo!()
+        Ok(self
+            .verification_share
+            .read()
+            .unwrap()
+            .values()
+            .cloned()
+            .collect())
     }
 
     async fn vote_proposal(
@@ -151,36 +248,138 @@ impl super::client::Client for DummyClient {
         _fee: Option<Fee>,
     ) -> Result<()> {
         if let Some(proposal) = self.proposal_db.write().unwrap().get_mut(&proposal_id) {
-            if vote_yes {
-                proposal.status = cw3::Status::Passed;
-            } else {
-                proposal.status = cw3::Status::Rejected;
+            // for now, just suppose that first vote is honest
+            if proposal.status == cw3::Status::Open {
+                if vote_yes {
+                    proposal.status = cw3::Status::Passed;
+                } else {
+                    proposal.status = cw3::Status::Rejected;
+                }
             }
         }
         Ok(())
     }
 
-    async fn execute_proposal(&self, _proposal_id: u64) -> Result<()> {
+    async fn execute_proposal(&self, proposal_id: u64) -> Result<()> {
+        self.proposal_db
+            .write()
+            .unwrap()
+            .entry(proposal_id)
+            .and_modify(|prop| {
+                if prop.status == cw3::Status::Passed {
+                    prop.status = cw3::Status::Executed
+                }
+            });
+        Ok(())
+    }
+
+    async fn advance_epoch_state(&self) -> Result<()> {
         todo!()
     }
 
     async fn register_dealer(
         &self,
-        _bte_key: EncodedBTEPublicKeyWithProof,
-        _announce_address: String,
+        bte_public_key_with_proof: EncodedBTEPublicKeyWithProof,
+        announce_address: String,
     ) -> Result<ExecuteResult> {
-        todo!()
+        let assigned_index = OsRng.gen();
+        self.dealer_details.write().unwrap().insert(
+            self.validator_address.to_string(),
+            DealerDetails {
+                address: Addr::unchecked(self.validator_address.to_string()),
+                bte_public_key_with_proof,
+                announce_address,
+                assigned_index,
+            },
+        );
+        Ok(ExecuteResult {
+            logs: vec![Log {
+                msg_index: 0,
+                events: vec![cosmwasm_std::Event::new("wasm")
+                    .add_attribute(NODE_INDEX, assigned_index.to_string())],
+            }],
+            data: Default::default(),
+            transaction_hash: Hash::new([0; 32]),
+            gas_info: Default::default(),
+        })
     }
 
-    async fn submit_dealing(&self, _dealing_bytes: ContractSafeBytes) -> Result<ExecuteResult> {
-        todo!()
+    async fn submit_dealing(&self, dealing_bytes: ContractSafeBytes) -> Result<ExecuteResult> {
+        self.dealings
+            .write()
+            .unwrap()
+            .entry(self.validator_address.to_string())
+            .and_modify(|v| {
+                if v.len() < TOTAL_DEALINGS {
+                    v.push(dealing_bytes.clone())
+                }
+            })
+            .or_insert_with(|| vec![dealing_bytes]);
+
+        Ok(ExecuteResult {
+            logs: vec![],
+            data: Default::default(),
+            transaction_hash: Hash::new([0; 32]),
+            gas_info: Default::default(),
+        })
     }
 
     async fn submit_verification_key_share(
         &self,
-        _share: VerificationKeyShare,
+        share: VerificationKeyShare,
     ) -> Result<ExecuteResult> {
-        todo!()
+        let dealer_details = self
+            .dealer_details
+            .read()
+            .unwrap()
+            .get(self.validator_address.as_ref())
+            .unwrap()
+            .clone();
+        self.verification_share.write().unwrap().insert(
+            self.validator_address.to_string(),
+            ContractVKShare {
+                share,
+                announce_address: dealer_details.announce_address.clone(),
+                node_index: dealer_details.assigned_index,
+                owner: Addr::unchecked(self.validator_address.to_string()),
+                verified: false,
+            },
+        );
+        let proposal_id = OsRng.gen();
+        let verify_vk_share_req = coconut_dkg_common::msg::ExecuteMsg::VerifyVerificationKeyShare {
+            owner: Addr::unchecked(self.validator_address.as_ref()),
+        };
+        let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute {
+            contract_addr: String::new(),
+            msg: to_binary(&verify_vk_share_req).unwrap(),
+            funds: vec![],
+        });
+        let proposal = ProposalResponse {
+            id: proposal_id,
+            title: String::new(),
+            description: String::new(),
+            msgs: vec![verify_vk_share_msg],
+            status: cw3::Status::Open,
+            expires: cw_utils::Expiration::Never {},
+            threshold: cw_utils::ThresholdResponse::AbsolutePercentage {
+                percentage: Decimal::from_ratio(2u32, 3u32),
+                total_weight: 100,
+            },
+        };
+        self.proposal_db
+            .write()
+            .unwrap()
+            .insert(proposal_id, proposal);
+        Ok(ExecuteResult {
+            logs: vec![Log {
+                msg_index: 0,
+                events: vec![cosmwasm_std::Event::new("wasm")
+                    .add_attribute(DKG_PROPOSAL_ID, proposal_id.to_string())],
+            }],
+            data: Default::default(),
+            transaction_hash: Hash::new([0; 32]),
+            gas_info: Default::default(),
+        })
     }
 }
 
@@ -261,24 +460,21 @@ async fn signed_before() {
     let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
     let mut db_dir = std::env::temp_dir();
     db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = ValidatorApiStorage::init(db_dir).await.unwrap();
+    let storage = NymApiStorage::init(db_dir).await.unwrap();
     let tx_db = Arc::new(RwLock::new(HashMap::new()));
     tx_db
         .write()
         .unwrap()
         .insert(tx_hash.to_string(), tx_entry.clone());
-    let nymd_client = DummyClient::new(
-        AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
-        &tx_db,
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-    );
+    let nyxd_client =
+        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap())
+            .with_tx_db(&tx_db);
     let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key());
     let staged_key_pair = crate::coconut::KeyPair::new();
     staged_key_pair.set(key_pair).await;
 
     let rocket = rocket::build().attach(InternalSignRequest::stage(
-        nymd_client,
+        nyxd_client,
         TEST_COIN_DENOM.to_string(),
         staged_key_pair,
         comm_channel,
@@ -334,22 +530,18 @@ async fn signed_before() {
 
 #[tokio::test]
 async fn state_functions() {
-    let nymd_client = DummyClient::new(
-        AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-    );
+    let nyxd_client =
+        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap());
     let params = Parameters::new(4).unwrap();
     let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
     let mut db_dir = std::env::temp_dir();
     db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = ValidatorApiStorage::init(db_dir).await.unwrap();
+    let storage = NymApiStorage::init(db_dir).await.unwrap();
     let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key());
     let staged_key_pair = crate::coconut::KeyPair::new();
     staged_key_pair.set(key_pair).await;
     let state = State::new(
-        nymd_client,
+        nyxd_client,
         TEST_COIN_DENOM.to_string(),
         staged_key_pair,
         comm_channel,
@@ -413,11 +605,11 @@ async fn state_functions() {
         crypto::asymmetric::encryption::PublicKey::from_bytes(&response.remote_key).unwrap();
 
     let encryption_key = recompute_shared_key::<
-        ValidatorApiCredentialEncryptionAlgorithm,
-        ValidatorApiCredentialHkdfAlgorithm,
+        NymApiCredentialEncryptionAlgorithm,
+        NymApiCredentialHkdfAlgorithm,
     >(&remote_key, encryption_keypair.private_key());
-    let zero_iv = stream_cipher::zero_iv::<ValidatorApiCredentialEncryptionAlgorithm>();
-    let blinded_signature_bytes = stream_cipher::decrypt::<ValidatorApiCredentialEncryptionAlgorithm>(
+    let zero_iv = stream_cipher::zero_iv::<NymApiCredentialEncryptionAlgorithm>();
+    let blinded_signature_bytes = stream_cipher::decrypt::<NymApiCredentialEncryptionAlgorithm>(
         &encryption_key,
         &zero_iv,
         &response.encrypted_signature,
@@ -477,7 +669,7 @@ async fn blind_sign_correct() {
     let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
     let mut db_dir = std::env::temp_dir();
     db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = ValidatorApiStorage::init(db_dir).await.unwrap();
+    let storage = NymApiStorage::init(db_dir).await.unwrap();
     let tx_db = Arc::new(RwLock::new(HashMap::new()));
 
     let mut tx_entry = tx_entry_fixture(&tx_hash.to_string());
@@ -511,18 +703,15 @@ async fn blind_sign_correct() {
         .write()
         .unwrap()
         .insert(tx_hash.to_string(), tx_entry.clone());
-    let nymd_client = DummyClient::new(
-        AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
-        &tx_db,
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-    );
+    let nyxd_client =
+        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap())
+            .with_tx_db(&tx_db);
     let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key());
     let staged_key_pair = crate::coconut::KeyPair::new();
     staged_key_pair.set(key_pair).await;
 
     let rocket = rocket::build().attach(InternalSignRequest::stage(
-        nymd_client,
+        nyxd_client,
         TEST_COIN_DENOM.to_string(),
         staged_key_pair,
         comm_channel,
@@ -591,19 +780,15 @@ async fn signature_test() {
     let key_pair = ttp_keygen(&params, 1, 1).unwrap().remove(0);
     let mut db_dir = std::env::temp_dir();
     db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage = ValidatorApiStorage::init(db_dir).await.unwrap();
-    let nymd_client = DummyClient::new(
-        AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap(),
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-        &Arc::new(RwLock::new(HashMap::new())),
-    );
+    let storage = NymApiStorage::init(db_dir).await.unwrap();
+    let nyxd_client =
+        DummyClient::new(AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap());
     let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key());
     let staged_key_pair = crate::coconut::KeyPair::new();
     staged_key_pair.set(key_pair).await;
 
     let rocket = rocket::build().attach(InternalSignRequest::stage(
-        nymd_client,
+        nyxd_client,
         TEST_COIN_DENOM.to_string(),
         staged_key_pair,
         comm_channel,
@@ -663,12 +848,9 @@ async fn verification_of_bandwidth_credential() {
     let validator_address = AccountId::from_str(TEST_REWARDING_VALIDATOR_ADDRESS).unwrap();
     let proposal_db = Arc::new(RwLock::new(HashMap::new()));
     let spent_credential_db = Arc::new(RwLock::new(HashMap::new()));
-    let nymd_client = DummyClient::new(
-        validator_address.clone(),
-        &Arc::new(RwLock::new(HashMap::new())),
-        &proposal_db,
-        &spent_credential_db,
-    );
+    let nyxd_client = DummyClient::new(validator_address.clone())
+        .with_proposal_db(&proposal_db)
+        .with_spent_credential_db(&spent_credential_db);
     let mut db_dir = std::env::temp_dir();
     let params = Parameters::new(4).unwrap();
     let mut key_pairs = ttp_keygen(&params, 1, 1).unwrap();
@@ -687,12 +869,12 @@ async fn verification_of_bandwidth_credential() {
         theta_from_keys_and_attributes(&params, &key_pairs, &indices, &public_attributes).unwrap();
     let key_pair = key_pairs.remove(0);
     db_dir.push(&key_pair.verification_key().to_bs58()[..8]);
-    let storage1 = ValidatorApiStorage::init(db_dir).await.unwrap();
+    let storage1 = NymApiStorage::init(db_dir).await.unwrap();
     let comm_channel = DummyCommunicationChannel::new(key_pair.verification_key());
     let staged_key_pair = crate::coconut::KeyPair::new();
     staged_key_pair.set(key_pair).await;
     let rocket = rocket::build().attach(InternalSignRequest::stage(
-        nymd_client.clone(),
+        nyxd_client.clone(),
         TEST_COIN_DENOM.to_string(),
         staged_key_pair,
         comm_channel.clone(),
diff --git a/validator-api/src/config/mod.rs b/nym-api/src/config/mod.rs
similarity index 90%
rename from validator-api/src/config/mod.rs
rename to nym-api/src/config/mod.rs
index e08b3bb20a..4b5ee33744 100644
--- a/validator-api/src/config/mod.rs
+++ b/nym-api/src/config/mod.rs
@@ -2,12 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::template::config_template;
-use config::defaults::DEFAULT_VALIDATOR_API_PORT;
+use config::defaults::mainnet::MIXNET_CONTRACT_ADDRESS;
+use config::defaults::DEFAULT_NYM_API_PORT;
 use config::NymConfig;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::time::Duration;
 use url::Url;
+use validator_client::nyxd;
 
 mod template;
 
@@ -66,11 +68,11 @@ impl NymConfig for Config {
         dirs::home_dir()
             .expect("Failed to evaluate $HOME value")
             .join(".nym")
-            .join("validator-api")
+            .join("nym-api")
     }
 
     fn try_default_root_directory() -> Option<PathBuf> {
-        dirs::home_dir().map(|path| path.join(".nym").join("validator-api"))
+        dirs::home_dir().map(|path| path.join(".nym").join("nym-api"))
     }
 
     fn root_directory(&self) -> PathBuf {
@@ -89,7 +91,7 @@ impl NymConfig for Config {
 #[derive(Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(default)]
 pub struct Base {
-    /// ID specifies the human readable ID of this particular validator-api.
+    /// ID specifies the human readable ID of this particular nym-api.
     id: String,
 
     local_validator: Url,
@@ -100,10 +102,10 @@ pub struct Base {
     announce_address: Url,
 
     /// Address of the validator contract managing the network
-    mixnet_contract_address: String,
+    mixnet_contract_address: nyxd::AccountId,
 
     /// Mnemonic used for rewarding and/or multisig operations
-    mnemonic: String,
+    mnemonic: bip39::Mnemonic,
 }
 
 impl Default for Base {
@@ -113,14 +115,15 @@ impl Default for Base {
             .expect("default local validator is malformed!");
         let mut default_announce_address = default_validator.clone();
         default_announce_address
-            .set_port(Some(DEFAULT_VALIDATOR_API_PORT))
+            .set_port(Some(DEFAULT_NYM_API_PORT))
             .expect("default local validator is malformed!");
         Base {
             id: String::default(),
             local_validator: default_validator,
             announce_address: default_announce_address,
-            mixnet_contract_address: String::default(),
-            mnemonic: "exact antique hybrid width raise anchor puzzle degree fee quit long crack net vague hip despair write put useless civil mechanic broom music day".to_string(),
+            mixnet_contract_address: MIXNET_CONTRACT_ADDRESS.parse().unwrap(),
+            // TODO: why is this random mnemonic our default?
+            mnemonic: "exact antique hybrid width raise anchor puzzle degree fee quit long crack net vague hip despair write put useless civil mechanic broom music day".parse().unwrap(),
         }
     }
 }
@@ -282,6 +285,9 @@ pub struct CoconutSigner {
     /// Specifies whether rewarding service is enabled in this process.
     enabled: bool,
 
+    /// Path to a JSON file where state is persisted between different stages of DKG.
+    dkg_persistent_state_path: PathBuf,
+
     /// Path to the coconut verification key.
     verification_key_path: PathBuf,
 
@@ -299,6 +305,7 @@ pub struct CoconutSigner {
 }
 
 impl CoconutSigner {
+    pub const DKG_PERSISTENT_STATE_FILE: &'static str = "dkg_persistent_state.json";
     pub const DKG_DECRYPTION_KEY_FILE: &'static str = "dkg_decryption_key.pem";
     pub const DKG_PUBLIC_KEY_WITH_PROOF_FILE: &'static str = "dkg_public_key_with_proof.pem";
     pub const COCONUT_VERIFICATION_KEY_FILE: &'static str = "coconut_verification_key.pem";
@@ -312,6 +319,10 @@ impl CoconutSigner {
         Config::default_data_directory(None).join(Self::COCONUT_SECRET_KEY_FILE)
     }
 
+    fn default_dkg_persistent_state_path() -> PathBuf {
+        Config::default_data_directory(None).join(Self::DKG_PERSISTENT_STATE_FILE)
+    }
+
     fn default_dkg_decryption_key_path() -> PathBuf {
         Config::default_data_directory(None).join(Self::DKG_DECRYPTION_KEY_FILE)
     }
@@ -325,6 +336,7 @@ impl Default for CoconutSigner {
     fn default() -> Self {
         Self {
             enabled: Default::default(),
+            dkg_persistent_state_path: CoconutSigner::default_dkg_persistent_state_path(),
             verification_key_path: CoconutSigner::default_coconut_verification_key_path(),
             secret_key_path: CoconutSigner::default_coconut_secret_key_path(),
             decryption_key_path: CoconutSigner::default_dkg_decryption_key_path(),
@@ -345,6 +357,8 @@ impl Config {
             Config::default_data_directory(Some(id)).join(NodeStatusAPI::DB_FILE);
         self.network_monitor.credentials_database_path =
             Config::default_data_directory(Some(id)).join(NetworkMonitor::DB_FILE);
+        self.coconut_signer.dkg_persistent_state_path =
+            Config::default_data_directory(Some(id)).join(CoconutSigner::DKG_PERSISTENT_STATE_FILE);
         self.coconut_signer.verification_key_path = Config::default_data_directory(Some(id))
             .join(CoconutSigner::COCONUT_VERIFICATION_KEY_FILE);
         self.coconut_signer.secret_key_path =
@@ -377,7 +391,7 @@ impl Config {
         self
     }
 
-    pub fn with_custom_nymd_validator(mut self, validator: Url) -> Self {
+    pub fn with_custom_nyxd_validator(mut self, validator: Url) -> Self {
         self.base.local_validator = validator;
         self
     }
@@ -388,13 +402,13 @@ impl Config {
         self
     }
 
-    pub fn with_custom_mixnet_contract<S: Into<String>>(mut self, mixnet_contract: S) -> Self {
-        self.base.mixnet_contract_address = mixnet_contract.into();
+    pub fn with_custom_mixnet_contract(mut self, mixnet_contract: nyxd::AccountId) -> Self {
+        self.base.mixnet_contract_address = mixnet_contract;
         self
     }
 
-    pub fn with_mnemonic<S: Into<String>>(mut self, mnemonic: S) -> Self {
-        self.base.mnemonic = mnemonic.into();
+    pub fn with_mnemonic(mut self, mnemonic: bip39::Mnemonic) -> Self {
+        self.base.mnemonic = mnemonic;
         self
     }
 
@@ -434,13 +448,11 @@ impl Config {
         self.network_monitor.credentials_database_path.clone()
     }
 
-    // TODO: Remove if still unused
-    #[allow(dead_code)]
     pub fn get_rewarding_enabled(&self) -> bool {
         self.rewarding.enabled
     }
 
-    pub fn get_nymd_validator_url(&self) -> Url {
+    pub fn get_nyxd_url(&self) -> Url {
         self.base.local_validator.clone()
     }
 
@@ -449,11 +461,11 @@ impl Config {
         self.base.announce_address.clone()
     }
 
-    pub fn get_mixnet_contract_address(&self) -> String {
+    pub fn get_mixnet_contract_address(&self) -> nyxd::AccountId {
         self.base.mixnet_contract_address.clone()
     }
 
-    pub fn get_mnemonic(&self) -> String {
+    pub fn get_mnemonic(&self) -> bip39::Mnemonic {
         self.base.mnemonic.clone()
     }
 
@@ -509,6 +521,11 @@ impl Config {
         self.node_status_api.database_path.clone()
     }
 
+    #[cfg(feature = "coconut")]
+    pub fn persistent_state_path(&self) -> PathBuf {
+        self.coconut_signer.dkg_persistent_state_path.clone()
+    }
+
     #[cfg(feature = "coconut")]
     pub fn verification_key_path(&self) -> PathBuf {
         self.coconut_signer.verification_key_path.clone()
diff --git a/validator-api/src/config/template.rs b/nym-api/src/config/template.rs
similarity index 95%
rename from validator-api/src/config/template.rs
rename to nym-api/src/config/template.rs
index 3d745f30ed..79773f56b7 100644
--- a/validator-api/src/config/template.rs
+++ b/nym-api/src/config/template.rs
@@ -6,11 +6,11 @@ pub(crate) fn config_template() -> &'static str {
 # This is a TOML config file.
 # For more information, see https://github.com/toml-lang/toml
 
-##### main base validator-api config options #####
+##### main base nym-api config options #####
 
 [base]
 
-# ID specifies the human readable ID of this particular validator-api.
+# ID specifies the human readable ID of this particular nym-api.
 id = '{{ base.id }}'
 
 # Validator server to which the API will be getting information about the network.
@@ -95,7 +95,7 @@ minimum_interval_monitor_threshold = {{ rewarding.minimum_interval_monitor_thres
 
 [coconut_signer]
 
-# Specifies whether rewarding service is enabled in this process.
+# Specifies whether coconut signing protocol is enabled in this process.
 enabled = {{ coconut_signer.enabled }}
 
 # Path to the coconut verification key
diff --git a/validator-api/src/contract_cache/mod.rs b/nym-api/src/contract_cache/mod.rs
similarity index 74%
rename from validator-api/src/contract_cache/mod.rs
rename to nym-api/src/contract_cache/mod.rs
index 95d984533c..4608c9d9d5 100644
--- a/validator-api/src/contract_cache/mod.rs
+++ b/nym-api/src/contract_cache/mod.rs
@@ -1,33 +1,31 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::nymd_client::Client;
-use crate::storage::ValidatorApiStorage;
+use crate::nyxd_client::Client;
 use ::time::OffsetDateTime;
 use anyhow::Result;
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::reward_params::{Performance, RewardingParams};
+use mixnet_contract_common::families::FamilyHead;
 use mixnet_contract_common::{
-    GatewayBond, IdentityKey, Interval, MixId, MixNodeBond, RewardedSetNodeStatus,
+    mixnode::MixNodeDetails, reward_params::RewardingParams, GatewayBond, IdentityKey, Interval,
+    MixId, MixNodeBond, RewardedSetNodeStatus,
 };
+use nym_api_requests::models::MixnodeStatus;
 use okapi::openapi3::OpenApi;
 use rocket::fairing::AdHoc;
 use rocket::Route;
 use rocket_okapi::openapi_get_routes_spec;
 use rocket_okapi::settings::OpenApiSettings;
 use serde::Serialize;
-use std::collections::HashMap;
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
+use std::ops::Deref;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::sync::{watch, RwLock};
 use tokio::time;
-use validator_api_requests::models::{MixNodeBondAnnotated, MixnodeStatus};
-use validator_client::nymd::CosmWasmClient;
+use validator_client::nyxd::CosmWasmClient;
 
-pub(crate) mod reward_estimate;
 pub(crate) mod routes;
 
 // The cache can emit notifications to listeners about the current state
@@ -38,13 +36,10 @@ pub enum CacheNotification {
 }
 
 pub struct ValidatorCacheRefresher<C> {
-    nymd_client: Client<C>,
+    nyxd_client: Client<C>,
     cache: ValidatorCache,
     caching_interval: Duration,
 
-    // Readonly: some of the quantities cached depends on values from the storage.
-    storage: Option<ValidatorApiStorage>,
-
     // Notify listeners that the cache has been updated
     update_notifier: watch::Sender<CacheNotification>,
 }
@@ -56,17 +51,19 @@ pub struct ValidatorCache {
 }
 
 struct ValidatorCacheInner {
-    mixnodes: Cache<Vec<MixNodeBondAnnotated>>,
+    mixnodes: Cache<Vec<MixNodeDetails>>,
     gateways: Cache<Vec<GatewayBond>>,
 
     mixnodes_blacklist: Cache<HashSet<MixId>>,
     gateways_blacklist: Cache<HashSet<IdentityKey>>,
 
-    rewarded_set: Cache<Vec<MixNodeBondAnnotated>>,
-    active_set: Cache<Vec<MixNodeBondAnnotated>>,
+    rewarded_set: Cache<Vec<MixNodeDetails>>,
+    active_set: Cache<Vec<MixNodeDetails>>,
 
     current_reward_params: Cache<Option<RewardingParams>>,
     current_interval: Cache<Option<Interval>>,
+
+    mix_to_family: Cache<Vec<(IdentityKey, FamilyHead)>>,
 }
 
 fn current_unix_timestamp() -> i64 {
@@ -102,95 +99,38 @@ impl<T: Clone> Cache<T> {
     }
 }
 
+impl<T> Deref for Cache<T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.value
+    }
+}
+
 impl<C> ValidatorCacheRefresher<C> {
     pub(crate) fn new(
-        nymd_client: Client<C>,
+        nyxd_client: Client<C>,
         caching_interval: Duration,
         cache: ValidatorCache,
-        storage: Option<ValidatorApiStorage>,
     ) -> Self {
         let (tx, _) = watch::channel(CacheNotification::Start);
         ValidatorCacheRefresher {
-            nymd_client,
+            nyxd_client,
             cache,
             caching_interval,
-            storage,
             update_notifier: tx,
         }
     }
 
-    async fn get_performance(&self, mix_id: MixId, epoch: Interval) -> Option<Performance> {
-        self.storage
-            .as_ref()?
-            .get_average_mixnode_uptime_in_the_last_24hrs(
-                mix_id,
-                epoch.current_epoch_end_unix_timestamp(),
-            )
-            .await
-            .ok()
-            .map(Into::into)
-    }
-
     pub fn subscribe(&self) -> watch::Receiver<CacheNotification> {
         self.update_notifier.subscribe()
     }
 
-    async fn annotate_node_with_details(
-        &self,
-        mixnodes: Vec<MixNodeDetails>,
-        interval_reward_params: RewardingParams,
-        current_interval: Interval,
-        rewarded_set: &HashMap<MixId, RewardedSetNodeStatus>,
-    ) -> Vec<MixNodeBondAnnotated> {
-        let mut annotated = Vec::new();
-        for mixnode in mixnodes {
-            let stake_saturation = mixnode
-                .rewarding_details
-                .bond_saturation(&interval_reward_params);
-
-            let uncapped_stake_saturation = mixnode
-                .rewarding_details
-                .uncapped_bond_saturation(&interval_reward_params);
-
-            let performance = self
-                .get_performance(mixnode.mix_id(), current_interval)
-                .await
-                .unwrap_or_default();
-
-            let rewarded_set_status = rewarded_set.get(&mixnode.mix_id()).cloned();
-
-            let reward_estimate = reward_estimate::compute_reward_estimate(
-                &mixnode,
-                performance,
-                rewarded_set_status,
-                interval_reward_params,
-                current_interval,
-            );
-
-            let (estimated_operator_apy, estimated_delegators_apy) =
-                reward_estimate::compute_apy_from_reward(
-                    &mixnode,
-                    reward_estimate,
-                    current_interval,
-                );
-
-            annotated.push(MixNodeBondAnnotated {
-                mixnode_details: mixnode,
-                stake_saturation,
-                uncapped_stake_saturation,
-                performance,
-                estimated_operator_apy,
-                estimated_delegators_apy,
-            });
-        }
-        annotated
-    }
-
     async fn get_rewarded_set_map(&self) -> HashMap<MixId, RewardedSetNodeStatus>
     where
         C: CosmWasmClient + Sync + Send,
     {
-        self.nymd_client
+        self.nyxd_client
             .get_rewarded_set_mixnodes()
             .await
             .map(|nodes| nodes.into_iter().collect())
@@ -198,9 +138,9 @@ impl<C> ValidatorCacheRefresher<C> {
     }
 
     fn collect_rewarded_and_active_set_details(
-        all_mixnodes: &[MixNodeBondAnnotated],
+        all_mixnodes: &[MixNodeDetails],
         rewarded_set_nodes: &HashMap<MixId, RewardedSetNodeStatus>,
-    ) -> (Vec<MixNodeBondAnnotated>, Vec<MixNodeBondAnnotated>) {
+    ) -> (Vec<MixNodeDetails>, Vec<MixNodeDetails>) {
         let mut active_set = Vec::new();
         let mut rewarded_set = Vec::new();
 
@@ -220,20 +160,18 @@ impl<C> ValidatorCacheRefresher<C> {
     where
         C: CosmWasmClient + Sync + Send,
     {
-        let rewarding_params = self.nymd_client.get_current_rewarding_parameters().await?;
-        let current_interval = self.nymd_client.get_current_interval().await?.interval;
+        let rewarding_params = self.nyxd_client.get_current_rewarding_parameters().await?;
+        let current_interval = self.nyxd_client.get_current_interval().await?.interval;
 
-        let mixnodes = self.nymd_client.get_mixnodes().await?;
-        let gateways = self.nymd_client.get_gateways().await?;
+        let mixnodes = self.nyxd_client.get_mixnodes().await?;
+        let gateways = self.nyxd_client.get_gateways().await?;
 
-        let rewarded_set = self.get_rewarded_set_map().await;
+        let mix_to_family = self.nyxd_client.get_all_family_members().await?;
 
-        let mixnodes = self
-            .annotate_node_with_details(mixnodes, rewarding_params, current_interval, &rewarded_set)
-            .await;
+        let rewarded_set_map = self.get_rewarded_set_map().await;
 
         let (rewarded_set, active_set) =
-            Self::collect_rewarded_and_active_set_details(&mixnodes, &rewarded_set);
+            Self::collect_rewarded_and_active_set_details(&mixnodes, &rewarded_set_map);
 
         info!(
             "Updating validator cache. There are {} mixnodes and {} gateways",
@@ -249,17 +187,18 @@ impl<C> ValidatorCacheRefresher<C> {
                 active_set,
                 rewarding_params,
                 current_interval,
+                mix_to_family,
             )
             .await;
 
         if let Err(err) = self.update_notifier.send(CacheNotification::Updated) {
-            warn!("Failed to notify validator cache refresh: {}", err);
+            warn!("Failed to notify validator cache refresh: {err}");
         }
 
         Ok(())
     }
 
-    pub(crate) async fn run(&self, mut shutdown: ShutdownListener)
+    pub(crate) async fn run(&self, mut shutdown: TaskClient)
     where
         C: CosmWasmClient + Sync + Send,
     {
@@ -274,7 +213,7 @@ impl<C> ValidatorCacheRefresher<C> {
                         }
                         ret = self.refresh_cache() => {
                             if let Err(err) = ret {
-                                error!("Failed to refresh validator cache - {}", err);
+                                error!("Failed to refresh validator cache - {err}");
                             } else {
                                 // relaxed memory ordering is fine here. worst case scenario network monitor
                                 // will just have to wait for an additional backoff to see the change.
@@ -322,14 +261,16 @@ impl ValidatorCache {
         })
     }
 
+    #[allow(clippy::too_many_arguments)]
     async fn update_cache(
         &self,
-        mixnodes: Vec<MixNodeBondAnnotated>,
+        mixnodes: Vec<MixNodeDetails>,
         gateways: Vec<GatewayBond>,
-        rewarded_set: Vec<MixNodeBondAnnotated>,
-        active_set: Vec<MixNodeBondAnnotated>,
+        rewarded_set: Vec<MixNodeDetails>,
+        active_set: Vec<MixNodeDetails>,
         rewarding_params: RewardingParams,
         current_interval: Interval,
+        mix_to_family: Vec<(IdentityKey, FamilyHead)>,
     ) {
         match time::timeout(Duration::from_millis(100), self.inner.write()).await {
             Ok(mut cache) => {
@@ -339,6 +280,7 @@ impl ValidatorCache {
                 cache.active_set.update(active_set);
                 cache.current_reward_params.update(Some(rewarding_params));
                 cache.current_interval.update(Some(current_interval));
+                cache.mix_to_family.update(mix_to_family)
             }
             Err(e) => {
                 error!("{}", e);
@@ -422,7 +364,7 @@ impl ValidatorCache {
         error!("Failed to update gateways blacklist");
     }
 
-    pub async fn mixnodes_detailed(&self) -> Vec<MixNodeBondAnnotated> {
+    pub async fn mixnodes(&self) -> Vec<MixNodeDetails> {
         let blacklist = self.mixnodes_blacklist().await;
         let mixnodes = match time::timeout(Duration::from_millis(100), self.inner.read()).await {
             Ok(cache) => cache.mixnodes.clone(),
@@ -444,14 +386,6 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn mixnodes(&self) -> Vec<MixNodeDetails> {
-        self.mixnodes_detailed()
-            .await
-            .into_iter()
-            .map(|bond| bond.mixnode_details)
-            .collect()
-    }
-
     pub async fn mixnodes_basic(&self) -> Vec<MixNodeBond> {
         match time::timeout(Duration::from_millis(100), self.inner.read()).await {
             Ok(cache) => cache
@@ -459,7 +393,7 @@ impl ValidatorCache {
                 .clone()
                 .into_inner()
                 .into_iter()
-                .map(|bond| bond.mixnode_details.bond_information)
+                .map(|bond| bond.bond_information)
                 .collect(),
             Err(e) => {
                 error!("{}", e);
@@ -500,7 +434,7 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn rewarded_set_detailed(&self) -> Cache<Vec<MixNodeBondAnnotated>> {
+    pub async fn rewarded_set(&self) -> Cache<Vec<MixNodeDetails>> {
         match time::timeout(Duration::from_millis(100), self.inner.read()).await {
             Ok(cache) => cache.rewarded_set.clone(),
             Err(e) => {
@@ -510,16 +444,7 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn rewarded_set(&self) -> Vec<MixNodeDetails> {
-        self.rewarded_set_detailed()
-            .await
-            .value
-            .into_iter()
-            .map(|bond| bond.mixnode_details)
-            .collect()
-    }
-
-    pub async fn active_set_detailed(&self) -> Cache<Vec<MixNodeBondAnnotated>> {
+    pub async fn active_set(&self) -> Cache<Vec<MixNodeDetails>> {
         match time::timeout(Duration::from_millis(100), self.inner.read()).await {
             Ok(cache) => cache.active_set.clone(),
             Err(e) => {
@@ -529,13 +454,14 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn active_set(&self) -> Vec<MixNodeDetails> {
-        self.active_set_detailed()
-            .await
-            .value
-            .into_iter()
-            .map(|bond| bond.mixnode_details)
-            .collect()
+    pub async fn mix_to_family(&self) -> Cache<Vec<(IdentityKey, FamilyHead)>> {
+        match time::timeout(Duration::from_millis(100), self.inner.read()).await {
+            Ok(cache) => cache.mix_to_family.clone(),
+            Err(e) => {
+                error!("{}", e);
+                Cache::new(Vec::new())
+            }
+        }
     }
 
     pub(crate) async fn interval_reward_params(&self) -> Cache<Option<RewardingParams>> {
@@ -558,24 +484,21 @@ impl ValidatorCache {
         }
     }
 
-    pub async fn mixnode_details(
-        &self,
-        mix_id: MixId,
-    ) -> (Option<MixNodeBondAnnotated>, MixnodeStatus) {
+    pub async fn mixnode_details(&self, mix_id: MixId) -> (Option<MixNodeDetails>, MixnodeStatus) {
         // it might not be the most optimal to possibly iterate the entire vector to find (or not)
         // the relevant value. However, the vectors are relatively small (< 10_000 elements, < 1000 for active set)
 
-        let active_set = &self.active_set_detailed().await.value;
+        let active_set = &self.active_set().await.value;
         if let Some(bond) = active_set.iter().find(|mix| mix.mix_id() == mix_id) {
             return (Some(bond.clone()), MixnodeStatus::Active);
         }
 
-        let rewarded_set = &self.rewarded_set_detailed().await.value;
+        let rewarded_set = &self.rewarded_set().await.value;
         if let Some(bond) = rewarded_set.iter().find(|mix| mix.mix_id() == mix_id) {
             return (Some(bond.clone()), MixnodeStatus::Standby);
         }
 
-        let all_bonded = &self.mixnodes_detailed().await;
+        let all_bonded = &self.mixnodes().await;
         if let Some(bond) = all_bonded.iter().find(|mix| mix.mix_id() == mix_id) {
             (Some(bond.clone()), MixnodeStatus::Inactive)
         } else {
@@ -615,6 +538,7 @@ impl ValidatorCacheInner {
             gateways_blacklist: Cache::default(),
             current_interval: Cache::default(),
             current_reward_params: Cache::default(),
+            mix_to_family: Cache::default(),
         }
     }
 }
diff --git a/validator-api/src/contract_cache/routes.rs b/nym-api/src/contract_cache/routes.rs
similarity index 59%
rename from validator-api/src/contract_cache/routes.rs
rename to nym-api/src/contract_cache/routes.rs
index 45d0b290ac..2d6b71e606 100644
--- a/validator-api/src/contract_cache/routes.rs
+++ b/nym-api/src/contract_cache/routes.rs
@@ -1,15 +1,21 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::contract_cache::ValidatorCache;
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::reward_params::RewardingParams;
-use mixnet_contract_common::{GatewayBond, Interval, MixId};
-use rocket::serde::json::Json;
-use rocket::State;
+use crate::{
+    contract_cache::ValidatorCache,
+    node_status_api::{
+        helpers::{_get_active_set_detailed, _get_mixnodes_detailed, _get_rewarded_set_detailed},
+        NodeStatusCache,
+    },
+};
+use mixnet_contract_common::{
+    mixnode::MixNodeDetails, reward_params::RewardingParams, GatewayBond, Interval, MixId,
+};
+use nym_api_requests::models::MixNodeBondAnnotated;
+
+use rocket::{serde::json::Json, State};
 use rocket_okapi::openapi;
 use std::collections::HashSet;
-use validator_api_requests::models::MixNodeBondAnnotated;
 
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes")]
@@ -17,12 +23,19 @@ pub async fn get_mixnodes(cache: &State<ValidatorCache>) -> Json<Vec<MixNodeDeta
     Json(cache.mixnodes().await)
 }
 
+// DEPRECATED: this endpoint now lives in `node_status_api`. Once all consumers are updated,
+// replace this with
+// ```
+//  pub fn get_mixnodes_detailed() -> Redirect {
+//      Redirect::to(uri!("/v1/status/mixnodes/detailed"))
+//  }
+// ```
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes/detailed")]
 pub async fn get_mixnodes_detailed(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
 ) -> Json<Vec<MixNodeBondAnnotated>> {
-    Json(cache.mixnodes_detailed().await)
+    Json(_get_mixnodes_detailed(cache).await)
 }
 
 #[openapi(tag = "contract-cache")]
@@ -34,29 +47,43 @@ pub async fn get_gateways(cache: &State<ValidatorCache>) -> Json<Vec<GatewayBond
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes/rewarded")]
 pub async fn get_rewarded_set(cache: &State<ValidatorCache>) -> Json<Vec<MixNodeDetails>> {
-    Json(cache.rewarded_set().await)
+    Json(cache.rewarded_set().await.value)
 }
 
+// DEPRECATED: this endpoint now lives in `node_status_api`. Once all consumers are updated,
+// replace this with
+// ```
+//  pub fn get_mixnodes_set_detailed() -> Redirect {
+//      Redirect::to(uri!("/v1/status/mixnodes/rewarded/detailed"))
+//  }
+// ```
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes/rewarded/detailed")]
 pub async fn get_rewarded_set_detailed(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
 ) -> Json<Vec<MixNodeBondAnnotated>> {
-    Json(cache.rewarded_set_detailed().await.value)
+    Json(_get_rewarded_set_detailed(cache).await)
 }
 
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes/active")]
 pub async fn get_active_set(cache: &State<ValidatorCache>) -> Json<Vec<MixNodeDetails>> {
-    Json(cache.active_set().await)
+    Json(cache.active_set().await.value)
 }
 
+// DEPRECATED: this endpoint now lives in `node_status_api`. Once all consumers are updated,
+// replace this with
+// ```
+//  pub fn get_active_set_detailed() -> Redirect {
+//      Redirect::to(uri!("/status/mixnodes/active/detailed"))
+//  }
+// ```
 #[openapi(tag = "contract-cache")]
 #[get("/mixnodes/active/detailed")]
 pub async fn get_active_set_detailed(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
 ) -> Json<Vec<MixNodeBondAnnotated>> {
-    Json(cache.active_set_detailed().await.value)
+    Json(_get_active_set_detailed(cache).await)
 }
 
 #[openapi(tag = "contract-cache")]
diff --git a/validator-api/src/epoch_operations/error.rs b/nym-api/src/epoch_operations/error.rs
similarity index 67%
rename from validator-api/src/epoch_operations/error.rs
rename to nym-api/src/epoch_operations/error.rs
index 20f0edc277..91e8005dd7 100644
--- a/validator-api/src/epoch_operations/error.rs
+++ b/nym-api/src/epoch_operations/error.rs
@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::node_status_api::models::ValidatorApiStorageError;
+use crate::node_status_api::models::NymApiStorageError;
 use thiserror::Error;
-use validator_client::nymd::error::NymdError;
+use validator_client::nyxd::error::NyxdError;
 use validator_client::ValidatorClientError;
 
 #[derive(Debug, Error)]
@@ -11,11 +11,11 @@ pub enum RewardingError {
     // #[error("There were no mixnodes to reward (network is dead)")]
     // NoMixnodesToReward,
     #[error("Failed to execute the smart contract - {0}")]
-    ContractExecutionFailure(NymdError),
+    ContractExecutionFailure(NyxdError),
 
     // The inner error should be modified at some point...
     #[error("We run into storage issues - {0}")]
-    StorageError(ValidatorApiStorageError),
+    StorageError(NymApiStorageError),
 
     #[error("Failed to query the smart contract - {0}")]
     ValidatorClientError(ValidatorClientError),
@@ -25,16 +25,21 @@ pub enum RewardingError {
         #[from]
         source: std::num::TryFromIntError,
     },
+    #[error("{source}")]
+    WeightedError {
+        #[from]
+        source: rand::distributions::WeightedError,
+    },
 }
 
-impl From<NymdError> for RewardingError {
-    fn from(err: NymdError) -> Self {
+impl From<NyxdError> for RewardingError {
+    fn from(err: NyxdError) -> Self {
         RewardingError::ContractExecutionFailure(err)
     }
 }
 
-impl From<ValidatorApiStorageError> for RewardingError {
-    fn from(err: ValidatorApiStorageError) -> Self {
+impl From<NymApiStorageError> for RewardingError {
+    fn from(err: NymApiStorageError) -> Self {
         RewardingError::StorageError(err)
     }
 }
diff --git a/validator-api/src/epoch_operations/helpers.rs b/nym-api/src/epoch_operations/helpers.rs
similarity index 100%
rename from validator-api/src/epoch_operations/helpers.rs
rename to nym-api/src/epoch_operations/helpers.rs
diff --git a/validator-api/src/epoch_operations/mod.rs b/nym-api/src/epoch_operations/mod.rs
similarity index 76%
rename from validator-api/src/epoch_operations/mod.rs
rename to nym-api/src/epoch_operations/mod.rs
index cb33962890..c38a52c706 100644
--- a/validator-api/src/epoch_operations/mod.rs
+++ b/nym-api/src/epoch_operations/mod.rs
@@ -13,18 +13,21 @@
 //    and hence this might be a good place for it.
 
 use crate::contract_cache::ValidatorCache;
-use crate::nymd_client::Client;
+use crate::nyxd_client::Client;
 use crate::storage::models::RewardingReport;
-use crate::storage::ValidatorApiStorage;
+use crate::storage::NymApiStorage;
+use mixnet_contract_common::families::FamilyHead;
 use mixnet_contract_common::{
     reward_params::Performance, CurrentIntervalResponse, ExecuteMsg, Interval, MixId,
 };
+use mixnet_contract_common::{IdentityKey, Layer, LayerAssignment, MixNodeDetails};
 use rand::prelude::SliceRandom;
 use rand::rngs::OsRng;
+use std::collections::HashMap;
 use std::collections::HashSet;
 use std::time::Duration;
 use tokio::time::sleep;
-use validator_client::nymd::SigningNymdClient;
+use validator_client::nyxd::SigningNyxdClient;
 
 pub(crate) mod error;
 mod helpers;
@@ -32,8 +35,7 @@ mod helpers;
 use crate::epoch_operations::helpers::stake_to_f64;
 use crate::node_status_api::ONE_DAY;
 use error::RewardingError;
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use task::ShutdownListener;
+use task::TaskClient;
 
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct MixnodeToReward {
@@ -52,47 +54,100 @@ impl From<MixnodeToReward> for ExecuteMsg {
 }
 
 pub struct RewardedSetUpdater {
-    nymd_client: Client<SigningNymdClient>,
+    nyxd_client: Client<SigningNyxdClient>,
     validator_cache: ValidatorCache,
-    storage: ValidatorApiStorage,
+    storage: NymApiStorage,
+}
+
+// Weight of a layer being chose is reciprocal to current count in layer
+fn layer_weight(l: &Layer, layer_assignments: &HashMap<Layer, f32>) -> f32 {
+    let total = layer_assignments.values().fold(0., |acc, i| acc + i);
+    if total == 0. {
+        1.
+    } else {
+        1. - (layer_assignments.get(l).unwrap_or(&0.) / total)
+    }
 }
 
 impl RewardedSetUpdater {
     pub(crate) async fn current_interval_details(
         &self,
     ) -> Result<CurrentIntervalResponse, RewardingError> {
-        Ok(self.nymd_client.get_current_interval().await?)
+        Ok(self.nyxd_client.get_current_interval().await?)
     }
 
     pub(crate) async fn new(
-        nymd_client: Client<SigningNymdClient>,
+        nyxd_client: Client<SigningNyxdClient>,
         validator_cache: ValidatorCache,
-        storage: ValidatorApiStorage,
+        storage: NymApiStorage,
     ) -> Result<Self, RewardingError> {
         Ok(RewardedSetUpdater {
-            nymd_client,
+            nyxd_client,
             validator_cache,
             storage,
         })
     }
 
+    async fn determine_layers(
+        &self,
+        rewarded_set: &[MixNodeDetails],
+    ) -> Result<(Vec<LayerAssignment>, HashMap<String, Layer>), RewardingError> {
+        let mut families_in_layer: HashMap<String, Layer> = HashMap::new();
+        let mut assignments = vec![];
+        let mut layer_assignments: HashMap<Layer, f32> = HashMap::new();
+        let mut rng = OsRng;
+        let layers = vec![Layer::One, Layer::Two, Layer::Three];
+
+        let mix_to_family = self.validator_cache.mix_to_family().await.to_vec();
+
+        let mix_to_family = mix_to_family
+            .into_iter()
+            .collect::<HashMap<IdentityKey, FamilyHead>>();
+
+        for mix in rewarded_set {
+            let family = mix_to_family.get(&mix.bond_information.identity().to_owned());
+            // Get layer already assigned to nodes family, if any
+            let family_layer = family.and_then(|h| families_in_layer.get(h.identity()));
+
+            // Same node families are always assigned to the same layer, otherwise layer selected by a random weighted choice
+            let layer = if let Some(layer) = family_layer {
+                layer.to_owned()
+            } else {
+                layers
+                    .choose_weighted(&mut rng, |l| layer_weight(l, &layer_assignments))?
+                    .to_owned()
+            };
+
+            assignments.push(LayerAssignment::new(mix.mix_id(), layer));
+
+            // layer accounting
+            let layer_entry = layer_assignments.entry(layer).or_insert(0.);
+            *layer_entry += 1.;
+            if let Some(family) = family {
+                families_in_layer.insert(family.identity().to_string(), layer);
+            }
+        }
+
+        Ok((assignments, families_in_layer))
+    }
+
     fn determine_rewarded_set(
         &self,
-        mixnodes: Vec<MixNodeDetails>,
+        mixnodes: &[MixNodeDetails],
         nodes_to_select: u32,
-    ) -> Vec<MixId> {
+    ) -> Result<Vec<MixNodeDetails>, RewardingError> {
         if mixnodes.is_empty() {
-            return Vec::new();
+            return Ok(Vec::new());
         }
 
         let mut rng = OsRng;
 
         // generate list of mixnodes and their relatively weight (by total stake)
         let choices = mixnodes
-            .into_iter()
+            .iter()
             .map(|mix| {
                 let total_stake = stake_to_f64(mix.total_stake());
-                (mix.mix_id(), total_stake)
+                (mix.to_owned(), total_stake)
             })
             .collect::<Vec<_>>();
 
@@ -101,11 +156,10 @@ impl RewardedSetUpdater {
         // - we have invalid weights, i.e. less than zero or NaNs - it shouldn't happen in our case as we safely cast down from u128
         // - all weights are zero - it's impossible in our case as the list of nodes is not empty and weight is proportional to stake. You must have non-zero stake in order to bond
         // - we have more than u32::MAX values (which is incredibly unrealistic to have 4B mixnodes bonded... literally every other person on the planet would need one)
-        choices
-            .choose_multiple_weighted(&mut rng, nodes_to_select as usize, |item| item.1)
-            .unwrap()
-            .map(|(mix_id, _weight)| *mix_id)
-            .collect()
+        Ok(choices
+            .choose_multiple_weighted(&mut rng, nodes_to_select as usize, |item| item.1)?
+            .map(|(mix, _weight)| mix.to_owned())
+            .collect())
     }
 
     async fn reward_current_rewarded_set(
@@ -125,7 +179,7 @@ impl RewardedSetUpdater {
 
         if to_reward.is_empty() {
             info!("There are no nodes to reward in this epoch");
-        } else if let Err(err) = self.nymd_client.send_rewarding_messages(&to_reward).await {
+        } else if let Err(err) = self.nyxd_client.send_rewarding_messages(&to_reward).await {
             error!(
                 "failed to perform mixnode rewarding for epoch {}! Error encountered: {}",
                 current_interval.current_epoch_absolute_id(),
@@ -151,12 +205,12 @@ impl RewardedSetUpdater {
     async fn nodes_to_reward(&self, interval: Interval) -> Vec<MixnodeToReward> {
         // try to get current up to date view of the network bypassing the cache
         // in case the epochs were significantly shortened for the purposes of testing
-        let rewarded_set: Vec<MixId> = match self.nymd_client.get_rewarded_set_mixnodes().await {
+        let rewarded_set: Vec<MixId> = match self.nyxd_client.get_rewarded_set_mixnodes().await {
             Ok(nodes) => nodes.into_iter().map(|(id, _)| id).collect::<Vec<_>>(),
             Err(err) => {
-                warn!("failed to obtain the current rewarded set - {}. falling back to the cached version", err);
+                warn!("failed to obtain the current rewarded set - {err}. falling back to the cached version");
                 self.validator_cache
-                    .rewarded_set_detailed()
+                    .rewarded_set()
                     .await
                     .into_inner()
                     .into_iter()
@@ -186,15 +240,19 @@ impl RewardedSetUpdater {
 
     async fn update_rewarded_set_and_advance_epoch(
         &self,
-        all_mixnodes: Vec<MixNodeDetails>,
+        all_mixnodes: &[MixNodeDetails],
     ) -> Result<(), RewardingError> {
         // we grab rewarding parameters here as they might have gotten updated when performing epoch actions
-        let rewarding_parameters = self.nymd_client.get_current_rewarding_parameters().await?;
+        let rewarding_parameters = self.nyxd_client.get_current_rewarding_parameters().await?;
 
         let new_rewarded_set =
-            self.determine_rewarded_set(all_mixnodes, rewarding_parameters.rewarded_set_size);
-        self.nymd_client
-            .advance_current_epoch(new_rewarded_set, rewarding_parameters.active_set_size)
+            self.determine_rewarded_set(all_mixnodes, rewarding_parameters.rewarded_set_size)?;
+
+        let (layer_assignments, _families_in_layer) =
+            self.determine_layers(&new_rewarded_set).await?;
+
+        self.nyxd_client
+            .advance_current_epoch(layer_assignments, rewarding_parameters.active_set_size)
             .await?;
 
         Ok(())
@@ -219,19 +277,15 @@ impl RewardedSetUpdater {
 
         let epoch_end = interval.current_epoch_end();
 
-        let all_nodes = self.validator_cache.mixnodes().await;
-        if all_nodes.is_empty() {
+        let all_mixnodes = self.validator_cache.mixnodes().await;
+        if all_mixnodes.is_empty() {
             log::warn!("there don't seem to be any mixnodes on the network!")
         }
 
-        // get list of all mixnodes BEFORE rewarding happens as to now be biased by rewards
-        // that might be given to them
-        let all_mixnodes = self.validator_cache.mixnodes().await;
-
         // Reward all the nodes in the still current, soon to be previous rewarded set
         log::info!("Rewarding the current rewarded set...");
         if let Err(err) = self.reward_current_rewarded_set(interval).await {
-            log::error!("FAILED to reward rewarded set - {}", err);
+            log::error!("FAILED to reward rewarded set - {err}");
             // since we haven't advanced the epoch yet, we will attempt to reward those nodes again
             // next time we enter this function (i.e. within 2min or so)
             //
@@ -248,8 +302,8 @@ impl RewardedSetUpdater {
         // as separate transactions
 
         log::info!("Reconciling all pending epoch events...");
-        if let Err(err) = self.nymd_client.reconcile_epoch_events().await {
-            log::error!("FAILED to reconcile epoch events... - {}", err);
+        if let Err(err) = self.nyxd_client.reconcile_epoch_events().await {
+            log::error!("FAILED to reconcile epoch events... - {err}");
             return Err(err.into());
         } else {
             log::info!("Reconciled all pending epoch events... SUCCESS");
@@ -257,10 +311,10 @@ impl RewardedSetUpdater {
 
         log::info!("Advancing epoch and updating the rewarded set...");
         if let Err(err) = self
-            .update_rewarded_set_and_advance_epoch(all_mixnodes)
+            .update_rewarded_set_and_advance_epoch(&all_mixnodes)
             .await
         {
-            log::error!("FAILED to advance the current epoch... - {}", err);
+            log::error!("FAILED to advance the current epoch... - {err}");
             return Err(err);
         } else {
             log::info!("Advanced the epoch and updated the rewarded set... SUCCESS");
@@ -319,7 +373,7 @@ impl RewardedSetUpdater {
         Ok(())
     }
 
-    async fn wait_until_epoch_end(&mut self, shutdown: &mut ShutdownListener) -> Option<Interval> {
+    async fn wait_until_epoch_end(&mut self, shutdown: &mut TaskClient) -> Option<Interval> {
         const POLL_INTERVAL: Duration = Duration::from_secs(120);
 
         loop {
@@ -367,10 +421,7 @@ impl RewardedSetUpdater {
         }
     }
 
-    pub(crate) async fn run(
-        &mut self,
-        mut shutdown: ShutdownListener,
-    ) -> Result<(), RewardingError> {
+    pub(crate) async fn run(&mut self, mut shutdown: TaskClient) -> Result<(), RewardingError> {
         self.validator_cache.wait_for_initial_values().await;
 
         while !shutdown.is_shutdown() {
@@ -380,11 +431,11 @@ impl RewardedSetUpdater {
                 Some(interval) => interval,
             };
             if let Err(err) = self.update_blacklist(&interval_details).await {
-                error!("failed to update the node blacklist - {}", err);
+                error!("failed to update the node blacklist - {err}");
                 continue;
             }
             if let Err(err) = self.perform_epoch_operations(interval_details).await {
-                error!("failed to perform epoch operations - {}", err);
+                error!("failed to perform epoch operations - {err}");
                 sleep(Duration::from_secs(30)).await;
             }
         }
diff --git a/nym-api/src/main.rs b/nym-api/src/main.rs
new file mode 100644
index 0000000000..6b6b2313f4
--- /dev/null
+++ b/nym-api/src/main.rs
@@ -0,0 +1,537 @@
+// Copyright 2020-2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[macro_use]
+extern crate rocket;
+
+use crate::config::Config;
+use crate::contract_cache::ValidatorCacheRefresher;
+use crate::epoch_operations::RewardedSetUpdater;
+use crate::network_monitor::NetworkMonitorBuilder;
+use crate::node_status_api::uptime_updater::HistoricalUptimeUpdater;
+use crate::nyxd_client::Client;
+use crate::storage::NymApiStorage;
+use ::config::defaults::setup_env;
+use ::config::defaults::var_names::{MIXNET_CONTRACT_ADDRESS, MIX_DENOM};
+use ::config::{NymConfig, OptionalSet};
+use anyhow::Result;
+use build_information::BinaryBuildInformation;
+use clap::Parser;
+use contract_cache::ValidatorCache;
+use lazy_static::lazy_static;
+use log::{info, warn};
+use logging::setup_logging;
+use node_status_api::NodeStatusCache;
+use okapi::openapi3::OpenApi;
+use rocket::fairing::AdHoc;
+use rocket::http::Method;
+use rocket::{Ignite, Rocket};
+use rocket_cors::{AllowedHeaders, AllowedOrigins, Cors};
+use rocket_okapi::mount_endpoints_and_merged_docs;
+use rocket_okapi::swagger_ui::make_swagger_ui;
+use std::sync::Arc;
+use std::time::Duration;
+use std::{fs, process};
+use task::{wait_for_signal, TaskManager};
+use tokio::sync::Notify;
+use validator_client::nyxd::{self, SigningNyxdClient};
+
+#[cfg(feature = "coconut")]
+use coconut::{
+    comm::QueryCommunicationChannel,
+    dkg::controller::{init_keypair, DkgController},
+    InternalSignRequest,
+};
+#[cfg(feature = "coconut")]
+use rand::rngs::OsRng;
+
+pub(crate) mod config;
+pub(crate) mod contract_cache;
+mod epoch_operations;
+mod network_monitor;
+mod node_status_api;
+pub(crate) mod nyxd_client;
+pub(crate) mod storage;
+mod swagger;
+
+#[cfg(feature = "coconut")]
+mod coconut;
+
+lazy_static! {
+    pub static ref PRETTY_BUILD_INFORMATION: String =
+        BinaryBuildInformation::new(env!("CARGO_PKG_VERSION")).pretty_print();
+}
+
+// Helper for passing LONG_VERSION to clap
+fn pretty_build_info_static() -> &'static str {
+    &PRETTY_BUILD_INFORMATION
+}
+
+// explicitly defined custom parser (as opposed to just using
+// #[arg(value_parser = clap::value_parser!(u8).range(0..100))]
+// for better error message
+fn threshold_in_range(s: &str) -> Result<u8, String> {
+    let threshold: usize = s
+        .parse()
+        .map_err(|_| format!("`{s}` isn't a valid threshold number"))?;
+    if threshold > 100 {
+        Err(format!("{threshold} is not within the range 0-100"))
+    } else {
+        Ok(threshold as u8)
+    }
+}
+
+#[derive(Parser)]
+#[clap(author = "Nymtech", version, long_version = pretty_build_info_static(), about)]
+struct ApiArgs {
+    /// Path pointing to an env file that configures the Nym API.
+    #[clap(short, long)]
+    config_env_file: Option<std::path::PathBuf>,
+
+    /// Id of the nym-api we want to run
+    #[clap(long)]
+    id: Option<String>,
+
+    /// Specifies whether network monitoring is enabled on this API
+    #[clap(short = 'm', long)]
+    enable_monitor: bool,
+
+    /// Specifies whether network rewarding is enabled on this API
+    #[clap(short = 'r', long, requires = "enable_monitor", requires = "mnemonic")]
+    enable_rewarding: bool,
+
+    /// Endpoint to nyxd instance from which the monitor will grab nodes to test
+    #[clap(long)]
+    nyxd_validator: Option<url::Url>,
+
+    /// Address of the mixnet contract managing the network
+    #[clap(long)]
+    mixnet_contract: Option<nyxd::AccountId>,
+
+    /// Mnemonic of the network monitor used for rewarding operators
+    // even though we're currently converting the mnemonic to string (and then back to the concrete type)
+    // at least we're getting immediate validation when passing the arguments
+    #[clap(long)]
+    mnemonic: Option<bip39::Mnemonic>,
+
+    /// Specifies whether a config file based on provided arguments should be saved to a file
+    #[clap(short = 'w', long)]
+    save_config: bool,
+
+    /// Specifies the minimum percentage of monitor test run data present in order to distribute rewards for given interval.
+    #[clap(long, value_parser = threshold_in_range)]
+    monitor_threshold: Option<u8>,
+
+    /// Mixnodes with reliability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
+    #[clap(long, value_parser = threshold_in_range)]
+    min_mixnode_reliability: Option<u8>,
+
+    /// Gateways with reliability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.
+    #[clap(long, value_parser = threshold_in_range)]
+    min_gateway_reliability: Option<u8>,
+
+    /// Set this nym api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement
+    #[clap(long)]
+    enabled_credentials_mode: bool,
+
+    /// Announced address where coconut clients will connect.
+    #[cfg(feature = "coconut")]
+    #[clap(long)]
+    announce_address: Option<url::Url>,
+
+    /// Flag to indicate whether coconut signer authority is enabled on this API
+    #[cfg(feature = "coconut")]
+    #[clap(long, requires = "mnemonic", requires = "announce-address")]
+    enable_coconut: bool,
+}
+
+async fn wait_for_interrupt(mut shutdown: TaskManager) {
+    wait_for_signal().await;
+
+    log::info!("Sending shutdown");
+    shutdown.signal_shutdown().ok();
+
+    log::info!("Waiting for tasks to finish... (Press ctrl-c to force)");
+    shutdown.wait_for_shutdown().await;
+
+    log::info!("Stopping nym API");
+}
+
+fn override_config(mut config: Config, args: ApiArgs) -> Config {
+    if let Some(id) = args.id {
+        fs::create_dir_all(Config::default_config_directory(Some(&id)))
+            .expect("Could not create config directory");
+        fs::create_dir_all(Config::default_data_directory(Some(&id)))
+            .expect("Could not create data directory");
+        config = config.with_id(&id);
+    }
+
+    config = config
+        .with_optional(Config::with_custom_nyxd_validator, args.nyxd_validator)
+        .with_optional_env(
+            Config::with_custom_mixnet_contract,
+            args.mixnet_contract,
+            MIXNET_CONTRACT_ADDRESS,
+        )
+        .with_optional(Config::with_mnemonic, args.mnemonic)
+        .with_optional(
+            Config::with_minimum_interval_monitor_threshold,
+            args.monitor_threshold,
+        )
+        .with_optional(
+            Config::with_min_mixnode_reliability,
+            args.min_mixnode_reliability,
+        )
+        .with_optional(
+            Config::with_min_gateway_reliability,
+            args.min_gateway_reliability,
+        )
+        .with_network_monitor_enabled(args.enable_monitor)
+        .with_rewarding_enabled(args.enable_rewarding)
+        .with_disabled_credentials_mode(!args.enabled_credentials_mode);
+
+    #[cfg(feature = "coconut")]
+    {
+        config = config
+            .with_optional(Config::with_announce_address, args.announce_address)
+            .with_coconut_signer_enabled(args.enable_coconut);
+    }
+
+    if args.save_config {
+        info!("Saving the configuration to a file");
+        if let Err(err) = config.save_to_file(None) {
+            error!("Failed to write config to a file - {err}");
+            process::exit(1)
+        }
+    }
+
+    config
+}
+
+fn setup_cors() -> Result<Cors> {
+    let allowed_origins = AllowedOrigins::all();
+
+    // You can also deserialize this
+    let cors = rocket_cors::CorsOptions {
+        allowed_origins,
+        allowed_methods: vec![Method::Post, Method::Get]
+            .into_iter()
+            .map(From::from)
+            .collect(),
+        allowed_headers: AllowedHeaders::all(),
+        allow_credentials: true,
+        ..Default::default()
+    }
+    .to_cors()?;
+
+    Ok(cors)
+}
+
+fn setup_liftoff_notify(notify: Arc<Notify>) -> AdHoc {
+    AdHoc::on_liftoff("Liftoff notifier", |_| {
+        Box::pin(async move { notify.notify_one() })
+    })
+}
+
+fn setup_network_monitor<'a>(
+    config: &'a Config,
+    _nyxd_client: Client<SigningNyxdClient>,
+    system_version: &str,
+    rocket: &Rocket<Ignite>,
+) -> Option<NetworkMonitorBuilder<'a>> {
+    if !config.get_network_monitor_enabled() {
+        return None;
+    }
+
+    // get instances of managed states
+    let node_status_storage = rocket.state::<NymApiStorage>().unwrap().clone();
+    let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
+
+    Some(NetworkMonitorBuilder::new(
+        config,
+        _nyxd_client,
+        system_version,
+        node_status_storage,
+        validator_cache,
+    ))
+}
+
+// TODO: Remove if still unused
+#[allow(dead_code)]
+fn expected_monitor_test_runs(config: &Config, interval_length: Duration) -> usize {
+    let test_delay = config.get_network_monitor_run_interval();
+
+    // this is just a rough estimate. In real world there will be slightly fewer test runs
+    // as they are not instantaneous and hence do not happen exactly every test_delay
+    (interval_length.as_secs() / test_delay.as_secs()) as usize
+}
+
+async fn setup_rocket(
+    config: &Config,
+    _mix_denom: String,
+    liftoff_notify: Arc<Notify>,
+    _nyxd_client: Client<SigningNyxdClient>,
+    #[cfg(feature = "coconut")] coconut_keypair: coconut::keypair::KeyPair,
+) -> Result<Rocket<Ignite>> {
+    let openapi_settings = rocket_okapi::settings::OpenApiSettings::default();
+    let mut rocket = rocket::build();
+
+    let custom_route_spec = (vec![], custom_openapi_spec());
+
+    mount_endpoints_and_merged_docs! {
+        rocket,
+        "/v1".to_owned(),
+        openapi_settings,
+        "/" => custom_route_spec,
+        "" => contract_cache::validator_cache_routes(&openapi_settings),
+        "/status" => node_status_api::node_status_routes(&openapi_settings, config.get_network_monitor_enabled()),
+    }
+
+    let rocket = rocket
+        .mount("/swagger", make_swagger_ui(&swagger::get_docs()))
+        .attach(setup_cors()?)
+        .attach(setup_liftoff_notify(liftoff_notify))
+        .attach(ValidatorCache::stage())
+        .attach(NodeStatusCache::stage());
+
+    // This is not a very nice approach. A lazy value would be more suitable, but that's still
+    // a nightly feature: https://github.com/rust-lang/rust/issues/74465
+    let storage = if cfg!(feature = "coconut") || config.get_network_monitor_enabled() {
+        Some(NymApiStorage::init(config.get_node_status_api_database_path()).await?)
+    } else {
+        None
+    };
+
+    #[cfg(feature = "coconut")]
+    let rocket = if config.get_coconut_signer_enabled() {
+        rocket.attach(InternalSignRequest::stage(
+            _nyxd_client.clone(),
+            _mix_denom,
+            coconut_keypair,
+            QueryCommunicationChannel::new(_nyxd_client),
+            storage.clone().unwrap(),
+        ))
+    } else {
+        rocket
+    };
+
+    // see if we should start up network monitor
+    let rocket = if config.get_network_monitor_enabled() {
+        rocket.attach(storage::NymApiStorage::stage(storage.unwrap()))
+    } else {
+        rocket
+    };
+
+    Ok(rocket.ignite().await?)
+}
+
+fn custom_openapi_spec() -> OpenApi {
+    use rocket_okapi::okapi::openapi3::*;
+    OpenApi {
+        openapi: OpenApi::default_version(),
+        info: Info {
+            title: "Validator API".to_owned(),
+            description: None,
+            terms_of_service: None,
+            contact: None,
+            license: None,
+            version: env!("CARGO_PKG_VERSION").to_owned(),
+            ..Default::default()
+        },
+        servers: get_servers(),
+        ..Default::default()
+    }
+}
+
+fn get_servers() -> Vec<rocket_okapi::okapi::openapi3::Server> {
+    if std::env::var_os("CARGO").is_some() {
+        return vec![];
+    }
+    vec![rocket_okapi::okapi::openapi3::Server {
+        url: std::env::var("OPEN_API_BASE").unwrap_or_else(|_| "/api/v1/".to_owned()),
+        description: Some("API".to_owned()),
+        ..Default::default()
+    }]
+}
+
+async fn run_nym_api(args: ApiArgs) -> Result<()> {
+    let system_version = env!("CARGO_PKG_VERSION");
+
+    // try to load config from the file, if it doesn't exist, use default values
+    let id = args.id.as_deref();
+    let (config, _already_inited) = match Config::load_from_file(id) {
+        Ok(cfg) => (cfg, true),
+        Err(_) => {
+            let config_path = Config::default_config_file_path(id)
+                .into_os_string()
+                .into_string()
+                .unwrap();
+            warn!(
+                "Could not load the configuration file from {config_path}. Either the file did not exist or was malformed. Using the default values instead",                
+            );
+            (Config::new(), false)
+        }
+    };
+
+    let save_to_file = args.save_config;
+    let config = override_config(config, args);
+
+    #[cfg(feature = "coconut")]
+    if !_already_inited {
+        init_keypair(&config)?;
+    }
+
+    // if we just wanted to write data to the config, exit
+    if save_to_file {
+        info!("Saving the configuration to a file");
+        if let Err(err) = config.save_to_file(None) {
+            error!("Failed to write config to a file - {err}");
+            process::exit(1)
+        } else {
+            return Ok(());
+        }
+    }
+
+    let mix_denom = std::env::var(MIX_DENOM).expect("mix denom not set");
+
+    let signing_nyxd_client = Client::new_signing(&config);
+
+    let liftoff_notify = Arc::new(Notify::new());
+    // We need a bigger timeout
+    let shutdown = TaskManager::new(10);
+
+    #[cfg(feature = "coconut")]
+    let coconut_keypair = coconut::keypair::KeyPair::new();
+
+    // let's build our rocket!
+    let rocket = setup_rocket(
+        &config,
+        mix_denom,
+        Arc::clone(&liftoff_notify),
+        signing_nyxd_client.clone(),
+        #[cfg(feature = "coconut")]
+        coconut_keypair.clone(),
+    )
+    .await?;
+    let monitor_builder = setup_network_monitor(
+        &config,
+        signing_nyxd_client.clone(),
+        system_version,
+        &rocket,
+    );
+
+    let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
+    let node_status_cache = rocket.state::<NodeStatusCache>().unwrap().clone();
+
+    #[cfg(feature = "coconut")]
+    {
+        let dkg_controller =
+            DkgController::new(&config, signing_nyxd_client.clone(), coconut_keypair, OsRng)
+                .await?;
+        let shutdown_listener = shutdown.subscribe();
+        tokio::spawn(async move { dkg_controller.run(shutdown_listener).await });
+    }
+
+    // if network monitor is disabled, we're not going to be sending any rewarding hence
+    // we're not starting signing client
+    let validator_cache_listener = if config.get_network_monitor_enabled() {
+        // Main storage
+        let storage = rocket.state::<NymApiStorage>().unwrap().clone();
+
+        // setup our daily uptime updater. Note that if network monitor is disabled, then we have
+        // no data for the updates and hence we don't need to start it up
+        let uptime_updater = HistoricalUptimeUpdater::new(storage.clone());
+        let shutdown_listener = shutdown.subscribe();
+        tokio::spawn(async move { uptime_updater.run(shutdown_listener).await });
+
+        // spawn the validator cache refresher
+        let validator_cache_refresher = ValidatorCacheRefresher::new(
+            signing_nyxd_client.clone(),
+            config.get_caching_interval(),
+            validator_cache.clone(),
+        );
+        let validator_cache_listener = validator_cache_refresher.subscribe();
+        let shutdown_listener = shutdown.subscribe();
+        tokio::spawn(async move { validator_cache_refresher.run(shutdown_listener).await });
+
+        // spawn rewarded set updater
+        if config.get_rewarding_enabled() {
+            let mut rewarded_set_updater =
+                RewardedSetUpdater::new(signing_nyxd_client, validator_cache.clone(), storage)
+                    .await?;
+            let shutdown_listener = shutdown.subscribe();
+            tokio::spawn(async move { rewarded_set_updater.run(shutdown_listener).await.unwrap() });
+        }
+        validator_cache_listener
+    } else {
+        // Spawn the validator cache refresher.
+        // When the network monitor is not enabled, we spawn the validator cache refresher task
+        // with just a nyxd client, in contrast to a signing client.
+        let nyxd_client = Client::new_query(&config);
+        let validator_cache_refresher = ValidatorCacheRefresher::new(
+            nyxd_client,
+            config.get_caching_interval(),
+            validator_cache.clone(),
+        );
+        let validator_cache_listener = validator_cache_refresher.subscribe();
+        let shutdown_listener = shutdown.subscribe();
+        tokio::spawn(async move { validator_cache_refresher.run(shutdown_listener).await });
+
+        validator_cache_listener
+    };
+
+    // Spawn the node status cache refresher.
+    // It is primarily refreshed in-sync with the validator cache, however provide a fallback
+    // caching interval that is twice the validator cache
+    let storage = rocket.state::<NymApiStorage>().cloned();
+    let mut nym_api_cache_refresher = node_status_api::NodeStatusCacheRefresher::new(
+        node_status_cache,
+        config.get_caching_interval().saturating_mul(2),
+        validator_cache,
+        validator_cache_listener,
+        storage,
+    );
+    let shutdown_listener = shutdown.subscribe();
+    tokio::spawn(async move { nym_api_cache_refresher.run(shutdown_listener).await });
+
+    // launch the rocket!
+    // Rocket handles shutdown on it's own, but its shutdown handling should be incorporated
+    // with that of the rest of the tasks.
+    // Currently it's runtime is forcefully terminated once the nym-api exits.
+    let shutdown_handle = rocket.shutdown();
+    tokio::spawn(rocket.launch());
+
+    // to finish building our monitor, we need to have rocket up and running so that we could
+    // obtain our bandwidth credential
+    if let Some(monitor_builder) = monitor_builder {
+        info!("Starting network monitor...");
+        // wait for rocket's liftoff stage
+        liftoff_notify.notified().await;
+
+        // we're ready to go! spawn the network monitor!
+        let runnables = monitor_builder.build().await;
+        runnables.spawn_tasks(&shutdown);
+    } else {
+        info!("Network monitoring is disabled.");
+    }
+
+    wait_for_interrupt(shutdown).await;
+    shutdown_handle.notify();
+
+    Ok(())
+}
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    println!("Starting validator api...");
+
+    cfg_if::cfg_if! {if #[cfg(feature = "console-subscriber")] {
+        // instriment tokio console subscriber needs RUSTFLAGS="--cfg tokio_unstable" at build time
+        console_subscriber::init();
+    }}
+
+    setup_logging();
+    let args = ApiArgs::parse();
+    setup_env(args.config_env_file.as_ref());
+    run_nym_api(args).await
+}
diff --git a/validator-api/src/network_monitor/chunker.rs b/nym-api/src/network_monitor/chunker.rs
similarity index 93%
rename from validator-api/src/network_monitor/chunker.rs
rename to nym-api/src/network_monitor/chunker.rs
index ec0da08871..0caaba0811 100644
--- a/validator-api/src/network_monitor/chunker.rs
+++ b/nym-api/src/network_monitor/chunker.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use nymsphinx::forwarding::packet::MixPacket;
+use nymsphinx::message::NymMessage;
 use nymsphinx::{
     acknowledgements::AckKey, addressing::clients::Recipient, preparer::MessagePreparer,
 };
@@ -52,10 +53,9 @@ impl Chunker {
     ) -> Vec<MixPacket> {
         let ack_key: AckKey = AckKey::new(&mut self.rng);
 
-        let (split_message, _reply_keys) = self
+        let split_message = self
             .message_preparer
-            .prepare_and_split_message(message, false, topology)
-            .expect("failed to split the message");
+            .pad_and_split_message(NymMessage::new_plain(message));
 
         let mut mix_packets = Vec::with_capacity(split_message.len());
         for message_chunk in split_message {
diff --git a/validator-api/src/network_monitor/gateways_reader.rs b/nym-api/src/network_monitor/gateways_reader.rs
similarity index 100%
rename from validator-api/src/network_monitor/gateways_reader.rs
rename to nym-api/src/network_monitor/gateways_reader.rs
diff --git a/validator-api/src/network_monitor/mod.rs b/nym-api/src/network_monitor/mod.rs
similarity index 93%
rename from validator-api/src/network_monitor/mod.rs
rename to nym-api/src/network_monitor/mod.rs
index 8b85d5fd5a..e2a9dbdfc6 100644
--- a/validator-api/src/network_monitor/mod.rs
+++ b/nym-api/src/network_monitor/mod.rs
@@ -6,8 +6,8 @@ use crypto::asymmetric::{encryption, identity};
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 use std::sync::Arc;
-use task::ShutdownNotifier;
-use validator_client::nymd::SigningNymdClient;
+use task::TaskManager;
+use validator_client::nyxd::SigningNyxdClient;
 
 use crate::config::Config;
 use crate::contract_cache::ValidatorCache;
@@ -21,8 +21,8 @@ use crate::network_monitor::monitor::receiver::{
 use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::SummaryProducer;
 use crate::network_monitor::monitor::Monitor;
-use crate::nymd_client::Client;
-use crate::storage::ValidatorApiStorage;
+use crate::nyxd_client::Client;
+use crate::storage::NymApiStorage;
 
 pub(crate) mod chunker;
 pub(crate) mod gateways_reader;
@@ -34,23 +34,23 @@ pub(crate) const ROUTE_TESTING_TEST_NONCE: u64 = 0;
 
 pub(crate) struct NetworkMonitorBuilder<'a> {
     config: &'a Config,
-    _nymd_client: Client<SigningNymdClient>,
+    _nyxd_client: Client<SigningNyxdClient>,
     system_version: String,
-    node_status_storage: ValidatorApiStorage,
+    node_status_storage: NymApiStorage,
     validator_cache: ValidatorCache,
 }
 
 impl<'a> NetworkMonitorBuilder<'a> {
     pub(crate) fn new(
         config: &'a Config,
-        _nymd_client: Client<SigningNymdClient>,
+        _nyxd_client: Client<SigningNyxdClient>,
         system_version: &str,
-        node_status_storage: ValidatorApiStorage,
+        node_status_storage: NymApiStorage,
         validator_cache: ValidatorCache,
     ) -> Self {
         NetworkMonitorBuilder {
             config,
-            _nymd_client,
+            _nyxd_client,
             system_version: system_version.to_string(),
             node_status_storage,
             validator_cache,
@@ -80,7 +80,7 @@ impl<'a> NetworkMonitorBuilder<'a> {
 
         #[cfg(feature = "coconut")]
         let bandwidth_controller = {
-            let client = self._nymd_client.0.read().await;
+            let client = self._nyxd_client.0.read().await;
             let coconut_api_clients =
                 validator_client::CoconutApiClient::all_coconut_api_clients(&client)
                     .await
@@ -142,7 +142,7 @@ impl NetworkMonitorRunnables {
     // TODO: note, that is not exactly doing what we want, because when
     // `ReceivedProcessor` is constructed, it already spawns a future
     // this needs to be refactored!
-    pub(crate) fn spawn_tasks(self, shutdown: &ShutdownNotifier) {
+    pub(crate) fn spawn_tasks(self, shutdown: &TaskManager) {
         let mut packet_receiver = self.packet_receiver;
         let mut monitor = self.monitor;
         let shutdown_listener = shutdown.subscribe();
diff --git a/validator-api/src/network_monitor/monitor/gateway_clients_cache.rs b/nym-api/src/network_monitor/monitor/gateway_clients_cache.rs
similarity index 100%
rename from validator-api/src/network_monitor/monitor/gateway_clients_cache.rs
rename to nym-api/src/network_monitor/monitor/gateway_clients_cache.rs
diff --git a/validator-api/src/network_monitor/monitor/gateways_pinger.rs b/nym-api/src/network_monitor/monitor/gateways_pinger.rs
similarity index 98%
rename from validator-api/src/network_monitor/monitor/gateways_pinger.rs
rename to nym-api/src/network_monitor/monitor/gateways_pinger.rs
index 24cd581bf3..986c1db5fb 100644
--- a/validator-api/src/network_monitor/monitor/gateways_pinger.rs
+++ b/nym-api/src/network_monitor/monitor/gateways_pinger.rs
@@ -7,7 +7,7 @@ use crypto::asymmetric::identity;
 use crypto::asymmetric::identity::PUBLIC_KEY_LENGTH;
 use log::{debug, info, trace, warn};
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::time::{sleep, Instant};
 
 // TODO: should it perhaps be moved to config along other timeout values?
@@ -144,7 +144,7 @@ impl GatewayPinger {
         info!("Pinging all active gateways took {:?}", time_taken);
     }
 
-    pub(crate) async fn run(&self, mut shutdown: ShutdownListener) {
+    pub(crate) async fn run(&self, mut shutdown: TaskClient) {
         while !shutdown.is_shutdown() {
             tokio::select! {
                 _ = sleep(self.pinging_interval) => {
diff --git a/validator-api/src/network_monitor/monitor/mod.rs b/nym-api/src/network_monitor/monitor/mod.rs
similarity index 98%
rename from validator-api/src/network_monitor/monitor/mod.rs
rename to nym-api/src/network_monitor/monitor/mod.rs
index e2d1a07128..f0f17bad09 100644
--- a/validator-api/src/network_monitor/monitor/mod.rs
+++ b/nym-api/src/network_monitor/monitor/mod.rs
@@ -8,11 +8,11 @@ use crate::network_monitor::monitor::sender::PacketSender;
 use crate::network_monitor::monitor::summary_producer::{SummaryProducer, TestSummary};
 use crate::network_monitor::test_packet::TestPacket;
 use crate::network_monitor::test_route::TestRoute;
-use crate::storage::ValidatorApiStorage;
+use crate::storage::NymApiStorage;
 use log::{debug, error, info};
 use std::collections::{HashMap, HashSet};
 use std::process;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::time::{sleep, Duration, Instant};
 
 pub(crate) mod gateway_clients_cache;
@@ -29,7 +29,7 @@ pub(super) struct Monitor {
     packet_sender: PacketSender,
     received_processor: ReceivedProcessor,
     summary_producer: SummaryProducer,
-    node_status_storage: ValidatorApiStorage,
+    node_status_storage: NymApiStorage,
     run_interval: Duration,
     gateway_ping_interval: Duration,
     packet_delivery_timeout: Duration,
@@ -52,7 +52,7 @@ impl Monitor {
         packet_sender: PacketSender,
         received_processor: ReceivedProcessor,
         summary_producer: SummaryProducer,
-        node_status_storage: ValidatorApiStorage,
+        node_status_storage: NymApiStorage,
     ) -> Self {
         Monitor {
             test_nonce: 1,
@@ -301,7 +301,7 @@ impl Monitor {
         self.test_nonce += 1;
     }
 
-    pub(crate) async fn run(&mut self, mut shutdown: ShutdownListener) {
+    pub(crate) async fn run(&mut self, mut shutdown: TaskClient) {
         self.received_processor.start_receiving();
 
         // wait for validator cache to be ready
diff --git a/validator-api/src/network_monitor/monitor/preparer.rs b/nym-api/src/network_monitor/monitor/preparer.rs
similarity index 100%
rename from validator-api/src/network_monitor/monitor/preparer.rs
rename to nym-api/src/network_monitor/monitor/preparer.rs
diff --git a/validator-api/src/network_monitor/monitor/processor.rs b/nym-api/src/network_monitor/monitor/processor.rs
similarity index 80%
rename from validator-api/src/network_monitor/monitor/processor.rs
rename to nym-api/src/network_monitor/monitor/processor.rs
index 28ef3ae900..4a86c52612 100644
--- a/validator-api/src/network_monitor/monitor/processor.rs
+++ b/nym-api/src/network_monitor/monitor/processor.rs
@@ -1,46 +1,40 @@
-// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::network_monitor::gateways_reader::GatewayMessages;
-use crate::network_monitor::test_packet::TestPacket;
+use crate::network_monitor::test_packet::{TestPacket, TestPacketError};
 use crate::network_monitor::ROUTE_TESTING_TEST_NONCE;
 use crypto::asymmetric::encryption;
 use futures::channel::mpsc;
 use futures::lock::{Mutex, MutexGuard};
 use futures::{SinkExt, StreamExt};
 use log::warn;
-use nymsphinx::receiver::MessageReceiver;
-use std::fmt::{self, Display, Formatter};
+use nymsphinx::receiver::{MessageReceiver, MessageRecoveryError};
 use std::mem;
 use std::sync::Arc;
+use thiserror::Error;
 
 pub(crate) type ReceivedProcessorSender = mpsc::UnboundedSender<GatewayMessages>;
 pub(crate) type ReceivedProcessorReceiver = mpsc::UnboundedReceiver<GatewayMessages>;
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 enum ProcessingError {
-    MalformedPacketReceived,
-    NonTestPacketReceived,
-    NonMatchingNonce(u64),
-    ReceivedOutsideTestRun,
-}
+    #[error(
+        "could not recover underlying data from the received packet since it was malformed - {0}"
+    )]
+    MalformedPacketReceived(#[from] MessageRecoveryError),
 
-impl Display for ProcessingError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            ProcessingError::MalformedPacketReceived => write!(f, "received malformed packet"),
-            ProcessingError::NonTestPacketReceived => write!(f, "received a non-test packet"),
-            ProcessingError::NonMatchingNonce(nonce) => write!(
-                f,
-                "received packet with nonce {} which is different than the expected",
-                nonce
-            ),
-            ProcessingError::ReceivedOutsideTestRun => write!(
-                f,
-                "received packet while the test is currently not in progress"
-            ),
-        }
-    }
+    #[error("received a mix packet that was NOT a proper network monitor test packet")]
+    NonTestPacketReceived,
+
+    #[error("the received test packet was malformed - {0}")]
+    MalformedTestPacket(#[from] TestPacketError),
+
+    #[error("received packet with an unexpected nonce. Got: {received}, expected: {expected}")]
+    NonMatchingNonce { received: u64, expected: u64 },
+
+    #[error("received a mix packet while no test run is currently in progress")]
+    ReceivedOutsideTestRun,
 }
 
 // we can't use Notify due to possible edge case where both notification are consumed at once
@@ -68,32 +62,32 @@ struct ReceivedProcessorInner {
 }
 
 impl ReceivedProcessorInner {
-    fn on_message(&mut self, message: Vec<u8>) -> Result<(), ProcessingError> {
+    fn on_message(&mut self, mut message: Vec<u8>) -> Result<(), ProcessingError> {
         // if the nonce is none it means the packet was received during the 'waiting' for the
         // next test run
         if self.test_nonce.is_none() {
             return Err(ProcessingError::ReceivedOutsideTestRun);
         }
 
-        let encrypted_bytes = self
+        let plaintext = self
             .message_receiver
-            .recover_plaintext(self.client_encryption_keypair.private_key(), message)
-            .map_err(|_| ProcessingError::MalformedPacketReceived)?;
-        let fragment = self
-            .message_receiver
-            .recover_fragment(&encrypted_bytes)
-            .map_err(|_| ProcessingError::MalformedPacketReceived)?;
+            .recover_plaintext_from_regular_packet(
+                self.client_encryption_keypair.private_key(),
+                &mut message,
+            )?;
+        let fragment = self.message_receiver.recover_fragment(plaintext)?;
         let (recovered, _) = self
             .message_receiver
-            .insert_new_fragment(fragment)
-            .map_err(|_| ProcessingError::MalformedPacketReceived)?
+            .insert_new_fragment(fragment)?
             .ok_or(ProcessingError::NonTestPacketReceived)?; // if it's a test packet it MUST BE reconstructed with single fragment
-        let test_packet = TestPacket::try_from_bytes(&recovered.message)
-            .map_err(|_| ProcessingError::MalformedPacketReceived)?;
+        let test_packet = TestPacket::try_from_bytes(&recovered.into_inner_data())?;
 
         // we know nonce is NOT none
         if test_packet.test_nonce() != self.test_nonce.unwrap() {
-            return Err(ProcessingError::NonMatchingNonce(test_packet.test_nonce()));
+            return Err(ProcessingError::NonMatchingNonce {
+                received: test_packet.test_nonce(),
+                expected: self.test_nonce.unwrap(),
+            });
         }
 
         self.received_packets.push(test_packet);
@@ -159,7 +153,7 @@ impl ReceivedProcessor {
                             Some(messages) => {
                                 for message in messages {
                                     if let Err(err) = inner.on_message(message) {
-                                        warn!(target: "Monitor", "failed to process received gateway message - {}", err)
+                                        warn!(target: "Monitor", "failed to process received gateway message - {err}")
                                     }
                                 }
                             }
diff --git a/validator-api/src/network_monitor/monitor/receiver.rs b/nym-api/src/network_monitor/monitor/receiver.rs
similarity index 96%
rename from validator-api/src/network_monitor/monitor/receiver.rs
rename to nym-api/src/network_monitor/monitor/receiver.rs
index 991da5fa05..c232458c6f 100644
--- a/validator-api/src/network_monitor/monitor/receiver.rs
+++ b/nym-api/src/network_monitor/monitor/receiver.rs
@@ -7,7 +7,7 @@ use crypto::asymmetric::identity;
 use futures::channel::mpsc;
 use futures::StreamExt;
 use gateway_client::{AcknowledgementReceiver, MixnetMessageReceiver};
-use task::ShutdownListener;
+use task::TaskClient;
 
 pub(crate) type GatewayClientUpdateSender = mpsc::UnboundedSender<GatewayClientUpdate>;
 pub(crate) type GatewayClientUpdateReceiver = mpsc::UnboundedReceiver<GatewayClientUpdate>;
@@ -56,7 +56,7 @@ impl PacketReceiver {
             .expect("packet processor seems to have crashed!");
     }
 
-    pub(crate) async fn run(&mut self, mut shutdown: ShutdownListener) {
+    pub(crate) async fn run(&mut self, mut shutdown: TaskClient) {
         while !shutdown.is_shutdown() {
             tokio::select! {
                 biased;
diff --git a/validator-api/src/network_monitor/monitor/sender.rs b/nym-api/src/network_monitor/monitor/sender.rs
similarity index 99%
rename from validator-api/src/network_monitor/monitor/sender.rs
rename to nym-api/src/network_monitor/monitor/sender.rs
index 4ec0e9ce45..5c6f3df22d 100644
--- a/validator-api/src/network_monitor/monitor/sender.rs
+++ b/nym-api/src/network_monitor/monitor/sender.rs
@@ -24,7 +24,7 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::Poll;
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 
 use gateway_client::bandwidth::BandwidthController;
 
@@ -166,11 +166,7 @@ impl PacketSender {
         }
     }
 
-    pub(crate) fn spawn_gateways_pinger(
-        &self,
-        pinging_interval: Duration,
-        shutdown: ShutdownListener,
-    ) {
+    pub(crate) fn spawn_gateways_pinger(&self, pinging_interval: Duration, shutdown: TaskClient) {
         let gateway_pinger = GatewayPinger::new(
             self.active_gateway_clients.clone(),
             self.fresh_gateway_client_data
@@ -209,7 +205,7 @@ impl PacketSender {
             ack_sender,
             fresh_gateway_client_data.gateway_response_timeout,
             Some(fresh_gateway_client_data.bandwidth_controller.clone()),
-            None,
+            task::TaskClient::dummy(),
         );
 
         gateway_client
diff --git a/validator-api/src/network_monitor/monitor/summary_producer.rs b/nym-api/src/network_monitor/monitor/summary_producer.rs
similarity index 100%
rename from validator-api/src/network_monitor/monitor/summary_producer.rs
rename to nym-api/src/network_monitor/monitor/summary_producer.rs
diff --git a/validator-api/src/network_monitor/test_packet.rs b/nym-api/src/network_monitor/test_packet.rs
similarity index 88%
rename from validator-api/src/network_monitor/test_packet.rs
rename to nym-api/src/network_monitor/test_packet.rs
index 8f5e0bde5e..4806c3efe4 100644
--- a/validator-api/src/network_monitor/test_packet.rs
+++ b/nym-api/src/network_monitor/test_packet.rs
@@ -3,12 +3,14 @@
 
 use crate::network_monitor::monitor::preparer::TestedNode;
 use crypto::asymmetric::identity;
+use crypto::asymmetric::identity::Ed25519RecoveryError;
 use mixnet_contract_common::MixId;
 use std::convert::TryInto;
 use std::fmt::{self, Display, Formatter};
 use std::hash::{Hash, Hasher};
 use std::mem;
 use std::str::Utf8Error;
+use thiserror::Error;
 use topology::{gateway, mix};
 
 const MIXNODE_TYPE: u8 = 0;
@@ -67,24 +69,25 @@ impl NodeType {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Error)]
 pub(crate) enum TestPacketError {
-    IncompletePacket,
+    #[error(
+        "the received packet was incomplete. Got {received} bytes but expected at least {min_expected}"
+    )]
+    IncompletePacket {
+        received: usize,
+        min_expected: usize,
+    },
+
+    // TODO: ideally this should contain more information but that'd require more refactoring than I'm willing to commit to now
+    #[error("the received packet did not contain a valid node type")]
     InvalidNodeType,
-    InvalidNodeKey,
-    InvalidOwner(Utf8Error),
-}
 
-impl From<identity::Ed25519RecoveryError> for TestPacketError {
-    fn from(_: identity::Ed25519RecoveryError) -> Self {
-        TestPacketError::InvalidNodeKey
-    }
-}
+    #[error("the received node identity key was malformed - {0}")]
+    InvalidNodeKey(#[from] Ed25519RecoveryError),
 
-impl From<Utf8Error> for TestPacketError {
-    fn from(err: Utf8Error) -> Self {
-        TestPacketError::InvalidOwner(err)
-    }
+    #[error("the received packet contained malformed owner data - {0}")]
+    InvalidOwner(#[from] Utf8Error),
 }
 
 #[derive(Eq, Clone, Debug)]
@@ -184,7 +187,10 @@ impl TestPacket {
         let n = mem::size_of::<u64>();
 
         if b.len() < 2 * n + 1 + identity::PUBLIC_KEY_LENGTH {
-            return Err(TestPacketError::IncompletePacket);
+            return Err(TestPacketError::IncompletePacket {
+                received: b.len(),
+                min_expected: 2 * n + 1 + identity::PUBLIC_KEY_LENGTH,
+            });
         }
 
         // those unwraps can't fail as we've already checked for the size
diff --git a/validator-api/src/network_monitor/test_route/mod.rs b/nym-api/src/network_monitor/test_route/mod.rs
similarity index 100%
rename from validator-api/src/network_monitor/test_route/mod.rs
rename to nym-api/src/network_monitor/test_route/mod.rs
diff --git a/nym-api/src/node_status_api/cache.rs b/nym-api/src/node_status_api/cache.rs
new file mode 100644
index 0000000000..5a76ffd85a
--- /dev/null
+++ b/nym-api/src/node_status_api/cache.rs
@@ -0,0 +1,396 @@
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::contract_cache::{Cache, CacheNotification, ValidatorCache};
+use crate::storage::NymApiStorage;
+use mixnet_contract_common::families::FamilyHead;
+use mixnet_contract_common::reward_params::Performance;
+use mixnet_contract_common::{
+    IdentityKey, Interval, MixId, MixNodeDetails, RewardedSetNodeStatus, RewardingParams,
+};
+use nym_api_requests::models::{MixNodeBondAnnotated, MixnodeStatus};
+use rocket::fairing::AdHoc;
+use std::collections::HashMap;
+use std::{sync::Arc, time::Duration};
+use task::TaskClient;
+use tokio::sync::RwLockReadGuard;
+use tokio::{
+    sync::{watch, RwLock},
+    time,
+};
+
+use self::inclusion_probabilities::InclusionProbabilities;
+
+use super::reward_estimate::{compute_apy_from_reward, compute_reward_estimate};
+
+mod inclusion_probabilities;
+
+const CACHE_TIMOUT_MS: u64 = 100;
+
+enum NodeStatusCacheError {
+    SimulationFailed,
+    SourceDataMissing,
+}
+
+// A node status cache suitable for caching values computed in one sweep, such as active set
+// inclusion probabilities that are computed for all mixnodes at the same time.
+//
+// The cache can be triggered to update on contract cache changes, and/or periodically on a timer.
+#[derive(Clone)]
+pub struct NodeStatusCache {
+    inner: Arc<RwLock<NodeStatusCacheInner>>,
+}
+
+#[derive(Default)]
+struct NodeStatusCacheInner {
+    mixnodes_annotated: Cache<Vec<MixNodeBondAnnotated>>,
+    rewarded_set_annotated: Cache<Vec<MixNodeBondAnnotated>>,
+    active_set_annotated: Cache<Vec<MixNodeBondAnnotated>>,
+
+    // Estimated active set inclusion probabilities from Monte Carlo simulation
+    inclusion_probabilities: Cache<InclusionProbabilities>,
+}
+
+impl NodeStatusCache {
+    fn new() -> Self {
+        NodeStatusCache {
+            inner: Arc::new(RwLock::new(NodeStatusCacheInner::new())),
+        }
+    }
+
+    pub fn stage() -> AdHoc {
+        AdHoc::on_ignite("Node Status Cache", |rocket| async {
+            rocket.manage(Self::new())
+        })
+    }
+
+    async fn update_cache(
+        &self,
+        mixnodes: Vec<MixNodeBondAnnotated>,
+        rewarded_set: Vec<MixNodeBondAnnotated>,
+        active_set: Vec<MixNodeBondAnnotated>,
+        inclusion_probabilities: InclusionProbabilities,
+    ) {
+        match time::timeout(Duration::from_millis(CACHE_TIMOUT_MS), self.inner.write()).await {
+            Ok(mut cache) => {
+                cache.mixnodes_annotated.update(mixnodes);
+                cache.rewarded_set_annotated.update(rewarded_set);
+                cache.active_set_annotated.update(active_set);
+                cache
+                    .inclusion_probabilities
+                    .update(inclusion_probabilities);
+            }
+            Err(e) => error!("{e}"),
+        }
+    }
+
+    async fn get_cache<T>(
+        &self,
+        fn_arg: impl FnOnce(RwLockReadGuard<'_, NodeStatusCacheInner>) -> Cache<T>,
+    ) -> Option<Cache<T>> {
+        match time::timeout(Duration::from_millis(CACHE_TIMOUT_MS), self.inner.read()).await {
+            Ok(cache) => Some(fn_arg(cache)),
+            Err(e) => {
+                error!("{e}");
+                None
+            }
+        }
+    }
+
+    pub(crate) async fn mixnodes_annotated(&self) -> Option<Cache<Vec<MixNodeBondAnnotated>>> {
+        self.get_cache(|c| c.mixnodes_annotated.clone()).await
+    }
+
+    pub(crate) async fn rewarded_set_annotated(&self) -> Option<Cache<Vec<MixNodeBondAnnotated>>> {
+        self.get_cache(|c| c.rewarded_set_annotated.clone()).await
+    }
+
+    pub(crate) async fn active_set_annotated(&self) -> Option<Cache<Vec<MixNodeBondAnnotated>>> {
+        self.get_cache(|c| c.active_set_annotated.clone()).await
+    }
+
+    pub(crate) async fn inclusion_probabilities(&self) -> Option<Cache<InclusionProbabilities>> {
+        self.get_cache(|c| c.inclusion_probabilities.clone()).await
+    }
+
+    pub async fn mixnode_details(
+        &self,
+        mix_id: MixId,
+    ) -> (Option<MixNodeBondAnnotated>, MixnodeStatus) {
+        // it might not be the most optimal to possibly iterate the entire vector to find (or not)
+        // the relevant value. However, the vectors are relatively small (< 10_000 elements, < 1000 for active set)
+
+        let active_set = &self.active_set_annotated().await.unwrap().into_inner();
+        if let Some(bond) = active_set.iter().find(|mix| mix.mix_id() == mix_id) {
+            return (Some(bond.clone()), MixnodeStatus::Active);
+        }
+
+        let rewarded_set = &self.rewarded_set_annotated().await.unwrap().into_inner();
+        if let Some(bond) = rewarded_set.iter().find(|mix| mix.mix_id() == mix_id) {
+            return (Some(bond.clone()), MixnodeStatus::Standby);
+        }
+
+        let all_bonded = &self.mixnodes_annotated().await.unwrap().into_inner();
+        if let Some(bond) = all_bonded.iter().find(|mix| mix.mix_id() == mix_id) {
+            (Some(bond.clone()), MixnodeStatus::Inactive)
+        } else {
+            (None, MixnodeStatus::NotFound)
+        }
+    }
+}
+
+impl NodeStatusCacheInner {
+    pub fn new() -> Self {
+        Self::default()
+    }
+}
+
+// Long running task responsible of keeping the cache up-to-date.
+pub struct NodeStatusCacheRefresher {
+    // Main stored data
+    cache: NodeStatusCache,
+    fallback_caching_interval: Duration,
+
+    // Sources for when refreshing data
+    contract_cache: ValidatorCache,
+    contract_cache_listener: watch::Receiver<CacheNotification>,
+    storage: Option<NymApiStorage>,
+}
+
+impl NodeStatusCacheRefresher {
+    pub(crate) fn new(
+        cache: NodeStatusCache,
+        fallback_caching_interval: Duration,
+        contract_cache: ValidatorCache,
+        contract_cache_listener: watch::Receiver<CacheNotification>,
+        storage: Option<NymApiStorage>,
+    ) -> Self {
+        Self {
+            cache,
+            fallback_caching_interval,
+            contract_cache,
+            contract_cache_listener,
+            storage,
+        }
+    }
+
+    pub async fn run(&mut self, mut shutdown: TaskClient) {
+        let mut fallback_interval = time::interval(self.fallback_caching_interval);
+        while !shutdown.is_shutdown() {
+            tokio::select! {
+                biased;
+                _ = shutdown.recv() => {
+                    log::trace!("NodeStatusCacheRefresher: Received shutdown");
+                }
+                // Update node status cache when the contract cache / validator cache is updated
+                Ok(_) = self.contract_cache_listener.changed() => {
+                    tokio::select! {
+                        _ = self.update_on_notify(&mut fallback_interval) => (),
+                        _ = shutdown.recv() => {
+                            log::trace!("NodeStatusCacheRefresher: Received shutdown");
+                        }
+                    }
+                }
+                // ... however, if we don't receive any notifications we fall back to periodic
+                // refreshes
+                _ = fallback_interval.tick() => {
+                    tokio::select! {
+                        _ = self.update_on_timer() => (),
+                        _ = shutdown.recv() => {
+                            log::trace!("NodeStatusCacheRefresher: Received shutdown");
+                        }
+                    }
+                }
+            }
+        }
+        log::info!("NodeStatusCacheRefresher: Exiting");
+    }
+
+    async fn update_on_notify(&self, fallback_interval: &mut time::Interval) {
+        log::debug!(
+            "Validator cache event detected: {:?}",
+            &*self.contract_cache_listener.borrow(),
+        );
+        let _ = self.refresh_cache().await;
+        fallback_interval.reset();
+    }
+
+    async fn update_on_timer(&self) {
+        log::debug!("Timed trigger for the node status cache");
+        let have_contract_cache_data =
+            *self.contract_cache_listener.borrow() != CacheNotification::Start;
+
+        if have_contract_cache_data {
+            let _ = self.refresh_cache().await;
+        } else {
+            log::trace!(
+                "Skipping updating node status cache, is the contract cache not yet available?"
+            );
+        }
+    }
+
+    async fn refresh_cache(&self) -> Result<(), NodeStatusCacheError> {
+        log::info!("Updating node status cache");
+
+        // Fetch contract cache data to work with
+        let mixnode_details = self.contract_cache.mixnodes().await;
+        let interval_reward_params = self.contract_cache.interval_reward_params().await;
+        let current_interval = self.contract_cache.current_interval().await;
+
+        let rewarded_set = self.contract_cache.rewarded_set().await;
+        let active_set = self.contract_cache.active_set().await;
+        let mix_to_family = self.contract_cache.mix_to_family().await;
+
+        let interval_reward_params =
+            interval_reward_params.ok_or(NodeStatusCacheError::SourceDataMissing)?;
+        let current_interval = current_interval.ok_or(NodeStatusCacheError::SourceDataMissing)?;
+
+        // Compute inclusion probabilities
+        let inclusion_probabilities = InclusionProbabilities::compute(
+            &mixnode_details,
+            interval_reward_params,
+        )
+        .ok_or_else(|| {
+            error!("Failed to simulate selection probabilties for mixnodes, not updating cache");
+            NodeStatusCacheError::SimulationFailed
+        })?;
+
+        // Create annotated data
+        let rewarded_set_node_status = to_rewarded_set_node_status(&rewarded_set, &active_set);
+        let mixnodes_annotated = self
+            .annotate_node_with_details(
+                mixnode_details,
+                interval_reward_params,
+                current_interval,
+                &rewarded_set_node_status,
+                mix_to_family.to_vec(),
+            )
+            .await;
+
+        // Create the annotated rewarded and active sets
+        let (rewarded_set, active_set) =
+            split_into_active_and_rewarded_set(&mixnodes_annotated, &rewarded_set_node_status);
+
+        self.cache
+            .update_cache(
+                mixnodes_annotated,
+                rewarded_set,
+                active_set,
+                inclusion_probabilities,
+            )
+            .await;
+        Ok(())
+    }
+
+    async fn get_performance_from_storage(
+        &self,
+        mix_id: MixId,
+        epoch: Interval,
+    ) -> Option<Performance> {
+        self.storage
+            .as_ref()?
+            .get_average_mixnode_uptime_in_the_last_24hrs(
+                mix_id,
+                epoch.current_epoch_end_unix_timestamp(),
+            )
+            .await
+            .ok()
+            .map(Into::into)
+    }
+
+    async fn annotate_node_with_details(
+        &self,
+        mixnodes: Vec<MixNodeDetails>,
+        interval_reward_params: RewardingParams,
+        current_interval: Interval,
+        rewarded_set: &HashMap<MixId, RewardedSetNodeStatus>,
+        mix_to_family: Vec<(IdentityKey, FamilyHead)>,
+    ) -> Vec<MixNodeBondAnnotated> {
+        let mix_to_family = mix_to_family
+            .into_iter()
+            .collect::<HashMap<IdentityKey, FamilyHead>>();
+
+        let mut annotated = Vec::new();
+        for mixnode in mixnodes {
+            let stake_saturation = mixnode
+                .rewarding_details
+                .bond_saturation(&interval_reward_params);
+
+            let uncapped_stake_saturation = mixnode
+                .rewarding_details
+                .uncapped_bond_saturation(&interval_reward_params);
+
+            // If the performance can't be obtained, because the nym-api was not started with
+            // the monitoring (and hence, storage), then reward estimates will be all zero
+            let performance = self
+                .get_performance_from_storage(mixnode.mix_id(), current_interval)
+                .await
+                .unwrap_or_default();
+
+            let rewarded_set_status = rewarded_set.get(&mixnode.mix_id()).copied();
+
+            let reward_estimate = compute_reward_estimate(
+                &mixnode,
+                performance,
+                rewarded_set_status,
+                interval_reward_params,
+                current_interval,
+            );
+
+            let (estimated_operator_apy, estimated_delegators_apy) =
+                compute_apy_from_reward(&mixnode, reward_estimate, current_interval);
+
+            let family = mix_to_family
+                .get(&mixnode.bond_information.identity().to_string())
+                .cloned();
+
+            annotated.push(MixNodeBondAnnotated {
+                mixnode_details: mixnode,
+                stake_saturation,
+                uncapped_stake_saturation,
+                performance,
+                estimated_operator_apy,
+                estimated_delegators_apy,
+                family,
+            });
+        }
+        annotated
+    }
+}
+
+fn to_rewarded_set_node_status(
+    rewarded_set: &[MixNodeDetails],
+    active_set: &[MixNodeDetails],
+) -> HashMap<MixId, RewardedSetNodeStatus> {
+    let mut rewarded_set_node_status: HashMap<MixId, RewardedSetNodeStatus> = rewarded_set
+        .iter()
+        .map(|m| (m.mix_id(), RewardedSetNodeStatus::Standby))
+        .collect();
+    for mixnode in active_set {
+        *rewarded_set_node_status
+            .get_mut(&mixnode.mix_id())
+            .expect("All active nodes are rewarded nodes") = RewardedSetNodeStatus::Active;
+    }
+    rewarded_set_node_status
+}
+
+fn split_into_active_and_rewarded_set(
+    mixnodes_annotated: &[MixNodeBondAnnotated],
+    rewarded_set_node_status: &HashMap<u32, RewardedSetNodeStatus>,
+) -> (Vec<MixNodeBondAnnotated>, Vec<MixNodeBondAnnotated>) {
+    let rewarded_set: Vec<_> = mixnodes_annotated
+        .iter()
+        .filter(|mixnode| rewarded_set_node_status.get(&mixnode.mix_id()).is_some())
+        .cloned()
+        .collect();
+    let active_set: Vec<_> = rewarded_set
+        .iter()
+        .filter(|mixnode| {
+            rewarded_set_node_status
+                .get(&mixnode.mix_id())
+                .map_or(false, RewardedSetNodeStatus::is_active)
+        })
+        .cloned()
+        .collect();
+    (rewarded_set, active_set)
+}
diff --git a/nym-api/src/node_status_api/cache/inclusion_probabilities.rs b/nym-api/src/node_status_api/cache/inclusion_probabilities.rs
new file mode 100644
index 0000000000..80643dae27
--- /dev/null
+++ b/nym-api/src/node_status_api/cache/inclusion_probabilities.rs
@@ -0,0 +1,89 @@
+use contracts_common::truncate_decimal;
+use mixnet_contract_common::{MixId, MixNodeDetails, RewardingParams};
+use nym_api_requests::models::InclusionProbability;
+use serde::Serialize;
+use std::time::Duration;
+use tap::TapFallible;
+
+const MAX_SIMULATION_SAMPLES: u64 = 5000;
+const MAX_SIMULATION_TIME_SEC: u64 = 15;
+
+#[derive(Clone, Default, Serialize, schemars::JsonSchema)]
+pub(crate) struct InclusionProbabilities {
+    pub inclusion_probabilities: Vec<InclusionProbability>,
+    pub samples: u64,
+    pub elapsed: Duration,
+    pub delta_max: f64,
+    pub delta_l2: f64,
+}
+
+impl InclusionProbabilities {
+    pub(crate) fn compute(
+        mixnodes: &[MixNodeDetails],
+        params: RewardingParams,
+    ) -> Option<InclusionProbabilities> {
+        compute_inclusion_probabilities(mixnodes, params)
+    }
+
+    pub(crate) fn node(&self, mix_id: MixId) -> Option<&InclusionProbability> {
+        self.inclusion_probabilities
+            .iter()
+            .find(|x| x.mix_id == mix_id)
+    }
+}
+
+fn compute_inclusion_probabilities(
+    mixnodes: &[MixNodeDetails],
+    params: RewardingParams,
+) -> Option<InclusionProbabilities> {
+    let active_set_size = params.active_set_size;
+    let standby_set_size = params.rewarded_set_size - active_set_size;
+
+    // Unzip list of total bonds into ids and bonds.
+    // We need to go through this zip/unzip procedure to make sure we have matching identities
+    // for the input to the simulator, which assumes the identity is the position in the vec
+    let (ids, mixnode_total_bonds) = unzip_into_mixnode_ids_and_total_bonds(mixnodes);
+
+    // Compute inclusion probabilitites and keep track of how long time it took.
+    let mut rng = rand::thread_rng();
+    let results = inclusion_probability::simulate_selection_probability_mixnodes(
+        &mixnode_total_bonds,
+        active_set_size as usize,
+        standby_set_size as usize,
+        MAX_SIMULATION_SAMPLES,
+        Duration::from_secs(MAX_SIMULATION_TIME_SEC),
+        &mut rng,
+    )
+    .tap_err(|err| error!("{err}"))
+    .ok()?;
+
+    Some(InclusionProbabilities {
+        inclusion_probabilities: zip_ids_together_with_results(&ids, &results),
+        samples: results.samples,
+        elapsed: results.time,
+        delta_max: results.delta_max,
+        delta_l2: results.delta_l2,
+    })
+}
+
+fn unzip_into_mixnode_ids_and_total_bonds(mixnodes: &[MixNodeDetails]) -> (Vec<MixId>, Vec<u128>) {
+    mixnodes
+        .iter()
+        .map(|m| (m.mix_id(), truncate_decimal(m.total_stake()).u128()))
+        .unzip()
+}
+
+fn zip_ids_together_with_results(
+    ids: &[MixId],
+    results: &inclusion_probability::SelectionProbability,
+) -> Vec<InclusionProbability> {
+    ids.iter()
+        .zip(results.active_set_probability.iter())
+        .zip(results.reserve_set_probability.iter())
+        .map(|((&mix_id, a), r)| InclusionProbability {
+            mix_id,
+            in_active: *a,
+            in_reserve: *r,
+        })
+        .collect()
+}
diff --git a/validator-api/src/node_status_api/helpers.rs b/nym-api/src/node_status_api/helpers.rs
similarity index 77%
rename from validator-api/src/node_status_api/helpers.rs
rename to nym-api/src/node_status_api/helpers.rs
index c0c2a544bd..a2d102ebdd 100644
--- a/validator-api/src/node_status_api/helpers.rs
+++ b/nym-api/src/node_status_api/helpers.rs
@@ -1,24 +1,26 @@
 // Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::contract_cache::reward_estimate::compute_reward_estimate;
 use crate::contract_cache::Cache;
 use crate::node_status_api::models::ErrorResponse;
-use crate::storage::ValidatorApiStorage;
+use crate::storage::NymApiStorage;
 use crate::{NodeStatusCache, ValidatorCache};
 use cosmwasm_std::Decimal;
 use mixnet_contract_common::reward_params::Performance;
 use mixnet_contract_common::{Interval, MixId, RewardedSetNodeStatus};
+use nym_api_requests::models::{
+    AllInclusionProbabilitiesResponse, ComputeRewardEstParam, InclusionProbabilityResponse,
+    MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse,
+    MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse,
+    StakeSaturationResponse, UptimeResponse,
+};
 use rocket::http::Status;
 use rocket::State;
-use validator_api_requests::models::{
-    ComputeRewardEstParam, InclusionProbabilityResponse, MixnodeCoreStatusResponse,
-    MixnodeStatusReportResponse, MixnodeStatusResponse, MixnodeUptimeHistoryResponse,
-    RewardEstimationResponse, StakeSaturationResponse, UptimeResponse,
-};
+
+use super::reward_estimate::compute_reward_estimate;
 
 pub(crate) async fn _mixnode_report(
-    storage: &ValidatorApiStorage,
+    storage: &NymApiStorage,
     mix_id: MixId,
 ) -> Result<MixnodeStatusReportResponse, ErrorResponse> {
     storage
@@ -29,7 +31,7 @@ pub(crate) async fn _mixnode_report(
 }
 
 pub(crate) async fn _mixnode_uptime_history(
-    storage: &ValidatorApiStorage,
+    storage: &NymApiStorage,
     mix_id: MixId,
 ) -> Result<MixnodeUptimeHistoryResponse, ErrorResponse> {
     storage
@@ -40,7 +42,7 @@ pub(crate) async fn _mixnode_uptime_history(
 }
 
 pub(crate) async fn _mixnode_core_status_count(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     mix_id: MixId,
     since: Option<i64>,
 ) -> Result<MixnodeCoreStatusResponse, ErrorResponse> {
@@ -62,17 +64,18 @@ pub(crate) async fn _get_mixnode_status(
 }
 
 pub(crate) async fn _get_mixnode_reward_estimation(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
+    validator_cache: &State<ValidatorCache>,
     mix_id: MixId,
 ) -> Result<RewardEstimationResponse, ErrorResponse> {
     let (mixnode, status) = cache.mixnode_details(mix_id).await;
     if let Some(mixnode) = mixnode {
-        let reward_params = cache.interval_reward_params().await;
+        let reward_params = validator_cache.interval_reward_params().await;
         let as_at = reward_params.timestamp();
         let reward_params = reward_params
             .into_inner()
             .ok_or_else(|| ErrorResponse::new("server error", Status::InternalServerError))?;
-        let current_interval = cache
+        let current_interval = validator_cache
             .current_interval()
             .await
             .into_inner()
@@ -103,7 +106,7 @@ pub(crate) async fn _get_mixnode_reward_estimation(
 async fn average_mixnode_performance(
     mix_id: MixId,
     current_interval: Interval,
-    storage: &ValidatorApiStorage,
+    storage: &NymApiStorage,
 ) -> Result<Performance, ErrorResponse> {
     storage
         .get_average_mixnode_uptime_in_the_last_24hrs(
@@ -117,17 +120,18 @@ async fn average_mixnode_performance(
 
 pub(crate) async fn _compute_mixnode_reward_estimation(
     user_reward_param: ComputeRewardEstParam,
-    cache: &ValidatorCache,
+    cache: &NodeStatusCache,
+    validator_cache: &ValidatorCache,
     mix_id: MixId,
 ) -> Result<RewardEstimationResponse, ErrorResponse> {
     let (mixnode, actual_status) = cache.mixnode_details(mix_id).await;
     if let Some(mut mixnode) = mixnode {
-        let reward_params = cache.interval_reward_params().await;
+        let reward_params = validator_cache.interval_reward_params().await;
         let as_at = reward_params.timestamp();
         let reward_params = reward_params
             .into_inner()
             .ok_or_else(|| ErrorResponse::new("server error", Status::InternalServerError))?;
-        let current_interval = cache
+        let current_interval = validator_cache
             .current_interval()
             .await
             .into_inner()
@@ -200,14 +204,15 @@ pub(crate) async fn _compute_mixnode_reward_estimation(
 }
 
 pub(crate) async fn _get_mixnode_stake_saturation(
-    cache: &ValidatorCache,
+    cache: &NodeStatusCache,
+    validator_cache: &ValidatorCache,
     mix_id: MixId,
 ) -> Result<StakeSaturationResponse, ErrorResponse> {
     let (mixnode, _) = cache.mixnode_details(mix_id).await;
     if let Some(mixnode) = mixnode {
         // Recompute the stake saturation just so that we can confidently state that the `as_at`
         // field is consistent and correct. Luckily this is very cheap.
-        let reward_params = cache.interval_reward_params().await;
+        let reward_params = validator_cache.interval_reward_params().await;
         let as_at = reward_params.timestamp();
         let rewarding_params = reward_params
             .into_inner()
@@ -250,7 +255,7 @@ pub(crate) async fn _get_mixnode_inclusion_probability(
 
 pub(crate) async fn _get_mixnode_avg_uptime(
     cache: &ValidatorCache,
-    storage: &ValidatorApiStorage,
+    storage: &NymApiStorage,
     mix_id: MixId,
 ) -> Result<UptimeResponse, ErrorResponse> {
     let current_interval = cache
@@ -266,3 +271,51 @@ pub(crate) async fn _get_mixnode_avg_uptime(
         avg_uptime: performance.round_to_integer(),
     })
 }
+
+pub(crate) async fn _get_mixnode_inclusion_probabilities(
+    cache: &NodeStatusCache,
+) -> Result<AllInclusionProbabilitiesResponse, ErrorResponse> {
+    if let Some(prob) = cache.inclusion_probabilities().await {
+        let as_at = prob.timestamp();
+        let prob = prob.into_inner();
+        Ok(AllInclusionProbabilitiesResponse {
+            inclusion_probabilities: prob.inclusion_probabilities,
+            samples: prob.samples,
+            elapsed: prob.elapsed,
+            delta_max: prob.delta_max,
+            delta_l2: prob.delta_l2,
+            as_at,
+        })
+    } else {
+        Err(ErrorResponse::new(
+            "No data available".to_string(),
+            Status::ServiceUnavailable,
+        ))
+    }
+}
+
+pub(crate) async fn _get_mixnodes_detailed(cache: &NodeStatusCache) -> Vec<MixNodeBondAnnotated> {
+    cache
+        .mixnodes_annotated()
+        .await
+        .unwrap_or_default()
+        .into_inner()
+}
+
+pub(crate) async fn _get_rewarded_set_detailed(
+    cache: &NodeStatusCache,
+) -> Vec<MixNodeBondAnnotated> {
+    cache
+        .rewarded_set_annotated()
+        .await
+        .unwrap_or_default()
+        .into_inner()
+}
+
+pub(crate) async fn _get_active_set_detailed(cache: &NodeStatusCache) -> Vec<MixNodeBondAnnotated> {
+    cache
+        .active_set_annotated()
+        .await
+        .unwrap_or_default()
+        .into_inner()
+}
diff --git a/validator-api/src/node_status_api/local_guard.rs b/nym-api/src/node_status_api/local_guard.rs
similarity index 100%
rename from validator-api/src/node_status_api/local_guard.rs
rename to nym-api/src/node_status_api/local_guard.rs
diff --git a/validator-api/src/node_status_api/mod.rs b/nym-api/src/node_status_api/mod.rs
similarity index 86%
rename from validator-api/src/node_status_api/mod.rs
rename to nym-api/src/node_status_api/mod.rs
index 08cf612dba..cbcf1784f2 100644
--- a/validator-api/src/node_status_api/mod.rs
+++ b/nym-api/src/node_status_api/mod.rs
@@ -10,6 +10,7 @@ pub(crate) mod cache;
 pub(crate) mod helpers;
 pub(crate) mod local_guard;
 pub(crate) mod models;
+pub(crate) mod reward_estimate;
 pub(crate) mod routes;
 pub(crate) mod uptime_updater;
 pub(crate) mod utils;
@@ -37,6 +38,9 @@ pub(crate) fn node_status_routes(
             routes::get_mixnode_inclusion_probability,
             routes::get_mixnode_avg_uptime,
             routes::get_mixnode_inclusion_probabilities,
+            routes::get_mixnodes_detailed,
+            routes::get_rewarded_set_detailed,
+            routes::get_active_set_detailed,
         ]
     } else {
         // in the minimal variant we would not have access to endpoints relying on existence
@@ -46,6 +50,9 @@ pub(crate) fn node_status_routes(
             routes::get_mixnode_stake_saturation,
             routes::get_mixnode_inclusion_probability,
             routes::get_mixnode_inclusion_probabilities,
+            routes::get_mixnodes_detailed,
+            routes::get_rewarded_set_detailed,
+            routes::get_active_set_detailed,
         ]
     }
 }
diff --git a/validator-api/src/node_status_api/models.rs b/nym-api/src/node_status_api/models.rs
similarity index 84%
rename from validator-api/src/node_status_api/models.rs
rename to nym-api/src/node_status_api/models.rs
index ae9661bf23..43a11627b3 100644
--- a/validator-api/src/node_status_api/models.rs
+++ b/nym-api/src/node_status_api/models.rs
@@ -5,6 +5,10 @@ use crate::node_status_api::utils::NodeUptimes;
 use crate::storage::models::NodeStatus;
 use mixnet_contract_common::reward_params::Performance;
 use mixnet_contract_common::{IdentityKey, MixId};
+use nym_api_requests::models::{
+    GatewayStatusReportResponse, GatewayUptimeHistoryResponse, HistoricalUptimeResponse,
+    MixnodeStatusReportResponse, MixnodeUptimeHistoryResponse, RequestError,
+};
 use okapi::openapi3::{Responses, SchemaObject};
 use rocket::http::Status;
 use rocket::response::{self, Responder, Response};
@@ -17,18 +21,15 @@ use schemars::gen::SchemaGenerator;
 use schemars::schema::{InstanceType, Schema};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use sqlx::Error;
 use std::convert::TryFrom;
-use std::fmt::{self, Display, Formatter};
+use thiserror::Error;
 use time::OffsetDateTime;
-use validator_api_requests::models::{
-    GatewayStatusReportResponse, GatewayUptimeHistoryResponse, HistoricalUptimeResponse,
-    MixnodeStatusReportResponse, MixnodeUptimeHistoryResponse, RequestError,
-};
 
-// todo: put into some error enum
-#[derive(Debug)]
-pub struct InvalidUptime;
+#[derive(Error, Debug)]
+#[error("Received uptime value was within 0-100 range (got {received})")]
+pub struct InvalidUptime {
+    received: isize,
+}
 
 // value in range 0-100
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Default, JsonSchema)]
@@ -56,7 +57,9 @@ impl Uptime {
         let uptime = ((numerator as f32 / denominator as f32) * 100.0).round() as u8;
 
         if uptime > 100 {
-            Err(InvalidUptime)
+            Err(InvalidUptime {
+                received: uptime as isize,
+            })
         } else {
             Ok(Uptime(uptime))
         }
@@ -70,7 +73,9 @@ impl Uptime {
         let uptime = (running_sum / count as f32).round() as u8;
 
         if uptime > 100 {
-            Err(InvalidUptime)
+            Err(InvalidUptime {
+                received: uptime as isize,
+            })
         } else {
             Ok(Uptime(uptime))
         }
@@ -92,7 +97,9 @@ impl TryFrom<u8> for Uptime {
 
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         if value > 100 {
-            Err(InvalidUptime)
+            Err(InvalidUptime {
+                received: value as isize,
+            })
         } else {
             Ok(Uptime(value))
         }
@@ -104,7 +111,9 @@ impl TryFrom<i64> for Uptime {
 
     fn try_from(value: i64) -> Result<Self, Self::Error> {
         if !(0..=100).contains(&value) {
-            Err(InvalidUptime)
+            Err(InvalidUptime {
+                received: value as isize,
+            })
         } else {
             Ok(Uptime(value as u8))
         }
@@ -364,48 +373,28 @@ impl OpenApiResponderInner for ErrorResponse {
 }
 
 #[derive(Debug, thiserror::Error)]
-pub enum ValidatorApiStorageError {
-    MixnodeReportNotFound(MixId),
-    GatewayReportNotFound(String),
-    MixnodeUptimeHistoryNotFound(MixId),
-    GatewayUptimeHistoryNotFound(String),
+pub enum NymApiStorageError {
+    #[error("could not find status report associated with mixnode {mix_id}")]
+    MixnodeReportNotFound { mix_id: MixId },
+
+    #[error("Could not find status report associated with gateway {identity}")]
+    GatewayReportNotFound { identity: IdentityKey },
+
+    #[error("could not find uptime history associated with mixnode {mix_id}")]
+    MixnodeUptimeHistoryNotFound { mix_id: MixId },
+
+    #[error("could not find uptime history associated with gateway {identity}")]
+    GatewayUptimeHistoryNotFound { identity: IdentityKey },
 
     // I don't think we want to expose errors to the user about what really happened
-    InternalDatabaseError(String),
-}
+    #[error("experienced internal database error")]
+    InternalDatabaseError(#[from] sqlx::Error),
 
-impl From<sqlx::Error> for ValidatorApiStorageError {
-    fn from(err: Error) -> Self {
-        ValidatorApiStorageError::InternalDatabaseError(err.to_string())
-    }
-}
+    // the same is true here (also note that the message is subtly different so we would be able to distinguish them)
+    #[error("experienced internal storage error")]
+    DatabaseInconsistency { reason: String },
 
-impl Display for ValidatorApiStorageError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            ValidatorApiStorageError::MixnodeReportNotFound(mix_id) => write!(
-                f,
-                "Could not find status report associated with mixnode {}",
-                mix_id
-            ),
-            ValidatorApiStorageError::GatewayReportNotFound(identity) => write!(
-                f,
-                "Could not find status report associated with gateway {}",
-                identity
-            ),
-            ValidatorApiStorageError::MixnodeUptimeHistoryNotFound(mix_id) => write!(
-                f,
-                "Could not find uptime history associated with mixnode {}",
-                mix_id
-            ),
-            ValidatorApiStorageError::GatewayUptimeHistoryNotFound(identity) => write!(
-                f,
-                "Could not find uptime history associated with gateway {}",
-                identity
-            ),
-            ValidatorApiStorageError::InternalDatabaseError(err) => {
-                write!(f, "The internal database has experienced an issue: {err}")
-            }
-        }
-    }
+    // this one would never be returned to users since it's only possible on startup
+    #[error("failed to perform startup SQL migration - {0}")]
+    StartupMigrationFailure(#[from] sqlx::migrate::MigrateError),
 }
diff --git a/validator-api/src/contract_cache/reward_estimate.rs b/nym-api/src/node_status_api/reward_estimate.rs
similarity index 96%
rename from validator-api/src/contract_cache/reward_estimate.rs
rename to nym-api/src/node_status_api/reward_estimate.rs
index 41e285a0a0..33bbd8320c 100644
--- a/validator-api/src/contract_cache/reward_estimate.rs
+++ b/nym-api/src/node_status_api/reward_estimate.rs
@@ -7,7 +7,7 @@ use mixnet_contract_common::reward_params::{NodeRewardParams, Performance, Rewar
 use mixnet_contract_common::rewarding::RewardEstimate;
 use mixnet_contract_common::{Interval, RewardedSetNodeStatus};
 
-pub fn compute_apy(epochs_in_year: Decimal, reward: Decimal, pledge_amount: Decimal) -> Decimal {
+fn compute_apy(epochs_in_year: Decimal, reward: Decimal, pledge_amount: Decimal) -> Decimal {
     if pledge_amount.is_zero() {
         return Decimal::zero();
     }
diff --git a/validator-api/src/node_status_api/routes.rs b/nym-api/src/node_status_api/routes.rs
similarity index 67%
rename from validator-api/src/node_status_api/routes.rs
rename to nym-api/src/node_status_api/routes.rs
index 7665f1bac1..70bb3db91e 100644
--- a/validator-api/src/node_status_api/routes.rs
+++ b/nym-api/src/node_status_api/routes.rs
@@ -3,31 +3,32 @@
 
 use super::NodeStatusCache;
 use crate::node_status_api::helpers::{
-    _compute_mixnode_reward_estimation, _get_mixnode_avg_uptime,
-    _get_mixnode_inclusion_probability, _get_mixnode_reward_estimation,
-    _get_mixnode_stake_saturation, _get_mixnode_status, _mixnode_core_status_count,
+    _compute_mixnode_reward_estimation, _get_active_set_detailed, _get_mixnode_avg_uptime,
+    _get_mixnode_inclusion_probabilities, _get_mixnode_inclusion_probability,
+    _get_mixnode_reward_estimation, _get_mixnode_stake_saturation, _get_mixnode_status,
+    _get_mixnodes_detailed, _get_rewarded_set_detailed, _mixnode_core_status_count,
     _mixnode_report, _mixnode_uptime_history,
 };
 use crate::node_status_api::models::ErrorResponse;
-use crate::storage::ValidatorApiStorage;
+use crate::storage::NymApiStorage;
 use crate::ValidatorCache;
 use mixnet_contract_common::MixId;
+use nym_api_requests::models::{
+    AllInclusionProbabilitiesResponse, ComputeRewardEstParam, GatewayCoreStatusResponse,
+    GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse,
+    MixNodeBondAnnotated, MixnodeCoreStatusResponse, MixnodeStatusReportResponse,
+    MixnodeStatusResponse, MixnodeUptimeHistoryResponse, RewardEstimationResponse,
+    StakeSaturationResponse, UptimeResponse,
+};
 use rocket::http::Status;
 use rocket::serde::json::Json;
 use rocket::State;
 use rocket_okapi::openapi;
-use validator_api_requests::models::{
-    AllInclusionProbabilitiesResponse, ComputeRewardEstParam, GatewayCoreStatusResponse,
-    GatewayStatusReportResponse, GatewayUptimeHistoryResponse, InclusionProbabilityResponse,
-    MixnodeCoreStatusResponse, MixnodeStatusReportResponse, MixnodeStatusResponse,
-    MixnodeUptimeHistoryResponse, RewardEstimationResponse, StakeSaturationResponse,
-    UptimeResponse,
-};
 
 #[openapi(tag = "status")]
 #[get("/gateway/<identity>/report")]
 pub(crate) async fn gateway_report(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     identity: &str,
 ) -> Result<Json<GatewayStatusReportResponse>, ErrorResponse> {
     storage
@@ -41,7 +42,7 @@ pub(crate) async fn gateway_report(
 #[openapi(tag = "status")]
 #[get("/gateway/<identity>/history")]
 pub(crate) async fn gateway_uptime_history(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     identity: &str,
 ) -> Result<Json<GatewayUptimeHistoryResponse>, ErrorResponse> {
     storage
@@ -55,7 +56,7 @@ pub(crate) async fn gateway_uptime_history(
 #[openapi(tag = "status")]
 #[get("/gateway/<identity>/core-status-count?<since>")]
 pub(crate) async fn gateway_core_status_count(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     identity: &str,
     since: Option<i64>,
 ) -> Json<GatewayCoreStatusResponse> {
@@ -73,7 +74,7 @@ pub(crate) async fn gateway_core_status_count(
 #[openapi(tag = "status")]
 #[get("/mixnode/<mix_id>/report")]
 pub(crate) async fn mixnode_report(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     mix_id: MixId,
 ) -> Result<Json<MixnodeStatusReportResponse>, ErrorResponse> {
     Ok(Json(_mixnode_report(storage, mix_id).await?))
@@ -82,7 +83,7 @@ pub(crate) async fn mixnode_report(
 #[openapi(tag = "status")]
 #[get("/mixnode/<mix_id>/history")]
 pub(crate) async fn mixnode_uptime_history(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     mix_id: MixId,
 ) -> Result<Json<MixnodeUptimeHistoryResponse>, ErrorResponse> {
     Ok(Json(_mixnode_uptime_history(storage, mix_id).await?))
@@ -91,7 +92,7 @@ pub(crate) async fn mixnode_uptime_history(
 #[openapi(tag = "status")]
 #[get("/mixnode/<mix_id>/core-status-count?<since>")]
 pub(crate) async fn mixnode_core_status_count(
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     mix_id: MixId,
     since: Option<i64>,
 ) -> Result<Json<MixnodeCoreStatusResponse>, ErrorResponse> {
@@ -112,10 +113,13 @@ pub(crate) async fn get_mixnode_status(
 #[openapi(tag = "status")]
 #[get("/mixnode/<mix_id>/reward-estimation")]
 pub(crate) async fn get_mixnode_reward_estimation(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
+    validator_cache: &State<ValidatorCache>,
     mix_id: MixId,
 ) -> Result<Json<RewardEstimationResponse>, ErrorResponse> {
-    Ok(Json(_get_mixnode_reward_estimation(cache, mix_id).await?))
+    Ok(Json(
+        _get_mixnode_reward_estimation(cache, validator_cache, mix_id).await?,
+    ))
 }
 
 #[openapi(tag = "status")]
@@ -125,21 +129,31 @@ pub(crate) async fn get_mixnode_reward_estimation(
 )]
 pub(crate) async fn compute_mixnode_reward_estimation(
     user_reward_param: Json<ComputeRewardEstParam>,
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
+    validator_cache: &State<ValidatorCache>,
     mix_id: MixId,
 ) -> Result<Json<RewardEstimationResponse>, ErrorResponse> {
     Ok(Json(
-        _compute_mixnode_reward_estimation(user_reward_param.into_inner(), cache, mix_id).await?,
+        _compute_mixnode_reward_estimation(
+            user_reward_param.into_inner(),
+            cache,
+            validator_cache,
+            mix_id,
+        )
+        .await?,
     ))
 }
 
 #[openapi(tag = "status")]
 #[get("/mixnode/<mix_id>/stake-saturation")]
 pub(crate) async fn get_mixnode_stake_saturation(
-    cache: &State<ValidatorCache>,
+    cache: &State<NodeStatusCache>,
+    validator_cache: &State<ValidatorCache>,
     mix_id: MixId,
 ) -> Result<Json<StakeSaturationResponse>, ErrorResponse> {
-    Ok(Json(_get_mixnode_stake_saturation(cache, mix_id).await?))
+    Ok(Json(
+        _get_mixnode_stake_saturation(cache, validator_cache, mix_id).await?,
+    ))
 }
 
 #[openapi(tag = "status")]
@@ -157,7 +171,7 @@ pub(crate) async fn get_mixnode_inclusion_probability(
 #[get("/mixnode/<mix_id>/avg_uptime")]
 pub(crate) async fn get_mixnode_avg_uptime(
     cache: &State<ValidatorCache>,
-    storage: &State<ValidatorApiStorage>,
+    storage: &State<NymApiStorage>,
     mix_id: MixId,
 ) -> Result<Json<UptimeResponse>, ErrorResponse> {
     Ok(Json(_get_mixnode_avg_uptime(cache, storage, mix_id).await?))
@@ -168,21 +182,29 @@ pub(crate) async fn get_mixnode_avg_uptime(
 pub(crate) async fn get_mixnode_inclusion_probabilities(
     cache: &State<NodeStatusCache>,
 ) -> Result<Json<AllInclusionProbabilitiesResponse>, ErrorResponse> {
-    if let Some(prob) = cache.inclusion_probabilities().await {
-        let as_at = prob.timestamp();
-        let prob = prob.into_inner();
-        Ok(Json(AllInclusionProbabilitiesResponse {
-            inclusion_probabilities: prob.inclusion_probabilities,
-            samples: prob.samples,
-            elapsed: prob.elapsed,
-            delta_max: prob.delta_max,
-            delta_l2: prob.delta_l2,
-            as_at,
-        }))
-    } else {
-        Err(ErrorResponse::new(
-            "No data available".to_string(),
-            Status::ServiceUnavailable,
-        ))
-    }
+    Ok(Json(_get_mixnode_inclusion_probabilities(cache).await?))
+}
+
+#[openapi(tag = "status")]
+#[get("/mixnodes/detailed")]
+pub async fn get_mixnodes_detailed(
+    cache: &State<NodeStatusCache>,
+) -> Json<Vec<MixNodeBondAnnotated>> {
+    Json(_get_mixnodes_detailed(cache).await)
+}
+
+#[openapi(tag = "status")]
+#[get("/mixnodes/rewarded/detailed")]
+pub async fn get_rewarded_set_detailed(
+    cache: &State<NodeStatusCache>,
+) -> Json<Vec<MixNodeBondAnnotated>> {
+    Json(_get_rewarded_set_detailed(cache).await)
+}
+
+#[openapi(tag = "status")]
+#[get("/mixnodes/active/detailed")]
+pub async fn get_active_set_detailed(
+    cache: &State<NodeStatusCache>,
+) -> Json<Vec<MixNodeBondAnnotated>> {
+    Json(_get_active_set_detailed(cache).await)
 }
diff --git a/validator-api/src/node_status_api/uptime_updater.rs b/nym-api/src/node_status_api/uptime_updater.rs
similarity index 90%
rename from validator-api/src/node_status_api/uptime_updater.rs
rename to nym-api/src/node_status_api/uptime_updater.rs
index dcb4f6424c..0c36c1a124 100644
--- a/validator-api/src/node_status_api/uptime_updater.rs
+++ b/nym-api/src/node_status_api/uptime_updater.rs
@@ -2,22 +2,22 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::node_status_api::models::{
-    GatewayStatusReport, MixnodeStatusReport, ValidatorApiStorageError,
+    GatewayStatusReport, MixnodeStatusReport, NymApiStorageError,
 };
 use crate::node_status_api::ONE_DAY;
-use crate::storage::ValidatorApiStorage;
+use crate::storage::NymApiStorage;
 use log::error;
 use std::time::Duration;
-use task::ShutdownListener;
+use task::TaskClient;
 use time::{OffsetDateTime, PrimitiveDateTime, Time};
 use tokio::time::{interval, sleep};
 
 pub(crate) struct HistoricalUptimeUpdater {
-    storage: ValidatorApiStorage,
+    storage: NymApiStorage,
 }
 
 impl HistoricalUptimeUpdater {
-    pub(crate) fn new(storage: ValidatorApiStorage) -> Self {
+    pub(crate) fn new(storage: NymApiStorage) -> Self {
         HistoricalUptimeUpdater { storage }
     }
 
@@ -30,8 +30,7 @@ impl HistoricalUptimeUpdater {
     async fn get_active_nodes(
         &self,
         now: OffsetDateTime,
-    ) -> Result<(Vec<MixnodeStatusReport>, Vec<GatewayStatusReport>), ValidatorApiStorageError>
-    {
+    ) -> Result<(Vec<MixnodeStatusReport>, Vec<GatewayStatusReport>), NymApiStorageError> {
         let day_ago = (now - ONE_DAY).unix_timestamp();
         let active_mixnodes = self
             .storage
@@ -46,7 +45,7 @@ impl HistoricalUptimeUpdater {
         Ok((active_mixnodes, active_gateways))
     }
 
-    async fn update_uptimes(&self) -> Result<(), ValidatorApiStorageError> {
+    async fn update_uptimes(&self) -> Result<(), NymApiStorageError> {
         let now = OffsetDateTime::now_utc();
         let today_iso_8601 = now.date().to_string();
 
@@ -69,7 +68,7 @@ impl HistoricalUptimeUpdater {
         Ok(())
     }
 
-    pub(crate) async fn run(&self, mut shutdown: ShutdownListener) {
+    pub(crate) async fn run(&self, mut shutdown: TaskClient) {
         // update uptimes at 23:00 UTC each day so that we'd have data from the actual [almost] whole day
         // and so that we would avoid the edge case of starting validator API at 23:59 and having some
         // nodes update for different days
diff --git a/validator-api/src/node_status_api/utils.rs b/nym-api/src/node_status_api/utils.rs
similarity index 100%
rename from validator-api/src/node_status_api/utils.rs
rename to nym-api/src/node_status_api/utils.rs
diff --git a/validator-api/src/nymd_client.rs b/nym-api/src/nyxd_client.rs
similarity index 76%
rename from validator-api/src/nymd_client.rs
rename to nym-api/src/nyxd_client.rs
index 0abefc0875..37a19c0791 100644
--- a/validator-api/src/nymd_client.rs
+++ b/nym-api/src/nyxd_client.rs
@@ -3,18 +3,20 @@
 
 use crate::config::Config;
 use crate::epoch_operations::MixnodeToReward;
-use config::defaults::{NymNetworkDetails, DEFAULT_VALIDATOR_API_PORT};
+use config::defaults::{NymNetworkDetails, DEFAULT_NYM_API_PORT};
+use mixnet_contract_common::families::{Family, FamilyHead};
 use mixnet_contract_common::mixnode::MixNodeDetails;
 use mixnet_contract_common::reward_params::RewardingParams;
 use mixnet_contract_common::{
-    CurrentIntervalResponse, ExecuteMsg, GatewayBond, MixId, RewardedSetNodeStatus,
+    CurrentIntervalResponse, ExecuteMsg, GatewayBond, IdentityKey, LayerAssignment, MixId,
+    RewardedSetNodeStatus,
 };
 use std::sync::Arc;
 use tokio::sync::RwLock;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
-use validator_client::nymd::{
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::{
     hash::{Hash, SHA256_HASH_SIZE},
-    Coin, CosmWasmClient, QueryNymdClient, SigningCosmWasmClient, SigningNymdClient,
+    Coin, CosmWasmClient, QueryNyxdClient, SigningCosmWasmClient, SigningNyxdClient,
     TendermintTime,
 };
 use validator_client::ValidatorClientError;
@@ -28,7 +30,7 @@ use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse
 #[cfg(feature = "coconut")]
 use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse};
 #[cfg(feature = "coconut")]
-use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, EpochState};
+use coconut_dkg_common::types::{EncodedBTEPublicKeyWithProof, Epoch};
 #[cfg(feature = "coconut")]
 use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare};
 #[cfg(feature = "coconut")]
@@ -36,7 +38,7 @@ use contracts_common::dealings::ContractSafeBytes;
 #[cfg(feature = "coconut")]
 use cw3::ProposalResponse;
 #[cfg(feature = "coconut")]
-use validator_client::nymd::{
+use validator_client::nyxd::{
     cosmwasm_client::types::ExecuteResult,
     traits::{
         CoconutBandwidthQueryClient, DkgQueryClient, DkgSigningClient, MultisigQueryClient,
@@ -53,52 +55,49 @@ impl<C> Clone for Client<C> {
     }
 }
 
-impl Client<QueryNymdClient> {
+impl Client<QueryNyxdClient> {
     pub(crate) fn new_query(config: &Config) -> Self {
         // the api address is irrelevant here as **WE ARE THE API**
         // and we won't be talking on the socket here.
-        let api_url = format!("http://localhost:{}", DEFAULT_VALIDATOR_API_PORT)
+        let api_url = format!("http://localhost:{}", DEFAULT_NYM_API_PORT)
             .parse()
             .unwrap();
-        let nymd_url = config.get_nymd_validator_url();
+        let nyxd_url = config.get_nyxd_url();
 
         let details = NymNetworkDetails::new_from_env()
-            .with_mixnet_contract(Some(config.get_mixnet_contract_address()));
+            .with_mixnet_contract(Some(config.get_mixnet_contract_address().as_ref()));
 
         let client_config = validator_client::Config::try_from_nym_network_details(&details)
             .expect("failed to construct valid validator client config with the provided network")
-            .with_urls(nymd_url, api_url);
+            .with_urls(nyxd_url, api_url);
 
         let inner =
-            validator_client::Client::new_query(client_config).expect("Failed to connect to nymd!");
+            validator_client::Client::new_query(client_config).expect("Failed to connect to nyxd!");
 
         Client(Arc::new(RwLock::new(inner)))
     }
 }
 
-impl Client<SigningNymdClient> {
+impl Client<SigningNyxdClient> {
     pub(crate) fn new_signing(config: &Config) -> Self {
         // the api address is irrelevant here as **WE ARE THE API**
         // and we won't be talking on the socket here.
-        let api_url = format!("http://localhost:{}", DEFAULT_VALIDATOR_API_PORT)
+        let api_url = format!("http://localhost:{}", DEFAULT_NYM_API_PORT)
             .parse()
             .unwrap();
-        let nymd_url = config.get_nymd_validator_url();
+        let nyxd_url = config.get_nyxd_url();
 
         let details = NymNetworkDetails::new_from_env()
-            .with_mixnet_contract(Some(config.get_mixnet_contract_address()));
+            .with_mixnet_contract(Some(config.get_mixnet_contract_address().as_ref()));
 
         let client_config = validator_client::Config::try_from_nym_network_details(&details)
             .expect("failed to construct valid validator client config with the provided network")
-            .with_urls(nymd_url, api_url);
+            .with_urls(nyxd_url, api_url);
 
-        let mnemonic = config
-            .get_mnemonic()
-            .parse()
-            .expect("the mnemonic is invalid!");
+        let mnemonic = config.get_mnemonic();
 
         let inner = validator_client::Client::new_signing(client_config, mnemonic)
-            .expect("Failed to connect to nymd!");
+            .expect("Failed to connect to nyxd!");
 
         Client(Arc::new(RwLock::new(inner)))
     }
@@ -117,7 +116,7 @@ impl<C> Client<C> {
             .0
             .read()
             .await
-            .nymd
+            .nyxd
             .get_current_block_timestamp()
             .await?;
 
@@ -138,7 +137,7 @@ impl<C> Client<C> {
     where
         C: CosmWasmClient + Sync,
     {
-        let hash = match self.0.read().await.nymd.get_block_hash(height).await? {
+        let hash = match self.0.read().await.nyxd.get_block_hash(height).await? {
             Hash::Sha256(hash) => Some(hash),
             Hash::None => None,
         };
@@ -150,14 +149,14 @@ impl<C> Client<C> {
     where
         C: CosmWasmClient + Sync + Send,
     {
-        self.0.read().await.get_all_nymd_mixnodes_detailed().await
+        self.0.read().await.get_all_nyxd_mixnodes_detailed().await
     }
 
     pub(crate) async fn get_gateways(&self) -> Result<Vec<GatewayBond>, ValidatorClientError>
     where
         C: CosmWasmClient + Sync + Send,
     {
-        self.0.read().await.get_all_nymd_gateways().await
+        self.0.read().await.get_all_nyxd_gateways().await
     }
 
     pub(crate) async fn get_current_interval(
@@ -187,10 +186,27 @@ impl<C> Client<C> {
         self.0
             .read()
             .await
-            .get_all_nymd_rewarded_set_mixnodes()
+            .get_all_nyxd_rewarded_set_mixnodes()
             .await
     }
 
+    #[allow(dead_code)]
+    pub(crate) async fn get_all_node_families(&self) -> Result<Vec<Family>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        self.0.read().await.get_all_node_families().await
+    }
+
+    pub(crate) async fn get_all_family_members(
+        &self,
+    ) -> Result<Vec<(IdentityKey, FamilyHead)>, ValidatorClientError>
+    where
+        C: CosmWasmClient + Sync + Send,
+    {
+        self.0.read().await.get_all_family_members().await
+    }
+
     pub(crate) async fn send_rewarding_messages(
         &self,
         nodes: &[MixnodeToReward],
@@ -224,7 +240,7 @@ impl<C> Client<C> {
         self.0
             .write()
             .await
-            .nymd
+            .nyxd
             .execute_multiple(
                 &contract,
                 msgs,
@@ -237,7 +253,7 @@ impl<C> Client<C> {
 
     pub(crate) async fn advance_current_epoch(
         &self,
-        new_rewarded_set: Vec<MixId>,
+        new_rewarded_set: Vec<LayerAssignment>,
         expected_active_set_size: u32,
     ) -> Result<(), ValidatorClientError>
     where
@@ -246,7 +262,7 @@ impl<C> Client<C> {
         self.0
             .write()
             .await
-            .nymd
+            .nyxd
             .advance_current_epoch(new_rewarded_set, expected_active_set_size, None)
             .await?;
         Ok(())
@@ -259,7 +275,7 @@ impl<C> Client<C> {
         self.0
             .write()
             .await
-            .nymd
+            .nyxd
             .reconcile_epoch_events(None, None)
             .await?;
         Ok(())
@@ -273,28 +289,28 @@ where
     C: SigningCosmWasmClient + Sync + Send,
 {
     async fn address(&self) -> AccountId {
-        self.0.read().await.nymd.address().clone()
+        self.0.read().await.nyxd.address().clone()
     }
 
     async fn get_tx(
         &self,
         tx_hash: &str,
-    ) -> crate::coconut::error::Result<validator_client::nymd::TxResponse> {
+    ) -> crate::coconut::error::Result<validator_client::nyxd::TxResponse> {
         let tx_hash = tx_hash
-            .parse::<validator_client::nymd::tx::Hash>()
+            .parse::<validator_client::nyxd::tx::Hash>()
             .map_err(|_| CoconutError::TxHashParseError)?;
-        Ok(self.0.read().await.nymd.get_tx(tx_hash).await?)
+        Ok(self.0.read().await.nyxd.get_tx(tx_hash).await?)
     }
 
     async fn get_proposal(
         &self,
         proposal_id: u64,
     ) -> crate::coconut::error::Result<ProposalResponse> {
-        Ok(self.0.read().await.nymd.get_proposal(proposal_id).await?)
+        Ok(self.0.read().await.nyxd.get_proposal(proposal_id).await?)
     }
 
     async fn list_proposals(&self) -> crate::coconut::error::Result<Vec<ProposalResponse>> {
-        Ok(self.0.read().await.get_all_nymd_proposals().await?)
+        Ok(self.0.read().await.get_all_nyxd_proposals().await?)
     }
 
     async fn get_spent_credential(
@@ -305,13 +321,25 @@ where
             .0
             .read()
             .await
-            .nymd
+            .nyxd
             .get_spent_credential(blinded_serial_number)
             .await?)
     }
 
-    async fn get_current_epoch_state(&self) -> crate::coconut::error::Result<EpochState> {
-        Ok(self.0.read().await.nymd.get_current_epoch_state().await?)
+    async fn get_current_epoch(&self) -> crate::coconut::error::Result<Epoch> {
+        Ok(self.0.read().await.nyxd.get_current_epoch().await?)
+    }
+
+    async fn get_current_epoch_threshold(
+        &self,
+    ) -> crate::coconut::error::Result<Option<dkg::Threshold>> {
+        Ok(self
+            .0
+            .read()
+            .await
+            .nyxd
+            .get_current_epoch_threshold()
+            .await?)
     }
 
     async fn get_self_registered_dealer_details(
@@ -322,20 +350,20 @@ where
             .0
             .read()
             .await
-            .nymd
+            .nyxd
             .get_dealer_details(self_address)
             .await?)
     }
 
     async fn get_current_dealers(&self) -> crate::coconut::error::Result<Vec<DealerDetails>> {
-        Ok(self.0.read().await.get_all_nymd_current_dealers().await?)
+        Ok(self.0.read().await.get_all_nyxd_current_dealers().await?)
     }
 
     async fn get_dealings(
         &self,
         idx: usize,
     ) -> crate::coconut::error::Result<Vec<ContractDealing>> {
-        Ok(self.0.read().await.get_all_nymd_epoch_dealings(idx).await?)
+        Ok(self.0.read().await.get_all_nyxd_epoch_dealings(idx).await?)
     }
 
     async fn get_verification_key_shares(
@@ -345,7 +373,7 @@ where
             .0
             .read()
             .await
-            .get_all_nymd_verification_key_shares()
+            .get_all_nyxd_verification_key_shares()
             .await?)
     }
 
@@ -358,7 +386,7 @@ where
         self.0
             .read()
             .await
-            .nymd
+            .nyxd
             .vote_proposal(proposal_id, vote_yes, fee)
             .await?;
         Ok(())
@@ -368,12 +396,22 @@ where
         self.0
             .read()
             .await
-            .nymd
+            .nyxd
             .execute_proposal(proposal_id, None)
             .await?;
         Ok(())
     }
 
+    async fn advance_epoch_state(&self) -> crate::coconut::error::Result<()> {
+        self.0
+            .write()
+            .await
+            .nyxd
+            .advance_dkg_epoch_state(None)
+            .await?;
+        Ok(())
+    }
+
     async fn register_dealer(
         &self,
         bte_key: EncodedBTEPublicKeyWithProof,
@@ -383,7 +421,7 @@ where
             .0
             .write()
             .await
-            .nymd
+            .nyxd
             .register_dealer(bte_key, announce_address, None)
             .await?)
     }
@@ -396,7 +434,7 @@ where
             .0
             .write()
             .await
-            .nymd
+            .nyxd
             .submit_dealing_bytes(dealing_bytes, None)
             .await?)
     }
@@ -409,7 +447,7 @@ where
             .0
             .write()
             .await
-            .nymd
+            .nyxd
             .submit_verification_key_share(share, None)
             .await?)
     }
diff --git a/validator-api/src/storage/manager.rs b/nym-api/src/storage/manager.rs
similarity index 100%
rename from validator-api/src/storage/manager.rs
rename to nym-api/src/storage/manager.rs
diff --git a/validator-api/src/storage/mod.rs b/nym-api/src/storage/mod.rs
similarity index 76%
rename from validator-api/src/storage/mod.rs
rename to nym-api/src/storage/mod.rs
index 21a5b2ca23..1d513defdf 100644
--- a/validator-api/src/storage/mod.rs
+++ b/nym-api/src/storage/mod.rs
@@ -4,8 +4,8 @@
 use crate::network_monitor::monitor::summary_producer::{GatewayResult, MixnodeResult};
 use crate::network_monitor::test_route::TestRoute;
 use crate::node_status_api::models::{
-    GatewayStatusReport, GatewayUptimeHistory, MixnodeStatusReport, MixnodeUptimeHistory, Uptime,
-    ValidatorApiStorageError,
+    GatewayStatusReport, GatewayUptimeHistory, MixnodeStatusReport, MixnodeUptimeHistory,
+    NymApiStorageError, Uptime,
 };
 use crate::node_status_api::{ONE_DAY, ONE_HOUR};
 use crate::storage::manager::StorageManager;
@@ -23,13 +23,13 @@ pub(crate) mod models;
 
 // note that clone here is fine as upon cloning the same underlying pool will be used
 #[derive(Clone)]
-pub(crate) struct ValidatorApiStorage {
+pub(crate) struct NymApiStorage {
     pub manager: StorageManager,
 }
 
-impl ValidatorApiStorage {
-    pub async fn init(database_path: PathBuf) -> Result<Self, ValidatorApiStorageError> {
-        // TODO: we can inject here more stuff based on our validator-api global config
+impl NymApiStorage {
+    pub async fn init(database_path: PathBuf) -> Result<Self, NymApiStorageError> {
+        // TODO: we can inject here more stuff based on our nym-api global config
         // struct. Maybe different pool size or timeout intervals?
         let mut opts = sqlx::sqlite::SqliteConnectOptions::new()
             .filename(&database_path)
@@ -41,31 +41,27 @@ impl ValidatorApiStorage {
 
         let connection_pool = match sqlx::SqlitePool::connect_with(opts).await {
             Ok(db) => db,
-            Err(e) => {
-                error!("Failed to connect to SQLx database: {}", e);
-                return Err(ValidatorApiStorageError::InternalDatabaseError(
-                    e.to_string(),
-                ));
+            Err(err) => {
+                error!("Failed to connect to SQLx database: {err}");
+                return Err(err.into());
             }
         };
 
-        if let Err(e) = sqlx::migrate!("./migrations").run(&connection_pool).await {
-            error!("Failed to initialize SQLx database: {}", e);
-            return Err(ValidatorApiStorageError::InternalDatabaseError(
-                e.to_string(),
-            ));
+        if let Err(err) = sqlx::migrate!("./migrations").run(&connection_pool).await {
+            error!("Failed to initialize SQLx database: {err}");
+            return Err(err.into());
         }
 
         info!("Database migration finished!");
 
-        let storage = ValidatorApiStorage {
+        let storage = NymApiStorage {
             manager: StorageManager { connection_pool },
         };
 
         Ok(storage)
     }
 
-    pub(crate) fn stage(storage: ValidatorApiStorage) -> AdHoc {
+    pub(crate) fn stage(storage: NymApiStorage) -> AdHoc {
         AdHoc::try_on_ignite("SQLx Database", |rocket| async {
             Ok(rocket.manage(storage))
         })
@@ -75,7 +71,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn mix_identity_to_mix_ids(
         &self,
         identity: &str,
-    ) -> Result<Vec<MixId>, ValidatorApiStorageError> {
+    ) -> Result<Vec<MixId>, NymApiStorageError> {
         Ok(self
             .manager
             .get_mixnode_mix_ids_by_identity(identity)
@@ -86,7 +82,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn mix_identity_to_latest_mix_id(
         &self,
         identity: &str,
-    ) -> Result<Option<MixId>, ValidatorApiStorageError> {
+    ) -> Result<Option<MixId>, NymApiStorageError> {
         Ok(self
             .mix_identity_to_mix_ids(identity)
             .await?
@@ -97,7 +93,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn get_all_avg_gateway_reliability_in_last_24hr(
         &self,
         end_ts_secs: i64,
-    ) -> Result<Vec<AvgGatewayReliability>, ValidatorApiStorageError> {
+    ) -> Result<Vec<AvgGatewayReliability>, NymApiStorageError> {
         let result = self
             .manager
             .get_all_avg_gateway_reliability_in_last_24hr(end_ts_secs)
@@ -109,7 +105,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn get_all_avg_mix_reliability_in_last_24hr(
         &self,
         end_ts_secs: i64,
-    ) -> Result<Vec<AvgMixnodeReliability>, ValidatorApiStorageError> {
+    ) -> Result<Vec<AvgMixnodeReliability>, NymApiStorageError> {
         let result = self
             .manager
             .get_all_avg_mix_reliability_in_last_24hr(end_ts_secs)
@@ -129,7 +125,7 @@ impl ValidatorApiStorage {
         &self,
         mix_id: MixId,
         since: i64,
-    ) -> Result<Vec<NodeStatus>, ValidatorApiStorageError> {
+    ) -> Result<Vec<NodeStatus>, NymApiStorageError> {
         let statuses = self
             .manager
             .get_mixnode_statuses_since(mix_id, since)
@@ -149,7 +145,7 @@ impl ValidatorApiStorage {
         &self,
         identity: &str,
         since: i64,
-    ) -> Result<Vec<NodeStatus>, ValidatorApiStorageError> {
+    ) -> Result<Vec<NodeStatus>, NymApiStorageError> {
         let statuses = self
             .manager
             .get_gateway_statuses_since(identity, since)
@@ -166,7 +162,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn construct_mixnode_report(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeStatusReport, ValidatorApiStorageError> {
+    ) -> Result<MixnodeStatusReport, NymApiStorageError> {
         let now = OffsetDateTime::now_utc();
         let day_ago = (now - ONE_DAY).unix_timestamp();
         let hour_ago = (now - ONE_HOUR).unix_timestamp();
@@ -175,7 +171,7 @@ impl ValidatorApiStorage {
 
         // if we have no statuses, the node doesn't exist (or monitor is down), but either way, we can't make a report
         if statuses.is_empty() {
-            return Err(ValidatorApiStorageError::MixnodeReportNotFound(mix_id));
+            return Err(NymApiStorageError::MixnodeReportNotFound { mix_id });
         }
 
         // determine the number of runs the mixnode should have been online for
@@ -210,7 +206,7 @@ impl ValidatorApiStorage {
     pub(crate) async fn construct_gateway_report(
         &self,
         identity: &str,
-    ) -> Result<GatewayStatusReport, ValidatorApiStorageError> {
+    ) -> Result<GatewayStatusReport, NymApiStorageError> {
         let now = OffsetDateTime::now_utc();
         let day_ago = (now - ONE_DAY).unix_timestamp();
         let hour_ago = (now - ONE_HOUR).unix_timestamp();
@@ -219,9 +215,9 @@ impl ValidatorApiStorage {
 
         // if we have no statuses, the node doesn't exist (or monitor is down), but either way, we can't make a report
         if statuses.is_empty() {
-            return Err(ValidatorApiStorageError::GatewayReportNotFound(
-                identity.to_owned(),
-            ));
+            return Err(NymApiStorageError::GatewayReportNotFound {
+                identity: identity.to_owned(),
+            });
         }
 
         // determine the number of runs the gateway should have been online for
@@ -249,13 +245,11 @@ impl ValidatorApiStorage {
     pub(crate) async fn get_mixnode_uptime_history(
         &self,
         mix_id: MixId,
-    ) -> Result<MixnodeUptimeHistory, ValidatorApiStorageError> {
+    ) -> Result<MixnodeUptimeHistory, NymApiStorageError> {
         let history = self.manager.get_mixnode_historical_uptimes(mix_id).await?;
 
         if history.is_empty() {
-            return Err(ValidatorApiStorageError::MixnodeUptimeHistoryNotFound(
-                mix_id,
-            ));
+            return Err(NymApiStorageError::MixnodeUptimeHistoryNotFound { mix_id });
         }
 
         let mixnode_owner =
@@ -279,16 +273,16 @@ impl ValidatorApiStorage {
     pub(crate) async fn get_gateway_uptime_history(
         &self,
         identity: &str,
-    ) -> Result<GatewayUptimeHistory, ValidatorApiStorageError> {
+    ) -> Result<GatewayUptimeHistory, NymApiStorageError> {
         let history = self
             .manager
             .get_gateway_historical_uptimes(identity)
             .await?;
 
         if history.is_empty() {
-            return Err(ValidatorApiStorageError::GatewayUptimeHistoryNotFound(
-                identity.to_owned(),
-            ));
+            return Err(NymApiStorageError::GatewayUptimeHistoryNotFound {
+                identity: identity.to_owned(),
+            });
         }
 
         let gateway_owner =
@@ -307,7 +301,7 @@ impl ValidatorApiStorage {
         &self,
         mix_id: MixId,
         end_ts_secs: i64,
-    ) -> Result<Uptime, ValidatorApiStorageError> {
+    ) -> Result<Uptime, NymApiStorageError> {
         let start = end_ts_secs - 86400;
         self.get_average_mixnode_uptime_in_time_interval(mix_id, start, end_ts_secs)
             .await
@@ -326,7 +320,7 @@ impl ValidatorApiStorage {
         mix_id: MixId,
         start: i64,
         end: i64,
-    ) -> Result<Uptime, ValidatorApiStorageError> {
+    ) -> Result<Uptime, NymApiStorageError> {
         let mixnode_database_id = match self.manager.get_mixnode_database_id(mix_id).await? {
             Some(id) => id,
             None => return Ok(Uptime::zero()),
@@ -356,7 +350,7 @@ impl ValidatorApiStorage {
         &self,
         start: i64,
         end: i64,
-    ) -> Result<Vec<MixnodeStatusReport>, ValidatorApiStorageError> {
+    ) -> Result<Vec<MixnodeStatusReport>, NymApiStorageError> {
         if (end - start) as u64 != ONE_DAY.as_secs() {
             warn!("Our current interval length breaks the 24h length assumption")
         }
@@ -400,7 +394,7 @@ impl ValidatorApiStorage {
         &self,
         start: i64,
         end: i64,
-    ) -> Result<Vec<GatewayStatusReport>, ValidatorApiStorageError> {
+    ) -> Result<Vec<GatewayStatusReport>, NymApiStorageError> {
         if (end - start) as u64 != ONE_DAY.as_secs() {
             warn!("Our current interval length breaks the 24h length assumption")
         }
@@ -441,36 +435,42 @@ impl ValidatorApiStorage {
         &self,
         monitor_run_db_id: i64,
         test_route: TestRoute,
-    ) -> Result<(), ValidatorApiStorageError> {
+    ) -> Result<(), NymApiStorageError> {
         // we MUST have those entries in the database, otherwise the route wouldn't have been chosen
         // in the first place
         let layer1_mix_db_id = self
             .manager
             .get_mixnode_database_id(test_route.layer_one_mix().mix_id)
-            .await
-            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?
-            .ok_or_else(|| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?;
+            .await?
+            .ok_or_else(|| NymApiStorageError::DatabaseInconsistency {
+                reason: format!("could not get db id for layer1 mixnode from network monitor run {monitor_run_db_id}"),
+            })?;
 
         let layer2_mix_db_id = self
             .manager
             .get_mixnode_database_id(test_route.layer_two_mix().mix_id)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?
-            .ok_or_else(|| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?;
+            .await?
+            .ok_or_else(|| NymApiStorageError::DatabaseInconsistency {
+                reason: format!("could not get db id for layer2 mixnode from network monitor run {monitor_run_db_id}"),
+            })?;
 
         let layer3_mix_db_id = self
             .manager
             .get_mixnode_database_id(test_route.layer_three_mix().mix_id)
-            .await
-            .map_err(|_| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?
-            .ok_or_else(|| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?;
+            .await?
+            .ok_or_else(|| NymApiStorageError::DatabaseInconsistency {
+                reason: format!("could not get db id for layer3 mixnode from network monitor run {monitor_run_db_id}"),
+            })?;
 
         let gateway_db_id = self
             .manager
             .get_gateway_id(&test_route.gateway().identity_key.to_base58_string())
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?
-            .ok_or_else(|| ValidatorApiStorageError::InternalDatabaseError("".to_string()))?;
+            .await?
+            .ok_or_else(|| NymApiStorageError::DatabaseInconsistency {
+                reason: format!(
+                    "could not get db id for gateway from network monitor run {monitor_run_db_id}"
+                ),
+            })?;
 
         self.manager
             .submit_testing_route_used(TestingRoute {
@@ -480,8 +480,7 @@ impl ValidatorApiStorage {
                 layer3_mix_db_id,
                 monitor_run_db_id,
             })
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+            .await?;
         Ok(())
     }
 
@@ -497,12 +496,8 @@ impl ValidatorApiStorage {
         &self,
         mix_id: MixId,
         since: Option<i64>,
-    ) -> Result<i32, ValidatorApiStorageError> {
-        let db_id = self
-            .manager
-            .get_mixnode_database_id(mix_id)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+    ) -> Result<i32, NymApiStorageError> {
+        let db_id = self.manager.get_mixnode_database_id(mix_id).await?;
 
         if let Some(node_id) = db_id {
             let since = since
@@ -511,7 +506,7 @@ impl ValidatorApiStorage {
             self.manager
                 .get_mixnode_testing_route_presence_count_since(node_id, since)
                 .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+                .map_err(|err| err.into())
         } else {
             Ok(0)
         }
@@ -529,12 +524,8 @@ impl ValidatorApiStorage {
         &self,
         identity: &str,
         since: Option<i64>,
-    ) -> Result<i32, ValidatorApiStorageError> {
-        let node_id = self
-            .manager
-            .get_gateway_id(identity)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+    ) -> Result<i32, NymApiStorageError> {
+        let node_id = self.manager.get_gateway_id(identity).await?;
 
         if let Some(node_id) = node_id {
             let since = since
@@ -543,7 +534,7 @@ impl ValidatorApiStorage {
             self.manager
                 .get_gateway_testing_route_presence_count_since(node_id, since)
                 .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+                .map_err(|err| err.into())
         } else {
             Ok(0)
         }
@@ -562,26 +553,20 @@ impl ValidatorApiStorage {
         mixnode_results: Vec<MixnodeResult>,
         gateway_results: Vec<GatewayResult>,
         test_routes: Vec<TestRoute>,
-    ) -> Result<(), ValidatorApiStorageError> {
+    ) -> Result<(), NymApiStorageError> {
         info!("Submitting new node results to the database. There are {} mixnode results and {} gateway results", mixnode_results.len(), gateway_results.len());
 
         let now = OffsetDateTime::now_utc().unix_timestamp();
 
-        let monitor_run_id = self
-            .manager
-            .insert_monitor_run(now)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+        let monitor_run_id = self.manager.insert_monitor_run(now).await?;
 
         self.manager
             .submit_mixnode_statuses(now, mixnode_results)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+            .await?;
 
         self.manager
             .submit_gateway_statuses(now, gateway_results)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+            .await?;
 
         for test_route in test_routes {
             self.insert_test_route(monitor_run_id, test_route).await?;
@@ -600,14 +585,14 @@ impl ValidatorApiStorage {
         &self,
         since: i64,
         until: i64,
-    ) -> Result<usize, ValidatorApiStorageError> {
+    ) -> Result<usize, NymApiStorageError> {
         let run_count = self.manager.get_monitor_runs_count(since, until).await?;
 
         if run_count < 0 {
             // I don't think it's ever possible for SQL to return a negative value from COUNT?
-            return Err(ValidatorApiStorageError::InternalDatabaseError(
-                "Negative run count".to_string(),
-            ));
+            return Err(NymApiStorageError::DatabaseInconsistency {
+                reason: "Negative run count".to_string(),
+            });
         }
         Ok(run_count as usize)
     }
@@ -625,16 +610,11 @@ impl ValidatorApiStorage {
         today_iso_8601: &str,
         mixnode_reports: &[MixnodeStatusReport],
         gateway_reports: &[GatewayStatusReport],
-    ) -> Result<(), ValidatorApiStorageError> {
+    ) -> Result<(), NymApiStorageError> {
         for report in mixnode_reports {
             // if this ever fails, we have a super weird error because we just constructed report for that node
             // and we never delete node data!
-            let node_id = match self
-                .manager
-                .get_mixnode_database_id(report.mix_id)
-                .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?
-            {
+            let node_id = match self.manager.get_mixnode_database_id(report.mix_id).await? {
                 Some(node_id) => node_id,
                 None => {
                     error!(
@@ -647,19 +627,13 @@ impl ValidatorApiStorage {
 
             self.manager
                 .insert_mixnode_historical_uptime(node_id, today_iso_8601, report.last_day.u8())
-                .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+                .await?;
         }
 
         for report in gateway_reports {
             // if this ever fails, we have a super weird error because we just constructed report for that node
             // and we never delete node data!
-            let node_id = match self
-                .manager
-                .get_gateway_id(&report.identity)
-                .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?
-            {
+            let node_id = match self.manager.get_gateway_id(&report.identity).await? {
                 Some(node_id) => node_id,
                 None => {
                     error!(
@@ -672,8 +646,7 @@ impl ValidatorApiStorage {
 
             self.manager
                 .insert_gateway_historical_uptime(node_id, today_iso_8601, report.last_day.u8())
-                .await
-                .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+                .await?;
         }
 
         Ok(())
@@ -682,11 +655,11 @@ impl ValidatorApiStorage {
     pub(crate) async fn check_if_historical_uptimes_exist_for_date(
         &self,
         date_iso_8601: &str,
-    ) -> Result<bool, ValidatorApiStorageError> {
+    ) -> Result<bool, NymApiStorageError> {
         self.manager
             .check_for_historical_uptime_existence(date_iso_8601)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 
     /// Removes all ipv4 and ipv6 statuses for all mixnodes and gateways that are older than the
@@ -695,49 +668,43 @@ impl ValidatorApiStorage {
     /// # Arguments
     ///
     /// * `until`: timestamp specifying the purge cutoff.
-    pub(crate) async fn purge_old_statuses(
-        &self,
-        until: i64,
-    ) -> Result<(), ValidatorApiStorageError> {
-        self.manager
-            .purge_old_mixnode_statuses(until)
-            .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))?;
+    pub(crate) async fn purge_old_statuses(&self, until: i64) -> Result<(), NymApiStorageError> {
+        self.manager.purge_old_mixnode_statuses(until).await?;
         self.manager
             .purge_old_gateway_statuses(until)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 
     pub(crate) async fn insert_rewarding_report(
         &self,
         report: RewardingReport,
-    ) -> Result<(), ValidatorApiStorageError> {
+    ) -> Result<(), NymApiStorageError> {
         self.manager
             .insert_rewarding_report(report)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 
     pub(crate) async fn get_rewarding_report(
         &self,
         absolute_epoch_id: EpochId,
-    ) -> Result<Option<RewardingReport>, ValidatorApiStorageError> {
+    ) -> Result<Option<RewardingReport>, NymApiStorageError> {
         self.manager
             .get_rewarding_report(absolute_epoch_id)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 
     #[cfg(feature = "coconut")]
     pub(crate) async fn get_blinded_signature_response(
         &self,
         tx_hash: &str,
-    ) -> Result<Option<String>, ValidatorApiStorageError> {
+    ) -> Result<Option<String>, NymApiStorageError> {
         self.manager
             .get_blinded_signature_response(tx_hash)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 
     #[cfg(feature = "coconut")]
@@ -745,10 +712,10 @@ impl ValidatorApiStorage {
         &self,
         tx_hash: &str,
         blinded_signature_response: &str,
-    ) -> Result<(), ValidatorApiStorageError> {
+    ) -> Result<(), NymApiStorageError> {
         self.manager
             .insert_blinded_signature_response(tx_hash, blinded_signature_response)
             .await
-            .map_err(|e| ValidatorApiStorageError::InternalDatabaseError(e.to_string()))
+            .map_err(|err| err.into())
     }
 }
diff --git a/validator-api/src/storage/models.rs b/nym-api/src/storage/models.rs
similarity index 100%
rename from validator-api/src/storage/models.rs
rename to nym-api/src/storage/models.rs
diff --git a/validator-api/src/swagger.rs b/nym-api/src/swagger.rs
similarity index 100%
rename from validator-api/src/swagger.rs
rename to nym-api/src/swagger.rs
diff --git a/validator-api/tests/README.md b/nym-api/tests/README.md
similarity index 100%
rename from validator-api/tests/README.md
rename to nym-api/tests/README.md
diff --git a/validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts b/nym-api/tests/functional_test/validator-api/status/status-mixnode.test.ts
similarity index 100%
rename from validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts
rename to nym-api/tests/functional_test/validator-api/status/status-mixnode.test.ts
diff --git a/validator-api/tests/jest.config.js b/nym-api/tests/jest.config.js
similarity index 100%
rename from validator-api/tests/jest.config.js
rename to nym-api/tests/jest.config.js
diff --git a/validator-api/tests/package.json b/nym-api/tests/package.json
similarity index 100%
rename from validator-api/tests/package.json
rename to nym-api/tests/package.json
diff --git a/validator-api/tests/src/config/config.yaml b/nym-api/tests/src/config/config.yaml
similarity index 100%
rename from validator-api/tests/src/config/config.yaml
rename to nym-api/tests/src/config/config.yaml
diff --git a/validator-api/tests/src/config/configHandler.ts b/nym-api/tests/src/config/configHandler.ts
similarity index 100%
rename from validator-api/tests/src/config/configHandler.ts
rename to nym-api/tests/src/config/configHandler.ts
diff --git a/validator-api/tests/src/endpoints/Status.ts b/nym-api/tests/src/endpoints/Status.ts
similarity index 100%
rename from validator-api/tests/src/endpoints/Status.ts
rename to nym-api/tests/src/endpoints/Status.ts
diff --git a/validator-api/tests/src/endpoints/abstracts/APIClient.ts b/nym-api/tests/src/endpoints/abstracts/APIClient.ts
similarity index 100%
rename from validator-api/tests/src/endpoints/abstracts/APIClient.ts
rename to nym-api/tests/src/endpoints/abstracts/APIClient.ts
diff --git a/validator-api/tests/src/interfaces/StatusInterfaces.ts b/nym-api/tests/src/interfaces/StatusInterfaces.ts
similarity index 100%
rename from validator-api/tests/src/interfaces/StatusInterfaces.ts
rename to nym-api/tests/src/interfaces/StatusInterfaces.ts
diff --git a/validator-api/tests/src/restClient/RestClient.ts b/nym-api/tests/src/restClient/RestClient.ts
similarity index 100%
rename from validator-api/tests/src/restClient/RestClient.ts
rename to nym-api/tests/src/restClient/RestClient.ts
diff --git a/validator-api/tests/tsconfig.eslint.json b/nym-api/tests/tsconfig.eslint.json
similarity index 100%
rename from validator-api/tests/tsconfig.eslint.json
rename to nym-api/tests/tsconfig.eslint.json
diff --git a/validator-api/tests/tsconfig.json b/nym-api/tests/tsconfig.json
similarity index 100%
rename from validator-api/tests/tsconfig.json
rename to nym-api/tests/tsconfig.json
diff --git a/validator-api/tests/yarn.lock b/nym-api/tests/yarn.lock
similarity index 99%
rename from validator-api/tests/yarn.lock
rename to nym-api/tests/yarn.lock
index e13dae8701..5cd1da22a1 100644
--- a/validator-api/tests/yarn.lock
+++ b/nym-api/tests/yarn.lock
@@ -2161,9 +2161,9 @@ json-stringify-safe@5.0.1:
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
 json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 kleur@^3.0.3:
   version "3.0.3"
diff --git a/nym-connect/.storybook/main.js b/nym-connect/.storybook/main.js
index c4a255d616..344c27778e 100644
--- a/nym-connect/.storybook/main.js
+++ b/nym-connect/.storybook/main.js
@@ -30,6 +30,19 @@ module.exports = {
       use: ['@svgr/webpack'],
     });
 
+    config.module.rules.unshift({
+      test: /\.ya?ml$/,
+      type: 'json',
+      use: [
+        {
+          loader: 'yaml-loader',
+          options: {
+            asJSON: true,
+          },
+        },
+      ],
+    });
+
     config.resolve.extensions = ['.tsx', '.ts', '.js'];
     config.resolve.plugins = [new TsconfigPathsPlugin()];
 
diff --git a/nym-connect/.storybook/mocks/tauri/notification.js b/nym-connect/.storybook/mocks/tauri/notification.js
new file mode 100644
index 0000000000..dcbe18e574
--- /dev/null
+++ b/nym-connect/.storybook/mocks/tauri/notification.js
@@ -0,0 +1,10 @@
+/**
+ * This is a mock for Tauri's API package (@tauri-apps/api/notification), to prevent stories from being excluded, because they either use
+ * or import dependencies that use Tauri.
+ */
+
+module.exports = {
+  isPermissionGranted: () => undefined,
+  requestPermission: () => undefined,
+  sendNotification: () => undefined,
+};
\ No newline at end of file
diff --git a/nym-connect/CHANGELOG.md b/nym-connect/CHANGELOG.md
index 1a8bc41c11..d6f0c7a05a 100644
--- a/nym-connect/CHANGELOG.md
+++ b/nym-connect/CHANGELOG.md
@@ -1,3 +1,21 @@
+## UNRELEASED
+
+## [nym-connect-v1.1.4](https://github.com/nymtech/nym/tree/nym-connect-v1.1.4) (2022-12-20)
+
+This release contains the new opt-in Test & Earn program, and it uses a stress-tested directory of network requesters to improve reliability. It also has some bugfixes, performance improvements, and better error handling.
+
+- nym-connect: send status messages from socks5 task to tauri backend by @octol in https://github.com/nymtech/nym/pull/1882
+- socks5: rework waiting in inbound.rs by @octol in https://github.com/nymtech/nym/pull/1880
+- Test&Earn by @mmsinclair in https://github.com/nymtech/nym/pull/2729
+
+## [nym-connect-v1.1.3](https://github.com/nymtech/nym/tree/nym-connect-v1.1.3) (2022-12-13)
+
+- socks5-client: added support for socks4a.
+
+## [nym-connect-v1.1.2](https://github.com/nymtech/nym/tree/nym-connect-v1.1.2) (2022-12-06)
+
+- socks5-client: fix error with client failing and disconnecting unnecessarily.
+
 ## [nym-connect-v1.1.1](https://github.com/nymtech/nym/tree/nym-connect-v1.1.1) (2022-11-29)
 
 - socks5-client: fix multiplex concurrent connections ([#1720], [#1777])
@@ -26,7 +44,7 @@
 - native-client/socks5-client: `disable_main_poisson_packet_distribution` Debug config option to make the client ignore poisson distribution in the main packet stream and ONLY send real message (and as fast as they come) ([#1664])
 - native-client/socks5-client: `use_extended_packet_size` Debug config option to make the client use 'ExtendedPacketSize' for its traffic (32kB as opposed to 2kB in 1.0.2) ([#1671])
 - network-requester: added additional Blockstream Green wallet endpoint to `example.allowed.list` ([#1611])
-- validator-client: added `query_contract_smart` and `query_contract_raw` on `NymdClient` ([#1558])
+- validator-client: added `query_contract_smart` and `query_contract_raw` on `NyxdClient` ([#1558])
 
 [#1472]: https://github.com/nymtech/nym/pull/1472
 [#1558]: https://github.com/nymtech/nym/pull/1558
diff --git a/nym-connect/Cargo.lock b/nym-connect/Cargo.lock
deleted file mode 100644
index 0dba93e249..0000000000
--- a/nym-connect/Cargo.lock
+++ /dev/null
@@ -1,6967 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "ctr 0.8.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba"
-dependencies = [
- "cfg-if",
- "cipher 0.4.3",
- "cpufeatures",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.7",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.65"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "async-trait"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atk"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
-dependencies = [
- "atk-sys",
- "bitflags",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "atk-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "atoi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "attohttpc"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "base64ct"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474"
-
-[[package]]
-name = "bip32"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873faa4363bfc54c36a48321da034c92a0645a363eed34d948683ffc1706e37f"
-dependencies = [
- "bs58",
- "hmac 0.11.0",
- "k256",
- "once_cell",
- "pbkdf2",
- "rand_core 0.6.4",
- "ripemd160",
- "sha2 0.9.9",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "bip39"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e89470017230c38e52b82b3ee3f530db1856ba1d434e3a67a3456a8a8dec5f"
-dependencies = [
- "bitcoin_hashes",
- "rand 0.6.5",
- "rand_core 0.4.2",
- "serde",
- "unicode-normalization",
-]
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce18265ec2324ad075345d5814fbeed4f41f0a660055dc78840b74d19b874b1"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "blake2"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
-dependencies = [
- "byte-tools",
- "crypto-mac 0.7.0",
- "digest 0.8.1",
- "opaque-debug 0.2.3",
-]
-
-[[package]]
-name = "blake3"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.2",
- "cc",
- "cfg-if",
- "constant_time_eq",
- "digest 0.10.5",
-]
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
-dependencies = [
- "block-padding",
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
-[[package]]
-name = "bls12_381"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397"
-dependencies = [
- "digest 0.9.0",
- "ff 0.10.1",
- "group 0.10.0",
- "pairing 0.20.0",
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "bls12_381"
-version = "0.6.0"
-source = "git+https://github.com/jstuczyn/bls12_381?branch=gt-serialisation#10fb6f700bfda17c8475af3bfd31e3fec15f2278"
-dependencies = [
- "digest 0.9.0",
- "ff 0.11.1",
- "group 0.11.0",
- "pairing 0.21.0",
- "rand_core 0.6.4",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-dependencies = [
- "sha2 0.9.9",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "bytemuck"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
-
-[[package]]
-name = "cairo-rs"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
-dependencies = [
- "bitflags",
- "cairo-sys-rs",
- "glib",
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-sys-rs"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "cargo_toml"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4419e9adae9fd7e231b60d50467481bf8181ddeef6ed54683b23ae925c74c9c"
-dependencies = [
- "serde",
- "serde_derive",
- "toml",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cfb"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c"
-dependencies = [
- "byteorder",
- "uuid 0.8.2",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec 1.9.0",
-]
-
-[[package]]
-name = "cfg-expr"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
-dependencies = [
- "smallvec 1.9.0",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
-dependencies = [
- "byteorder",
- "keystream",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "time 0.1.44",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "3.2.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "clap_lex",
- "indexmap",
- "once_cell",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap_complete"
-version = "3.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8"
-dependencies = [
- "clap",
-]
-
-[[package]]
-name = "clap_complete_fig"
-version = "3.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed37b4c0c1214673eba6ad8ea31666626bf72be98ffb323067d973c48b4964b9"
-dependencies = [
- "clap",
- "clap_complete",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
-dependencies = [
- "heck 0.4.0",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "client-connections"
-version = "0.1.0"
-dependencies = [
- "futures",
- "log",
-]
-
-[[package]]
-name = "client-core"
-version = "1.1.0"
-dependencies = [
- "client-connections",
- "config",
- "crypto",
- "dirs",
- "futures",
- "gateway-client",
- "gateway-requests",
- "gloo-timers",
- "humantime-serde",
- "log",
- "nonexhaustive-delayqueue",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "serde",
- "sled",
- "tap",
- "task",
- "thiserror",
- "tokio",
- "tokio-stream",
- "topology",
- "url",
- "validator-client",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832"
-dependencies = [
- "bitflags",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
-dependencies = [
- "bitflags",
- "block",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "coconut-bandwidth-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-dkg-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-utils",
- "multisig-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "coconut-interface"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "getset",
- "nymcoconut",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "completions"
-version = "0.1.0"
-dependencies = [
- "clap",
- "clap_complete",
- "clap_complete_fig",
-]
-
-[[package]]
-name = "config"
-version = "0.1.0"
-dependencies = [
- "cfg-if",
- "handlebars",
- "log",
- "network-defaults",
- "serde",
- "toml",
- "url",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "contracts-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-graphics-types",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
-dependencies = [
- "bitflags",
- "core-foundation",
- "foreign-types",
- "libc",
-]
-
-[[package]]
-name = "cosmos-sdk-proto"
-version = "0.12.3"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
-dependencies = [
- "prost",
- "prost-types",
- "tendermint-proto",
-]
-
-[[package]]
-name = "cosmrs"
-version = "0.7.1"
-source = "git+https://github.com/neacsu/cosmos-rust?branch=neacsu/feegrant_support#f63ded63ec13e753ebe8bdafe9dc503df265d67d"
-dependencies = [
- "bip32",
- "cosmos-sdk-proto",
- "ecdsa",
- "eyre",
- "getrandom 0.2.7",
- "k256",
- "prost",
- "prost-types",
- "rand_core 0.6.4",
- "serde",
- "serde_json",
- "subtle-encoding",
- "tendermint",
- "tendermint-rpc",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-crypto"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eb0afef2325df81aadbf9be1233f522ed8f6e91df870c764bc44cca2b1415bd"
-dependencies = [
- "digest 0.9.0",
- "ed25519-zebra",
- "k256",
- "rand_core 0.6.4",
- "thiserror",
-]
-
-[[package]]
-name = "cosmwasm-derive"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0faf3a02389f78d6173b7e680751205015d5406f8abbaa9aa36fd216adc9f10d"
-dependencies = [
- "syn",
-]
-
-[[package]]
-name = "cosmwasm-std"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875994993c2082a6fcd406937bf0fca21c349e4a624f3810253a14fa83a3a195"
-dependencies = [
- "base64",
- "cosmwasm-crypto",
- "cosmwasm-derive",
- "forward_ref",
- "schemars",
- "serde",
- "serde-json-wasm",
- "thiserror",
- "uint",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "credential-storage"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "log",
- "sqlx",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "credentials"
-version = "0.1.0"
-dependencies = [
- "bls12_381 0.5.0",
- "coconut-interface",
- "crypto",
- "thiserror",
- "validator-api-requests",
- "validator-client",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
-dependencies = [
- "autocfg 1.1.0",
- "cfg-if",
- "crossbeam-utils",
- "memoffset",
- "once_cell",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto"
-version = "0.1.0"
-dependencies = [
- "aes 0.8.1",
- "blake3",
- "bs58",
- "cipher 0.4.3",
- "ctr 0.9.1",
- "digest 0.10.5",
- "ed25519-dalek",
- "generic-array 0.14.6",
- "hkdf 0.12.3",
- "hmac 0.12.1",
- "nymsphinx-types",
- "pemstore",
- "rand 0.7.3",
- "subtle-encoding",
- "x25519-dalek",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21"
-dependencies = [
- "generic-array 0.14.6",
- "rand_core 0.6.4",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array 0.14.6",
- "typenum",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
-dependencies = [
- "generic-array 0.12.4",
- "subtle 1.0.0",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.6",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "cssparser"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa 0.4.8",
- "matches",
- "phf 0.8.0",
- "proc-macro2",
- "quote",
- "smallvec 1.9.0",
- "syn",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ct-logs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
-dependencies = [
- "sct",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher 0.3.0",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d14f329cfbaf5d0e06b5e87fff7e265d2673c5ea7d2c27691a2c107db1442a0"
-dependencies = [
- "cipher 0.4.3",
-]
-
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "cw-storage-plus"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "648b1507290bbc03a8d88463d7cd9b04b1fa0155e5eef366c4fa052b9caaac7a"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw-utils"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbaecb78c8e8abfd6b4258c7f4fbeb5c49a5e45ee4d910d3240ee8e1d714e1b"
-dependencies = [
- "cosmwasm-std",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw2"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cf4639517490dd36b333bbd6c4fbd92e325fd0acf4683b41753bc5eb63bfc1"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe19462a7f644ba60c19d3443cb90d00c50d9b6b3b0a3a7fca93df8261af979b"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "cw3-fixed-multisig"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df54aa54c13f405ec4ab36b6217538bc957d439eee58f89312db05a79caf6706"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "cw-utils",
- "cw2",
- "cw3",
- "schemars",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "cw4"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acc3549d5ce11c6901b3a676f2e2628684722197054d97cd0101ea174ed5cbd"
-dependencies = [
- "cosmwasm-std",
- "cw-storage-plus",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
-name = "der"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c"
-dependencies = [
- "const-oid",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version 0.4.0",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
-dependencies = [
- "block-buffer 0.10.3",
- "crypto-common",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "dkg"
-version = "0.1.0"
-dependencies = [
- "bitvec",
- "bls12_381 0.6.0",
- "bs58",
- "ff 0.11.1",
- "group 0.11.0",
- "lazy_static",
- "pemstore",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
-[[package]]
-name = "dotenv"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
-
-[[package]]
-name = "dtoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
-
-[[package]]
-name = "ecdsa"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9"
-dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9c280362032ea4203659fc489832d0204ef09f247a0506f170dafcac08c369"
-dependencies = [
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "rand 0.7.3",
- "serde",
- "sha2 0.9.9",
- "zeroize",
-]
-
-[[package]]
-name = "ed25519-zebra"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69"
-dependencies = [
- "curve25519-dalek",
- "hex",
- "rand_core 0.6.4",
- "serde",
- "sha2 0.9.9",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "ff 0.11.1",
- "generic-array 0.14.6",
- "group 0.11.0",
- "rand_core 0.6.4",
- "sec1",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "embed_plist"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "execute"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "ff"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f"
-dependencies = [
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "ff"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924"
-dependencies = [
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "field-offset"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
-dependencies = [
- "memoffset",
- "rustc_version 0.3.3",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "windows-sys",
-]
-
-[[package]]
-name = "fix-path-env"
-version = "0.1.0"
-source = "git+https://github.com/tauri-apps/fix-path-env-rs?branch=release#b7905421de7e4f589baf6d34a6dd0c3cb83197c3"
-dependencies = [
- "strip-ansi-escapes",
- "thiserror",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flex-error"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c606d892c9de11507fa0dcffc116434f94e105d0bbdc4e405b61519464c49d7b"
-dependencies = [
- "eyre",
- "paste",
-]
-
-[[package]]
-name = "flume"
-version = "0.10.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
-dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project",
- "spin 0.9.4",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "forward_ref"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futf"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-intrusive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e"
-dependencies = [
- "futures-core",
- "lock_api",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
-
-[[package]]
-name = "futures-task"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
-
-[[package]]
-name = "futures-util"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "gateway-client"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "credential-storage",
- "credentials",
- "crypto",
- "futures",
- "gateway-requests",
- "getrandom 0.2.7",
- "log",
- "network-defaults",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "task",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite",
- "tungstenite",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-timer",
- "wasm-utils",
-]
-
-[[package]]
-name = "gateway-requests"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "credentials",
- "crypto",
- "futures",
- "log",
- "nymsphinx",
- "pemstore",
- "rand 0.7.3",
- "serde",
- "serde_json",
- "thiserror",
- "tungstenite",
-]
-
-[[package]]
-name = "gdk"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk-pixbuf",
- "gdk-sys",
- "gio",
- "glib",
- "libc",
- "pango",
-]
-
-[[package]]
-name = "gdk-pixbuf"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
-dependencies = [
- "bitflags",
- "gdk-pixbuf-sys",
- "gio",
- "glib",
- "libc",
-]
-
-[[package]]
-name = "gdk-pixbuf-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gdk-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
-dependencies = [
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gdkx11-sys"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
-dependencies = [
- "gdk-sys",
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
- "x11",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.32.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "gio"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-io",
- "gio-sys",
- "glib",
- "libc",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
- "winapi",
-]
-
-[[package]]
-name = "git2"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
-dependencies = [
- "bitflags",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
-[[package]]
-name = "glib"
-version = "0.15.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "once_cell",
- "smallvec 1.9.0",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.15.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
-dependencies = [
- "anyhow",
- "heck 0.4.0",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
-dependencies = [
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
-name = "globset"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "group"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912"
-dependencies = [
- "byteorder",
- "ff 0.10.1",
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "group"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89"
-dependencies = [
- "byteorder",
- "ff 0.11.1",
- "rand_core 0.6.4",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "gtk"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
-dependencies = [
- "atk",
- "bitflags",
- "cairo-rs",
- "field-offset",
- "futures-channel",
- "gdk",
- "gdk-pixbuf",
- "gio",
- "glib",
- "gtk-sys",
- "gtk3-macros",
- "libc",
- "once_cell",
- "pango",
- "pkg-config",
-]
-
-[[package]]
-name = "gtk-sys"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
-dependencies = [
- "atk-sys",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pango-sys",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "gtk3-macros"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"
-dependencies = [
- "anyhow",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "handlebars"
-version = "3.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "quick-error 2.0.1",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown 0.11.2",
-]
-
-[[package]]
-name = "headers"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
-dependencies = [
- "base64",
- "bitflags",
- "bytes",
- "headers-core",
- "http",
- "httpdate",
- "mime",
- "sha1",
-]
-
-[[package]]
-name = "headers-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
-dependencies = [
- "http",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hex-literal"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-
-[[package]]
-name = "hkdf"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01706d578d5c281058480e673ae4086a9f4710d8df1ad80a5b03e39ece5f886b"
-dependencies = [
- "digest 0.9.0",
- "hmac 0.11.0",
-]
-
-[[package]]
-name = "hkdf"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
-dependencies = [
- "hmac 0.12.1",
-]
-
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.5",
-]
-
-[[package]]
-name = "html5ever"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
-dependencies = [
- "log",
- "mac",
- "markup5ever",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.3",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "humantime-serde"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
-dependencies = [
- "humantime 2.1.0",
- "serde",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa 1.0.3",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-proxy"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc"
-dependencies = [
- "bytes",
- "futures",
- "headers",
- "http",
- "hyper",
- "hyper-rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "webpki",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64"
-dependencies = [
- "ct-logs",
- "futures-util",
- "hyper",
- "log",
- "rustls",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "ico"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804"
-dependencies = [
- "byteorder",
- "png 0.11.0",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "ignore"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
-dependencies = [
- "crossbeam-utils",
- "globset",
- "lazy_static",
- "log",
- "memchr",
- "regex",
- "same-file",
- "thread_local",
- "walkdir",
- "winapi-util",
-]
-
-[[package]]
-name = "image"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg 1.1.0",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "infer"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b"
-dependencies = [
- "cfb",
-]
-
-[[package]]
-name = "inflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array 0.14.6",
-]
-
-[[package]]
-name = "input_buffer"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
-
-[[package]]
-name = "itertools"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
-
-[[package]]
-name = "javascriptcore-rs"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
-dependencies = [
- "bitflags",
- "glib",
- "javascriptcore-rs-sys",
-]
-
-[[package]]
-name = "javascriptcore-rs-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 5.0.0",
-]
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json-patch"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d"
-dependencies = [
- "serde",
- "serde_json",
- "treediff",
-]
-
-[[package]]
-name = "k256"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d"
-dependencies = [
- "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sec1",
- "sha2 0.9.9",
- "sha3",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
-
-[[package]]
-name = "keystream"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
-
-[[package]]
-name = "kuchiki"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
-dependencies = [
- "cssparser",
- "html5ever",
- "matches",
- "selectors",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libappindicator"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8"
-dependencies = [
- "glib",
- "gtk",
- "gtk-sys",
- "libappindicator-sys",
- "log",
-]
-
-[[package]]
-name = "libappindicator-sys"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa"
-dependencies = [
- "gtk-sys",
- "libloading",
- "once_cell",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.132"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.14.0+1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-dependencies = [
- "safemem",
-]
-
-[[package]]
-name = "lioness"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
-dependencies = [
- "arrayref",
- "blake2",
- "chacha",
- "keystream",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
-dependencies = [
- "autocfg 1.1.0",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "logging"
-version = "0.1.0"
-dependencies = [
- "log",
- "pretty_env_logger",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "mac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf 0.8.0",
- "phf_codegen",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "minisign-verify"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
-]
-
-[[package]]
-name = "mixnet-contract-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "contracts-common",
- "cosmwasm-std",
- "humantime-serde",
- "log",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time 0.3.14",
-]
-
-[[package]]
-name = "multisig-contract-common"
-version = "0.1.0"
-dependencies = [
- "cosmwasm-std",
- "cw-utils",
- "cw3",
- "cw3-fixed-multisig",
- "cw4",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "ndk"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
-dependencies = [
- "bitflags",
- "jni-sys",
- "ndk-sys",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "network-defaults"
-version = "0.1.0"
-dependencies = [
- "cfg-if",
- "dotenv",
- "hex-literal",
- "once_cell",
- "serde",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
-
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "nonexhaustive-delayqueue"
-version = "0.1.0"
-dependencies = [
- "futures-core",
- "slab",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "wasm-timer",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg 1.1.0",
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg 1.1.0",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg 1.1.0",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg 1.1.0",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "nym-connect"
-version = "1.1.0"
-dependencies = [
- "bip39",
- "client-core",
- "config",
- "dirs",
- "eyre",
- "fix-path-env",
- "futures",
- "log",
- "logging",
- "nym-socks5-client",
- "pretty_env_logger",
- "rand 0.8.5",
- "reqwest",
- "serde",
- "serde_json",
- "tap",
- "tauri",
- "tauri-build",
- "tauri-codegen",
- "tauri-macros",
- "tempfile",
- "tendermint-rpc",
- "thiserror",
- "tokio",
- "topology",
- "ts-rs",
- "url",
-]
-
-[[package]]
-name = "nym-socks5-client"
-version = "1.1.0"
-dependencies = [
- "clap",
- "client-connections",
- "client-core",
- "completions",
- "config",
- "credential-storage",
- "crypto",
- "dirs",
- "futures",
- "gateway-client",
- "gateway-requests",
- "log",
- "logging",
- "network-defaults",
- "nymsphinx",
- "ordered-buffer",
- "pemstore",
- "pin-project",
- "pretty_env_logger",
- "proxy-helpers",
- "rand 0.7.3",
- "serde",
- "snafu",
- "socks5-requests",
- "tap",
- "task",
- "thiserror",
- "tokio",
- "topology",
- "url",
- "validator-client",
- "vergen",
- "version-checker",
-]
-
-[[package]]
-name = "nymcoconut"
-version = "0.5.0"
-dependencies = [
- "bls12_381 0.6.0",
- "bs58",
- "digest 0.9.0",
- "dkg",
- "ff 0.11.1",
- "getrandom 0.2.7",
- "group 0.11.0",
- "itertools",
- "pemstore",
- "rand 0.8.5",
- "serde",
- "serde_derive",
- "sha2 0.9.9",
- "thiserror",
-]
-
-[[package]]
-name = "nymsphinx"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-acknowledgements",
- "nymsphinx-addressing",
- "nymsphinx-anonymous-replies",
- "nymsphinx-chunking",
- "nymsphinx-cover",
- "nymsphinx-forwarding",
- "nymsphinx-framing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "rand_distr",
- "tokio",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-acknowledgements"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "pemstore",
- "rand 0.7.3",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-addressing"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-types",
- "serde",
-]
-
-[[package]]
-name = "nymsphinx-anonymous-replies"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "crypto",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "serde",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-chunking"
-version = "0.1.0"
-dependencies = [
- "log",
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "nymsphinx-cover"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-acknowledgements",
- "nymsphinx-addressing",
- "nymsphinx-chunking",
- "nymsphinx-forwarding",
- "nymsphinx-params",
- "nymsphinx-types",
- "rand 0.7.3",
- "topology",
-]
-
-[[package]]
-name = "nymsphinx-forwarding"
-version = "0.1.0"
-dependencies = [
- "nymsphinx-addressing",
- "nymsphinx-params",
- "nymsphinx-types",
-]
-
-[[package]]
-name = "nymsphinx-framing"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "nymsphinx-params",
- "nymsphinx-types",
- "tokio-util",
-]
-
-[[package]]
-name = "nymsphinx-params"
-version = "0.1.0"
-dependencies = [
- "crypto",
- "nymsphinx-types",
-]
-
-[[package]]
-name = "nymsphinx-types"
-version = "0.1.0"
-dependencies = [
- "sphinx",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "open"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716"
-dependencies = [
- "pathdiff",
- "windows-sys",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
-dependencies = [
- "autocfg 1.1.0",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-buffer"
-version = "0.1.0"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
-
-[[package]]
-name = "pairing"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3"
-dependencies = [
- "group 0.10.0",
-]
-
-[[package]]
-name = "pairing"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42"
-dependencies = [
- "group 0.11.0",
-]
-
-[[package]]
-name = "pango"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
-dependencies = [
- "bitflags",
- "glib",
- "libc",
- "once_cell",
- "pango-sys",
-]
-
-[[package]]
-name = "pango-sys"
-version = "0.15.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec 1.9.0",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec 1.9.0",
- "windows-sys",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739"
-dependencies = [
- "crypto-mac 0.11.1",
-]
-
-[[package]]
-name = "peg"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a"
-dependencies = [
- "peg-macros",
- "peg-runtime",
-]
-
-[[package]]
-name = "peg-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c"
-dependencies = [
- "peg-runtime",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "peg-runtime"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088"
-
-[[package]]
-name = "pem"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
-dependencies = [
- "base64",
- "once_cell",
- "regex",
-]
-
-[[package]]
-name = "pemstore"
-version = "0.1.0"
-dependencies = [
- "pem",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb779fcf4bb850fbbb0edc96ff6cf34fd90c4b1a112ce042653280d9a7364048"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502b62a6d0245378b04ffe0a7fb4f4419a4815fce813bd8a0ec89a56e07d67b1"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "451e629bf49b750254da26132f1a5a9d11fd8a95a3df51d15c4abd1ba154cb6c"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcec162c71c45e269dfc3fc2916eaeb97feab22993a21bcce4721d08cd7801a6"
-dependencies = [
- "once_cell",
- "pest",
- "sha1",
-]
-
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_macros 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
-dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs8"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0"
-dependencies = [
- "der",
- "spki",
- "zeroize",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
-
-[[package]]
-name = "plist"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225"
-dependencies = [
- "base64",
- "indexmap",
- "line-wrap",
- "serde",
- "time 0.3.14",
- "xml-rs",
-]
-
-[[package]]
-name = "png"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925"
-dependencies = [
- "bitflags",
- "deflate",
- "inflate",
- "num-iter",
-]
-
-[[package]]
-name = "png"
-version = "0.17.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c"
-dependencies = [
- "bitflags",
- "crc32fast",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
-dependencies = [
- "env_logger",
- "log",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
-dependencies = [
- "once_cell",
- "thiserror",
- "toml",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prost"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc"
-dependencies = [
- "anyhow",
- "itertools",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68"
-dependencies = [
- "bytes",
- "prost",
-]
-
-[[package]]
-name = "proxy-helpers"
-version = "0.1.0"
-dependencies = [
- "bytes",
- "client-connections",
- "futures",
- "log",
- "ordered-buffer",
- "socks5-requests",
- "task",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
-[[package]]
-name = "quote"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-dependencies = [
- "autocfg 0.1.8",
- "libc",
- "rand_chacha 0.1.1",
- "rand_core 0.4.2",
- "rand_hc 0.1.0",
- "rand_isaac",
- "rand_jitter",
- "rand_os",
- "rand_pcg 0.1.2",
- "rand_xorshift",
- "winapi",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.7",
-]
-
-[[package]]
-name = "rand_distr"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e9532ada3929fb8b2e9dbe28d1e06c9b2cc65813f074fcb6bd5fbefeff9d56"
-dependencies = [
- "num-traits",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-dependencies = [
- "libc",
- "rand_core 0.4.2",
- "winapi",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.4.2",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-dependencies = [
- "autocfg 0.1.8",
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "raw-window-handle"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-dependencies = [
- "getrandom 0.2.7",
- "redox_syscall",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "lazy_static",
- "log",
- "mime",
- "native-tls",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525"
-dependencies = [
- "crypto-bigint",
- "hmac 0.11.0",
- "zeroize",
-]
-
-[[package]]
-name = "rfd"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
-dependencies = [
- "block",
- "dispatch",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "lazy_static",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.37.0",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ripemd160"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver 1.0.14",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
-dependencies = [
- "openssl-probe",
- "rustls",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
-
-[[package]]
-name = "ryu"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
-dependencies = [
- "lazy_static",
- "windows-sys",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed"
-dependencies = [
- "dyn-clone",
- "indexmap",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "sec1"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1"
-dependencies = [
- "der",
- "generic-array 0.14.6",
- "pkcs8",
- "subtle 2.4.1",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "selectors"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
-dependencies = [
- "bitflags",
- "cssparser",
- "derive_more",
- "fxhash",
- "log",
- "matches",
- "phf 0.8.0",
- "phf_codegen",
- "precomputed-hash",
- "servo_arc",
- "smallvec 1.9.0",
- "thin-slice",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.144"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-json-wasm"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479b4dbc401ca13ee8ce902851b834893251404c4f3c65370a49e047a6be09a5"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.144"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
-dependencies = [
- "itoa 1.0.3",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa 1.0.3",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
-dependencies = [
- "serde",
- "serde_with_macros",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serialize-to-javascript"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
-dependencies = [
- "serde",
- "serde_json",
- "serialize-to-javascript-impl",
-]
-
-[[package]]
-name = "serialize-to-javascript-impl"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.5",
-]
-
-[[package]]
-name = "sha2"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.5",
-]
-
-[[package]]
-name = "sha3"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809"
-dependencies = [
- "block-buffer 0.9.0",
- "digest 0.9.0",
- "keccak",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
-dependencies = [
- "digest 0.9.0",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
-
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg 1.1.0",
-]
-
-[[package]]
-name = "sled"
-version = "0.34.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
-dependencies = [
- "crc32fast",
- "crossbeam-epoch",
- "crossbeam-utils",
- "fs2",
- "fxhash",
- "libc",
- "log",
- "parking_lot 0.11.2",
-]
-
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
-
-[[package]]
-name = "snafu"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7"
-dependencies = [
- "doc-comment",
- "snafu-derive",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socks5-requests"
-version = "0.1.0"
-dependencies = [
- "nymsphinx-addressing",
- "thiserror",
-]
-
-[[package]]
-name = "soup2"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
-dependencies = [
- "bitflags",
- "gio",
- "glib",
- "libc",
- "once_cell",
- "soup2-sys",
-]
-
-[[package]]
-name = "soup2-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
-dependencies = [
- "bitflags",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps 5.0.0",
-]
-
-[[package]]
-name = "sphinx"
-version = "0.1.0"
-source = "git+https://github.com/nymtech/sphinx?rev=c494250f2a78bed33a618d470792418eee932859#c494250f2a78bed33a618d470792418eee932859"
-dependencies = [
- "aes 0.7.5",
- "arrayref",
- "blake2",
- "bs58",
- "byteorder",
- "chacha",
- "curve25519-dalek",
- "digest 0.9.0",
- "hkdf 0.11.0",
- "hmac 0.11.0",
- "lioness",
- "log",
- "rand 0.7.3",
- "rand_distr",
- "sha2 0.9.9",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spki"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "sqlformat"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4"
-dependencies = [
- "itertools",
- "nom",
- "unicode_categories",
-]
-
-[[package]]
-name = "sqlx"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b"
-dependencies = [
- "sqlx-core",
- "sqlx-macros",
-]
-
-[[package]]
-name = "sqlx-core"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5"
-dependencies = [
- "ahash",
- "atoi",
- "bitflags",
- "byteorder",
- "bytes",
- "crc",
- "crossbeam-queue",
- "either",
- "event-listener",
- "flume",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-intrusive",
- "futures-util",
- "hashlink",
- "hex",
- "indexmap",
- "itoa 1.0.3",
- "libc",
- "libsqlite3-sys",
- "log",
- "memchr",
- "once_cell",
- "paste",
- "percent-encoding",
- "rustls",
- "sha2 0.10.6",
- "smallvec 1.9.0",
- "sqlformat",
- "sqlx-rt",
- "stringprep",
- "thiserror",
- "tokio-stream",
- "url",
- "webpki",
- "webpki-roots",
-]
-
-[[package]]
-name = "sqlx-macros"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1"
-dependencies = [
- "dotenv",
- "either",
- "heck 0.4.0",
- "once_cell",
- "proc-macro2",
- "quote",
- "sha2 0.10.6",
- "sqlx-core",
- "sqlx-rt",
- "syn",
- "url",
-]
-
-[[package]]
-name = "sqlx-rt"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae"
-dependencies = [
- "once_cell",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "state"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "string_cache"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
-dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot 0.12.1",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde",
-]
-
-[[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
-dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "stringprep"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "strip-ansi-escapes"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8"
-dependencies = [
- "vte",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "subtle-encoding"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dcb1ed7b8330c5eed5441052651dd7a12c75e2ed88f2ec024ae1fa3a5e59945"
-dependencies = [
- "zeroize",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "unicode-xid",
-]
-
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml",
- "version-compare 0.0.11",
-]
-
-[[package]]
-name = "system-deps"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709"
-dependencies = [
- "cfg-expr 0.10.3",
- "heck 0.4.0",
- "pkg-config",
- "toml",
- "version-compare 0.1.0",
-]
-
-[[package]]
-name = "tao"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "cc",
- "cocoa",
- "core-foundation",
- "core-graphics",
- "crossbeam-channel",
- "dirs-next",
- "dispatch",
- "gdk",
- "gdk-pixbuf",
- "gdk-sys",
- "gdkx11-sys",
- "gio",
- "glib",
- "glib-sys",
- "gtk",
- "image",
- "instant",
- "jni",
- "lazy_static",
- "libappindicator",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "objc",
- "once_cell",
- "parking_lot 0.12.1",
- "paste",
- "png 0.17.6",
- "raw-window-handle",
- "scopeguard",
- "serde",
- "unicode-segmentation",
- "uuid 1.1.2",
- "windows 0.39.0",
- "windows-implement",
- "x11-dl",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "task"
-version = "0.1.0"
-dependencies = [
- "futures",
- "log",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tauri"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbf22abd61d95ca9b2becd77f9db4c093892f73e8a07d21d8b0b2bf71a7bcea"
-dependencies = [
- "anyhow",
- "attohttpc",
- "base64",
- "cocoa",
- "dirs-next",
- "embed_plist",
- "encoding_rs",
- "flate2",
- "futures-util",
- "glib",
- "glob",
- "gtk",
- "heck 0.4.0",
- "http",
- "ignore",
- "minisign-verify",
- "objc",
- "once_cell",
- "open",
- "percent-encoding",
- "rand 0.8.5",
- "raw-window-handle",
- "regex",
- "rfd",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "serde_repr",
- "serialize-to-javascript",
- "state",
- "tar",
- "tauri-macros",
- "tauri-runtime",
- "tauri-runtime-wry",
- "tauri-utils",
- "tempfile",
- "thiserror",
- "time 0.3.14",
- "tokio",
- "url",
- "uuid 1.1.2",
- "webkit2gtk",
- "webview2-com",
- "windows 0.39.0",
- "zip",
-]
-
-[[package]]
-name = "tauri-build"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0991fb306849897439dbd4a72e4cbed2413e2eb26cb4b3ba220b94edba8b4b88"
-dependencies = [
- "anyhow",
- "cargo_toml",
- "heck 0.4.0",
- "json-patch",
- "semver 1.0.14",
- "serde_json",
- "tauri-utils",
- "winres",
-]
-
-[[package]]
-name = "tauri-codegen"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356fa253e40ae4d6ff02075011f2f2bb4066f5c9d8c1e16ca6912d7b75903ba6"
-dependencies = [
- "base64",
- "brotli",
- "ico",
- "json-patch",
- "plist",
- "png 0.17.6",
- "proc-macro2",
- "quote",
- "regex",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "tauri-utils",
- "thiserror",
- "time 0.3.14",
- "uuid 1.1.2",
- "walkdir",
-]
-
-[[package]]
-name = "tauri-macros"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6051fd6940ddb22af452340d03c66a3e2f5d72e0788d4081d91e31528ccdc4d"
-dependencies = [
- "heck 0.4.0",
- "proc-macro2",
- "quote",
- "syn",
- "tauri-codegen",
- "tauri-utils",
-]
-
-[[package]]
-name = "tauri-runtime"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2"
-dependencies = [
- "gtk",
- "http",
- "http-range",
- "infer",
- "rand 0.8.5",
- "raw-window-handle",
- "serde",
- "serde_json",
- "tauri-utils",
- "thiserror",
- "uuid 1.1.2",
- "webview2-com",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "tauri-runtime-wry"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4"
-dependencies = [
- "cocoa",
- "gtk",
- "percent-encoding",
- "rand 0.8.5",
- "raw-window-handle",
- "tauri-runtime",
- "tauri-utils",
- "uuid 1.1.2",
- "webkit2gtk",
- "webview2-com",
- "windows 0.39.0",
- "wry",
-]
-
-[[package]]
-name = "tauri-utils"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8fdae6f29cef959809a3c3afef510c5b715a446a597ab8b791497585363f39"
-dependencies = [
- "brotli",
- "ctor",
- "glob",
- "heck 0.4.0",
- "html5ever",
- "json-patch",
- "kuchiki",
- "memchr",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
- "semver 1.0.14",
- "serde",
- "serde_json",
- "serde_with",
- "thiserror",
- "url",
- "walkdir",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
-]
-
-[[package]]
-name = "tendermint"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ca881fa4dedd2b46334f13be7fbc8cc1549ba4be5a833fe4e73d1a1baaf7949"
-dependencies = [
- "async-trait",
- "bytes",
- "ed25519",
- "ed25519-dalek",
- "flex-error",
- "futures",
- "k256",
- "num-traits",
- "once_cell",
- "prost",
- "prost-types",
- "ripemd160",
- "serde",
- "serde_bytes",
- "serde_json",
- "serde_repr",
- "sha2 0.9.9",
- "signature",
- "subtle 2.4.1",
- "subtle-encoding",
- "tendermint-proto",
- "time 0.3.14",
- "zeroize",
-]
-
-[[package]]
-name = "tendermint-config"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c56ee93f4e9b7e7daba86d171f44572e91b741084384d0ae00df7991873dfd"
-dependencies = [
- "flex-error",
- "serde",
- "serde_json",
- "tendermint",
- "toml",
- "url",
-]
-
-[[package]]
-name = "tendermint-proto"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71f925d74903f4abbdc4af0110635a307b3cb05b175fdff4a7247c14a4d0874"
-dependencies = [
- "bytes",
- "flex-error",
- "num-derive",
- "num-traits",
- "prost",
- "prost-types",
- "serde",
- "serde_bytes",
- "subtle-encoding",
- "time 0.3.14",
-]
-
-[[package]]
-name = "tendermint-rpc"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e63f57ee05a1e927887191c76d1b139de9fa40c180b9f8727ee44377242a6"
-dependencies = [
- "async-trait",
- "bytes",
- "flex-error",
- "futures",
- "getrandom 0.2.7",
- "http",
- "hyper",
- "hyper-proxy",
- "hyper-rustls",
- "peg",
- "pin-project",
- "serde",
- "serde_bytes",
- "serde_json",
- "subtle-encoding",
- "tendermint",
- "tendermint-config",
- "tendermint-proto",
- "thiserror",
- "time 0.3.14",
- "tokio",
- "tracing",
- "url",
- "uuid 0.8.2",
- "walkdir",
-]
-
-[[package]]
-name = "tendril"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
-dependencies = [
- "futf",
- "mac",
- "utf-8",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d"
-
-[[package]]
-name = "thin-slice"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
-
-[[package]]
-name = "thiserror"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
-dependencies = [
- "itoa 1.0.3",
- "libc",
- "num_threads",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
-
-[[package]]
-name = "tokio"
-version = "1.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
-dependencies = [
- "autocfg 1.1.0",
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "winapi",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e96bb520beab540ab664bd5a9cfeaa1fcd846fa68c830b42e2c8963071251d2"
-dependencies = [
- "futures-util",
- "log",
- "pin-project",
- "tokio",
- "tungstenite",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "slab",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "topology"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "crypto",
- "log",
- "mixnet-contract-common",
- "nymsphinx-addressing",
- "nymsphinx-types",
- "rand 0.7.3",
- "version-checker",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
-dependencies = [
- "ansi_term",
- "matchers",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec 1.9.0",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "treediff"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff"
-dependencies = [
- "serde_json",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
-
-[[package]]
-name = "ts-rs"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc59f479df54269b400dd95bc3b7e81623b3e4b9c70c8ca7125ab8341eafa64e"
-dependencies = [
- "thiserror",
- "ts-rs-macros",
-]
-
-[[package]]
-name = "ts-rs-macros"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f807fdb3151fee75df7485b901a89624358cd07a67a8fb1a5831bf5a07681ff"
-dependencies = [
- "Inflector",
- "proc-macro2",
- "quote",
- "syn",
- "termcolor",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "input_buffer",
- "log",
- "rand 0.8.5",
- "sha-1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
-[[package]]
-name = "uint"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
-dependencies = [
- "byteorder",
- "crunchy",
- "hex",
- "static_assertions",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
-dependencies = [
- "smallvec 0.6.14",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "unicode_categories"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
-
-[[package]]
-name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-
-[[package]]
-name = "uuid"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
-dependencies = [
- "getrandom 0.2.7",
-]
-
-[[package]]
-name = "validator-api-requests"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "coconut-interface",
- "cosmrs",
- "cosmwasm-std",
- "getset",
- "mixnet-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "validator-client"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "base64",
- "bip39",
- "coconut-bandwidth-contract-common",
- "coconut-dkg-common",
- "coconut-interface",
- "colored",
- "config",
- "contracts-common",
- "cosmrs",
- "cosmwasm-std",
- "cw3",
- "execute",
- "flate2",
- "futures",
- "itertools",
- "log",
- "mixnet-contract-common",
- "multisig-contract-common",
- "network-defaults",
- "prost",
- "reqwest",
- "serde",
- "serde_json",
- "sha2 0.9.9",
- "thiserror",
- "tokio",
- "url",
- "validator-api-requests",
- "vesting-contract",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vergen"
-version = "5.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e"
-dependencies = [
- "anyhow",
- "cfg-if",
- "chrono",
- "enum-iterator",
- "getset",
- "git2",
- "rustc_version 0.4.0",
- "rustversion",
- "thiserror",
-]
-
-[[package]]
-name = "version-checker"
-version = "0.1.0"
-dependencies = [
- "semver 0.11.0",
-]
-
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
-[[package]]
-name = "version-compare"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vesting-contract"
-version = "1.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-storage-plus",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "thiserror",
- "vergen",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "vesting-contract-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "mixnet-contract-common",
- "schemars",
- "serde",
-]
-
-[[package]]
-name = "vte"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
-dependencies = [
- "arrayvec 0.5.2",
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte_generate_state_changes"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "git+https://github.com/mmsinclair/wasm-timer?rev=b9d1a54ad514c2f230a026afe0dde341e98cd7b6#b9d1a54ad514c2f230a026afe0dde341e98cd7b6"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-utils"
-version = "0.1.0"
-dependencies = [
- "futures",
- "js-sys",
- "tungstenite",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webkit2gtk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc"
-dependencies = [
- "bitflags",
- "cairo-rs",
- "gdk",
- "gdk-sys",
- "gio",
- "gio-sys",
- "glib",
- "glib-sys",
- "gobject-sys",
- "gtk",
- "gtk-sys",
- "javascriptcore-rs",
- "libc",
- "once_cell",
- "soup2",
- "webkit2gtk-sys",
-]
-
-[[package]]
-name = "webkit2gtk-sys"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
-dependencies = [
- "atk-sys",
- "bitflags",
- "cairo-sys-rs",
- "gdk-pixbuf-sys",
- "gdk-sys",
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "javascriptcore-rs-sys",
- "libc",
- "pango-sys",
- "pkg-config",
- "soup2-sys",
- "system-deps 6.0.2",
-]
-
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "webview2-com"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
-dependencies = [
- "webview2-com-macros",
- "webview2-com-sys",
- "windows 0.39.0",
- "windows-implement",
-]
-
-[[package]]
-name = "webview2-com-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "webview2-com-sys"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
-dependencies = [
- "regex",
- "serde",
- "serde_json",
- "thiserror",
- "windows 0.39.0",
- "windows-bindgen",
- "windows-metadata",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec"
-dependencies = [
- "windows_aarch64_msvc 0.32.0",
- "windows_i686_gnu 0.32.0",
- "windows_i686_msvc 0.32.0",
- "windows_x86_64_gnu 0.32.0",
- "windows_x86_64_msvc 0.32.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
-dependencies = [
- "windows-implement",
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
-]
-
-[[package]]
-name = "windows-bindgen"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
-dependencies = [
- "windows-metadata",
- "windows-tokens",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
-dependencies = [
- "syn",
- "windows-tokens",
-]
-
-[[package]]
-name = "windows-metadata"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-tokens"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winres"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c"
-dependencies = [
- "toml",
-]
-
-[[package]]
-name = "wry"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945"
-dependencies = [
- "base64",
- "block",
- "cocoa",
- "core-graphics",
- "crossbeam-channel",
- "gdk",
- "gio",
- "glib",
- "gtk",
- "html5ever",
- "http",
- "kuchiki",
- "libc",
- "log",
- "objc",
- "objc_id",
- "once_cell",
- "serde",
- "serde_json",
- "sha2 0.10.6",
- "tao",
- "thiserror",
- "url",
- "webkit2gtk",
- "webkit2gtk-sys",
- "webview2-com",
- "windows 0.39.0",
- "windows-implement",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "x11"
-version = "2.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6"
-dependencies = [
- "lazy_static",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "x25519-dalek"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
-dependencies = [
- "curve25519-dalek",
- "rand_core 0.5.1",
- "zeroize",
-]
-
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "xml-rs"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
-
-[[package]]
-name = "zeroize"
-version = "1.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "synstructure",
-]
-
-[[package]]
-name = "zip"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d"
-dependencies = [
- "byteorder",
- "crc32fast",
- "crossbeam-utils",
-]
diff --git a/nym-connect/package.json b/nym-connect/package.json
index 7e7824d6b6..bff93c5a67 100644
--- a/nym-connect/package.json
+++ b/nym-connect/package.json
@@ -1,11 +1,12 @@
 {
   "name": "@nym/nym-connect",
-  "version": "1.1.0",
+  "version": "1.1.4",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "prewebpack:dev": "yarn --cwd .. build",
     "webpack:dev": "yarn webpack serve --config webpack.dev.js",
+    "webpack:dev:onlyThis": "yarn webpack serve --config webpack.dev.js",
     "webpack:prod": "yarn webpack --progress --config webpack.prod.js",
     "tauri:dev": "RUST_DEBUG=1 yarn tauri dev",
     "tauri:build": "yarn tauri build",
@@ -30,7 +31,7 @@
     "@mui/material": "^5.2.2",
     "@mui/styles": "^5.2.2",
     "@nymproject/react": "^1.0.0",
-    "@tauri-apps/api": "^1.1.0",
+    "@tauri-apps/api": "^1.2.0",
     "@tauri-apps/tauri-forage": "^1.0.0-beta.2",
     "clsx": "^1.1.1",
     "luxon": "^2.3.0",
@@ -39,6 +40,7 @@
     "react-dom": "^17.0.2",
     "react-error-boundary": "^3.1.3",
     "react-hook-form": "^7.14.2",
+    "react-markdown": "^8.0.4",
     "react-router-dom": "^5.2.0",
     "semver": "^6.3.0",
     "yup": "^0.32.9"
@@ -49,11 +51,12 @@
     "@babel/preset-env": "^7.15.0",
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
+    "@mdx-js/loader": "^2.1.5",
     "@nymproject/eslint-config-react-typescript": "^1.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
     "@storybook/react": "^6.5.8",
     "@svgr/webpack": "^6.1.1",
-    "@tauri-apps/cli": "^1.1.0",
+    "@tauri-apps/cli": "^1.2.2",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
     "@types/jest": "^27.0.1",
@@ -105,6 +108,7 @@
     "webpack-cli": "^4.8.0",
     "webpack-dev-server": "^4.5.0",
     "webpack-favicons": "^1.3.8",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "yaml-loader": "^0.8.0"
   }
-}
\ No newline at end of file
+}
diff --git a/nym-connect/public/growth.html b/nym-connect/public/growth.html
new file mode 100644
index 0000000000..08672aaa3c
--- /dev/null
+++ b/nym-connect/public/growth.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Nym Connect</title>
+  </head>
+  <body style="background: rgb(29, 33, 37);">
+    <div id="root-growth"></div>
+  </body>
+</html>
diff --git a/nym-connect/public/index.html b/nym-connect/public/index.html
index 752946edb6..2ba643a663 100644
--- a/nym-connect/public/index.html
+++ b/nym-connect/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>nym-connect</title>
+    <title>Nym Connect</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/nym-connect/public/log.html b/nym-connect/public/log.html
new file mode 100644
index 0000000000..5ced2243f1
--- /dev/null
+++ b/nym-connect/public/log.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Nym Wallet Logs</title>
+  </head>
+  <body>
+    <div id="root-log"></div>
+  </body>
+</html>
diff --git a/nym-connect/src-tauri/Cargo.toml b/nym-connect/src-tauri/Cargo.toml
index dfaf452dd1..1ef082ea8d 100644
--- a/nym-connect/src-tauri/Cargo.toml
+++ b/nym-connect/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-connect"
-version = "1.1.0"
+version = "1.1.4"
 description = "nym-connect"
 authors = ["Nym Technologies SA"]
 license = ""
@@ -13,35 +13,43 @@ rust-version = "1.58"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "^1.1.1", features = [] }
+tauri-build = { version = "^1.2.1", features = [] }
 
-tauri-codegen = "^1.1.1"
-tauri-macros = "^1.1.1"
+tauri-codegen = "^1.2.1"
+tauri-macros = "^1.2.1"
 
 [dependencies]
-
+anyhow = "1.0"
 bip39 = "1.0"
+chrono = "0.4"
 dirs = "4.0"
 eyre = "0.6.5"
 fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs", branch = "release"}
 futures = "0.3"
-log = "0.4"
+fern = { version = "0.6.1", features = ["colored"] }
+itertools = "0.10.5"
+log = { version = "0.4", features = ["serde"] }
 pretty_env_logger = "0.4.0"
 rand = "0.8"
-reqwest = { version = "0.11", features = ["json"] }
+reqwest = { version = "0.11", features = ["json", "socks"] }
+rust-embed = { version = "6.4.2", features = ["include-exclude"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde_repr = "0.1"
 tap = "1.0.1"
-tauri = { version = "^1.1.1", features = ["clipboard-write-text", "macos-private-api", "shell-open", "system-tray", "updater", "window-close", "window-start-dragging"] }
+tauri = { version = "^1.2.2", features = ["clipboard-write-text", "macos-private-api", "notification-all", "shell-open", "system-tray", "updater", "window-close", "window-minimize", "window-start-dragging"] }
 tendermint-rpc = "0.23.0"
 thiserror = "1.0"
 tokio = { version = "1.21.2", features = ["sync", "time"] }
 url = "2.2"
+yaml-rust = "0.4"
 
 client-core = { path = "../../clients/client-core" }
 config-common = { path = "../../common/config", package = "config" }
+crypto = { path = "../../common/crypto" }
 logging = { path = "../../common/logging"}
 nym-socks5-client = { path = "../../clients/socks5" }
+task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }
 
 [dev-dependencies]
diff --git a/nym-connect/src-tauri/src/config/mod.rs b/nym-connect/src-tauri/src/config/mod.rs
index e9a46b26a1..4cf4570207 100644
--- a/nym-connect/src-tauri/src/config/mod.rs
+++ b/nym-connect/src-tauri/src/config/mod.rs
@@ -1,18 +1,14 @@
-use std::path::PathBuf;
-
-use client_core::config::GatewayEndpointConfig;
-use std::sync::Arc;
-use tap::TapFallible;
-use tokio::sync::RwLock;
-
-use client_core::config::Config as BaseConfig;
-use config_common::NymConfig;
-use nym_socks5::client::config::Config as Socks5Config;
-
 use crate::{
     error::{BackendError, Result},
     state::State,
 };
+use client_core::config::Config as BaseConfig;
+use config_common::NymConfig;
+use nym_socks5::client::config::Config as Socks5Config;
+use std::path::PathBuf;
+use std::sync::Arc;
+use tap::TapFallible;
+use tokio::sync::RwLock;
 
 static SOCKS5_CONFIG_ID: &str = "nym-connect";
 
@@ -48,6 +44,13 @@ impl Config {
         }
     }
 
+    #[allow(unused)]
+    pub fn new_with_port<S: Into<String>>(id: S, provider_mix_address: S, port: u16) -> Self {
+        Config {
+            socks5: Socks5Config::new(id, provider_mix_address).with_port(port),
+        }
+    }
+
     pub fn get_socks5(&self) -> &Socks5Config {
         &self.socks5
     }
@@ -116,39 +119,52 @@ pub async fn init_socks5_config(provider_address: String, chosen_gateway_id: Str
     // Future proofing. This flag exists for the other clients
     let user_wants_force_register = false;
 
+    // If the client was already initialized, don't generate new keys and don't re-register with
+    // the gateway (because this would create a new shared key).
+    // Unless the user really wants to.
     let register_gateway = !already_init || user_wants_force_register;
 
     log::trace!("Creating config for id: {}", id);
     let mut config = Config::new(id.as_str(), &provider_address);
 
-    if let Ok(raw_validators) = std::env::var(config_common::defaults::var_names::API_VALIDATOR) {
+    if let Ok(raw_validators) = std::env::var(config_common::defaults::var_names::NYM_API) {
         config
             .get_base_mut()
-            .set_custom_validator_apis(config_common::parse_validators(&raw_validators));
+            .set_custom_nym_apis(config_common::parse_urls(&raw_validators));
     }
 
-    let gateway = setup_gateway(
-        &id,
+    // Setup gateway by either registering a new one, or reusing exiting keys
+    let gateway = client_core::init::setup_gateway::<Socks5Config, _>(
         register_gateway,
-        Some(&chosen_gateway_id),
-        config.get_socks5(),
+        Some(chosen_gateway_id),
+        config.get_base(),
     )
     .await?;
+
     config.get_base_mut().with_gateway_endpoint(gateway);
 
-    let config_save_location = config.get_socks5().get_config_file_save_location();
     config.get_socks5().save_to_file(None).tap_err(|_| {
         log::error!("Failed to save the config file");
     })?;
 
-    log::info!("Saved configuration file to {:?}", config_save_location);
+    print_saved_config(&config);
+
+    let address = client_core::init::get_client_address_from_stored_keys(config.get_base())?;
+    log::info!("The address of this client is: {}", address);
+    Ok(())
+}
+
+fn print_saved_config(config: &Config) {
+    log::info!(
+        "Saved configuration file to {:?}",
+        config.get_socks5().get_config_file_save_location()
+    );
     log::info!("Gateway id: {}", config.get_base().get_gateway_id());
     log::info!("Gateway owner: {}", config.get_base().get_gateway_owner());
     log::info!(
         "Gateway listener: {}",
         config.get_base().get_gateway_listener()
     );
-
     log::info!(
         "Service provider address: {}",
         config.get_socks5().get_provider_mix_address()
@@ -158,60 +174,4 @@ pub async fn init_socks5_config(provider_address: String, chosen_gateway_id: Str
         config.get_socks5().get_listening_port()
     );
     log::info!("Client configuration completed.");
-
-    client_core::init::show_address(config.get_base())?;
-    Ok(())
-}
-
-// TODO: deduplicate with same functions in other client
-async fn setup_gateway(
-    id: &str,
-    register: bool,
-    user_chosen_gateway_id: Option<&str>,
-    config: &Socks5Config,
-) -> Result<GatewayEndpointConfig> {
-    if register {
-        // Get the gateway details by querying the validator-api. Either pick one at random or use
-        // the chosen one if it's among the available ones.
-        println!("Configuring gateway");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-
-        // Registering with gateway by setting up and writing shared keys to disk
-        log::trace!("Registering gateway");
-        client_core::init::register_with_gateway_and_store_keys(gateway.clone(), config.get_base())
-            .await?;
-        println!("Saved all generated keys");
-
-        Ok(gateway.into())
-    } else if user_chosen_gateway_id.is_some() {
-        // Just set the config, don't register or create any keys
-        // This assumes that the user knows what they are doing, and that the existing keys are
-        // valid for the gateway being used
-        println!("Using gateway provided by user, keeping existing keys");
-        let gateway = client_core::init::query_gateway_details(
-            config.get_base().get_validator_api_endpoints(),
-            user_chosen_gateway_id,
-        )
-        .await?;
-        log::debug!("Querying gateway gives: {}", gateway);
-        Ok(gateway.into())
-    } else {
-        println!("Not registering gateway, will reuse existing config and keys");
-        let existing_config = Socks5Config::load_from_file(Some(id)).map_err(|err| {
-            log::error!(
-                "Unable to configure gateway: {err}. \n
-                Seems like the client was already initialized but it was not possible to read \
-                the existing configuration file. \n
-                CAUTION: Consider backing up your gateway keys and try force gateway registration, or \
-                removing the existing configuration and starting over."
-            );
-            BackendError::CouldNotLoadExistingGatewayConfiguration(err)
-        })?;
-        Ok(existing_config.get_base().get_gateway_endpoint().clone())
-    }
 }
diff --git a/nym-connect/src-tauri/src/error.rs b/nym-connect/src-tauri/src/error.rs
index b2b44ee345..124eeeddc4 100644
--- a/nym-connect/src-tauri/src/error.rs
+++ b/nym-connect/src-tauri/src/error.rs
@@ -26,6 +26,11 @@ pub enum BackendError {
         source: tauri::Error,
     },
     #[error("{source}")]
+    TauriApiError {
+        #[from]
+        source: tauri::api::Error,
+    },
+    #[error("{source}")]
     SerdeJsonError {
         #[from]
         source: serde_json::Error,
@@ -35,6 +40,11 @@ pub enum BackendError {
         #[from]
         source: ClientCoreError,
     },
+    #[error("{source}")]
+    ApiClientError {
+        #[from]
+        source: crate::operations::growth::api_client::ApiClientError,
+    },
 
     #[error("Could not send disconnect signal to the SOCKS5 client")]
     CoundNotSendDisconnectSignal,
@@ -56,6 +66,8 @@ pub enum BackendError {
     CouldNotGetConfigFilename,
     #[error("Could not load existing gateway configuration")]
     CouldNotLoadExistingGatewayConfiguration(std::io::Error),
+    #[error("Unable to open a new window")]
+    NewWindowError,
 }
 
 impl Serialize for BackendError {
diff --git a/nym-connect/src-tauri/src/logging.rs b/nym-connect/src-tauri/src/logging.rs
new file mode 100644
index 0000000000..c805411107
--- /dev/null
+++ b/nym-connect/src-tauri/src/logging.rs
@@ -0,0 +1,113 @@
+use std::str::FromStr;
+
+use fern::colors::ColoredLevelConfig;
+use serde::Serialize;
+use serde_repr::{Deserialize_repr, Serialize_repr};
+use tauri::Manager;
+
+pub fn setup_logging(app_handle: tauri::AppHandle) -> Result<(), log::SetLoggerError> {
+    let colors = ColoredLevelConfig::new();
+    let base_config = fern::Dispatch::new()
+        .level(global_level())
+        .filter_lowlevel_external_components()
+        .show_operations();
+
+    let stdout_config = fern::Dispatch::new()
+        .format(move |out, message, record| {
+            out.finish(format_args!(
+                "{}[{}][{}] {}",
+                chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
+                record.target(),
+                colors.color(record.level()),
+                message,
+            ))
+        })
+        .chain(std::io::stdout());
+
+    let tauri_event_config = fern::Dispatch::new()
+        .format(move |out, message, record| {
+            out.finish(format_args!(
+                "{}[{}] {}",
+                chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
+                record.target(),
+                message,
+            ))
+        })
+        .chain(fern::Output::call(move |record| {
+            let msg = LogMessage {
+                message: record.args().to_string(),
+                level: record.level().into(),
+            };
+            app_handle.emit_all("log://log", msg).unwrap();
+        }));
+
+    base_config
+        .chain(stdout_config)
+        .chain(tauri_event_config)
+        .apply()
+}
+
+trait FernExt {
+    fn show_operations(self) -> Self;
+    fn filter_lowlevel_external_components(self) -> Self;
+}
+
+impl FernExt for fern::Dispatch {
+    fn show_operations(self) -> Self {
+        if ::std::env::var("RUST_TRACE_OPERATIONS").is_ok() {
+            self.level_for("nym_connect::operations", log::LevelFilter::Trace)
+        } else {
+            self
+        }
+    }
+
+    fn filter_lowlevel_external_components(self) -> Self {
+        self.level_for("hyper", log::LevelFilter::Warn)
+            .level_for("tokio_reactor", log::LevelFilter::Warn)
+            .level_for("reqwest", log::LevelFilter::Warn)
+            .level_for("mio", log::LevelFilter::Warn)
+            .level_for("want", log::LevelFilter::Warn)
+            .level_for("sled", log::LevelFilter::Warn)
+            .level_for("tungstenite", log::LevelFilter::Warn)
+            .level_for("tokio_tungstenite", log::LevelFilter::Warn)
+            .level_for("rustls", log::LevelFilter::Warn)
+            .level_for("tokio_util", log::LevelFilter::Warn)
+    }
+}
+
+fn global_level() -> log::LevelFilter {
+    if let Ok(s) = ::std::env::var("RUST_LOG") {
+        log::LevelFilter::from_str(&s).unwrap_or(log::LevelFilter::Info)
+    } else {
+        log::LevelFilter::Info
+    }
+}
+
+#[derive(Debug, Serialize, Clone)]
+struct LogMessage {
+    message: String,
+    level: LogLevel,
+}
+
+// Serialize to u16 instead of strings.
+#[derive(Debug, Clone, Deserialize_repr, Serialize_repr)]
+#[repr(u16)]
+enum LogLevel {
+    Trace = 1,
+    Debug,
+    Info,
+    Warn,
+    Error,
+}
+
+impl From<log::Level> for LogLevel {
+    fn from(level: log::Level) -> Self {
+        match level {
+            log::Level::Trace => LogLevel::Trace,
+            log::Level::Debug => LogLevel::Debug,
+            log::Level::Info => LogLevel::Info,
+            log::Level::Warn => LogLevel::Warn,
+            log::Level::Error => LogLevel::Error,
+        }
+    }
+}
diff --git a/nym-connect/src-tauri/src/main.rs b/nym-connect/src-tauri/src/main.rs
index 4f4e8bb5fb..608eca4130 100644
--- a/nym-connect/src-tauri/src/main.rs
+++ b/nym-connect/src-tauri/src/main.rs
@@ -6,8 +6,7 @@
 use std::sync::Arc;
 
 use config_common::defaults::setup_env;
-use logging::setup_logging;
-use tauri::Menu;
+use tauri::{Manager, Menu};
 use tokio::sync::RwLock;
 
 use crate::menu::AddDefaultSubmenus;
@@ -17,6 +16,7 @@ use crate::window::window_toggle;
 
 mod config;
 mod error;
+mod logging;
 mod menu;
 mod models;
 mod operations;
@@ -25,7 +25,6 @@ mod tasks;
 mod window;
 
 fn main() {
-    setup_logging();
     setup_env(None);
     println!("Starting up...");
 
@@ -35,11 +34,13 @@ fn main() {
         log::warn!("Failed to fix PATH: {error}");
     }
 
+    let context = tauri::generate_context!();
     tauri::Builder::default()
         .manage(Arc::new(RwLock::new(State::new())))
         .invoke_handler(tauri::generate_handler![
             crate::config::get_config_file_location,
             crate::config::get_config_id,
+            crate::operations::connection::status::get_connection_status,
             crate::operations::connection::connect::get_gateway,
             crate::operations::connection::connect::get_service_provider,
             crate::operations::connection::connect::set_gateway,
@@ -49,10 +50,31 @@ fn main() {
             crate::operations::directory::get_services,
             crate::operations::export::export_keys,
             crate::operations::window::hide_window,
+            crate::operations::growth::test_and_earn::growth_tne_get_client_id,
+            crate::operations::growth::test_and_earn::growth_tne_take_part,
+            crate::operations::growth::test_and_earn::growth_tne_get_draws,
+            crate::operations::growth::test_and_earn::growth_tne_ping,
+            crate::operations::growth::test_and_earn::growth_tne_submit_wallet_address,
+            crate::operations::growth::test_and_earn::growth_tne_enter_draw,
+            crate::operations::growth::test_and_earn::growth_tne_toggle_window,
+            crate::operations::help::log::help_log_toggle_window,
         ])
-        .menu(Menu::new().add_default_app_submenu_if_macos())
+        .menu(Menu::os_default(&context.package_info().name).add_default_app_submenus())
+        .on_menu_event(|event| {
+            if event.menu_item_id() == menu::SHOW_LOG_WINDOW {
+                let _r = crate::operations::help::log::help_log_toggle_window(
+                    event.window().app_handle(),
+                );
+            }
+            if event.menu_item_id() == menu::CLEAR_STORAGE {
+                let _r = crate::operations::help::storage::help_clear_storage(
+                    event.window().app_handle(),
+                );
+            }
+        })
+        .setup(|app| Ok(crate::logging::setup_logging(app.app_handle())?))
         .system_tray(create_tray_menu())
         .on_system_tray_event(tray_menu_event_handler)
-        .run(tauri::generate_context!())
+        .run(context)
         .expect("error while running tauri application");
 }
diff --git a/nym-connect/src-tauri/src/menu.rs b/nym-connect/src-tauri/src/menu.rs
index 368fc07d3a..2f9be83e07 100644
--- a/nym-connect/src-tauri/src/menu.rs
+++ b/nym-connect/src-tauri/src/menu.rs
@@ -1,40 +1,24 @@
-use crate::window_toggle;
 use tauri::{
-    AppHandle, CustomMenuItem, Menu, SystemTray, SystemTrayEvent, SystemTrayMenu,
+    AppHandle, CustomMenuItem, Menu, Submenu, SystemTray, SystemTrayEvent, SystemTrayMenu,
     SystemTrayMenuItem, Wry,
 };
-#[cfg(target_os = "macos")]
-use tauri::{MenuItem, Submenu};
+
+use crate::window_toggle;
+
+pub const SHOW_LOG_WINDOW: &str = "show_log_window";
+pub const CLEAR_STORAGE: &str = "clear_storage";
 
 pub trait AddDefaultSubmenus {
-    fn add_default_app_submenu_if_macos(self) -> Self;
+    fn add_default_app_submenus(self) -> Self;
 }
 
 impl AddDefaultSubmenus for Menu {
-    fn add_default_app_submenu_if_macos(self) -> Menu {
-        #[cfg(target_os = "macos")]
-        return self
-            .add_submenu(Submenu::new(
-                "File",
-                Menu::new().add_native_item(MenuItem::Quit),
-            ))
-            .add_submenu(Submenu::new(
-                "Edit",
-                Menu::new()
-                    .add_native_item(MenuItem::Copy)
-                    .add_native_item(MenuItem::Cut)
-                    .add_native_item(MenuItem::Paste)
-                    .add_native_item(MenuItem::SelectAll),
-            ))
-            .add_submenu(Submenu::new(
-                "Window",
-                Menu::new()
-                    .add_native_item(MenuItem::Hide)
-                    .add_native_item(MenuItem::HideOthers)
-                    .add_native_item(MenuItem::ShowAll),
-            ));
-        #[cfg(not(target_os = "macos"))]
-        return self;
+    fn add_default_app_submenus(self) -> Self {
+        let submenu = Submenu::new(
+            "Help",
+            Menu::new().add_item(CustomMenuItem::new(SHOW_LOG_WINDOW, "Show logs")),
+        );
+        self.add_submenu(submenu)
     }
 }
 
diff --git a/nym-connect/src-tauri/src/models/mod.rs b/nym-connect/src-tauri/src/models/mod.rs
index e5076ac5c0..cde0deed96 100644
--- a/nym-connect/src-tauri/src/models/mod.rs
+++ b/nym-connect/src-tauri/src/models/mod.rs
@@ -39,21 +39,31 @@ impl fmt::Display for ConnectionStatusKind {
 pub const APP_EVENT_CONNECTION_STATUS_CHANGED: &str = "app:connection-status-changed";
 
 #[cfg_attr(test, derive(ts_rs::TS))]
-#[derive(Clone, serde::Serialize)]
+#[derive(Clone, Serialize)]
 pub struct AppEventConnectionStatusChangedPayload {
     pub status: ConnectionStatusKind,
 }
 
 #[cfg_attr(test, derive(ts_rs::TS))]
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DirectoryService {
     pub id: String,
     pub description: String,
     pub items: Vec<DirectoryServiceProvider>,
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct HarbourMasterService {
+    pub service_provider_client_id: String,
+    pub gateway_identity_key: String,
+    pub ip_address: String,
+    pub last_successful_ping_utc: String,
+    pub last_updated_utc: String,
+    pub routing_score: f32,
+}
+
 #[cfg_attr(test, derive(ts_rs::TS))]
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DirectoryServiceProvider {
     pub id: String,
     pub description: String,
@@ -63,3 +73,11 @@ pub struct DirectoryServiceProvider {
     /// Address of the gateway, e.g. 2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh
     pub gateway: String,
 }
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct PagedResult<T> {
+    pub page: u32,
+    pub size: u32,
+    pub total: i32,
+    pub items: Vec<T>,
+}
diff --git a/nym-connect/src-tauri/src/operations/connection/connect.rs b/nym-connect/src-tauri/src/operations/connection/connect.rs
index 032221d456..6170fec0b4 100644
--- a/nym-connect/src-tauri/src/operations/connection/connect.rs
+++ b/nym-connect/src-tauri/src/operations/connection/connect.rs
@@ -11,14 +11,15 @@ pub async fn start_connecting(
     state: tauri::State<'_, Arc<RwLock<State>>>,
     window: tauri::Window<tauri::Wry>,
 ) -> Result<ConnectResult> {
-    let status_receiver = {
+    let (msg_receiver, exit_status_receiver) = {
         let mut state_w = state.write().await;
         state_w.start_connecting(&window).await?
     };
 
     // Setup task for checking status
     let state = state.inner().clone();
-    tasks::start_disconnect_listener(state, window, status_receiver);
+    tasks::start_disconnect_listener(state, window.clone(), exit_status_receiver);
+    tasks::start_status_listener(window, msg_receiver);
 
     Ok(ConnectResult {
         address: "PLACEHOLDER".to_string(),
@@ -36,10 +37,10 @@ pub async fn get_service_provider(state: tauri::State<'_, Arc<RwLock<State>>>) -
 
 #[tauri::command]
 pub async fn set_service_provider(
-    service_provider: String,
+    service_provider: Option<String>,
     state: tauri::State<'_, Arc<RwLock<State>>>,
 ) -> Result<()> {
-    log::trace!("Setting service_provider: {service_provider}");
+    log::trace!("Setting service_provider: {:?}", &service_provider);
     let mut guard = state.write().await;
     guard.set_service_provider(service_provider);
     Ok(())
@@ -56,10 +57,10 @@ pub async fn get_gateway(state: tauri::State<'_, Arc<RwLock<State>>>) -> Result<
 
 #[tauri::command]
 pub async fn set_gateway(
-    gateway: String,
+    gateway: Option<String>,
     state: tauri::State<'_, Arc<RwLock<State>>>,
 ) -> Result<()> {
-    log::trace!("Setting gateway: {gateway}");
+    log::trace!("Setting gateway: {:?}", &gateway);
     let mut guard = state.write().await;
     guard.set_gateway(gateway);
     Ok(())
diff --git a/nym-connect/src-tauri/src/operations/connection/mod.rs b/nym-connect/src-tauri/src/operations/connection/mod.rs
index 587edf0fc7..8c3449909e 100644
--- a/nym-connect/src-tauri/src/operations/connection/mod.rs
+++ b/nym-connect/src-tauri/src/operations/connection/mod.rs
@@ -1,2 +1,3 @@
 pub mod connect;
 pub mod disconnect;
+pub mod status;
diff --git a/nym-connect/src-tauri/src/operations/connection/status.rs b/nym-connect/src-tauri/src/operations/connection/status.rs
new file mode 100644
index 0000000000..ccf02400f3
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/connection/status.rs
@@ -0,0 +1,15 @@
+use crate::error::Result;
+use std::sync::Arc;
+
+use tokio::sync::RwLock;
+
+use crate::models::ConnectionStatusKind;
+use crate::state::State;
+
+#[tauri::command]
+pub async fn get_connection_status(
+    state: tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<ConnectionStatusKind> {
+    let state = state.read().await;
+    Ok(state.get_status())
+}
diff --git a/nym-connect/src-tauri/src/operations/directory/mod.rs b/nym-connect/src-tauri/src/operations/directory/mod.rs
index b6c45fa8c0..efc2ba175b 100644
--- a/nym-connect/src-tauri/src/operations/directory/mod.rs
+++ b/nym-connect/src-tauri/src/operations/directory/mod.rs
@@ -1,9 +1,13 @@
+use itertools::Itertools;
+
 use crate::error::Result;
-use crate::models::DirectoryService;
+use crate::models::{DirectoryService, HarbourMasterService, PagedResult};
 
 static SERVICE_PROVIDER_WELLKNOWN_URL: &str =
     "https://nymtech.net/.wellknown/connect/service-providers.json";
 
+static HARBOUR_MASTER_URL: &str = "https://harbourmaster.nymtech.net/v1/services/?size=100";
+
 #[tauri::command]
 pub async fn get_services() -> Result<Vec<DirectoryService>> {
     log::trace!("Fetching services");
@@ -12,5 +16,36 @@ pub async fn get_services() -> Result<Vec<DirectoryService>> {
         .json::<Vec<DirectoryService>>()
         .await?;
     log::trace!("Received: {:#?}", res);
-    Ok(res)
+
+    // TODO: get paged
+    log::trace!("Fetching active services");
+    let active_services = reqwest::get(HARBOUR_MASTER_URL)
+        .await?
+        .json::<PagedResult<HarbourMasterService>>()
+        .await?;
+    log::trace!("Active: {:#?}", active_services);
+
+    let mut filtered: Vec<DirectoryService> = vec![];
+
+    for service in &res {
+        let items: _ = service
+            .items
+            .clone()
+            .into_iter()
+            .filter(|sp| {
+                active_services
+                    .items
+                    .iter()
+                    .any(|active| active.service_provider_client_id == sp.address)
+            })
+            .collect_vec();
+        log::trace!("service = {} has {} items", service.id, items.len());
+        filtered.push(DirectoryService {
+            id: service.id.clone(),
+            description: service.description.clone(),
+            items,
+        })
+    }
+
+    Ok(filtered)
 }
diff --git a/nym-connect/src-tauri/src/operations/export.rs b/nym-connect/src-tauri/src/operations/export.rs
index d4190c686a..93c2e81bc8 100644
--- a/nym-connect/src-tauri/src/operations/export.rs
+++ b/nym-connect/src-tauri/src/operations/export.rs
@@ -5,6 +5,24 @@ use crate::{
     error::{BackendError, Result},
     state::State,
 };
+use client_core::client::key_manager::KeyManager;
+use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
+use crypto::asymmetric::identity;
+
+pub async fn get_identity_key(
+    state: &tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<Arc<identity::KeyPair>> {
+    let config = {
+        let state = state.read().await;
+        state.load_socks5_config()?
+    };
+
+    let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
+    let key_manager = KeyManager::load_keys(&pathfinder)?;
+    let identity_keypair = key_manager.identity_keypair();
+
+    Ok(identity_keypair)
+}
 
 /// Export the gateway keys as a JSON string blob
 #[tauri::command]
diff --git a/nym-connect/src-tauri/src/operations/growth/api_client.rs b/nym-connect/src-tauri/src/operations/growth/api_client.rs
new file mode 100644
index 0000000000..a8053e1977
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/growth/api_client.rs
@@ -0,0 +1,271 @@
+use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[allow(unused)]
+#[derive(Error, Debug)]
+pub enum ApiClientError {
+    #[error("{source}")]
+    Reqwest {
+        #[from]
+        source: reqwest::Error,
+    },
+    #[error("{source}")]
+    SerdeJson {
+        #[from]
+        source: serde_json::Error,
+    },
+    #[error("{0}")]
+    Status(String),
+}
+
+const API_BASE_URL: &str = "https://growth-api.nymtech.net";
+
+// For development mode, switch to this
+// const API_BASE_URL: &str = "http://localhost:8000";
+
+#[derive(Debug, Clone)]
+pub struct GrowthApiClient {
+    base_url: String,
+}
+
+impl GrowthApiClient {
+    pub fn new(resource_base: &str) -> Self {
+        let base_url = std::env::var("API_BASE_URL").unwrap_or_else(|_| API_BASE_URL.to_string());
+        GrowthApiClient {
+            base_url: format!("{}{}", base_url, resource_base),
+        }
+    }
+
+    pub fn registrations() -> Registrations {
+        Registrations::new(GrowthApiClient::new("/v1/tne"))
+    }
+
+    pub fn daily_draws() -> DailyDraws {
+        DailyDraws::new(GrowthApiClient::new("/v1/tne/daily_draw"))
+    }
+
+    pub(crate) async fn get<T: DeserializeOwned>(&self, url: &str) -> Result<T, ApiClientError> {
+        log::info!(">>> GET {}", url);
+        let proxy = reqwest::Proxy::all("socks5h://127.0.0.1:1080")?;
+        let client = reqwest::Client::builder()
+            .proxy(proxy)
+            .timeout(std::time::Duration::from_secs(10))
+            .build()?;
+
+        match client.get(format!("{}{}", self.base_url, url)).send().await {
+            Ok(res) => {
+                if res.status().is_client_error() || res.status().is_server_error() {
+                    log::error!("<<< {}", res.status());
+                    return Err(ApiClientError::Status(res.status().to_string()));
+                }
+                match res.text().await {
+                    Ok(response_body) => {
+                        log::info!("<<< {}", response_body);
+                        match serde_json::from_str(&response_body) {
+                            Ok(res) => Ok(res),
+                            Err(e) => {
+                                log::error!("<<< JSON parsing error: {}", e);
+                                Err(e.into())
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        log::error!("<<< Request error: {}", e);
+                        Err(e.into())
+                    }
+                }
+            }
+            Err(e) => {
+                log::error!("<<< Response parsing error: {}", e);
+                Err(e.into())
+            }
+        }
+    }
+
+    pub(crate) async fn post<REQ: Serialize + ?Sized, RESP: DeserializeOwned>(
+        &self,
+        url: &str,
+        body: &REQ,
+    ) -> Result<RESP, ApiClientError> {
+        log::info!(">>> POST {}", url);
+        let proxy = reqwest::Proxy::all("socks5h://127.0.0.1:1080")?;
+        let client = reqwest::Client::builder()
+            .proxy(proxy)
+            .timeout(std::time::Duration::from_secs(10))
+            .build()?;
+
+        match client
+            .post(format!("{}{}", self.base_url, url))
+            .json(body)
+            .send()
+            .await
+        {
+            Ok(res) => {
+                if res.status().is_client_error() || res.status().is_server_error() {
+                    log::error!("<<< {}", res.status());
+                    return Err(ApiClientError::Status(res.status().to_string()));
+                }
+                match res.text().await {
+                    Ok(response_body) => {
+                        log::info!("<<< {}", response_body);
+                        match serde_json::from_str(&response_body) {
+                            Ok(res) => Ok(res),
+                            Err(e) => {
+                                log::error!("<<< JSON parsing error: {}", e);
+                                Err(e.into())
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        log::error!("<<< Request error: {}", e);
+                        Err(e.into())
+                    }
+                }
+            }
+            Err(e) => {
+                log::error!("<<< Response parsing error: {}", e);
+                Err(e.into())
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct ClientIdPartial {
+    pub client_id: String,
+    pub client_id_signature: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Registration {
+    pub id: String,
+    pub client_id: String,
+    pub timestamp: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Ping {
+    pub client_id: String,
+    pub timestamp: String,
+}
+
+pub struct Registrations {
+    client: GrowthApiClient,
+}
+
+impl Registrations {
+    pub fn new(client: GrowthApiClient) -> Self {
+        Registrations { client }
+    }
+
+    pub async fn register(
+        &self,
+        registration: &ClientIdPartial,
+    ) -> Result<Registration, ApiClientError> {
+        self.client.post("/register", &registration).await
+    }
+
+    #[allow(dead_code)]
+    pub async fn unregister(&self, registration: &ClientIdPartial) -> Result<(), ApiClientError> {
+        self.client.post("/unregister", &registration).await
+    }
+
+    #[allow(dead_code)]
+    pub async fn status(&self, registration: &ClientIdPartial) -> Result<(), ApiClientError> {
+        self.client.post("/status", &registration).await
+    }
+
+    pub async fn ping(&self, registration: &ClientIdPartial) -> Result<(), ApiClientError> {
+        self.client.post("/ping", &registration).await
+    }
+
+    #[allow(dead_code)]
+    pub async fn health(&self) -> Result<(), ApiClientError> {
+        self.client.get("/health").await
+    }
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct DrawEntryPartial {
+    pub draw_id: String,
+    pub client_id: String,
+    pub client_id_signature: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct DrawEntry {
+    pub id: String,
+    pub draw_id: String,
+    pub timestamp: String,
+    pub status: Option<String>,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct DrawWithWordOfTheDay {
+    pub id: String,
+    pub start_utc: String,
+    pub end_utc: String,
+    pub word_of_the_day: Option<String>,
+    pub last_modified: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct ClaimPartial {
+    pub draw_id: String,
+    pub registration_id: String,
+    pub client_id: String,
+    pub client_id_signature: String,
+    pub wallet_address: String,
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Winner {
+    pub id: String,
+    pub client_id: String,
+    pub draw_id: String,
+    pub timestamp: String,
+    pub winner_reg_id: String,
+    pub winner_wallet_address: Option<String>,
+    pub winner_claim_timestamp: Option<String>,
+}
+
+pub struct DailyDraws {
+    client: GrowthApiClient,
+}
+
+impl DailyDraws {
+    pub fn new(client: GrowthApiClient) -> Self {
+        DailyDraws { client }
+    }
+
+    pub async fn current(&self) -> Result<DrawWithWordOfTheDay, ApiClientError> {
+        self.client.get("/current").await
+    }
+
+    pub async fn next(&self) -> Result<DrawWithWordOfTheDay, ApiClientError> {
+        self.client.get("/next").await
+    }
+
+    #[allow(dead_code)]
+    pub async fn status(&self, draw_id: &str) -> Result<DrawWithWordOfTheDay, ApiClientError> {
+        self.client
+            .get(format!("/status/{}", draw_id).as_str())
+            .await
+    }
+
+    pub async fn enter(&self, entry: &DrawEntryPartial) -> Result<DrawEntry, ApiClientError> {
+        self.client.post("/enter", entry).await
+    }
+
+    pub async fn entries(
+        &self,
+        client_id: &ClientIdPartial,
+    ) -> Result<Vec<DrawEntry>, ApiClientError> {
+        self.client.post("/entries", client_id).await
+    }
+
+    pub async fn claim(&self, claim: &ClaimPartial) -> Result<Winner, ApiClientError> {
+        self.client.post("/claim", claim).await
+    }
+}
diff --git a/nym-connect/src-tauri/src/operations/growth/assets.rs b/nym-connect/src-tauri/src/operations/growth/assets.rs
new file mode 100644
index 0000000000..752b221916
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/growth/assets.rs
@@ -0,0 +1,57 @@
+use rust_embed::RustEmbed;
+extern crate yaml_rust;
+use yaml_rust::YamlLoader;
+
+#[derive(RustEmbed)]
+#[folder = "../src/components/Growth/content/"]
+#[include = "*.yaml"]
+#[exclude = "*.mdx"]
+struct Asset;
+
+#[derive(Debug)]
+pub struct NotificationContent {
+    pub title: String,
+    pub body: String,
+}
+
+#[derive(Debug)]
+pub struct Notifications {
+    pub you_are_in_draw: NotificationContent,
+    pub take_part: NotificationContent,
+}
+
+pub struct Content {}
+
+const RESOURCE_ERROR: &str = "❌ RESOURCE ERROR";
+
+fn get_as_string_or_error_message(value: &yaml_rust::Yaml) -> String {
+    value.as_str().unwrap_or(RESOURCE_ERROR).to_string()
+}
+
+impl Content {
+    pub fn get_notifications() -> Notifications {
+        let content = Asset::get("en.yaml").unwrap();
+        let s = std::str::from_utf8(content.data.as_ref()).unwrap();
+        let content = YamlLoader::load_from_str(s).unwrap();
+        let content = &content[0];
+
+        Notifications {
+            you_are_in_draw: NotificationContent {
+                title: get_as_string_or_error_message(
+                    &content["testAndEarn"]["notifications"]["youAreInDraw"]["title"],
+                ),
+                body: get_as_string_or_error_message(
+                    &content["testAndEarn"]["notifications"]["youAreInDraw"]["body"],
+                ),
+            },
+            take_part: NotificationContent {
+                title: get_as_string_or_error_message(
+                    &content["testAndEarn"]["notifications"]["takePart"]["title"],
+                ),
+                body: get_as_string_or_error_message(
+                    &content["testAndEarn"]["notifications"]["takePart"]["body"],
+                ),
+            },
+        }
+    }
+}
diff --git a/nym-connect/src-tauri/src/operations/growth/mod.rs b/nym-connect/src-tauri/src/operations/growth/mod.rs
new file mode 100644
index 0000000000..449c1bcee2
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/growth/mod.rs
@@ -0,0 +1,3 @@
+pub mod api_client;
+pub mod assets;
+pub mod test_and_earn;
diff --git a/nym-connect/src-tauri/src/operations/growth/test_and_earn.rs b/nym-connect/src-tauri/src/operations/growth/test_and_earn.rs
new file mode 100644
index 0000000000..c2216ce245
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/growth/test_and_earn.rs
@@ -0,0 +1,156 @@
+use crate::error::BackendError;
+use crate::operations::export::get_identity_key;
+use crate::operations::growth::api_client::{
+    ClaimPartial, ClientIdPartial, DrawEntry, DrawEntryPartial, DrawWithWordOfTheDay,
+    GrowthApiClient, Registration, Winner,
+};
+use crate::State;
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+use tauri::api::notification::Notification;
+use tauri::Manager;
+use tokio::sync::RwLock;
+
+async fn get_client_id(
+    state: &tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<ClientIdPartial, BackendError> {
+    let keypair = get_identity_key(state).await?;
+    let client_id = keypair.public_key().to_base58_string();
+    let client_id_signature = keypair
+        .private_key()
+        .sign(client_id.as_bytes())
+        .to_base58_string();
+    Ok(ClientIdPartial {
+        client_id,
+        client_id_signature,
+    })
+}
+
+#[tauri::command]
+pub async fn growth_tne_get_client_id(
+    state: tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<ClientIdPartial, BackendError> {
+    get_client_id(&state).await
+}
+
+#[tauri::command]
+pub async fn growth_tne_take_part(
+    app_handle: tauri::AppHandle,
+    state: tauri::State<'_, Arc<RwLock<State>>>,
+) -> Result<Registration, BackendError> {
+    let notifications = super::assets::Content::get_notifications();
+
+    let client_id = get_client_id(&state).await?;
+    let registration = GrowthApiClient::registrations()
+        .register(&client_id)
+        .await?;
+
+    log::info!("<<< Test&Earn: registration details: {:?}", registration);
+
+    if let Err(e) = Notification::new(&app_handle.config().tauri.bundle.identifier)
+        .title(notifications.take_part.title)
+        .body(notifications.take_part.body)
+        .show()
+    {
+        log::error!("Could not show notification. Error = {:?}", e);
+    }
+
+    Ok(registration)
+}
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Draws {
+    pub current: Option<DrawWithWordOfTheDay>,
+    pub next: Option<DrawWithWordOfTheDay>,
+    pub draws: Vec<DrawEntry>,
+}
+
+#[tauri::command]
+pub async fn growth_tne_get_draws(client_details: ClientIdPartial) -> Result<Draws, BackendError> {
+    let draws_api = GrowthApiClient::daily_draws();
+
+    let current = draws_api.current().await.ok();
+    let next = draws_api.next().await.ok();
+    let draws = draws_api.entries(&client_details).await?;
+
+    Ok(Draws {
+        current,
+        next,
+        draws,
+    })
+}
+
+#[tauri::command]
+pub async fn growth_tne_enter_draw(
+    client_details: ClientIdPartial,
+    draw_id: String,
+) -> Result<DrawEntry, BackendError> {
+    Ok(GrowthApiClient::daily_draws()
+        .enter(&DrawEntryPartial {
+            draw_id,
+            client_id: client_details.client_id,
+            client_id_signature: client_details.client_id_signature,
+        })
+        .await?)
+}
+
+#[tauri::command]
+pub async fn growth_tne_submit_wallet_address(
+    client_details: ClientIdPartial,
+    draw_id: String,
+    wallet_address: String,
+    registration_id: String,
+) -> Result<Winner, BackendError> {
+    Ok(GrowthApiClient::daily_draws()
+        .claim(&ClaimPartial {
+            draw_id,
+            client_id: client_details.client_id,
+            client_id_signature: client_details.client_id_signature,
+            wallet_address,
+            registration_id,
+        })
+        .await?)
+}
+
+#[tauri::command]
+pub async fn growth_tne_ping(client_details: ClientIdPartial) -> Result<(), BackendError> {
+    log::info!("Test&Earn is sending a ping...");
+    Ok(GrowthApiClient::registrations()
+        .ping(&client_details)
+        .await?)
+}
+
+#[tauri::command]
+pub async fn growth_tne_toggle_window(
+    app_handle: tauri::AppHandle,
+    window_title: Option<String>,
+) -> Result<(), BackendError> {
+    if let Some(window) = app_handle.windows().get("growth") {
+        log::info!("Closing growth window...");
+        if let Err(e) = window.close() {
+            log::error!("Unable to close growth window: {:?}", e);
+        }
+        return Ok(());
+    }
+
+    log::info!("Creating growth window...");
+    match tauri::WindowBuilder::new(
+        &app_handle,
+        "growth",
+        tauri::WindowUrl::App("growth.html".into()),
+    )
+    .title(window_title.unwrap_or_else(|| "NymConnect Test&Earn".to_string()))
+    .build()
+    {
+        Ok(window) => {
+            if let Err(e) = window.set_focus() {
+                log::error!("Unable to focus growth window: {:?}", e);
+            }
+            Ok(())
+        }
+        Err(e) => {
+            log::error!("Unable to create growth window: {:?}", e);
+            Err(BackendError::NewWindowError)
+        }
+    }
+}
diff --git a/nym-connect/src-tauri/src/operations/help/log.rs b/nym-connect/src-tauri/src/operations/help/log.rs
new file mode 100644
index 0000000000..e2cfd249b1
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/help/log.rs
@@ -0,0 +1,30 @@
+use crate::error::BackendError;
+use tauri::Manager;
+
+#[tauri::command]
+pub fn help_log_toggle_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
+    if let Some(current_log_window) = app_handle.windows().get("log") {
+        log::info!("Closing log window...");
+        if let Err(e) = current_log_window.close() {
+            log::error!("Unable to close log window: {:?}", e);
+        }
+        return Ok(());
+    }
+
+    log::info!("Creating log window...");
+    match tauri::WindowBuilder::new(&app_handle, "log", tauri::WindowUrl::App("log.html".into()))
+        .title("Nym Connect Logs")
+        .build()
+    {
+        Ok(window) => {
+            if let Err(e) = window.set_focus() {
+                log::error!("Unable to focus log window: {:?}", e);
+            }
+            Ok(())
+        }
+        Err(e) => {
+            log::error!("Unable to create log window: {:?}", e);
+            Err(BackendError::NewWindowError)
+        }
+    }
+}
diff --git a/nym-connect/src-tauri/src/operations/help/mod.rs b/nym-connect/src-tauri/src/operations/help/mod.rs
new file mode 100644
index 0000000000..52dafe6d0f
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/help/mod.rs
@@ -0,0 +1,2 @@
+pub mod log;
+pub mod storage;
diff --git a/nym-connect/src-tauri/src/operations/help/storage.rs b/nym-connect/src-tauri/src/operations/help/storage.rs
new file mode 100644
index 0000000000..ab47ffa529
--- /dev/null
+++ b/nym-connect/src-tauri/src/operations/help/storage.rs
@@ -0,0 +1,20 @@
+use crate::error::BackendError;
+use serde::Serialize;
+use tauri::Manager;
+
+#[derive(Debug, Serialize, Clone)]
+struct ClearStorageEvent {
+    kind: String,
+}
+
+#[tauri::command]
+pub fn help_clear_storage(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
+    log::info!("Sending event to clear local storage...");
+
+    let event = ClearStorageEvent {
+        kind: "local_storage".to_string(),
+    };
+    app_handle.emit_all("help://clear-storage", event)?;
+
+    Ok(())
+}
diff --git a/nym-connect/src-tauri/src/operations/mod.rs b/nym-connect/src-tauri/src/operations/mod.rs
index 766762858e..1d0fa5b211 100644
--- a/nym-connect/src-tauri/src/operations/mod.rs
+++ b/nym-connect/src-tauri/src/operations/mod.rs
@@ -1,4 +1,6 @@
 pub mod connection;
 pub mod directory;
 pub mod export;
+pub mod growth;
+pub mod help;
 pub mod window;
diff --git a/nym-connect/src-tauri/src/state.rs b/nym-connect/src-tauri/src/state.rs
index 6d0f34bc8f..f0aa869edd 100644
--- a/nym-connect/src-tauri/src/state.rs
+++ b/nym-connect/src-tauri/src/state.rs
@@ -16,7 +16,7 @@ use crate::{
         AppEventConnectionStatusChangedPayload, ConnectionStatusKind,
         APP_EVENT_CONNECTION_STATUS_CHANGED,
     },
-    tasks::{self, StatusReceiver},
+    tasks::{self, ExitStatusReceiver},
 };
 
 pub struct State {
@@ -64,16 +64,16 @@ impl State {
         &self.service_provider
     }
 
-    pub fn set_service_provider(&mut self, provider: String) {
-        self.service_provider = Some(provider);
+    pub fn set_service_provider(&mut self, provider: Option<String>) {
+        self.service_provider = provider;
     }
 
     pub fn get_gateway(&self) -> &Option<String> {
         &self.gateway
     }
 
-    pub fn set_gateway(&mut self, gateway: String) {
-        self.gateway = Some(gateway);
+    pub fn set_gateway(&mut self, gateway: Option<String>) {
+        self.gateway = gateway;
     }
 
     /// The effective config id is the static config id appended with the id of the gateway
@@ -96,12 +96,12 @@ impl State {
     pub async fn start_connecting(
         &mut self,
         window: &tauri::Window<tauri::Wry>,
-    ) -> Result<StatusReceiver> {
+    ) -> Result<(task::StatusReceiver, ExitStatusReceiver)> {
         self.set_state(ConnectionStatusKind::Connecting, window);
 
         // Setup configuration by writing to file
         if let Err(err) = self.init_config().await {
-            log::error!("Failed to initialize: {}", err);
+            log::error!("Failed to initialize: {err}");
 
             // Wait a little to give the user some rudimentary feedback that the click actually
             // registered.
@@ -111,9 +111,9 @@ impl State {
         }
 
         // Kick off the main task and get the channel for controlling it
-        let status_receiver = self.start_nym_socks5_client().await?;
+        let (msg_receiver, exit_status_receiver) = self.start_nym_socks5_client()?;
         self.set_state(ConnectionStatusKind::Connected, window);
-        Ok(status_receiver)
+        Ok((msg_receiver, exit_status_receiver))
     }
 
     /// Create a configuration file
@@ -133,12 +133,13 @@ impl State {
     }
 
     /// Spawn a new thread running the SOCKS5 client
-    async fn start_nym_socks5_client(&mut self) -> Result<StatusReceiver> {
+    fn start_nym_socks5_client(&mut self) -> Result<(task::StatusReceiver, ExitStatusReceiver)> {
         let id = self.get_config_id()?;
-        let (control_tx, status_rx, used_gateway) = tasks::start_nym_socks5_client(&id)?;
+        let (control_tx, msg_rx, exit_status_rx, used_gateway) =
+            tasks::start_nym_socks5_client(&id)?;
         self.socks5_client_sender = Some(control_tx);
         self.gateway = Some(used_gateway.gateway_id);
-        Ok(status_rx)
+        Ok((msg_rx, exit_status_rx))
     }
 
     /// Disconnect by sending a message to the SOCKS5 client thread. Once it has finished and is
diff --git a/nym-connect/src-tauri/src/tasks.rs b/nym-connect/src-tauri/src/tasks.rs
index 267c20e08c..3201648e6e 100644
--- a/nym-connect/src-tauri/src/tasks.rs
+++ b/nym-connect/src-tauri/src/tasks.rs
@@ -1,5 +1,5 @@
-use client_core::config::GatewayEndpointConfig;
-use futures::channel::mpsc;
+use client_core::config::{ClientCoreConfigTrait, GatewayEndpointConfig};
+use futures::{channel::mpsc, StreamExt};
 use std::sync::Arc;
 use tap::TapFallible;
 use tokio::sync::RwLock;
@@ -11,15 +11,15 @@ use nym_socks5::client::{config::Config as Socks5Config, Socks5ControlMessageSen
 
 use crate::{error::Result, state::State};
 
-pub type StatusReceiver = futures::channel::oneshot::Receiver<Socks5StatusMessage>;
+pub type ExitStatusReceiver = futures::channel::oneshot::Receiver<Socks5ExitStatusMessage>;
 
 /// Status messages sent by the SOCKS5 client task to the main tauri task.
 #[derive(Debug)]
-pub enum Socks5StatusMessage {
+pub enum Socks5ExitStatusMessage {
     /// The SOCKS5 task successfully stopped
     Stopped,
     /// The SOCKS5 task failed to start
-    FailedToStart,
+    Failed(Box<dyn std::error::Error + Send>),
 }
 
 /// The main SOCKS5 client task. It loads the configuration from file determined by the `id`.
@@ -27,7 +27,8 @@ pub fn start_nym_socks5_client(
     id: &str,
 ) -> Result<(
     Socks5ControlMessageSender,
-    StatusReceiver,
+    task::StatusReceiver,
+    ExitStatusReceiver,
     GatewayEndpointConfig,
 )> {
     log::info!("Loading config from file: {id}");
@@ -41,8 +42,11 @@ pub fn start_nym_socks5_client(
     // Channel to send control messages to the socks5 client
     let (socks5_ctrl_tx, socks5_ctrl_rx) = mpsc::unbounded();
 
+    // Channel to send status update messages from the background socks5 task to the frontend.
+    let (socks5_status_tx, socks5_status_rx) = mpsc::channel(128);
+
     // Channel to signal back to the main task when the socks5 client finishes, and why
-    let (socks5_status_tx, socks5_status_rx) = futures::channel::oneshot::channel();
+    let (socks5_exit_tx, socks5_exit_rx) = futures::channel::oneshot::channel();
 
     // Spawn a separate runtime for the socks5 client so we can forcefully terminate.
     // Once we can gracefully shutdown the socks5 client we can get rid of this.
@@ -51,23 +55,32 @@ pub fn start_nym_socks5_client(
     std::thread::spawn(|| {
         let result = tokio::runtime::Runtime::new()
             .expect("Failed to create runtime for SOCKS5 client")
-            .block_on(async move { socks5_client.run_and_listen(socks5_ctrl_rx).await });
+            .block_on(async move {
+                socks5_client
+                    .run_and_listen(socks5_ctrl_rx, socks5_status_tx)
+                    .await
+            });
 
         if let Err(err) = result {
             log::error!("SOCKS5 proxy failed: {err}");
-            socks5_status_tx
-                .send(Socks5StatusMessage::FailedToStart)
+            socks5_exit_tx
+                .send(Socks5ExitStatusMessage::Failed(err))
                 .expect("Failed to send status message back to main task");
             return;
         }
 
         log::info!("SOCKS5 task finished");
-        socks5_status_tx
-            .send(Socks5StatusMessage::Stopped)
+        socks5_exit_tx
+            .send(Socks5ExitStatusMessage::Stopped)
             .expect("Failed to send status message back to main task");
     });
 
-    Ok((socks5_ctrl_tx, socks5_status_rx, used_gateway))
+    Ok((
+        socks5_ctrl_tx,
+        socks5_status_rx,
+        socks5_exit_rx,
+        used_gateway,
+    ))
 }
 
 #[derive(Clone, serde::Serialize)]
@@ -76,17 +89,39 @@ struct Payload {
     message: String,
 }
 
+/// The status listener listens for non-exit status messages from the background socks5 proxy task.
+pub fn start_status_listener(
+    window: tauri::Window<tauri::Wry>,
+    mut msg_receiver: task::StatusReceiver,
+) {
+    log::info!("Starting status listener");
+    tokio::spawn(async move {
+        while let Some(msg) = msg_receiver.next().await {
+            log::info!("SOCKS5 proxy sent status message: {}", msg);
+            window
+                .emit(
+                    "socks5-status-event",
+                    Payload {
+                        title: "SOCKS5 update".into(),
+                        message: msg.to_string(),
+                    },
+                )
+                .unwrap();
+        }
+    });
+}
+
 /// The disconnect listener listens to the channel setup between the socks5 proxy task and the main
 /// tauri task. Primarily it listens for shutdown messages, and updates the state accordingly.
 pub fn start_disconnect_listener(
     state: Arc<RwLock<State>>,
     window: tauri::Window<tauri::Wry>,
-    status_receiver: StatusReceiver,
+    exit_status_receiver: ExitStatusReceiver,
 ) {
     log::trace!("Starting disconnect listener");
     tokio::spawn(async move {
-        match status_receiver.await {
-            Ok(Socks5StatusMessage::Stopped) => {
+        match exit_status_receiver.await {
+            Ok(Socks5ExitStatusMessage::Stopped) => {
                 log::info!("SOCKS5 task reported it has finished");
                 window
                     .emit(
@@ -98,14 +133,14 @@ pub fn start_disconnect_listener(
                     )
                     .unwrap();
             }
-            Ok(Socks5StatusMessage::FailedToStart) => {
-                log::info!("SOCKS5 task reported it failed to start");
+            Ok(Socks5ExitStatusMessage::Failed(err)) => {
+                log::info!("SOCKS5 task reported error: {err}");
                 window
                     .emit(
                         "socks5-event",
                         Payload {
                             title: "SOCKS5 error".into(),
-                            message: "SOCKS5 failed to start".into(),
+                            message: format!("SOCKS5 failed: {err}"),
                         },
                     )
                     .unwrap();
diff --git a/nym-connect/src-tauri/tauri.conf.json b/nym-connect/src-tauri/tauri.conf.json
index b9cbfd8233..05d22942c4 100644
--- a/nym-connect/src-tauri/tauri.conf.json
+++ b/nym-connect/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-connect",
-    "version": "1.1.0"
+    "version": "1.1.4"
   },
   "build": {
     "distDir": "../dist",
@@ -57,14 +57,18 @@
       },
       "window": {
         "startDragging": true,
-        "close": true
+        "close": true,
+        "minimize": true
+      },
+      "notification": {
+        "all": true
       }
     },
     "windows": [
       {
         "title": "NymConnect",
         "width": 240,
-        "height": 540,
+        "height": 675,
         "resizable": false,
         "decorations": false,
         "transparent": true
diff --git a/nym-connect/src/App.tsx b/nym-connect/src/App.tsx
index 90dd1a4230..9d5afd1427 100644
--- a/nym-connect/src/App.tsx
+++ b/nym-connect/src/App.tsx
@@ -1,15 +1,27 @@
 import React, { useEffect } from 'react';
 import { DateTime } from 'luxon';
+import { forage } from '@tauri-apps/tauri-forage';
 import { ConnectionStatusKind } from './types';
 import { useClientContext } from './context/main';
 import { DefaultLayout } from './layouts/DefaultLayout';
 import { ConnectedLayout } from './layouts/ConnectedLayout';
 import { HelpGuideLayout } from './layouts/HelpGuideLayout';
+import { useTauriEvents } from './utils';
 
 export const App: React.FC = () => {
   const context = useClientContext();
   const [busy, setBusy] = React.useState<boolean>();
   const [showInfoModal, setShowInfoModal] = React.useState(false);
+  useTauriEvents('help://clear-storage', (_event) => {
+    console.log('About to clear local storage...');
+    // clear local storage
+    try {
+      forage.clear()();
+      console.log('Local storage cleared');
+    } catch (e) {
+      console.error('Failed to clear local storage', e);
+    }
+  });
 
   const handleConnectClick = React.useCallback(async () => {
     const currentStatus = context.connectionStatus;
@@ -49,7 +61,6 @@ export const App: React.FC = () => {
         busy={busy}
         onConnectClick={handleConnectClick}
         services={context.services}
-        onServiceProviderChange={context.setServiceProvider}
       />
     );
   }
diff --git a/nym-connect/src/components/AppVersion.tsx b/nym-connect/src/components/AppVersion.tsx
new file mode 100644
index 0000000000..f82f99b5a2
--- /dev/null
+++ b/nym-connect/src/components/AppVersion.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Typography, Box } from '@mui/material';
+import { useClientContext } from 'src/context/main';
+
+export const AppVersion = () => {
+  const { appVersion } = useClientContext();
+
+  return (
+    <Box sx={{ display: 'grid', width: '100%', justifyContent: 'center' }}>
+      <Box fontSize="small" sx={{ mb: 4, color: 'grey.600' }}>
+        Version {appVersion}
+      </Box>
+    </Box>
+  );
+};
diff --git a/nym-connect/src/components/AppWindowFrame.tsx b/nym-connect/src/components/AppWindowFrame.tsx
index 5fc3d60ff6..3abc14a8e6 100644
--- a/nym-connect/src/components/AppWindowFrame.tsx
+++ b/nym-connect/src/components/AppWindowFrame.tsx
@@ -1,18 +1,20 @@
 import React from 'react';
 import { Box } from '@mui/material';
 import { CustomTitleBar } from './CustomTitleBar';
+import { AppVersion } from './AppVersion';
 
 export const AppWindowFrame: React.FC = ({ children }) => (
   <Box
     sx={{
       display: 'grid',
       borderRadius: '12px',
-      gridTemplateRows: '40px 1fr',
-      bgcolor: 'nym.background.dark',
+      gridTemplateRows: '40px 1fr 30px',
       height: '100vh',
+      overflowY: 'hidden',
     }}
   >
     <CustomTitleBar />
     <Box style={{ padding: '16px' }}>{children}</Box>
+    <AppVersion />
   </Box>
 );
diff --git a/nym-connect/src/components/ConnectionButton.tsx b/nym-connect/src/components/ConnectionButton.tsx
index 42903a80ea..6d8a592681 100644
--- a/nym-connect/src/components/ConnectionButton.tsx
+++ b/nym-connect/src/components/ConnectionButton.tsx
@@ -76,9 +76,9 @@ export const ConnectionButton: React.FC<{
   return (
     <svg
       opacity={disabled ? 0.75 : 1}
-      width="208"
-      height="208"
-      viewBox="0 0 208 208"
+      width="200"
+      height="200"
+      viewBox="0 0 200 200"
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
diff --git a/nym-connect/src/components/CopyToClipboard.tsx b/nym-connect/src/components/CopyToClipboard.tsx
index 4e4031cf46..7a48662190 100644
--- a/nym-connect/src/components/CopyToClipboard.tsx
+++ b/nym-connect/src/components/CopyToClipboard.tsx
@@ -14,9 +14,13 @@ export const CopyToClipboard = ({
 }) => {
   const [copied, setCopied] = useState(false);
 
-  const handleCopy = async (text: string) => {
+  const handleCopy = async (textToCopy: string) => {
     try {
-      await clipboard.writeText(text);
+      if (clipboard) {
+        await clipboard.writeText(textToCopy);
+      } else {
+        await navigator.clipboard.writeText(textToCopy);
+      }
       setCopied(true);
     } catch (e) {
       console.log(`failed to copy: ${e}`);
diff --git a/nym-connect/src/components/CustomTitleBar.tsx b/nym-connect/src/components/CustomTitleBar.tsx
index dc4e8c0061..41c71137b9 100644
--- a/nym-connect/src/components/CustomTitleBar.tsx
+++ b/nym-connect/src/components/CustomTitleBar.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ArrowBack, Close, HelpOutline } from '@mui/icons-material';
+import { ArrowBack, Close, HelpOutline, Minimize } from '@mui/icons-material';
 import { Box, IconButton } from '@mui/material';
 import { NymWordmark } from '@nymproject/react/logo/NymWordmark';
 import { appWindow } from '@tauri-apps/api/window';
@@ -19,7 +19,7 @@ const customTitleBarStyles = {
 };
 
 const CustomButton = ({ Icon, onClick }: { Icon: React.JSXElementConstructor<any>; onClick: () => void }) => (
-  <IconButton size="small" style={{ padding: 0 }} onClick={onClick}>
+  <IconButton size="small" onClick={onClick} sx={{ padding: 0 }}>
     <Icon style={{ fontSize: 16 }} />
   </IconButton>
 );
@@ -28,14 +28,22 @@ export const CustomTitleBar = () => {
   const { showHelp, handleShowHelp } = useClientContext();
   return (
     <Box data-tauri-drag-region style={customTitleBarStyles.titlebar}>
-      <CustomButton
-        Icon={!showHelp ? HelpOutline : ArrowBack}
-        onClick={() => {
-          handleShowHelp();
-        }}
-      />
+      {/* set width to keep logo centered */}
+      <Box sx={{ width: '40px' }}>
+        <CustomButton
+          Icon={!showHelp ? HelpOutline : ArrowBack}
+          onClick={() => {
+            handleShowHelp();
+          }}
+        />
+      </Box>
+
       <NymWordmark width={36} />
-      <CustomButton Icon={Close} onClick={() => appWindow.close()} />
+
+      <Box sx={{ display: 'flex', alignItems: 'center', gap: 1 }}>
+        <CustomButton Icon={Minimize} onClick={() => appWindow.minimize()} />
+        <CustomButton Icon={Close} onClick={() => appWindow.close()} />
+      </Box>
     </Box>
   );
 };
diff --git a/nym-connect/src/components/ErrorFallback.tsx b/nym-connect/src/components/ErrorFallback.tsx
new file mode 100644
index 0000000000..f582536b6b
--- /dev/null
+++ b/nym-connect/src/components/ErrorFallback.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import { FallbackProps } from 'react-error-boundary';
+import { Alert, AlertTitle, Button } from '@mui/material';
+
+export const ErrorFallback = ({ error, resetErrorBoundary }: FallbackProps) => (
+  <div>
+    <Alert severity="error" data-testid="error-message">
+      <AlertTitle>{error.name}</AlertTitle>
+      {error.message}
+    </Alert>
+    <Alert severity="error" data-testid="stack-trace">
+      <AlertTitle>Stack trace</AlertTitle>
+      {error.stack}
+    </Alert>
+    <Button onClick={resetErrorBoundary}>Back to safety</Button>
+  </div>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnButtonArea.tsx b/nym-connect/src/components/Growth/TestAndEarnButtonArea.tsx
new file mode 100644
index 0000000000..ed6219e31f
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnButtonArea.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import { Badge, Box, Button, Tooltip } from '@mui/material';
+import MonetizationOnIcon from '@mui/icons-material/MonetizationOn';
+import { invoke } from '@tauri-apps/api';
+import Content from './content/en.yaml';
+import { useClientContext } from '../../context/main';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { NymShipyardTheme } from '../../theme';
+import { ConnectionStatusKind } from '../../types';
+
+export const Wrapper: React.FC<{ disabled: boolean }> = ({ disabled, children }) => {
+  if (disabled) {
+    return (
+      <Badge badgeContent="!" color="warning">
+        <Tooltip arrow title={disabled ? Content.testAndEarn.mainWindow.button.popup.disconnected : undefined}>
+          <div>{children}</div>
+        </Tooltip>
+      </Badge>
+    );
+  }
+  return <>{children}</>;
+};
+
+export const TestAndEarnButtonArea: React.FC = () => {
+  const clientContext = useClientContext();
+  const context = useTestAndEarnContext();
+  const disabled = clientContext.connectionStatus !== ConnectionStatusKind.connected;
+  const pinger = React.useRef<NodeJS.Timer | null>();
+
+  const doPing = async () => {
+    if (context.clientDetails) {
+      try {
+        await invoke('growth_tne_ping', { clientDetails: context.clientDetails });
+      } catch (_e) {
+        // console.error('Failed to ping: ', e);
+      }
+    }
+  };
+
+  React.useEffect(() => {
+    (async () => {
+      if (!disabled) {
+        // sleep a little until the SOCKS5 proxy connects
+        setTimeout(() => {
+          doPing();
+        }, 1000 * 10);
+
+        // update every 15 mins
+        pinger.current = setInterval(doPing, 1000 * 60 * 15);
+      } else if (pinger.current) {
+        clearInterval(pinger.current);
+        pinger.current = null;
+      }
+    })();
+  }, [disabled, context.clientDetails]);
+
+  const handleClick = async () => {
+    if (!disabled) {
+      await context.toggleGrowthWindow(Content.testAndEarn.popupWindow.title);
+    }
+  };
+
+  return (
+    <NymShipyardTheme>
+      <Box justifyContent="center" display="grid">
+        <Wrapper disabled={disabled}>
+          <Button
+            color={disabled ? 'secondary' : undefined}
+            variant="contained"
+            size="small"
+            endIcon={<MonetizationOnIcon />}
+            sx={{ width: '150px', mb: 4, opacity: disabled ? 0.4 : undefined }}
+            onClick={handleClick}
+          >
+            {context.registration
+              ? Content.testAndEarn.mainWindow.button.text.entered
+              : Content.testAndEarn.mainWindow.button.text.default}
+          </Button>
+        </Wrapper>
+      </Box>
+    </NymShipyardTheme>
+  );
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx b/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx
new file mode 100644
index 0000000000..99b9206e7a
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.stories.tsx
@@ -0,0 +1,94 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { DateTime, Duration } from 'luxon';
+import {
+  TestAndEarnCurrentDraw,
+  TestAndEarnCurrentDrawEntered,
+  TestAndEarnCurrentDrawFuture,
+} from './TestAndEarnCurrentDraw';
+import { NymShipyardTheme } from '../../theme';
+import { DrawEntryStatus } from './context/types';
+import { testMarkdown } from './context/mocks/TestAndEarnContext';
+
+export default {
+  title: 'Growth/TestAndEarn/Components/Cards/Current Draw',
+  component: TestAndEarnCurrentDraw,
+} as ComponentMeta<typeof TestAndEarnCurrentDraw>;
+
+export const Valid = () => (
+  <NymShipyardTheme>
+    <TestAndEarnCurrentDraw
+      draw={{
+        id: '1',
+        start_utc: DateTime.now().toISO(),
+        end_utc: DateTime.now()
+          .plus(Duration.fromMillis(1000 * 3600))
+          .toISO(),
+        last_modified: DateTime.now().toISO(),
+        word_of_the_day: 'words words words',
+      }}
+    />
+  </NymShipyardTheme>
+);
+
+export const EnteredMalformedDraw = () => (
+  <NymShipyardTheme>
+    <TestAndEarnCurrentDrawEntered
+      draw={{
+        id: '1',
+        start_utc: DateTime.now().toISO(),
+        end_utc: DateTime.now()
+          .plus(Duration.fromMillis(1000 * 3600))
+          .toISO(),
+        last_modified: DateTime.now().toISO(),
+        word_of_the_day: undefined,
+        entry: {
+          draw_id: '1',
+          status: DrawEntryStatus.pending,
+          id: 'aaaa',
+          timestamp: DateTime.now().toISO(),
+        },
+      }}
+    />
+  </NymShipyardTheme>
+);
+
+export const EnteredDraw = () => (
+  <NymShipyardTheme>
+    <TestAndEarnCurrentDrawEntered
+      draw={{
+        id: '1',
+        start_utc: DateTime.now().toISO(),
+        end_utc: DateTime.now()
+          .plus(Duration.fromMillis(1000 * 3600))
+          .toISO(),
+        last_modified: DateTime.now().toISO(),
+        word_of_the_day: testMarkdown,
+        entry: {
+          draw_id: '1',
+          status: DrawEntryStatus.pending,
+          id: 'aaaa',
+          timestamp: DateTime.now().toISO(),
+        },
+      }}
+    />
+  </NymShipyardTheme>
+);
+
+export const Future = () => (
+  <NymShipyardTheme>
+    <TestAndEarnCurrentDrawFuture
+      draw={{
+        id: '1',
+        start_utc: DateTime.now()
+          .plus(Duration.fromMillis(1000 * 3600))
+          .toISO(),
+        end_utc: DateTime.now()
+          .plus(Duration.fromMillis(1000 * 3600 * 2))
+          .toISO(),
+        last_modified: DateTime.now().toISO(),
+        word_of_the_day: 'words words words',
+      }}
+    />
+  </NymShipyardTheme>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.tsx b/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.tsx
new file mode 100644
index 0000000000..b9b029c414
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnCurrentDraw.tsx
@@ -0,0 +1,192 @@
+import React from 'react';
+import LoadingButton from '@mui/lab/LoadingButton';
+import { Alert, AlertTitle, Box, Card, CardContent, CardMedia, Link, Typography } from '@mui/material';
+import { SxProps } from '@mui/system';
+import { DateTime } from 'luxon';
+import ReactMarkdown from 'react-markdown';
+import assetAnimation from './content/assets/matrix.webp';
+import { CopyToClipboard } from '../CopyToClipboard';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { DrawEntryStatus, DrawWithWordOfTheDay } from './context/types';
+import Content from './content/en.yaml';
+
+export const TestAndEarnCurrentDrawFuture: React.FC<{ draw?: DrawWithWordOfTheDay }> = ({ draw }) => {
+  const startsUtc = React.useMemo(() => draw && DateTime.fromISO(draw.start_utc), [draw?.start_utc]);
+  const startsIn = React.useMemo(() => {
+    if (draw && startsUtc) {
+      return startsUtc.toRelative();
+    }
+    return undefined;
+  }, [draw?.start_utc]);
+
+  if (!draw || !startsUtc) {
+    return null;
+  }
+  return (
+    <Card sx={{ mb: 2 }} elevation={10}>
+      <CardContent>
+        <h3>
+          {Content.testAndEarn.draw.next.header} {startsIn} ⏰
+        </h3>
+        <p>on {startsUtc.toLocaleString(DateTime.DATETIME_FULL)}</p>
+      </CardContent>
+    </Card>
+  );
+};
+
+export const TestAndEarnCurrentDrawEnter: React.FC<{ draw?: DrawWithWordOfTheDay }> = ({ draw }) => {
+  const context = useTestAndEarnContext();
+  const [busy, setBusy] = React.useState(false);
+  const [error, setError] = React.useState<string>();
+  const handleClick = async () => {
+    if (!draw) {
+      setError('No draw selected');
+      return;
+    }
+
+    setBusy(true);
+    try {
+      await context.enterDraw(draw.id);
+    } catch (e) {
+      const message = `${e}`;
+      console.error('Could not enter draw', message);
+      setError(message);
+    }
+    setBusy(false);
+  };
+  return (
+    <Box display="flex" flexDirection="column" alignItems="center" py={3} px={2} mx={6} my={2}>
+      <Typography mb={4}>Complete today’s task for the chance to earn 1000 NYMs.</Typography>
+      <LoadingButton variant="contained" size="large" loading={busy} onClick={handleClick}>
+        Start task ✨
+      </LoadingButton>
+      {error && (
+        <Box mt={2}>
+          <Alert variant="filled" severity="error">
+            <AlertTitle>Oh no! Something went wrong.</AlertTitle>
+            {error}
+          </Alert>
+        </Box>
+      )}
+    </Box>
+  );
+};
+
+export const TestAndEarnCurrentDrawEntered: React.FC<{ draw?: DrawWithWordOfTheDay }> = ({ draw }) => {
+  if (!draw || !draw.entry) {
+    return null;
+  }
+
+  if (!draw.word_of_the_day) {
+    return (
+      <Alert severity="error" variant="filled">
+        <AlertTitle>Oh no! Something is wrong</AlertTitle>
+        Someone configured the wrong instructions for the task, you will not be able to see it until this is fixed
+      </Alert>
+    );
+  }
+
+  return (
+    <Box
+      display="flex"
+      flexDirection="column"
+      alignItems="center"
+      sx={{ background: 'rgba(255,255,255,0.1)' }}
+      py={4}
+      mx={6}
+      my={2}
+      borderRadius={2}
+    >
+      <Box py={2} px={4} color="warning.light">
+        <ReactMarkdown>{draw.word_of_the_day}</ReactMarkdown>
+      </Box>
+
+      <Typography>{Content.testAndEarn.task.afterText}</Typography>
+      <Typography mt={2} fontFamily="monospace" fontWeight="bold" color="warning.main">
+        {draw.entry.id} <CopyToClipboard iconButton light text={draw.entry.id} />
+      </Typography>
+
+      <Typography mt={2}>{Content.testAndEarn.task.beforeSocials}</Typography>
+      <Typography mt={2} mx={1} textAlign="center">
+        <Typography component="span" color="info.light" fontWeight="bold">
+          Twitter
+        </Typography>{' '}
+        - remember to
+        <Typography component="span" color="info.light">
+          @nymproject
+        </Typography>{' '}
+        and use the hashtag{' '}
+        <Typography component="span" color="info.light">
+          #PrivacyLovesCompany
+        </Typography>
+      </Typography>
+      <Typography mt={2}>or</Typography>
+      <Typography textAlign="center" fontWeight="bold">
+        Nym{' '}
+        <Link target="_blank" href="https://t.me/nymchan" color="info.light">
+          Telegram channel
+        </Link>
+      </Typography>
+    </Box>
+  );
+};
+
+export const TestAndEarnCurrentDraw: React.FC<{
+  draw?: DrawWithWordOfTheDay;
+  sx?: SxProps;
+}> = ({ draw, sx }) => {
+  const [trigger, setTrigger] = React.useState(DateTime.now().toISO());
+  const endsUtc = React.useMemo(() => draw && DateTime.fromISO(draw.end_utc), [draw?.end_utc]);
+  const closesIn = React.useMemo(() => {
+    if (draw && endsUtc) {
+      return endsUtc.toRelative();
+    }
+    return undefined;
+  }, [trigger, endsUtc]);
+
+  React.useEffect(() => {
+    const timer = setInterval(() => setTrigger(DateTime.now().toISO()), 1000 * 3600 * 15);
+    return () => clearInterval(timer);
+  }, []);
+
+  if (draw && closesIn && endsUtc) {
+    return (
+      <Card sx={{ mb: 2, ...sx }} elevation={10}>
+        <CardContent>
+          <h3>
+            {"Today's task ends "}
+            {closesIn}
+            <Typography sx={{ opacity: 0.5 }}>
+              {endsUtc.weekdayLong} {endsUtc.toLocaleString(DateTime.DATETIME_FULL)}
+            </Typography>
+          </h3>
+          {!draw.entry && <TestAndEarnCurrentDrawEnter draw={draw} />}
+          {draw.entry && <TestAndEarnCurrentDrawEntered draw={draw} />}
+        </CardContent>
+        <CardMedia component="img" height="150" image={assetAnimation} alt="lottery" />
+      </Card>
+    );
+  }
+
+  return null;
+};
+
+export const TestAndEarnCurrentDrawWithState: React.FC<{
+  sx?: SxProps;
+}> = ({ sx }) => {
+  const context = useTestAndEarnContext();
+
+  if (
+    context.draws?.current?.entry?.status === DrawEntryStatus.winner ||
+    context.draws?.current?.entry?.status === DrawEntryStatus.claimed ||
+    context.draws?.current?.entry?.status === DrawEntryStatus.noWin
+  ) {
+    return null;
+  }
+
+  if (!context.draws?.current) {
+    return <TestAndEarnCurrentDrawFuture draw={context.draws?.next} />;
+  }
+
+  return <TestAndEarnCurrentDraw sx={sx} draw={context.draws.current} />;
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnDraws.stories.tsx b/nym-connect/src/components/Growth/TestAndEarnDraws.stories.tsx
new file mode 100644
index 0000000000..83776d8e20
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnDraws.stories.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { NymShipyardTheme } from 'src/theme';
+import { TestAndEarnDraws } from './TestAndEarnDraws';
+import { MockTestAndEarnProvider_RegisteredWithAllDraws } from './context/mocks/TestAndEarnContext';
+
+export default {
+  title: 'Growth/TestAndEarn/Components/Cards/Draws',
+  component: TestAndEarnDraws,
+} as ComponentMeta<typeof TestAndEarnDraws>;
+
+export const Draws = () => (
+  <NymShipyardTheme>
+    <MockTestAndEarnProvider_RegisteredWithAllDraws>
+      <TestAndEarnDraws />
+    </MockTestAndEarnProvider_RegisteredWithAllDraws>
+  </NymShipyardTheme>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnDraws.tsx b/nym-connect/src/components/Growth/TestAndEarnDraws.tsx
new file mode 100644
index 0000000000..6dd9b8954a
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnDraws.tsx
@@ -0,0 +1,195 @@
+import React from 'react';
+import LoadingButton from '@mui/lab/LoadingButton';
+import {
+  Alert,
+  AlertTitle,
+  Button,
+  Card,
+  CardContent,
+  Chip,
+  Dialog,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableRow,
+  Tooltip,
+  Typography,
+} from '@mui/material';
+import { SxProps } from '@mui/system';
+import { DateTime } from 'luxon';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { DrawEntry, DrawEntryStatus } from './context/types';
+import { CopyToClipboard } from '../CopyToClipboard';
+import { TestAndEarnEnterWalletAddress } from './TestAndEarnEnterWalletAddress';
+import Content from './content/en.yaml';
+
+const statusToText = (status: string): string => Content.testAndEarn.status.chip[status] || '-';
+
+const statusToColor = (status: string): 'info' | 'success' | 'warning' | undefined => {
+  switch (status) {
+    case DrawEntryStatus.pending:
+      return 'info';
+    case DrawEntryStatus.winner:
+      return 'warning';
+    case DrawEntryStatus.claimed:
+      return 'success';
+    default:
+      return undefined;
+  }
+};
+
+const StatusText: React.FC<{ entry: DrawEntry }> = ({ entry }) => {
+  const context = useTestAndEarnContext();
+  const [busy, setBusy] = React.useState(false);
+  const [error, setError] = React.useState<string>();
+  const [showWalletCapture, setShowWalletCapture] = React.useState(false);
+
+  const clear = () => {
+    setShowWalletCapture(false);
+    setError(undefined);
+    setBusy(false);
+  };
+
+  const handleStartWalletCapture = async () => {
+    setBusy(true);
+    setShowWalletCapture(true);
+  };
+
+  const cancelEndWalletCapture = async () => {
+    setBusy(false);
+    setShowWalletCapture(false);
+  };
+
+  const handleEndWalletCapture = async () => {
+    setBusy(true);
+    setShowWalletCapture(false);
+
+    if (!context.walletAddress) {
+      setError('Wallet address is not set');
+      return;
+    }
+    if (!entry.draw_id) {
+      setError('Task id is not set');
+      return;
+    }
+
+    try {
+      await context.claim(entry.draw_id, context.walletAddress);
+    } catch (e) {
+      const message = `${e}`;
+      console.error('Failed to submit claim');
+      setError(message);
+    }
+    setBusy(false);
+  };
+
+  if (error) {
+    return (
+      <Alert severity="error" variant="filled">
+        <AlertTitle>Oh no! Failed to submit claim</AlertTitle>
+        {error}
+        <Button variant="contained" color="secondary" size="small" onClick={() => clear()} sx={{ mx: 2 }}>
+          Try again!
+        </Button>
+      </Alert>
+    );
+  }
+
+  if (showWalletCapture) {
+    return (
+      <Dialog open fullWidth onBackdropClick={cancelEndWalletCapture}>
+        <TestAndEarnEnterWalletAddress onSubmit={handleEndWalletCapture} />
+      </Dialog>
+    );
+  }
+
+  switch (entry.status) {
+    case DrawEntryStatus.pending:
+      return <>{Content.testAndEarn.status.text.Pending}</>;
+    case DrawEntryStatus.winner:
+      return (
+        <>
+          {Content.testAndEarn.status.text.Winner}
+          <LoadingButton
+            loading={busy}
+            disabled={busy}
+            variant="contained"
+            sx={{ ml: 2 }}
+            size="small"
+            onClick={handleStartWalletCapture}
+          >
+            {Content.testAndEarn.winner.claimButton.text}
+          </LoadingButton>
+        </>
+      );
+    case DrawEntryStatus.claimed:
+      return <>{Content.testAndEarn.status.text.Claimed}</>;
+    case DrawEntryStatus.noWin:
+      return <>{Content.testAndEarn.status.text.NoWin}</>;
+    default:
+      return null;
+  }
+};
+
+export const TestAndEarnDraws: React.FC<{
+  sx?: SxProps;
+}> = ({ sx }) => {
+  const context = useTestAndEarnContext();
+
+  const draws = React.useMemo<DrawEntry[]>(
+    () =>
+      (context.draws?.draws || []).map((item) => ({
+        ...item,
+        timestamp: DateTime.fromISO(item.timestamp).toLocaleString(DateTime.DATETIME_FULL),
+      })),
+    [context.draws?.draws],
+  );
+
+  if (!context.draws) {
+    return null;
+  }
+
+  return (
+    <Card sx={{ mb: 2 }}>
+      <CardContent>
+        <Typography mb={2}>Here is a history of the tasks you have completed:</Typography>
+        <TableContainer>
+          <Table>
+            <TableBody>
+              {draws.map((entry) => (
+                <TableRow key={entry.draw_id}>
+                  <TableCell width="150px">{entry.timestamp}</TableCell>
+                  <TableCell width="150px">
+                    <Tooltip arrow title={`Task Id: ${entry.draw_id}`}>
+                      <Chip label={statusToText(entry.status)} color={statusToColor(entry.status)} />
+                    </Tooltip>
+                  </TableCell>
+                  <TableCell>
+                    <StatusText entry={entry} />
+                  </TableCell>
+                  <TableCell>
+                    {entry.id} <CopyToClipboard iconButton light text={entry.id} />
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+      </CardContent>
+    </Card>
+  );
+};
+
+export const TestAndEarnDrawsWithState: React.FC<{
+  sx?: SxProps;
+}> = ({ sx }) => {
+  const context = useTestAndEarnContext();
+
+  const drawCount = context.draws?.draws?.length || 0;
+  if (drawCount < 1) {
+    return null;
+  }
+
+  return <TestAndEarnDraws sx={sx} />;
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx b/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx
new file mode 100644
index 0000000000..0f5c4ea0de
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.stories.tsx
@@ -0,0 +1,41 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { Box } from '@mui/material';
+import { TestAndEarnEnterWalletAddress } from './TestAndEarnEnterWalletAddress';
+import { TestAndEarnContextProvider } from './context/TestAndEarnContext';
+import { NymShipyardTheme } from '../../theme';
+
+export default {
+  title: 'Growth/TestAndEarn/Components/Enter wallet address',
+  component: TestAndEarnEnterWalletAddress,
+} as ComponentMeta<typeof TestAndEarnEnterWalletAddress>;
+
+export const Empty = () => (
+  <NymShipyardTheme>
+    <TestAndEarnContextProvider>
+      <Box minWidth="25vw" maxWidth={500}>
+        <TestAndEarnEnterWalletAddress sx={{ width: '100%' }} />
+      </Box>
+    </TestAndEarnContextProvider>
+  </NymShipyardTheme>
+);
+
+export const ErrorValue = () => (
+  <NymShipyardTheme>
+    <TestAndEarnContextProvider>
+      <Box minWidth="25vw" maxWidth={500}>
+        <TestAndEarnEnterWalletAddress initialValue="this is a bad value" sx={{ width: '100%' }} />
+      </Box>
+    </TestAndEarnContextProvider>
+  </NymShipyardTheme>
+);
+
+export const ValidValue = () => (
+  <NymShipyardTheme>
+    <TestAndEarnContextProvider>
+      <Box minWidth="25vw" maxWidth={500}>
+        <TestAndEarnEnterWalletAddress initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec" sx={{ width: '100%' }} />
+      </Box>
+    </TestAndEarnContextProvider>
+  </NymShipyardTheme>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.tsx b/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.tsx
new file mode 100644
index 0000000000..80d7f2de5b
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnEnterWalletAddress.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { WalletAddressFormField } from '@nymproject/react/account/WalletAddressFormField';
+import { SxProps } from '@mui/system';
+import { Paper, Stack, Button, Box } from '@mui/material';
+import ArrowCircleRightIcon from '@mui/icons-material/ArrowCircleRight';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+
+export const TestAndEarnEnterWalletAddress: React.FC<{
+  initialValue?: string;
+  placeholder?: string;
+  onSubmit?: () => Promise<void> | void;
+  sx?: SxProps;
+}> = ({ initialValue, placeholder, onSubmit, sx }) => {
+  const context = useTestAndEarnContext();
+  const [isAddressValid, setAddressIsValid] = React.useState(false);
+  return (
+    <Paper sx={{ py: 4, px: 2 }}>
+      <Stack spacing={4}>
+        <Box>
+          <WalletAddressFormField
+            label="Wallet address"
+            initialValue={initialValue}
+            placeholder={placeholder || 'Please enter your wallet address'}
+            onChanged={context.setWalletAddress}
+            onValidate={setAddressIsValid}
+            sx={{ width: '80%' }}
+          />
+        </Box>
+        <Box>
+          <Button variant="contained" endIcon={<ArrowCircleRightIcon />} disabled={!isAddressValid} onClick={onSubmit}>
+            Submit
+          </Button>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnError.tsx b/nym-connect/src/components/Growth/TestAndEarnError.tsx
new file mode 100644
index 0000000000..3fcf4efb59
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnError.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Box, Button } from '@mui/material';
+
+export const TestAndEarnError: React.FC<{ error?: string }> = ({ error = 'An error has occurred' }) => (
+  <Box>
+    <Box mb={4} fontWeight="bold">
+      {error}
+    </Box>
+    <Button variant="outlined" color="secondary">
+      Send us an error report
+    </Button>
+  </Box>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnPopup.stories.tsx b/nym-connect/src/components/Growth/TestAndEarnPopup.stories.tsx
new file mode 100644
index 0000000000..ac38ec1d4b
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnPopup.stories.tsx
@@ -0,0 +1,167 @@
+/* eslint-disable react/jsx-pascal-case */
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { Alert, Box } from '@mui/material';
+import { NymShipyardTheme } from 'src/theme';
+import { TestAndEarnPopup, TestAndEarnPopupContent } from './TestAndEarnPopup';
+import { TestAndEarnContextProvider } from './context/TestAndEarnContext';
+import { MockProvider } from '../../context/mocks/main';
+import { ConnectionStatusKind } from '../../types';
+import { TestAndEarnCurrentDraw } from './TestAndEarnCurrentDraw';
+import { TestAndEarnWinner } from './TestAndEarnWinner';
+import { TestAndEarnDraws } from './TestAndEarnDraws';
+import { TestAndEarnWinnerWalletAddress } from './TestAndEarnWinnerWalletAddress';
+import {
+  MockTestAndEarnProvider_NotRegistered,
+  MockTestAndEarnProvider_Registered,
+  MockTestAndEarnProvider_RegisteredAndError,
+  MockTestAndEarnProvider_RegisteredWithDraws,
+  MockTestAndEarnProvider_RegisteredWithDrawsAndEntry,
+  MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndNoWinner,
+  MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner,
+  MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerClaimed,
+  MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerCollectWallet,
+  MockTestAndEarnProvider_RegisteredWithDrawsNoCurrent,
+} from './context/mocks/TestAndEarnContext';
+
+export default {
+  title: 'Growth/TestAndEarn/Content/Popup',
+  component: TestAndEarnPopupContent,
+} as ComponentMeta<typeof TestAndEarnPopupContent>;
+
+const MacOSWindow: React.FC<{ width?: string | number; height?: string | number; title?: string }> = ({
+  title,
+  width,
+  height,
+  children,
+}) => (
+  <Box sx={{ border: '1px solid #EEEEEE', width, height }}>
+    <Box sx={{ background: '#EEEEEE', display: 'grid', gridTemplateColumns: 'auto auto', gridTemplateRows: 'auto' }}>
+      <Box ml={1}>
+        <svg width="52px" height="12px" viewBox="0 0 52 12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+          <g id="Components" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
+            <g id="macOS" transform="translate(-600.000000, -220.000000)">
+              <g id="Group" transform="translate(600.000000, 220.000000)" strokeWidth="0.5">
+                <g id="Traffic-Lights">
+                  <circle id="Traffic-Light---Zoom" stroke="#1BAC2C" fill="#2ACB42" cx="46" cy="6" r="5.75" />
+                  <circle id="Traffic-Light---Minimise" stroke="#DFA023" fill="#FFC12F" cx="26" cy="6" r="5.75" />
+                  <circle id="Traffic-Light---Close" stroke="#E24640" fill="#FF6157" cx="6" cy="6" r="5.75" />
+                </g>
+              </g>
+            </g>
+          </g>
+        </svg>
+      </Box>
+      <Box
+        sx={{
+          alignSelf: 'center',
+          color: '#000000',
+          opacity: 0.848675272,
+          fontSize: 13,
+        }}
+      >
+        {title || 'Window title'}
+      </Box>
+    </Box>
+    <Box sx={{ overflowY: 'scroll', height: 'calc(100% - 25px)' }}>{children}</Box>
+  </Box>
+);
+
+const Wrapper: React.FC<{ text: React.ReactNode }> = ({ text }) => (
+  <NymShipyardTheme>
+    <Alert severity="info" sx={{ mb: 4 }}>
+      {text}
+    </Alert>
+    <MacOSWindow width={700} height={600} title="Test&Earn">
+      <TestAndEarnPopup />
+    </MacOSWindow>
+  </NymShipyardTheme>
+);
+
+export const Stage0 = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_NotRegistered>
+      <Wrapper text="The user sees this content when they have not joined Test&Earn." />
+    </MockTestAndEarnProvider_NotRegistered>
+  </MockProvider>
+);
+
+export const Stage1EnterDraw = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDraws>
+      <Wrapper text="The user has signed up and can see the next draw and choose the enter." />
+    </MockTestAndEarnProvider_RegisteredWithDraws>
+  </MockProvider>
+);
+
+export const Stage2GetTask = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntry>
+      <Wrapper text="The user has entered a draw and can view the word of the day if they missed the popup notification." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntry>
+  </MockProvider>
+);
+
+export const Stage3Winner = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner>
+      <Wrapper text="The user has won and can claim their prize." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner>
+  </MockProvider>
+);
+
+export const Stage3NoPrize = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndNoWinner>
+      <Wrapper text="The user has not won. A winner has been announced." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndNoWinner>
+  </MockProvider>
+);
+
+export const Stage4EnterWalletAddress = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerCollectWallet>
+      <Wrapper text="The user is a winner, claims their prize and enters their wallet address." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerCollectWallet>
+  </MockProvider>
+);
+
+export const Stage5ClaimedPrize = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerClaimed>
+      <Wrapper text="The user is a winner and has claimed their prize." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerClaimed>
+  </MockProvider>
+);
+
+export const Stage6DrawsFinished = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connected}>
+    <MockTestAndEarnProvider_RegisteredWithDrawsNoCurrent>
+      <Wrapper text="There are no more draws. The user can see their entries and prizes they have claimed." />
+    </MockTestAndEarnProvider_RegisteredWithDrawsNoCurrent>
+  </MockProvider>
+);
+
+export const Connecting = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.connecting}>
+    <TestAndEarnContextProvider>
+      <Wrapper text="Test&Earn requires the user to be connected to talk the API. This is shown while connecting." />
+    </TestAndEarnContextProvider>
+  </MockProvider>
+);
+
+export const Disconnected = () => (
+  <MockProvider connectionStatus={ConnectionStatusKind.disconnected}>
+    <TestAndEarnContextProvider>
+      <Wrapper text="Test&Earn requires the user to be connected to talk the API. This is shown when not connected." />
+    </TestAndEarnContextProvider>
+  </MockProvider>
+);
+
+export const Error = () => (
+  <MockProvider>
+    <MockTestAndEarnProvider_RegisteredAndError>
+      <Wrapper text="The user see this with details about errors. They can submit an error report." />
+    </MockTestAndEarnProvider_RegisteredAndError>
+  </MockProvider>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnPopup.tsx b/nym-connect/src/components/Growth/TestAndEarnPopup.tsx
new file mode 100644
index 0000000000..73e8008069
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnPopup.tsx
@@ -0,0 +1,118 @@
+import React from 'react';
+import { Box, CircularProgress, LinearProgress, Stack, Typography } from '@mui/material';
+import { useClientContext } from '../../context/main';
+import ErrorContent from './content/TestAndEarn/Error.mdx';
+import ContentStep0 from './content/TestAndEarn/Stage0_intro.mdx';
+import ContentNotAvailable from './content/TestAndEarnNotAvaialble.mdx';
+import { ConnectionStatusKind } from '../../types';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { TestAndEarnWinnerWithState } from './TestAndEarnWinner';
+import { TestAndEarnCurrentDrawWithState } from './TestAndEarnCurrentDraw';
+import { TestAndEarnDrawsWithState } from './TestAndEarnDraws';
+
+enum Stages {
+  mustRegister = 'mustRegister',
+  registered = 'registered',
+}
+
+export const TestAndEarnPopupContent: React.FC<{
+  stage?: string;
+  connectionStatus?: ConnectionStatusKind;
+  error?: string;
+}> = ({ connectionStatus, error, stage = Stages.mustRegister }) => {
+  if (error) {
+    return (
+      <Box p={4}>
+        <ErrorContent error={error} />
+      </Box>
+    );
+  }
+
+  if (!connectionStatus || connectionStatus === ConnectionStatusKind.disconnected) {
+    return (
+      <Box p={4}>
+        <ContentNotAvailable />
+      </Box>
+    );
+  }
+
+  if (connectionStatus === ConnectionStatusKind.connecting || connectionStatus === ConnectionStatusKind.disconnecting) {
+    return (
+      <Box p={4} justifyContent="center" alignItems="center" display="flex">
+        <CircularProgress />
+        <Typography ml={3}>Please wait...</Typography>
+      </Box>
+    );
+  }
+
+  switch (stage) {
+    case Stages.mustRegister:
+      return (
+        <Box p={4}>
+          <ContentStep0 />
+        </Box>
+      );
+    case Stages.registered:
+      return (
+        <Box p={4}>
+          <TestAndEarnWinnerWithState />
+          <TestAndEarnCurrentDrawWithState />
+          <TestAndEarnDrawsWithState />
+        </Box>
+      );
+    default:
+      return (
+        <Box p={4}>
+          <Stack direction="row" spacing={2} display="flex" alignItems="center">
+            <CircularProgress />
+            <Box>Waiting for task information...</Box>
+          </Stack>
+        </Box>
+      );
+  }
+};
+
+export const TestAndEarnPopup: React.FC = () => {
+  const clientContext = useClientContext();
+  const context = useTestAndEarnContext();
+
+  React.useEffect(() => {
+    if (clientContext.connectionStatus === ConnectionStatusKind.connected) {
+      context.refresh();
+    }
+  }, [clientContext.connectionStatus]);
+
+  const stage = React.useMemo<Stages>(() => {
+    if (context.registration) {
+      return Stages.registered;
+    }
+    return Stages.mustRegister;
+  }, [context.registration?.id]);
+
+  React.useEffect(() => {
+    const interval = setInterval(context.refresh, 1000 * 60 * 5);
+    return () => clearInterval(interval);
+  }, []);
+
+  if (!context.loadedOnce && clientContext.connectionStatus === ConnectionStatusKind.connected) {
+    const message = 'Waiting for data to be transferred over the mixnet...';
+    return (
+      <Box p={4}>
+        <Stack direction="row" spacing={2} display="flex" alignItems="center">
+          <CircularProgress />
+          <Box>{message}</Box>
+          {/* {process.env.NODE_ENV === 'development' && <pre>{JSON.stringify(context, null, 2)}</pre>} */}
+        </Stack>
+      </Box>
+    );
+  }
+
+  return (
+    <>
+      {context.loading && <LinearProgress />}
+      {/* <Button onClick={context.refresh}>Refresh</Button> */}
+      <TestAndEarnPopupContent connectionStatus={clientContext.connectionStatus} stage={stage} error={context.error} />
+      {/* {process.env.NODE_ENV === 'development' && <pre>{JSON.stringify(context, null, 2)}</pre>} */}
+    </>
+  );
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnTakePart.tsx b/nym-connect/src/components/Growth/TestAndEarnTakePart.tsx
new file mode 100644
index 0000000000..c5b08975f2
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnTakePart.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { Alert, AlertTitle, Box, Checkbox, Link, Stack } from '@mui/material';
+import LoadingButton from '@mui/lab/LoadingButton';
+import { SxProps } from '@mui/system';
+import ArrowCircleRightIcon from '@mui/icons-material/ArrowCircleRight';
+import { invoke } from '@tauri-apps/api';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { ClientId, Registration } from './context/types';
+
+export const TestAndEarnTakePart: React.FC<{
+  websiteLinkUrl: string;
+  websiteLinkText: string;
+  content: string;
+  sx?: SxProps;
+}> = ({ content, websiteLinkText, websiteLinkUrl, sx }) => {
+  const [agree, setAgree] = React.useState(false);
+  const [busy, setBusy] = React.useState(false);
+  const [error, setError] = React.useState<string>();
+  const context = useTestAndEarnContext();
+  const handleNext = async () => {
+    try {
+      setBusy(true);
+      if (context.clientDetails) {
+        const registration: Registration = await invoke('growth_tne_take_part');
+        console.log('Registration: ', { registration });
+        await context.setAndStoreRegistration(registration);
+        if (registration) {
+          console.log('Registered...');
+        } else {
+          setError('Failed to get registration details');
+        }
+      } else {
+        setError('Failed to get client details');
+      }
+    } catch (e) {
+      const message = `${e}`;
+      console.error('An error occurred', message);
+      setError(message);
+      setBusy(false); // the busy state only resets on errors, for success stats, the context will navigate the window away
+    }
+  };
+  return (
+    <>
+      <Stack direction="row" spacing={6} alignItems="center" sx={sx}>
+        <Stack alignItems="center" direction="row">
+          <Checkbox onChange={(_event, checked) => setAgree(checked)} />
+          <Box color="primary.light" fontWeight="bold">
+            {content}
+          </Box>
+        </Stack>
+        <Box>
+          <Link href={websiteLinkUrl} target="_blank" color="secondary" sx={{ opacity: 0.5 }}>
+            {websiteLinkText}
+          </Link>
+        </Box>
+        <LoadingButton
+          loading={busy}
+          disabled={!agree || busy}
+          variant="contained"
+          sx={{ justifySelf: 'end' }}
+          endIcon={<ArrowCircleRightIcon />}
+          onClick={handleNext}
+        >
+          Next
+        </LoadingButton>
+      </Stack>
+      {error && (
+        <Alert severity="error" variant="filled">
+          <AlertTitle>Oh no! Something went wrong</AlertTitle>
+          {error}
+        </Alert>
+      )}
+    </>
+  );
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnWinner.stories.tsx b/nym-connect/src/components/Growth/TestAndEarnWinner.stories.tsx
new file mode 100644
index 0000000000..ed12362122
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnWinner.stories.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { NymShipyardTheme } from 'src/theme';
+import { TestAndEarnWinner, TestAndEarnWinnerWithState } from './TestAndEarnWinner';
+import { MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner } from './context/mocks/TestAndEarnContext';
+
+export default {
+  title: 'Growth/TestAndEarn/Components/Cards/Winner',
+  component: TestAndEarnWinner,
+} as ComponentMeta<typeof TestAndEarnWinner>;
+
+export const Winner = () => (
+  <NymShipyardTheme>
+    <MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner>
+      <TestAndEarnWinnerWithState />
+    </MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner>
+  </NymShipyardTheme>
+);
diff --git a/nym-connect/src/components/Growth/TestAndEarnWinner.tsx b/nym-connect/src/components/Growth/TestAndEarnWinner.tsx
new file mode 100644
index 0000000000..600d8f6f4b
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnWinner.tsx
@@ -0,0 +1,114 @@
+import React from 'react';
+import { Alert, AlertTitle, Button, Card, CardContent, CardMedia, Dialog, Typography } from '@mui/material';
+import { SxProps } from '@mui/system';
+import LoadingButton from '@mui/lab/LoadingButton';
+import winner from './content/assets/winner.webp';
+import { useTestAndEarnContext } from './context/TestAndEarnContext';
+import { DrawEntry, DrawEntryStatus } from './context/types';
+import { TestAndEarnEnterWalletAddress } from './TestAndEarnEnterWalletAddress';
+import Content from './content/en.yaml';
+
+export const TestAndEarnWinner: React.FC<{
+  sx?: SxProps;
+  entry?: DrawEntry;
+}> = ({ sx, entry }) => {
+  const context = useTestAndEarnContext();
+  const [busy, setBusy] = React.useState(false);
+  const [error, setError] = React.useState<string>();
+  const [showWalletCapture, setShowWalletCapture] = React.useState(false);
+
+  const clear = () => {
+    setShowWalletCapture(false);
+    setError(undefined);
+    setBusy(false);
+  };
+
+  const handleStartWalletCapture = async () => {
+    setBusy(true);
+    setShowWalletCapture(true);
+  };
+
+  const cancelEndWalletCapture = async () => {
+    setBusy(false);
+    setShowWalletCapture(false);
+  };
+
+  const handleEndWalletCapture = async () => {
+    setBusy(true);
+    setShowWalletCapture(false);
+
+    if (!context.walletAddress) {
+      setError('Wallet address is not set');
+      return;
+    }
+    if (!entry?.draw_id) {
+      setError('Draw id is not set');
+      return;
+    }
+
+    try {
+      await context.claim(entry.draw_id, context.walletAddress);
+    } catch (e) {
+      const message = `${e}`;
+      console.error('Failed to submit claim', entry.draw_id, context.walletAddress);
+      setError(message);
+    }
+    setBusy(false);
+  };
+
+  return (
+    <>
+      {showWalletCapture && (
+        <Dialog open fullWidth onBackdropClick={cancelEndWalletCapture}>
+          <TestAndEarnEnterWalletAddress onSubmit={handleEndWalletCapture} />
+        </Dialog>
+      )}
+      <Card sx={{ mb: 2 }}>
+        <CardMedia component="img" height="165" image={winner} alt="winner" />
+        <CardContent>
+          <Typography color="warning.main" fontSize={20} fontWeight="bold">
+            {Content.testAndEarn.winner.card.header}
+          </Typography>
+          <Typography mt={2}>
+            {entry && (
+              <>
+                {Content.testAndEarn.winner.card.text} {entry.draw_id}.
+              </>
+            )}
+            <LoadingButton
+              loading={busy}
+              variant="contained"
+              sx={{ ml: 2, my: 2 }}
+              size="small"
+              onClick={handleStartWalletCapture}
+            >
+              {Content.testAndEarn.winner.claimButton.text}
+            </LoadingButton>
+          </Typography>
+          {error && (
+            <Alert severity="error" variant="filled">
+              <AlertTitle>Oh no! Failed to submit claim</AlertTitle>
+              {error}
+              <Button variant="contained" color="secondary" size="small" onClick={() => clear()} sx={{ mx: 2 }}>
+                Try again!
+              </Button>
+            </Alert>
+          )}
+        </CardContent>
+      </Card>
+    </>
+  );
+};
+
+export const TestAndEarnWinnerWithState: React.FC<{
+  sx?: SxProps;
+}> = ({ sx }) => {
+  const context = useTestAndEarnContext();
+
+  if (context.draws?.current?.entry?.status === DrawEntryStatus.winner) {
+    return <TestAndEarnWinner sx={sx} entry={context.draws.current.entry} />;
+  }
+
+  // when the user does not have any unclaimed prizes, don't render anything
+  return null;
+};
diff --git a/nym-connect/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx b/nym-connect/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx
new file mode 100644
index 0000000000..8592b651dd
--- /dev/null
+++ b/nym-connect/src/components/Growth/TestAndEarnWinnerWalletAddress.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Box, Button, Card, CardContent, CardMedia, Typography } from '@mui/material';
+import { SxProps } from '@mui/system';
+import Content from './content/TestAndEarn/WinnerEntersWalletAddress.mdx';
+
+export const TestAndEarnWinnerWalletAddress: React.FC<{
+  sx?: SxProps;
+}> = ({ sx }) => (
+  <Box>
+    <Content />
+  </Box>
+);
diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/Error.mdx b/nym-connect/src/components/Growth/content/TestAndEarn/Error.mdx
new file mode 100644
index 0000000000..05afd5a492
--- /dev/null
+++ b/nym-connect/src/components/Growth/content/TestAndEarn/Error.mdx
@@ -0,0 +1,17 @@
+import { Alert, AlertTitle, Link } from '@mui/material';
+import { TestAndEarnError } from '../../TestAndEarnError';
+
+<Alert severity="error" sx={{ mb: 4 }}>
+  <AlertTitle>Oh no! Something went wrong</AlertTitle>
+
+  Sorry about that. Here is some more information about the error that occurred:
+
+  <TestAndEarnError/>
+
+  Any error reports that you send us will contain information about your client, the gateway you're using and your IP address.
+
+  We need this information to make Nym better for everyone.
+
+</Alert>
+
+If you'd like more information about Test&Earn please look on the <Link href="http://shipyard.nymtech.net/test-and-win">Shipyard website</Link>.
diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx b/nym-connect/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx
new file mode 100644
index 0000000000..557a800084
--- /dev/null
+++ b/nym-connect/src/components/Growth/content/TestAndEarn/Stage0_intro.mdx
@@ -0,0 +1,25 @@
+import { Card, CardContent, Link, Typography } from '@mui/material';
+import { TestAndEarnTakePart } from '../../TestAndEarnTakePart';
+
+### Test privacy & Earn tokens!
+
+<Typography color="primary.light" component="span">
+Help us stress test the Nym privacy system and have the chance to earn 1000 NYMs per day!
+</Typography>
+
+All you need to do is:
+
+1. Make sure you're running NymConnect and it is connected.
+2. Note your reference number.
+3. NymConnect will ping you a task every day.
+
+Complete the task, post it on Twitter <Typography color="primary.light" component="span">#PrivacyLovesCompany</Typography> or <Link target="_blank" href="https://t.me/nymchan">Telegram</Link> along with your reference number!
+
+Thank you for being part of the Nym community and helping to build a flourishing and free digital society.  #PrivacyLovesCompany and we love you!
+
+<Card>
+  <CardContent sx={{ py: 2 }}>
+    <TestAndEarnTakePart content={"I want to take part"} websiteLinkText={"Terms and conditions"}
+                         websiteLinkUrl={"https://shipyard.nymtech.net/test-and-win"} sx={{ py: 2 }} />
+  </CardContent>
+</Card>
diff --git a/nym-connect/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx b/nym-connect/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx
new file mode 100644
index 0000000000..d519ce49eb
--- /dev/null
+++ b/nym-connect/src/components/Growth/content/TestAndEarn/WinnerEntersWalletAddress.mdx
@@ -0,0 +1,9 @@
+import { TestAndEarnEnterWalletAddress } from '../../TestAndEarnEnterWalletAddress';
+
+### 🎉 Congratulations! One more thing...
+
+We need one more thing from you, and that is your wallet address:
+
+<TestAndEarnEnterWalletAddress/>
+
+Once you've submitting your wallet address over the mixnet, we will be in touch to arrange sending your tokens to you.
\ No newline at end of file
diff --git a/nym-connect/src/components/Growth/content/TestAndEarnNotAvaialble.mdx b/nym-connect/src/components/Growth/content/TestAndEarnNotAvaialble.mdx
new file mode 100644
index 0000000000..fc9a0a3c5d
--- /dev/null
+++ b/nym-connect/src/components/Growth/content/TestAndEarnNotAvaialble.mdx
@@ -0,0 +1,3 @@
+## 😕 Sorry, Test&Earn is only accessible while you are connected to the mixnet
+
+Please connect to any service provider and try again once the connection has been established.
\ No newline at end of file
diff --git a/nym-connect/src/components/Growth/content/assets/matrix.webp b/nym-connect/src/components/Growth/content/assets/matrix.webp
new file mode 100644
index 0000000000..2b1517166c
Binary files /dev/null and b/nym-connect/src/components/Growth/content/assets/matrix.webp differ
diff --git a/nym-connect/src/components/Growth/content/assets/winner.webp b/nym-connect/src/components/Growth/content/assets/winner.webp
new file mode 100644
index 0000000000..3fbecb9f99
Binary files /dev/null and b/nym-connect/src/components/Growth/content/assets/winner.webp differ
diff --git a/nym-connect/src/components/Growth/content/en.yaml b/nym-connect/src/components/Growth/content/en.yaml
new file mode 100644
index 0000000000..849323e24e
--- /dev/null
+++ b/nym-connect/src/components/Growth/content/en.yaml
@@ -0,0 +1,43 @@
+testAndEarn:
+  mainWindow:
+    button:
+      text:
+        default: Join Test&Earn
+        entered: Test&Earn
+        claim: Claim your reward
+      popup:
+        disconnected: Test&Earn is only available when connected. Please connect to any service provider.
+    help:
+      url: https://shipyard.nymtech.net/test-and-win
+  popupWindow:
+    title: NymConnect Test&Earn 🌈
+  notifications:
+    takePart:
+      title: Thanks for taking part in Ter&Earn
+      body: Watch out for new tasks 👀 and take part to earn
+    youAreInDraw:
+      title: Thanks for completing the task ✨
+      body: Post a message on Telegram, Discord or Twitter for a chance to to be selected 🤞 good luck
+  task:
+    afterText: Copy your reference number
+    beforeSocials: "And include it in your post to:"
+  draw:
+    next:
+      header: The next task starts
+  winner:
+    claimButton:
+      text: Claim your reward!
+    card:
+      header: You are a top contributor!
+      text: Congratulations, you have earned the reward for
+  status:
+    chip:
+      Pending: Good luck 🤞
+      Winner: Rewarded!
+      Claimed: Claimed
+      NoWin: No rewards
+    text:
+      Pending: Task completed. Good luck 🤞
+      Winner: Well done 🎉
+      Claimed: You have claimed the reward 💰
+      NoWin: Sorry you were not a top contributor, better luck next time!
diff --git a/nym-connect/src/components/Growth/context/TestAndEarnContext.tsx b/nym-connect/src/components/Growth/context/TestAndEarnContext.tsx
new file mode 100644
index 0000000000..f70e8a407d
--- /dev/null
+++ b/nym-connect/src/components/Growth/context/TestAndEarnContext.tsx
@@ -0,0 +1,272 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
+import { forage } from '@tauri-apps/tauri-forage';
+import { invoke } from '@tauri-apps/api';
+import { ClientId, DrawEntry, Draws, Registration } from './types';
+import { useClientContext } from '../../../context/main';
+import { ConnectionStatusKind } from '../../../types';
+
+export type TTestAndEarnContext = {
+  loadedOnce: boolean;
+  loading: boolean;
+  clientDetails?: ClientId;
+  registration?: Registration;
+  walletAddress?: string;
+  draws?: Draws;
+  isWinnerWithUnclaimedPrize?: boolean;
+  isEnterWallet?: boolean;
+  error?: string;
+  setWalletAddress: (newWalletAddress: string) => void;
+  clearStorage: () => Promise<void>;
+  toggleGrowthWindow: (windowTitle?: string) => Promise<void>;
+  setAndStoreClientId: (newClientId: ClientId) => Promise<void>;
+  setAndStoreRegistration: (registration: Registration) => Promise<void>;
+  enterDraw: (drawId: string) => Promise<DrawEntry>;
+  claim: (drawId: string, walletAddress: string) => Promise<void>;
+  refresh: () => Promise<void>;
+};
+
+const defaultValue: TTestAndEarnContext = {
+  loadedOnce: false,
+  loading: true,
+  setWalletAddress: () => undefined,
+  clearStorage: async () => undefined,
+  toggleGrowthWindow: async () => undefined,
+  setAndStoreRegistration: async () => undefined,
+  setAndStoreClientId: async () => undefined,
+  enterDraw: async () => ({} as DrawEntry),
+  claim: async () => undefined,
+  refresh: async () => undefined,
+};
+
+export const TestAndEarnContext = createContext(defaultValue);
+
+const CLIENT_ID_KEY = 'tne_client_id';
+const REGISTRATION_KEY = 'tne_registration';
+
+export const TestAndEarnContextProvider = ({ children }: { children: React.ReactNode }) => {
+  const clientContext = useClientContext();
+  const [loadedOnce, setLoadedOnce] = useState(false);
+  const [loading, setLoading] = useState(true);
+  const [walletAddress, setWalletAddress] = useState<string>();
+  const [registration, setRegistration] = useState<Registration>();
+  const [clientDetails, setClientDetails] = useState<ClientId>();
+  const [draws, setDraws] = useState<Draws>();
+
+  const setAndStoreClientId = async (newClientId: ClientId) => {
+    await forage.setItem({ key: CLIENT_ID_KEY, value: newClientId } as any)();
+    setClientDetails((prevState) => {
+      if (
+        prevState?.client_id !== newClientId.client_id ||
+        prevState?.client_id_signature !== newClientId.client_id_signature
+      ) {
+        console.log('Setting client details');
+        return newClientId;
+      }
+      console.log('Skipping client details');
+      return prevState;
+    });
+  };
+  const loadClientDetails = async () => {
+    const data: ClientId | undefined = await forage.getItem({ key: CLIENT_ID_KEY })();
+    if (data) {
+      try {
+        setClientDetails((prevState) => {
+          if (prevState?.client_id !== data.client_id || prevState?.client_id_signature !== data.client_id_signature) {
+            console.log('Setting client details');
+            return data;
+          }
+          console.log('Skipping client details');
+          return prevState;
+        });
+      } catch (e) {
+        console.error('Failed to get registration');
+      }
+    } else {
+      const clientId: ClientId = await invoke('growth_tne_get_client_id');
+      await setAndStoreClientId(clientId);
+    }
+  };
+
+  const loadRegistration = async () => {
+    const data: Registration | undefined = await forage.getItem({ key: REGISTRATION_KEY })();
+    if (data) {
+      try {
+        setRegistration((prevState) => {
+          if (
+            prevState?.timestamp !== data.timestamp ||
+            prevState.client_id_signature !== data.client_id_signature ||
+            prevState.id !== data.id
+          ) {
+            console.log('Setting registration');
+            return data;
+          }
+          console.log('Skipping registration');
+          return prevState;
+        });
+      } catch (e) {
+        console.error('Failed to get registration');
+      }
+    }
+  };
+
+  const loadDraws = React.useCallback(async () => {
+    setLoading(true);
+    let clientDetailsForDraws = clientDetails;
+    try {
+      if (!clientDetailsForDraws) {
+        console.log('[loadDraws] client details not set, trying to get...');
+        clientDetailsForDraws = await invoke('growth_tne_get_client_id');
+      }
+
+      if (!clientDetailsForDraws) {
+        console.log('[loadDraws] failed to get client details not set, skipping...');
+        setLoading(false);
+        setLoadedOnce(true);
+        return;
+      }
+
+      const newDraws: Draws = await invoke('growth_tne_get_draws', { clientDetails: clientDetailsForDraws });
+      console.log('[loadDraws] draws = ', newDraws);
+
+      // find the entered draw and keep a reference
+      const entered = newDraws.draws.find((draw) => draw.draw_id === newDraws.current?.id);
+      if (newDraws.current) {
+        newDraws.current.entry = entered;
+      }
+
+      console.log('[loadDraws] setting draws');
+      setDraws(newDraws);
+    } catch (e) {
+      console.error('Could not get draws: ', e);
+    }
+    setLoading(false);
+    setLoadedOnce(true);
+    console.log('[loadDraws] done, loaded once');
+  }, [clientDetails]);
+
+  React.useEffect(() => {
+    loadClientDetails().catch(console.error);
+    loadRegistration().catch(console.error);
+  }, []);
+
+  React.useEffect(() => {
+    if (registration && clientContext.connectionStatus === ConnectionStatusKind.connected) {
+      setTimeout(() => {
+        loadDraws().catch(console.error);
+      }, 1000 * 3);
+    }
+  }, [registration?.id, registration?.timestamp, clientContext.connectionStatus]);
+
+  const refresh = React.useCallback(async () => {
+    console.log('Refreshing...');
+
+    console.log('Loading client details...');
+    await loadClientDetails();
+
+    console.log('Loading registration...');
+    await loadRegistration();
+
+    console.log('Loading draws...');
+    await loadDraws();
+
+    console.log('Refresh complete.');
+  }, [clientDetails]);
+
+  const clearStorage = async () => {
+    await forage.setItem({ key: REGISTRATION_KEY, value: undefined })();
+  };
+
+  const toggleGrowthWindow = useCallback(async (windowTitle?: string) => {
+    try {
+      await invoke('growth_tne_toggle_window', { windowTitle });
+    } catch (e) {
+      console.error('Failed to toggle growth window', e);
+    }
+  }, []);
+
+  const setAndStoreRegistration = async (newRegistration: Registration) => {
+    await forage.setItem({ key: REGISTRATION_KEY, value: newRegistration } as any)();
+    setRegistration(newRegistration);
+  };
+
+  const enterDraw = async (drawId: string): Promise<DrawEntry> => {
+    if (!clientDetails) {
+      throw new Error('No client details set');
+    }
+    if (!draws) {
+      throw new Error('No draws set');
+    }
+
+    const existingEntry: DrawEntry | undefined = draws.draws.filter((d) => d.draw_id === drawId)[0];
+    if (existingEntry) {
+      throw new Error('Already entered into draw');
+    }
+
+    const entry: DrawEntry = await invoke('growth_tne_enter_draw', { clientDetails, drawId });
+    console.log('Entered draw', { entry });
+
+    await loadDraws();
+
+    return entry;
+  };
+
+  const claim = async (drawId: string, newWalletAddress: string) => {
+    if (!clientDetails) {
+      throw new Error('No client details set');
+    }
+    if (!draws) {
+      throw new Error('No draws set');
+    }
+    if (!registration) {
+      throw new Error('No registration set');
+    }
+
+    const registrationId = registration.id;
+
+    const args = {
+      registrationId,
+      clientDetails,
+      drawId,
+      walletAddress: newWalletAddress,
+    };
+    console.log({ args });
+    await invoke('growth_tne_submit_wallet_address', args);
+
+    await loadDraws();
+  };
+
+  const contextValue = useMemo<TTestAndEarnContext>(
+    () => ({
+      loadedOnce,
+      loading,
+      clientDetails,
+      registration,
+      walletAddress,
+      draws,
+      clearStorage,
+      toggleGrowthWindow,
+      setWalletAddress,
+      setAndStoreClientId,
+      setAndStoreRegistration,
+      enterDraw,
+      refresh,
+      claim,
+    }),
+    [
+      loadedOnce,
+      loading,
+      walletAddress,
+      registration,
+      refresh,
+      draws,
+      draws?.current?.last_modified,
+      draws?.current?.entry,
+      draws?.draws.length,
+      clientDetails,
+    ],
+  );
+  return <TestAndEarnContext.Provider value={contextValue}>{children}</TestAndEarnContext.Provider>;
+};
+
+export const useTestAndEarnContext = () => useContext(TestAndEarnContext);
diff --git a/nym-connect/src/components/Growth/context/mocks/TestAndEarnContext.tsx b/nym-connect/src/components/Growth/context/mocks/TestAndEarnContext.tsx
new file mode 100644
index 0000000000..215367d643
--- /dev/null
+++ b/nym-connect/src/components/Growth/context/mocks/TestAndEarnContext.tsx
@@ -0,0 +1,262 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import React from 'react';
+import { DateTime } from 'luxon';
+import { TTestAndEarnContext, TestAndEarnContext } from '../TestAndEarnContext';
+import { DrawEntry, DrawEntryStatus, DrawWithWordOfTheDay } from '../types';
+
+const methodDefaults = {
+  loadedOnce: true,
+  loading: false,
+  refresh: async () => undefined,
+  setAndStoreClientId: async () => undefined,
+  setAndStoreRegistration: async () => undefined,
+  clearStorage: async () => undefined,
+  toggleGrowthWindow: async () => undefined,
+  setWalletAddress: async () => undefined,
+  enterDraw: async () => ({} as DrawEntry),
+  claim: async () => undefined,
+};
+
+const mockValues_NotRegistered: TTestAndEarnContext = {
+  ...methodDefaults,
+};
+
+export const MockTestAndEarnProvider_NotRegistered = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_NotRegistered}>{children}</TestAndEarnContext.Provider>
+);
+
+export const testMarkdown = `**Create a sentence including "Nym" and one or more of the following words** *(in any language)*:
+ 
+- Privacy
+- Pleasure 
+- Pineapple
+- Mix
+`;
+
+const mockValues_Registered: TTestAndEarnContext = {
+  ...methodDefaults,
+  registration: {
+    id: '1234',
+    client_id_signature: 'signature',
+    client_id: '5678',
+    timestamp: '2022-12-12T18:17:37.840Z',
+  },
+};
+
+export const MockTestAndEarnProvider_Registered = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_Registered}>{children}</TestAndEarnContext.Provider>
+);
+
+const allDraws: DrawEntry[] = [
+  {
+    draw_id: '1111',
+    timestamp: DateTime.now().toISO(),
+    id: 'AAAA',
+    status: DrawEntryStatus.pending,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.noWin,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.claimed,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.winner,
+  },
+];
+
+const draws: DrawEntry[] = [
+  {
+    draw_id: '1111',
+    timestamp: DateTime.now().toISO(),
+    id: 'AAAA',
+    status: DrawEntryStatus.pending,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.noWin,
+  },
+];
+
+const drawsWithWin: DrawEntry[] = [
+  {
+    draw_id: '1111',
+    timestamp: DateTime.now().toISO(),
+    id: 'AAAA',
+    status: DrawEntryStatus.winner,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.noWin,
+  },
+];
+
+const drawsWithClaim: DrawEntry[] = [
+  {
+    draw_id: '1111',
+    timestamp: DateTime.now().toISO(),
+    id: 'AAAA',
+    status: DrawEntryStatus.claimed,
+  },
+  {
+    draw_id: '2222',
+    timestamp: DateTime.now().toISO(),
+    id: 'BBBB',
+    status: DrawEntryStatus.noWin,
+  },
+];
+
+const current: DrawWithWordOfTheDay = {
+  id: '1111',
+  start_utc: DateTime.now().toISO(),
+  end_utc: DateTime.now().plus({ day: 1 }).minus({ second: 25 }).toISO(),
+  last_modified: DateTime.now().toISO(),
+  word_of_the_day: testMarkdown,
+};
+
+const mockValues_RegisteredWithAllDrawsAndEntry: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    current: {
+      ...current,
+    },
+    draws: allDraws,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithAllDraws = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithAllDrawsAndEntry}>
+    {children}
+  </TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsNoCurrent: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    draws: drawsWithClaim,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsNoCurrent = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsNoCurrent}>{children}</TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDraws: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    current,
+    draws,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDraws = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDraws}>{children}</TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsAndEntry: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    current: {
+      ...current,
+      entry: mockValues_RegisteredWithDraws.draws!.draws[0],
+    },
+    draws,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsAndEntry = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsAndEntry}>{children}</TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsAndEntryAndWinner: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    current: {
+      ...current,
+      entry: drawsWithWin[0],
+    },
+    draws: drawsWithWin,
+  },
+  isWinnerWithUnclaimedPrize: true,
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinner = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsAndEntryAndWinner}>
+    {children}
+  </TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsAndEntryAndNoWinner: TTestAndEarnContext = {
+  ...mockValues_RegisteredWithDrawsAndEntry,
+  isWinnerWithUnclaimedPrize: false,
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndNoWinner = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsAndEntryAndNoWinner}>
+    {children}
+  </TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsAndEntryAndWinnerCollectWallet: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    draws: drawsWithWin,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerCollectWallet = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsAndEntryAndWinnerCollectWallet}>
+    {children}
+  </TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredWithDrawsAndEntryAndWinnerClaimed: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  draws: {
+    draws: drawsWithClaim,
+  },
+};
+
+export const MockTestAndEarnProvider_RegisteredWithDrawsAndEntryAndWinnerClaimed = ({
+  children,
+}: {
+  children: React.ReactNode;
+}) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredWithDrawsAndEntryAndWinnerClaimed}>
+    {children}
+  </TestAndEarnContext.Provider>
+);
+
+const mockValues_RegisteredAndError: TTestAndEarnContext = {
+  ...mockValues_Registered,
+  error: 'Error message text will go here',
+};
+
+export const MockTestAndEarnProvider_RegisteredAndError = ({ children }: { children: React.ReactNode }) => (
+  <TestAndEarnContext.Provider value={mockValues_RegisteredAndError}>{children}</TestAndEarnContext.Provider>
+);
diff --git a/nym-connect/src/components/Growth/context/types.ts b/nym-connect/src/components/Growth/context/types.ts
new file mode 100644
index 0000000000..ebedf20d91
--- /dev/null
+++ b/nym-connect/src/components/Growth/context/types.ts
@@ -0,0 +1,66 @@
+import { DateTime } from 'luxon';
+
+export interface ClientId {
+  client_id: string;
+  client_id_signature: string;
+}
+
+export interface Registration {
+  id: string;
+  client_id: string;
+  client_id_signature: string;
+  timestamp: string;
+}
+
+export interface DrawEntryPartial {
+  draw_id: string;
+  client_id: string;
+  client_id_signature: string;
+}
+
+export enum DrawEntryStatus {
+  pending = 'Pending',
+  winner = 'Winner',
+  noWin = 'NoWin',
+  claimed = 'Claimed',
+}
+
+export interface DrawEntry {
+  id: string;
+  draw_id: string;
+  timestamp: string;
+  status: DrawEntryStatus;
+}
+
+export interface DrawWithWordOfTheDay {
+  id: string;
+  start_utc: string;
+  end_utc: string;
+  word_of_the_day?: string;
+  last_modified: string;
+  entry?: DrawEntry;
+}
+
+export interface ClaimPartial {
+  draw_id: string;
+  registration_id: string;
+  client_id: string;
+  client_id_signature: string;
+  wallet_address: string;
+}
+
+export interface Winner {
+  id: string;
+  client_id: string;
+  draw_id: string;
+  timestamp: string;
+  winner_reg_id: string;
+  winner_wallet_address?: string;
+  winner_claim_timestamp?: string;
+}
+
+export interface Draws {
+  current?: DrawWithWordOfTheDay;
+  next?: DrawWithWordOfTheDay;
+  draws: DrawEntry[];
+}
diff --git a/nym-connect/src/components/LogViewer/index.tsx b/nym-connect/src/components/LogViewer/index.tsx
new file mode 100644
index 0000000000..f2a9d2e6d0
--- /dev/null
+++ b/nym-connect/src/components/LogViewer/index.tsx
@@ -0,0 +1,97 @@
+import React, { FC, useEffect, useRef, useState } from 'react';
+import type { UnlistenFn } from '@tauri-apps/api/event';
+import { listen } from '@tauri-apps/api/event';
+import { Box, Paper, Chip, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@mui/material';
+
+// see https://github.com/tauri-apps/tauri-plugin-log/blob/dev/webview-src/index.ts#L4
+enum LogLevel {
+  Trace = 1,
+  Debug,
+  Info,
+  Warn,
+  Error,
+}
+
+const getLogLevelName = (value: LogLevel) => {
+  switch (value) {
+    case LogLevel.Trace:
+      return 'Trace';
+    case LogLevel.Debug:
+      return 'Debug';
+    case LogLevel.Info:
+      return 'Info';
+    case LogLevel.Warn:
+      return 'Warn';
+    case LogLevel.Error:
+      return 'Error';
+    default:
+      return 'Unknown';
+  }
+};
+
+// see https://github.com/tauri-apps/tauri-plugin-log/blob/dev/webview-src/index.ts#L147
+interface RecordPayload {
+  level: LogLevel;
+  message: string;
+}
+
+export const LogViewer: FC = () => {
+  const unlisten = useRef<UnlistenFn>();
+  const messages = useRef<RecordPayload[]>([]);
+  const [messageCount, setMessageCount] = useState(0);
+
+  useEffect(() => {
+    listen('log://log', (event) => {
+      console.log(event.payload);
+      const payload = event.payload as RecordPayload;
+      messages.current.unshift(payload);
+      setMessageCount((prev) => prev + 1);
+    }).then((fn) => {
+      unlisten.current = fn;
+    });
+
+    return () => {
+      if (unlisten.current) {
+        unlisten.current();
+      }
+    };
+  }, []);
+
+  return (
+    <Box sx={{ height: '100vh', width: '100vw', display: 'grid', gridTemplateRows: '1fr auto' }}>
+      <Box sx={{ overflowY: 'hidden', p: 2 }}>
+        <TableContainer component={Paper} sx={{ maxHeight: '100%' }}>
+          <Table size="small" stickyHeader>
+            <TableHead>
+              <TableRow>
+                <TableCell>Severity</TableCell>
+                <TableCell>Log message</TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {messages.current.map((m) => (
+                <TableRow sx={{ '&:last-child td, &:last-child th': { border: 0 } }}>
+                  <TableCell sx={{ padding: 1 }}>
+                    <Chip label={getLogLevelName(m.level)} variant="outlined" size="small" />
+                  </TableCell>
+                  <TableCell sx={{ padding: 1, fontFamily: 'Monospace' }}>{m.message}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+      </Box>
+      <Box
+        sx={{
+          p: 1,
+          textAlign: 'right',
+          fontSize: 'small',
+          borderTop: '2px solid',
+          borderTopColor: (theme) => theme.palette.divider,
+        }}
+      >
+        {messageCount} log entries since opening this window
+      </Box>
+    </Box>
+  );
+};
diff --git a/nym-connect/src/components/ServiceProviderPopup.tsx b/nym-connect/src/components/ServiceProviderPopup.tsx
new file mode 100644
index 0000000000..27ecfba127
--- /dev/null
+++ b/nym-connect/src/components/ServiceProviderPopup.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { Autocomplete, Box, Chip, Dialog, DialogProps, TextField, Typography } from '@mui/material';
+import { ServiceProvider, Service, Services } from '../types/directory';
+
+export const ServiceProviderPopup: React.FC<
+  DialogProps & { services: Services; onServiceProviderChanged: (sp?: ServiceProvider, s?: Service) => void }
+> = ({ services, onServiceProviderChanged, ...dialogProps }) => {
+  const options = services.flatMap((s) =>
+    s.items.map((sp) => ({ id: `${s.id}-${sp.id}`, title: sp.description, service: s, sp })),
+  );
+  return (
+    <Dialog {...dialogProps} fullWidth PaperProps={{ sx: { p: 0, m: 0, width: '100%' } }}>
+      <Autocomplete
+        fullWidth
+        openOnFocus
+        sx={{ p: 1 }}
+        // filterOptions={(filterOptions, { inputValue }) =>
+        //   filterOptions.filter((o) => o.title.toLowerCase().includes(inputValue.toLowerCase()))
+        // }
+        options={options}
+        groupBy={(option) => option.service.description}
+        getOptionLabel={(option) => option.title}
+        onChange={(event, value) => onServiceProviderChanged(value?.sp, value?.service)}
+        isOptionEqualToValue={(option, value) => option.id.toLowerCase() === value?.id.toLowerCase()}
+        renderOption={(props, option) => (
+          <Box key={option.id} component="li" sx={{ '& > img': { mr: 2, flexShrink: 0 } }} {...props} fontSize="small">
+            <Typography component="p" sx={{ opacity: 0.5, mr: 2, fontSize: 'inherit' }}>
+              {option.id}
+            </Typography>
+            <p>{option.title}</p>
+          </Box>
+        )}
+        renderInput={(params) => <TextField autoFocus {...params} label="Select a service provider" />}
+      />
+    </Dialog>
+  );
+};
diff --git a/nym-connect/src/components/ServiceProviderSelector.stories.tsx b/nym-connect/src/components/ServiceProviderSelector.stories.tsx
new file mode 100644
index 0000000000..c7df76ea4a
--- /dev/null
+++ b/nym-connect/src/components/ServiceProviderSelector.stories.tsx
@@ -0,0 +1,342 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { Box } from '@mui/material';
+import { ServiceProviderSelector } from './ServiceProviderSelector';
+import { Services } from '../types/directory';
+
+export default {
+  title: 'Components/Service Provider Selector',
+  component: ServiceProviderSelector,
+} as ComponentMeta<typeof ServiceProviderSelector>;
+
+const width = 240;
+
+export const Loading = () => (
+  <Box width={width}>
+    <ServiceProviderSelector />
+  </Box>
+);
+
+const services: Services = JSON.parse(`[
+  {
+    "id": "keybase",
+    "description": "Keybase",
+    "items": [
+      {
+        "id": "nym-keybase",
+        "description": "Nym Keybase Service Provider",
+        "address": "Entztfv6Uaz2hpYHQJ6JKoaCTpDL5dja18SuQWVJAmmx.Cvhn9rBJw5Ay9wgHcbgCnVg89MPSV5s2muPV2YF1BXYu@Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf",
+        "gateway": "Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf"
+      },
+      {
+        "id": "shipyard-keybase-1",
+        "description": "Nym Keybase Service Provider",
+        "address": "D55ksecHzY6vAeqk8MCTzCfj2pqwJeKCKZCUUGnwGnn3.FS42vXS5a6GNTb1qk3aVk5mjSiJCAuawbBVyQZZVfhvt@DfNMqQRy6pPkU8Z5rBsxRwzDUzAMXHPFwMhjF16ScZqn",
+        "gateway": "DfNMqQRy6pPkU8Z5rBsxRwzDUzAMXHPFwMhjF16ScZqn"
+      },
+      {
+        "id": "shipyard-keybase-2",
+        "description": "Nym Keybase Service Provider",
+        "address": "DFdDtW7LNBATxQ4ef3jNbqs3cRE8b9wDZTCctHCQRULa.4AbKiTNVUwYFWHhy98o5pT9dELiUrkXoJQ9wHqPgf6GV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN",
+        "gateway": "GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN"
+      },
+      {
+        "id": "shipyard-keybase-3",
+        "description": "Nym Keybase Service Provider",
+        "address": "6Y1HE1jJ92P9yoHer11TR4A2NdZePrLGaBNFf65MnYGe.FwXoh217odQDWNmViqzNX28fauYrjB3PYLrVvpqnQrX4@5vC8spDvw5VDQ8Zvd9fVvBhbUDv9jABR4cXzd4Kh5vz",
+        "gateway": "5vC8spDvw5VDQ8Zvd9fVvBhbUDv9jABR4cXzd4Kh5vz"
+      },
+      {
+        "id": "shipyard-keybase-4",
+        "description": "Nym Keybase Service Provider",
+        "address": "3zzhLtWvaJgn755MkRckG5aRnoTZich8ASn395iSsTgj.J1R5VuxXbh2eNHiaRbrwbKGXrrEQcHKLdzf8eg9HTB6q@3B7PsbXFuqq6rerYFLw5HPbQb4UmBqAhfWURRovMmWoj",
+        "gateway": "3B7PsbXFuqq6rerYFLw5HPbQb4UmBqAhfWURRovMmWoj"
+      },
+      {
+        "id": "shipyard-keybase-5", 
+        "description": "Nym Keybase Service Provider", 
+        "address": "CHuXdZJYQ8xH7ekgN9gAuVtQ7ZikjjHEZY5BSN7yc5mN.29dFvqicKQQQvoX1vup44mspmc249RH5xgLibWMwTYGT@CfWcDJq8QBz6cVAPCYSaLbaJEhVTmHEmyYgQ6C5GdDW9", 
+        "gateway": "CfWcDJq8QBz6cVAPCYSaLbaJEhVTmHEmyYgQ6C5GdDW9"
+      }
+    ]
+  },
+  {
+    "id": "electrum",
+    "description": "Electrum Wallet",
+    "items": [
+      {
+        "id": "nym-electrum",
+        "description": "Nym Electrum Service Provider",
+        "address": "DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh",
+        "gateway": "2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh"
+      },
+      {
+        "id": "shipyard-electrum-1",
+        "description": "Nym Electrum Service Provider",
+        "address": "8Tb73cFQpXCLpgxEA2VSDru2hHrcZ3KQcyMsGbxcTjBp.4x5tu66k8YkHk4tYac1qwEFbNq5WsKiX5kR51q5KKH88@4WgKhJdmUffz4e1o1ftVAGS3HnG56LiNAxA9dmaekrVd",
+        "gateway": "4WgKhJdmUffz4e1o1ftVAGS3HnG56LiNAxA9dmaekrVd"
+      },
+      {
+        "id": "shipyard-electrum-2",
+        "description": "Nym Electrum Service Provider",
+        "address": "GR6z31MwCsvxHrnvvVN1Cpasd8aQ1giwQqPTZM9dN7VH.5rEiqakSPDrBtKmvpU8Shnhz6gRM85JLoB7AX4h7PJYr@5Ao1J38frnU9Rx5YVeF5BWExcnDTcW8etNe9W2sRASXD",
+        "gateway": "5Ao1J38frnU9Rx5YVeF5BWExcnDTcW8etNe9W2sRASXD"
+      }   
+  ]
+  },
+  {
+    "id": "telegram",
+    "description": "Telegram",
+    "items": [
+     {
+        "id": "shipyard-telegram-2",
+        "description": "Nym Telegram Service Provider",
+        "address": "C4w6ewbQtoaZEeoaaNw1xVASChqo4WVjNfuYEUFjZxpc.8F1D7rQXf2jGoj1Ken7PiGDM8HS2Ug79wSoc9nZ1iqh1@62F81C9GrHDRja9WCqozemRFSzFPMecY85MbGwn6efve",
+        "gateway": "62F81C9GrHDRja9WCqozemRFSzFPMecY85MbGwn6efve"
+      },
+      {
+        "id": "shipyard-telegram-3",
+        "description": "Nym Telegram Service Provider",
+        "address": "DStL3BEUZuQZfbij1KAY3BvJh8rC5jpr9mc6AQ6aTLUu.Ax9foYaKfFgX6g8y393GoNpKkKrnDGFGRZwxDv9R7X6M@FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE",
+        "gateway": "FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE"
+      },
+      {
+        "id": "shipyard-telegram-4",
+        "description": "Nym Telegram Service Provider",
+        "address": "8gRdGTzsDxYzpasRQhsRg59MCgNNhnfag2oFfwwZPXnB.DtDrGz7ScVm4o7sN4K3CYUJveYgz7fcXELBVLNDfMS9Y@3ojQD6V7skM1bSXJX7fVQvscjmcgptzdixQEaAha2ixh",
+        "gateway": "3ojQD6V7skM1bSXJX7fVQvscjmcgptzdixQEaAha2ixh"
+      },
+      {
+        "id": "shipyard-telegram-5",
+        "description": "Nym Telegram Service Provider",
+        "address": "AR3oEM6Uvmfs6fyddwSehoBUKCFxz7MdFi4z7aahuHuY.3ZKapg9A3Py1PXhyLbCJr8ZbJsEV6NZdN1WJaGGut5tj@EEyq16v63aotPBCepxUpCgAojrNasZ6Hk1PjpRyBAdEp",
+        "gateway": "EEyq16v63aotPBCepxUpCgAojrNasZ6Hk1PjpRyBAdEp"
+      },
+      {
+        "id": "shipyard-telegram-6",
+        "description": "Nym Telegram Service Provider",
+        "address": "7n1BYhsXSwcr8Qim8AqZTAodqFia4QG6T7CRc1ihQHpv.7o4trpGqu2LHMUiXc3dddgfGET1CFFcAK9gKYoHoSn5e@BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYfr",
+        "gateway": "BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYfr"
+      },
+      {
+        "id": "shipyard-telegram-7",
+        "description": "Nym Telegram Service Provider",
+        "address": "Gv4TWhUKrvJfqh1jBRPGEQrikNZvZse2kS3ZgN9Z2nAZ.7KGPaaqUEum2C59jLvw7f8Ug8a48YuZdjjZu3t4JES4U@C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi",
+        "gateway": "C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi"
+      },
+      {
+        "id": "shipyard-telegram-8",
+        "description": "Nym Telegram Service Provider",
+        "address": "8Mqgp12cpF6FSXMeqzxgFgQXvTSapyNqGAi5wy7ub4ge.7z7PDsiJGiGxGz4p77v5L5fZhXBJ5qNZ8CgJwYNr6H6J",
+        "gateway": "3zd3wrCK8Dz5TXrcvk5dG5s9EEdf4Ck1v9VgBPMMFVkR"
+      },
+      {
+        "id": "shipyard-telegram-9",
+        "description": "Nym Telegram Service Provider",
+        "address": "F3N5eiPDZcGFC985Go4Mpv8p9uxFD1L3jRUdrLCbrZLm.EyTxWwwTwYpPrJBmc97GLd1LpUAphjptS5y1ed182bGk@GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ",
+        "gateway": "GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ"
+      },
+      {
+        "id": "shipyard-telegram-10",
+        "description": "Nym Telegram Service Provider",
+        "address": "G7y7e1nVBr8fmQSzdeAxXnCmmmJb5k8N3E8LBV31KE5g.GRRUCj6t6cCUUjakmTWzidMLiYA7EdCedKnup8osaBC6@AJad2R9virYEYXEsTcicN5y5tyPoixrhhAGsxoESZVnc",
+        "gateway": "AJad2R9virYEYXEsTcicN5y5tyPoixrhhAGsxoESZVnc"
+      },
+      {
+        "id": "shipyard-telegram-11",
+        "description": "Nym Telegram Service Provider",
+        "address": "2kq9Z7RyDZtb8kxXjyP3ZT8VMWHg6JXFDChGuuNBk7Hw.F5XYbBaGSoF8qAo8faPcaNRPHEq3Y25BDcwESeabUS9S@HaLyPQrhBTq75dnGeBUdYWeFVA2BBn39MgkhEt3VTMMM",
+        "gateway": "HaLyPQrhBTq75dnGeBUdYWeFVA2BBn39MgkhEt3VTMMM"
+      },
+      {
+        "id": "shipyard-telegram-12",
+        "description": "Nym Telegram Service Provider",
+        "address": "GegdtpNzYj4QCgpih9Kxv7ZVZxmVdxYHsDkiPsbT71XG.E8xtE8mrapjzFtyuziZSrsScAKhwZMH5wNpKWtKfzJ5Y@9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J",
+        "gateway": "9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J"
+      },
+      {
+        "id": "shipyard-telegram-13",
+        "description": "Nym Telegram Service Provider",
+        "address": "4SsrDQeEtG3mpeD9nN5CDdGaCsxFvNeYMhoviDzNNB9f.GyqG6iK5rBvhe3HXLR11m6ULpf13ATgYvkkidLmteDLs@5EpkkrMFYAM3XcaztXnZwBWquURHSKsyc9JxUCengDFS",
+        "gateway": "5EpkkrMFYAM3XcaztXnZwBWquURHSKsyc9JxUCengDFS"
+      },
+      {
+        "id": "shipyard-telegram-14",
+        "description": "Nym Telegram Service Provider",
+        "address": "9JoHRu2RrSD1fjbj9NSTASgjv9Szep7Nhd9L2PywxbBi.AZhAUDNX6iH8BqXyR5c7TJuzpwMEvDXrabNLGuRukvVf@9xJM74FwwHhEKKJHihD21QSZnHM2QBRMoFx9Wst6qNBS",
+        "gateway": "9xJM74FwwHhEKKJHihD21QSZnHM2QBRMoFx9Wst6qNBS"
+      },
+      {
+        "id": "shipyard-telegram-15",
+        "description": "Nym Telegram Service Provider",
+        "address": "3K174ijjXqCkhMDT9xLcqjS4MXk2QsqZt4PdgNcuUrnn.BNnHnQmWoj6Uo6kkS1QkPqsdHaXrcwyR9F6MnnzDkZJL@C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi",
+        "gateway": "C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi"
+      },
+      {
+        "id": "shipyard-telegram-16",
+        "description": "Nym Telegram Service Provider",
+        "address": "BqX5Q3MEcbTnM39hUswQchLW68SrqbhL8K5ucrLmtP39.AWrVsFoVC9s6KjdpcasATmZPA3GtMsUxcfHpAkuNdtFG@Emswx6KXyjRfq1c2k4d4uD2e6nBSbH1biorCZUei8UNS",
+        "gateway": "Emswx6KXyjRfq1c2k4d4uD2e6nBSbH1biorCZUei8UNS"
+      },
+      {
+        "id": "shipyard-telegram-17",
+        "description": "Nym Telegram Service Provider",
+        "address": "2tQxccgcqdkuUvLqgiEkEN4rNRZ5QknygnKAFcS4gfoe.EVrY5q5sqDqBUbS3wHsRRZhk2MAw1S17hNoH1Bicyv7n@DAGQxdxwAkwjaLjTw1B9vndia4YyFD15qRgcTQxrmkom",
+        "gateway": "DAGQxdxwAkwjaLjTw1B9vndia4YyFD15qRgcTQxrmkom"
+      },
+      {
+        "id": "shipyard-telegram-18",
+        "description": "Nym Telegram Service Provider",
+        "address": "8YG1rcEauJA814Nd7hSxjNe2UrRwrGsrXTm1Cmd3gRrU.FxYaYqpNN8PciNsySs3zYPrTB1J8AYUu9DBsM2vVDDfF@7EfEESLo71GUvx3UEW79LgTegHUBPUocUzGyJVv6LHog",
+        "gateway": "7EfEESLo71GUvx3UEW79LgTegHUBPUocUzGyJVv6LHog"
+      },
+      {
+        "id": "shipyard-telegram-19",
+        "description": "Nym Telegram Service Provider",
+        "address": "HPiXADVFLwLQPNpPtyYefzvYntC6tp9UJ5fJZGfkqvDt.2EUUxmeT3AiaUzAcE5SyXRAk8a2JXBkRz4B8McSdkrST@9ACTkYraCqE9jMb6zb6ne8EDQGGhZw5ykNiq9YRUdHTD",
+        "gateway": "9ACTkYraCqE9jMb6zb6ne8EDQGGhZw5ykNiq9YRUdHTD"
+      },
+      {
+        "id": "shipyard-telegram-20",
+        "description": "Nym Telegram Service Provider",
+        "address": "2QLnEEnTmf2NRWtcQPWBeRcg7Hej5WSPWRWwtTpEEZWF.BheS78ozc8ngvhsXNNnshdJzpoYsmEvhfn3WKUYF5dRU@C2uyokSPoxhku9GexRxEo1e8KPZ7q6e8FXmK3gtY8kkF",
+        "gateway": "C2uyokSPoxhku9GexRxEo1e8KPZ7q6e8FXmK3gtY8kkF"
+      },
+      {
+        "id": "shipyard-telegram-21",
+        "description": "Nym Telegram Service Provider",
+        "address": "FuBbnwiANfaXZnn683jBapK5XVm5ttgZSykU3vqPSHoD.94MFGv1VcBLTkRwzBDQUkWjvqtZYVBrJg2Q8JGbizcib@CTqYPY8htdAQMXCzRW9SjZzZuqYwSt2iUh6HPaNgmTvK",
+        "gateway": "CTqYPY8htdAQMXCzRW9SjZzZuqYwSt2iUh6HPaNgmTvK"
+      },
+      {
+        "id": "shipyard-telegram-22",
+        "description": "Nym Telegram Service Provider",
+        "address": "9EbQx5jQznSVbftFom7sqUSHAACrsfvMhrzhaFt4A3SZ.D1FQCirL4YKwfcmtMGvB5Rugt5sAzGEhdSjJ3bHVQRZ@7Zh1Sz5dXpA6s53CbtcdqhQhLqwf4cLynL7KqHKcjrG4",
+        "gateway": "7Zh1Sz5dXpA6s53CbtcdqhQhLqwf4cLynL7KqHKcjrG4"
+      },
+      {
+        "id": "shipyard-telegram-24",
+        "description": "Nym Telegram Service Provider",
+        "address": "6Umawwvf551VyB3Ko46NgKLqJdTFJeToCM67mrTmM3G.3A4sesBac4KGuMTFjvYBwLpksMJvbMbteGJQgmm4PV4Y@AnnYnEtBjB2a5sHmeRCnBq43qxyHDf95Bqd7cwQyKNLR",
+        "gateway": "AnnYnEtBjB2a5sHmeRCnBq43qxyHDf95Bqd7cwQyKNLR"
+      },
+      {
+        "id": "shipyard-telegram-25",
+        "description": "Nym Telegram Service Provider",
+        "address": "CDtxTeoyqq83JpV9G8cR5HRHRdMMaVspQsCwH3Qnajt3.F5EHK9HFcdGrE2hqA7bK9AUmkbihujYDhtNNqHKxW765@BDkeNx7JQm5NsQakst9s8htogZXhpTQedFAgZpvsGCqH",
+        "gateway": "BDkeNx7JQm5NsQakst9s8htogZXhpTQedFAgZpvsGCqH"
+      },
+      {
+        "id": "shipyard-telegram-26",
+        "description": "Nym Telegram Service Provider",
+        "address": "HukZkLG2DoarQEqaoDLuqW1GFf2NSHDUMGBZiyJGRYJD.9GyU8wPsyzcvRjcyk8hiNpTJbXCmq5F3VoVhFBZYuHR3@GsGEZiDBz8SWfHGaK5SDmhfbTEM55v37WCYYcT9wTSxN",
+        "gateway": "GsGEZiDBz8SWfHGaK5SDmhfbTEM55v37WCYYcT9wTSxN"
+      },
+      {
+        "id": "shipyard-telegram-27", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "773y8iMVJiRk4dRbjQzkJVbrei4TwkePNE5WTEttt77d.3Mw47C9XZj3oAzk1iSqC5Y36tbBsjtaTtdgaHM3Zsdma@7fiZtNL1RACQTwGrKLBT9nbY77bfwZnX9rqcWqc53qgv",
+        "gateway": "7fiZtNL1RACQTwGrKLBT9nbY77bfwZnX9rqcWqc53qgv"
+      }, 
+      {
+        "id": "shipyard-telegram-28", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "6jQJEorCu7YiP9HdDaMeHxcNhxeNmZ1kpd836GnqLZX.HsJqEmNTszGecsKqFB37i84nBXxqf4ETgrKmKmBvMGHC@FYnDMQzT49ZGM23gVqpTxfih14V6wuedNXirekmt37zE", 
+        "gateway": "FYnDMQzT49ZGM23gVqpTxfih14V6wuedNXirekmt37zE"
+      }, 
+      {
+        "id": "shipyard-telegram-29", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "BiCSyovpFMuSnTvF2TdiuZwrytXDrd9AH47ZMcCxscVC.G9YpdicA9BBNoVHDgjWjgt17wv5WYKWcbE3vPJJVpSJD@GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ", 
+        "gateway":"GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ" 
+      }, 
+      {
+        "id": "shipyard-telegram-30", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "AQRRAs9oc8QWXAFBs44YhCKUny7AyLsfLy91pwmGgxuf.CWUKoKA1afSKyw5BnFJJg19UDgnaVATupsFhQpyTEBHJ@EBT8jTD8o4tKng2NXrrcrzVhJiBnKpT1bJy5CMeArt2w", 
+        "gateway": "EBT8jTD8o4tKng2NXrrcrzVhJiBnKpT1bJy5CMeArt2w"
+      }, 
+      {
+        "id": "shipyard-telegram-31", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "6YqjAZK3Pr1ngiBLcDkotboB5WiN6k6NPpbXvShH4pR5.9Ss6VW3Xbyi8LuxduNNwnXEv9njHCQ2PLSP1UK6tsoa5@42XCK9dMS9m5XJLzQd2dBuwimk6ndZnczhZaV5VPFkQD",
+        "gateway": "42XCK9dMS9m5XJLzQd2dBuwimk6ndZnczhZaV5VPFkQD" 
+      }, 
+      { 
+        "id": "shipyard-telegram-32",
+        "description": "Nym Telegram Service Provider", 
+        "address": "EmYWLeybmj86Vzr62vxuZ3T15jwMNHggzK7sQwid96yp.GyaF9WprSr56cxUdGf5TpcUvAjb2VbAr8CVBrmBUYAaw@GL5wESoz4oSbpBaTki9qB9213FGUQXCiRjbzDkhWwoBC", 
+        "gateway": "GL5wESoz4oSbpBaTki9qB9213FGUQXCiRjbzDkhWwoBC"
+      }, 
+      {
+        "id": "shipyard-telegram-33", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "4PDb96cck5btTj6G7rsomqwHJsp4qu8uPvFCbwHfjFUx.C5dKbaoakH7egsZvAueRbwLFbmxnQaVMeSr6QTMpuBAA@58ceEFaLJh6zAo3cirzT1BDQm7D3L5acnQrxGH1D6TAY", 
+        "gateway": "58ceEFaLJh6zAo3cirzT1BDQm7D3L5acnQrxGH1D6TAY"
+      }, 
+      {
+         "id": "shipyard-telegram-34", 
+         "description": "Nym Telegram Service Provider", 
+         "address": "BeZbeMf9vcpUf368qDd85dtLwXLj4Ee5bsHMB2fUD8uX.HELVbppkwU1jmzUAUrCEbHeJfVciSeo8VGAkbJSpwxsb@ADdHkiTfkpsSt31zVToWW9j3KikH24aLAAwDKtCYE5jY", 
+         "gateway":"ADdHkiTfkpsSt31zVToWW9j3KikH24aLAAwDKtCYE5jY"
+      }, 
+      { 
+        "id": "shipyard-telegram-35", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "Bp4JRFyf7GB9L9J95AqMPnz9zbGmPnViA5fDXKeNraLJ.D6CTdcjJVxDmH2UQvzXuPWg9Se9xXYe76uDMypXvhzd7@6UjGEeQZK14C5K2kenycTkqt7qRjEHGLgaQx3FWySo3N", 
+        "gateway": "6UjGEeQZK14C5K2kenycTkqt7qRjEHGLgaQx3FWySo3N"
+      }, 
+      { 
+        "id": "shipyard-telegram-36", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "91h7io6BGhVjbtC7dbbRcScyTJcTfnMsTQZ6aWMVsrWR.Epb4hANXCp8cGEY3wSgawux991ti9Z5Y1FHTMzAKFa6E@DF4TE7V8kJkttMvnoSVGnRFFRt6WYGxxiC2w1XyPQnHe", 
+        "gateway": "DF4TE7V8kJkttMvnoSVGnRFFRt6WYGxxiC2w1XyPQnHe"
+      }, 
+      { 
+        "id": "shipyard-telegram-37", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "Cy2wuwKpWZ3iWzKU3ZWL1qqcVfJ5Cq85dU7UHVWwv2gc.9AhC9b2zVcLnXLGriMdxjpsWJpq6iAdCavDi63udbL89@678qVUJ21uwxZBhp3r56z7GRf6gMh3NYDHruTegPtgMf", 
+        "gateway": "678qVUJ21uwxZBhp3r56z7GRf6gMh3NYDHruTegPtgMf"
+      }, 
+      { 
+        "id": "shipyard-telegram-38", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "GgUeUWW1NRSuquZYeZf3WkppE92EQUHJrFjNZtYU1jow.CSEjwrRi4f4uyw7N6L2LPKw2tB8spcMbFu99wHZzFZSj@77TSuVU8d1oXKbPzjec2xh4i3Wj5WwUyy9Lr36sm8gZm", 
+        "gateway": "77TSuVU8d1oXKbPzjec2xh4i3Wj5WwUyy9Lr36sm8gZm"
+      },
+      { 
+        "id": "shipyard-telegram-39", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "kz4zWwSkYiQxqxXFPNcGUByTPQWXascD9RfYsmSxY7n.ajp3SjbBVBjrU9nXpSQXAXzbb6EHJJyhbY6cc1ajayx@BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYf", 
+        "gateway": "HyS2UZtZX3kQXdazbdE99DhCjBXjbG61LC9QsmXwbxrU"
+      }
+    ]
+  },
+  {
+    "id": "blockstream",
+    "description": "Blockstream Green",
+    "items": [
+      {
+        "id": "nym-blockstream",
+        "description": "Nym Blockstream Green Service Provider",
+        "address": "GiRjFWrMxt58pEMuusm4yT3RxoMD1MMPrR9M2N4VWRJP.3CNZBPq4vg7v7qozjGjdPMXcvDmkbWPCgbGCjQVw9n6Z@2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW",
+        "gateway": "2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW"
+      }
+    ]
+  }
+]`);
+export const Loaded = () => (
+  <Box width={width}>
+    <ServiceProviderSelector services={services} />
+  </Box>
+);
+
+export const ServiceAlreadySelected = () => (
+  <Box width={width}>
+    <ServiceProviderSelector
+      services={services}
+      currentSp={services[2].items[2]}
+      onChange={(serviceProvider) => console.log('New service provider selected: ', serviceProvider)}
+    />
+  </Box>
+);
diff --git a/nym-connect/src/components/ServiceProviderSelector.tsx b/nym-connect/src/components/ServiceProviderSelector.tsx
index 9dee82fbb4..16086aa5e1 100644
--- a/nym-connect/src/components/ServiceProviderSelector.tsx
+++ b/nym-connect/src/components/ServiceProviderSelector.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo } from 'react';
 import { Box, CircularProgress, Stack, TextField, Tooltip, Typography, MenuItem, ListItemIcon } from '@mui/material';
 import { ServiceProvider, Service, Services } from '../types/directory';
+import { useTauriEvents } from '../utils';
 
 type ServiceWithRandomSp = {
   id: string;
@@ -8,13 +9,31 @@ type ServiceWithRandomSp = {
   sp: ServiceProvider;
 };
 
+const defaultServiceValue = { id: '', description: '', items: [] };
+
 export const ServiceProviderSelector: React.FC<{
-  onChange?: (serviceProvider: ServiceProvider) => void;
+  onChange?: (serviceProvider?: ServiceProvider) => void;
   services?: Services;
   currentSp?: ServiceProvider;
 }> = ({ services, currentSp, onChange }) => {
-  const [service, setService] = React.useState<Service>({ id: '', description: '', items: [] });
+  const [service, setService] = React.useState<Service>(defaultServiceValue);
   const [serviceProvider, setServiceProvider] = React.useState<ServiceProvider | undefined>(currentSp);
+  const [resetTrigger, setResetTrigger] = React.useState(new Date().toISOString());
+
+  const handleSelectSp = (newServiceProvider?: ServiceProvider) => {
+    if (newServiceProvider && newServiceProvider !== currentSp) {
+      setServiceProvider(newServiceProvider);
+      onChange?.(newServiceProvider);
+    }
+  };
+
+  // when the user clears local storage, reset the selector
+  useTauriEvents('help://clear-storage', () => {
+    setService(defaultServiceValue);
+    setServiceProvider(undefined);
+    onChange?.(undefined);
+    setResetTrigger(new Date().toISOString());
+  });
 
   useEffect(() => {
     if (!serviceProvider && currentSp) {
@@ -39,13 +58,6 @@ export const ServiceProviderSelector: React.FC<{
     }
   }, [serviceProvider, services]);
 
-  const handleSelectSp = (newServiceProvider?: ServiceProvider) => {
-    if (newServiceProvider && newServiceProvider !== currentSp) {
-      setServiceProvider(newServiceProvider);
-      onChange?.(newServiceProvider);
-    }
-  };
-
   if (!services) {
     return (
       <Box display="flex" alignItems="center" justifyContent="center" sx={{ my: 3 }}>
@@ -64,7 +76,7 @@ export const ServiceProviderSelector: React.FC<{
         description,
         sp: items[Math.floor(Math.random() * items.length)],
       })),
-    [services],
+    [services, resetTrigger],
   );
 
   if (!service) return null;
diff --git a/nym-connect/src/components/ServiceSelector.stories.tsx b/nym-connect/src/components/ServiceSelector.stories.tsx
new file mode 100644
index 0000000000..56be7c19ee
--- /dev/null
+++ b/nym-connect/src/components/ServiceSelector.stories.tsx
@@ -0,0 +1,342 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { Box } from '@mui/material';
+import { ServiceSelector } from './ServiceSelector';
+import { Services } from '../types/directory';
+
+export default {
+  title: 'Components/Service Selector',
+  component: ServiceSelector,
+} as ComponentMeta<typeof ServiceSelector>;
+
+const width = 240;
+
+export const Loading = () => (
+  <Box width={width}>
+    <ServiceSelector />
+  </Box>
+);
+
+const services: Services = JSON.parse(`[
+  {
+    "id": "keybase",
+    "description": "Keybase",
+    "items": [
+      {
+        "id": "nym-keybase",
+        "description": "Nym Keybase Service Provider",
+        "address": "Entztfv6Uaz2hpYHQJ6JKoaCTpDL5dja18SuQWVJAmmx.Cvhn9rBJw5Ay9wgHcbgCnVg89MPSV5s2muPV2YF1BXYu@Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf",
+        "gateway": "Fo4f4SQLdoyoGkFae5TpVhRVoXCF8UiypLVGtGjujVPf"
+      },
+      {
+        "id": "shipyard-keybase-1",
+        "description": "Nym Keybase Service Provider",
+        "address": "D55ksecHzY6vAeqk8MCTzCfj2pqwJeKCKZCUUGnwGnn3.FS42vXS5a6GNTb1qk3aVk5mjSiJCAuawbBVyQZZVfhvt@DfNMqQRy6pPkU8Z5rBsxRwzDUzAMXHPFwMhjF16ScZqn",
+        "gateway": "DfNMqQRy6pPkU8Z5rBsxRwzDUzAMXHPFwMhjF16ScZqn"
+      },
+      {
+        "id": "shipyard-keybase-2",
+        "description": "Nym Keybase Service Provider",
+        "address": "DFdDtW7LNBATxQ4ef3jNbqs3cRE8b9wDZTCctHCQRULa.4AbKiTNVUwYFWHhy98o5pT9dELiUrkXoJQ9wHqPgf6GV@GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN",
+        "gateway": "GJqd3ZxpXWSNxTfx7B1pPtswpetH4LnJdFeLeuY5KUuN"
+      },
+      {
+        "id": "shipyard-keybase-3",
+        "description": "Nym Keybase Service Provider",
+        "address": "6Y1HE1jJ92P9yoHer11TR4A2NdZePrLGaBNFf65MnYGe.FwXoh217odQDWNmViqzNX28fauYrjB3PYLrVvpqnQrX4@5vC8spDvw5VDQ8Zvd9fVvBhbUDv9jABR4cXzd4Kh5vz",
+        "gateway": "5vC8spDvw5VDQ8Zvd9fVvBhbUDv9jABR4cXzd4Kh5vz"
+      },
+      {
+        "id": "shipyard-keybase-4",
+        "description": "Nym Keybase Service Provider",
+        "address": "3zzhLtWvaJgn755MkRckG5aRnoTZich8ASn395iSsTgj.J1R5VuxXbh2eNHiaRbrwbKGXrrEQcHKLdzf8eg9HTB6q@3B7PsbXFuqq6rerYFLw5HPbQb4UmBqAhfWURRovMmWoj",
+        "gateway": "3B7PsbXFuqq6rerYFLw5HPbQb4UmBqAhfWURRovMmWoj"
+      },
+      {
+        "id": "shipyard-keybase-5", 
+        "description": "Nym Keybase Service Provider", 
+        "address": "CHuXdZJYQ8xH7ekgN9gAuVtQ7ZikjjHEZY5BSN7yc5mN.29dFvqicKQQQvoX1vup44mspmc249RH5xgLibWMwTYGT@CfWcDJq8QBz6cVAPCYSaLbaJEhVTmHEmyYgQ6C5GdDW9", 
+        "gateway": "CfWcDJq8QBz6cVAPCYSaLbaJEhVTmHEmyYgQ6C5GdDW9"
+      }
+    ]
+  },
+  {
+    "id": "electrum",
+    "description": "Electrum Wallet",
+    "items": [
+      {
+        "id": "nym-electrum",
+        "description": "Nym Electrum Service Provider",
+        "address": "DpB3cHAchJiNBQi5FrZx2csXb1mrHkpYh9Wzf8Rjsuko.ANNWrvHqMYuertHGHUrZdBntQhpzfbWekB39qez9U2Vx@2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh",
+        "gateway": "2BuMSfMW3zpeAjKXyKLhmY4QW1DXurrtSPEJ6CjX3SEh"
+      },
+      {
+        "id": "shipyard-electrum-1",
+        "description": "Nym Electrum Service Provider",
+        "address": "8Tb73cFQpXCLpgxEA2VSDru2hHrcZ3KQcyMsGbxcTjBp.4x5tu66k8YkHk4tYac1qwEFbNq5WsKiX5kR51q5KKH88@4WgKhJdmUffz4e1o1ftVAGS3HnG56LiNAxA9dmaekrVd",
+        "gateway": "4WgKhJdmUffz4e1o1ftVAGS3HnG56LiNAxA9dmaekrVd"
+      },
+      {
+        "id": "shipyard-electrum-2",
+        "description": "Nym Electrum Service Provider",
+        "address": "GR6z31MwCsvxHrnvvVN1Cpasd8aQ1giwQqPTZM9dN7VH.5rEiqakSPDrBtKmvpU8Shnhz6gRM85JLoB7AX4h7PJYr@5Ao1J38frnU9Rx5YVeF5BWExcnDTcW8etNe9W2sRASXD",
+        "gateway": "5Ao1J38frnU9Rx5YVeF5BWExcnDTcW8etNe9W2sRASXD"
+      }   
+  ]
+  },
+  {
+    "id": "telegram",
+    "description": "Telegram",
+    "items": [
+     {
+        "id": "shipyard-telegram-2",
+        "description": "Nym Telegram Service Provider",
+        "address": "C4w6ewbQtoaZEeoaaNw1xVASChqo4WVjNfuYEUFjZxpc.8F1D7rQXf2jGoj1Ken7PiGDM8HS2Ug79wSoc9nZ1iqh1@62F81C9GrHDRja9WCqozemRFSzFPMecY85MbGwn6efve",
+        "gateway": "62F81C9GrHDRja9WCqozemRFSzFPMecY85MbGwn6efve"
+      },
+      {
+        "id": "shipyard-telegram-3",
+        "description": "Nym Telegram Service Provider",
+        "address": "DStL3BEUZuQZfbij1KAY3BvJh8rC5jpr9mc6AQ6aTLUu.Ax9foYaKfFgX6g8y393GoNpKkKrnDGFGRZwxDv9R7X6M@FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE",
+        "gateway": "FQon7UwF5knbUr2jf6jHhmNLbJnMreck1eUcVH59kxYE"
+      },
+      {
+        "id": "shipyard-telegram-4",
+        "description": "Nym Telegram Service Provider",
+        "address": "8gRdGTzsDxYzpasRQhsRg59MCgNNhnfag2oFfwwZPXnB.DtDrGz7ScVm4o7sN4K3CYUJveYgz7fcXELBVLNDfMS9Y@3ojQD6V7skM1bSXJX7fVQvscjmcgptzdixQEaAha2ixh",
+        "gateway": "3ojQD6V7skM1bSXJX7fVQvscjmcgptzdixQEaAha2ixh"
+      },
+      {
+        "id": "shipyard-telegram-5",
+        "description": "Nym Telegram Service Provider",
+        "address": "AR3oEM6Uvmfs6fyddwSehoBUKCFxz7MdFi4z7aahuHuY.3ZKapg9A3Py1PXhyLbCJr8ZbJsEV6NZdN1WJaGGut5tj@EEyq16v63aotPBCepxUpCgAojrNasZ6Hk1PjpRyBAdEp",
+        "gateway": "EEyq16v63aotPBCepxUpCgAojrNasZ6Hk1PjpRyBAdEp"
+      },
+      {
+        "id": "shipyard-telegram-6",
+        "description": "Nym Telegram Service Provider",
+        "address": "7n1BYhsXSwcr8Qim8AqZTAodqFia4QG6T7CRc1ihQHpv.7o4trpGqu2LHMUiXc3dddgfGET1CFFcAK9gKYoHoSn5e@BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYfr",
+        "gateway": "BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYfr"
+      },
+      {
+        "id": "shipyard-telegram-7",
+        "description": "Nym Telegram Service Provider",
+        "address": "Gv4TWhUKrvJfqh1jBRPGEQrikNZvZse2kS3ZgN9Z2nAZ.7KGPaaqUEum2C59jLvw7f8Ug8a48YuZdjjZu3t4JES4U@C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi",
+        "gateway": "C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi"
+      },
+      {
+        "id": "shipyard-telegram-8",
+        "description": "Nym Telegram Service Provider",
+        "address": "8Mqgp12cpF6FSXMeqzxgFgQXvTSapyNqGAi5wy7ub4ge.7z7PDsiJGiGxGz4p77v5L5fZhXBJ5qNZ8CgJwYNr6H6J",
+        "gateway": "3zd3wrCK8Dz5TXrcvk5dG5s9EEdf4Ck1v9VgBPMMFVkR"
+      },
+      {
+        "id": "shipyard-telegram-9",
+        "description": "Nym Telegram Service Provider",
+        "address": "F3N5eiPDZcGFC985Go4Mpv8p9uxFD1L3jRUdrLCbrZLm.EyTxWwwTwYpPrJBmc97GLd1LpUAphjptS5y1ed182bGk@GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ",
+        "gateway": "GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ"
+      },
+      {
+        "id": "shipyard-telegram-10",
+        "description": "Nym Telegram Service Provider",
+        "address": "G7y7e1nVBr8fmQSzdeAxXnCmmmJb5k8N3E8LBV31KE5g.GRRUCj6t6cCUUjakmTWzidMLiYA7EdCedKnup8osaBC6@AJad2R9virYEYXEsTcicN5y5tyPoixrhhAGsxoESZVnc",
+        "gateway": "AJad2R9virYEYXEsTcicN5y5tyPoixrhhAGsxoESZVnc"
+      },
+      {
+        "id": "shipyard-telegram-11",
+        "description": "Nym Telegram Service Provider",
+        "address": "2kq9Z7RyDZtb8kxXjyP3ZT8VMWHg6JXFDChGuuNBk7Hw.F5XYbBaGSoF8qAo8faPcaNRPHEq3Y25BDcwESeabUS9S@HaLyPQrhBTq75dnGeBUdYWeFVA2BBn39MgkhEt3VTMMM",
+        "gateway": "HaLyPQrhBTq75dnGeBUdYWeFVA2BBn39MgkhEt3VTMMM"
+      },
+      {
+        "id": "shipyard-telegram-12",
+        "description": "Nym Telegram Service Provider",
+        "address": "GegdtpNzYj4QCgpih9Kxv7ZVZxmVdxYHsDkiPsbT71XG.E8xtE8mrapjzFtyuziZSrsScAKhwZMH5wNpKWtKfzJ5Y@9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J",
+        "gateway": "9Byd9VAtyYMnbVAcqdoQxJnq76XEg2dbxbiF5Aa5Jj9J"
+      },
+      {
+        "id": "shipyard-telegram-13",
+        "description": "Nym Telegram Service Provider",
+        "address": "4SsrDQeEtG3mpeD9nN5CDdGaCsxFvNeYMhoviDzNNB9f.GyqG6iK5rBvhe3HXLR11m6ULpf13ATgYvkkidLmteDLs@5EpkkrMFYAM3XcaztXnZwBWquURHSKsyc9JxUCengDFS",
+        "gateway": "5EpkkrMFYAM3XcaztXnZwBWquURHSKsyc9JxUCengDFS"
+      },
+      {
+        "id": "shipyard-telegram-14",
+        "description": "Nym Telegram Service Provider",
+        "address": "9JoHRu2RrSD1fjbj9NSTASgjv9Szep7Nhd9L2PywxbBi.AZhAUDNX6iH8BqXyR5c7TJuzpwMEvDXrabNLGuRukvVf@9xJM74FwwHhEKKJHihD21QSZnHM2QBRMoFx9Wst6qNBS",
+        "gateway": "9xJM74FwwHhEKKJHihD21QSZnHM2QBRMoFx9Wst6qNBS"
+      },
+      {
+        "id": "shipyard-telegram-15",
+        "description": "Nym Telegram Service Provider",
+        "address": "3K174ijjXqCkhMDT9xLcqjS4MXk2QsqZt4PdgNcuUrnn.BNnHnQmWoj6Uo6kkS1QkPqsdHaXrcwyR9F6MnnzDkZJL@C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi",
+        "gateway": "C7J8SwZQqjWqhBryyjJxLt7FacVuPTwAmR2otGy53ayi"
+      },
+      {
+        "id": "shipyard-telegram-16",
+        "description": "Nym Telegram Service Provider",
+        "address": "BqX5Q3MEcbTnM39hUswQchLW68SrqbhL8K5ucrLmtP39.AWrVsFoVC9s6KjdpcasATmZPA3GtMsUxcfHpAkuNdtFG@Emswx6KXyjRfq1c2k4d4uD2e6nBSbH1biorCZUei8UNS",
+        "gateway": "Emswx6KXyjRfq1c2k4d4uD2e6nBSbH1biorCZUei8UNS"
+      },
+      {
+        "id": "shipyard-telegram-17",
+        "description": "Nym Telegram Service Provider",
+        "address": "2tQxccgcqdkuUvLqgiEkEN4rNRZ5QknygnKAFcS4gfoe.EVrY5q5sqDqBUbS3wHsRRZhk2MAw1S17hNoH1Bicyv7n@DAGQxdxwAkwjaLjTw1B9vndia4YyFD15qRgcTQxrmkom",
+        "gateway": "DAGQxdxwAkwjaLjTw1B9vndia4YyFD15qRgcTQxrmkom"
+      },
+      {
+        "id": "shipyard-telegram-18",
+        "description": "Nym Telegram Service Provider",
+        "address": "8YG1rcEauJA814Nd7hSxjNe2UrRwrGsrXTm1Cmd3gRrU.FxYaYqpNN8PciNsySs3zYPrTB1J8AYUu9DBsM2vVDDfF@7EfEESLo71GUvx3UEW79LgTegHUBPUocUzGyJVv6LHog",
+        "gateway": "7EfEESLo71GUvx3UEW79LgTegHUBPUocUzGyJVv6LHog"
+      },
+      {
+        "id": "shipyard-telegram-19",
+        "description": "Nym Telegram Service Provider",
+        "address": "HPiXADVFLwLQPNpPtyYefzvYntC6tp9UJ5fJZGfkqvDt.2EUUxmeT3AiaUzAcE5SyXRAk8a2JXBkRz4B8McSdkrST@9ACTkYraCqE9jMb6zb6ne8EDQGGhZw5ykNiq9YRUdHTD",
+        "gateway": "9ACTkYraCqE9jMb6zb6ne8EDQGGhZw5ykNiq9YRUdHTD"
+      },
+      {
+        "id": "shipyard-telegram-20",
+        "description": "Nym Telegram Service Provider",
+        "address": "2QLnEEnTmf2NRWtcQPWBeRcg7Hej5WSPWRWwtTpEEZWF.BheS78ozc8ngvhsXNNnshdJzpoYsmEvhfn3WKUYF5dRU@C2uyokSPoxhku9GexRxEo1e8KPZ7q6e8FXmK3gtY8kkF",
+        "gateway": "C2uyokSPoxhku9GexRxEo1e8KPZ7q6e8FXmK3gtY8kkF"
+      },
+      {
+        "id": "shipyard-telegram-21",
+        "description": "Nym Telegram Service Provider",
+        "address": "FuBbnwiANfaXZnn683jBapK5XVm5ttgZSykU3vqPSHoD.94MFGv1VcBLTkRwzBDQUkWjvqtZYVBrJg2Q8JGbizcib@CTqYPY8htdAQMXCzRW9SjZzZuqYwSt2iUh6HPaNgmTvK",
+        "gateway": "CTqYPY8htdAQMXCzRW9SjZzZuqYwSt2iUh6HPaNgmTvK"
+      },
+      {
+        "id": "shipyard-telegram-22",
+        "description": "Nym Telegram Service Provider",
+        "address": "9EbQx5jQznSVbftFom7sqUSHAACrsfvMhrzhaFt4A3SZ.D1FQCirL4YKwfcmtMGvB5Rugt5sAzGEhdSjJ3bHVQRZ@7Zh1Sz5dXpA6s53CbtcdqhQhLqwf4cLynL7KqHKcjrG4",
+        "gateway": "7Zh1Sz5dXpA6s53CbtcdqhQhLqwf4cLynL7KqHKcjrG4"
+      },
+      {
+        "id": "shipyard-telegram-24",
+        "description": "Nym Telegram Service Provider",
+        "address": "6Umawwvf551VyB3Ko46NgKLqJdTFJeToCM67mrTmM3G.3A4sesBac4KGuMTFjvYBwLpksMJvbMbteGJQgmm4PV4Y@AnnYnEtBjB2a5sHmeRCnBq43qxyHDf95Bqd7cwQyKNLR",
+        "gateway": "AnnYnEtBjB2a5sHmeRCnBq43qxyHDf95Bqd7cwQyKNLR"
+      },
+      {
+        "id": "shipyard-telegram-25",
+        "description": "Nym Telegram Service Provider",
+        "address": "CDtxTeoyqq83JpV9G8cR5HRHRdMMaVspQsCwH3Qnajt3.F5EHK9HFcdGrE2hqA7bK9AUmkbihujYDhtNNqHKxW765@BDkeNx7JQm5NsQakst9s8htogZXhpTQedFAgZpvsGCqH",
+        "gateway": "BDkeNx7JQm5NsQakst9s8htogZXhpTQedFAgZpvsGCqH"
+      },
+      {
+        "id": "shipyard-telegram-26",
+        "description": "Nym Telegram Service Provider",
+        "address": "HukZkLG2DoarQEqaoDLuqW1GFf2NSHDUMGBZiyJGRYJD.9GyU8wPsyzcvRjcyk8hiNpTJbXCmq5F3VoVhFBZYuHR3@GsGEZiDBz8SWfHGaK5SDmhfbTEM55v37WCYYcT9wTSxN",
+        "gateway": "GsGEZiDBz8SWfHGaK5SDmhfbTEM55v37WCYYcT9wTSxN"
+      },
+      {
+        "id": "shipyard-telegram-27", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "773y8iMVJiRk4dRbjQzkJVbrei4TwkePNE5WTEttt77d.3Mw47C9XZj3oAzk1iSqC5Y36tbBsjtaTtdgaHM3Zsdma@7fiZtNL1RACQTwGrKLBT9nbY77bfwZnX9rqcWqc53qgv",
+        "gateway": "7fiZtNL1RACQTwGrKLBT9nbY77bfwZnX9rqcWqc53qgv"
+      }, 
+      {
+        "id": "shipyard-telegram-28", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "6jQJEorCu7YiP9HdDaMeHxcNhxeNmZ1kpd836GnqLZX.HsJqEmNTszGecsKqFB37i84nBXxqf4ETgrKmKmBvMGHC@FYnDMQzT49ZGM23gVqpTxfih14V6wuedNXirekmt37zE", 
+        "gateway": "FYnDMQzT49ZGM23gVqpTxfih14V6wuedNXirekmt37zE"
+      }, 
+      {
+        "id": "shipyard-telegram-29", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "BiCSyovpFMuSnTvF2TdiuZwrytXDrd9AH47ZMcCxscVC.G9YpdicA9BBNoVHDgjWjgt17wv5WYKWcbE3vPJJVpSJD@GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ", 
+        "gateway":"GAjhJcrd6f1edaqUkfWCff6zdHoqo756qYrc2TfPuCXJ" 
+      }, 
+      {
+        "id": "shipyard-telegram-30", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "AQRRAs9oc8QWXAFBs44YhCKUny7AyLsfLy91pwmGgxuf.CWUKoKA1afSKyw5BnFJJg19UDgnaVATupsFhQpyTEBHJ@EBT8jTD8o4tKng2NXrrcrzVhJiBnKpT1bJy5CMeArt2w", 
+        "gateway": "EBT8jTD8o4tKng2NXrrcrzVhJiBnKpT1bJy5CMeArt2w"
+      }, 
+      {
+        "id": "shipyard-telegram-31", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "6YqjAZK3Pr1ngiBLcDkotboB5WiN6k6NPpbXvShH4pR5.9Ss6VW3Xbyi8LuxduNNwnXEv9njHCQ2PLSP1UK6tsoa5@42XCK9dMS9m5XJLzQd2dBuwimk6ndZnczhZaV5VPFkQD",
+        "gateway": "42XCK9dMS9m5XJLzQd2dBuwimk6ndZnczhZaV5VPFkQD" 
+      }, 
+      { 
+        "id": "shipyard-telegram-32",
+        "description": "Nym Telegram Service Provider", 
+        "address": "EmYWLeybmj86Vzr62vxuZ3T15jwMNHggzK7sQwid96yp.GyaF9WprSr56cxUdGf5TpcUvAjb2VbAr8CVBrmBUYAaw@GL5wESoz4oSbpBaTki9qB9213FGUQXCiRjbzDkhWwoBC", 
+        "gateway": "GL5wESoz4oSbpBaTki9qB9213FGUQXCiRjbzDkhWwoBC"
+      }, 
+      {
+        "id": "shipyard-telegram-33", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "4PDb96cck5btTj6G7rsomqwHJsp4qu8uPvFCbwHfjFUx.C5dKbaoakH7egsZvAueRbwLFbmxnQaVMeSr6QTMpuBAA@58ceEFaLJh6zAo3cirzT1BDQm7D3L5acnQrxGH1D6TAY", 
+        "gateway": "58ceEFaLJh6zAo3cirzT1BDQm7D3L5acnQrxGH1D6TAY"
+      }, 
+      {
+         "id": "shipyard-telegram-34", 
+         "description": "Nym Telegram Service Provider", 
+         "address": "BeZbeMf9vcpUf368qDd85dtLwXLj4Ee5bsHMB2fUD8uX.HELVbppkwU1jmzUAUrCEbHeJfVciSeo8VGAkbJSpwxsb@ADdHkiTfkpsSt31zVToWW9j3KikH24aLAAwDKtCYE5jY", 
+         "gateway":"ADdHkiTfkpsSt31zVToWW9j3KikH24aLAAwDKtCYE5jY"
+      }, 
+      { 
+        "id": "shipyard-telegram-35", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "Bp4JRFyf7GB9L9J95AqMPnz9zbGmPnViA5fDXKeNraLJ.D6CTdcjJVxDmH2UQvzXuPWg9Se9xXYe76uDMypXvhzd7@6UjGEeQZK14C5K2kenycTkqt7qRjEHGLgaQx3FWySo3N", 
+        "gateway": "6UjGEeQZK14C5K2kenycTkqt7qRjEHGLgaQx3FWySo3N"
+      }, 
+      { 
+        "id": "shipyard-telegram-36", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "91h7io6BGhVjbtC7dbbRcScyTJcTfnMsTQZ6aWMVsrWR.Epb4hANXCp8cGEY3wSgawux991ti9Z5Y1FHTMzAKFa6E@DF4TE7V8kJkttMvnoSVGnRFFRt6WYGxxiC2w1XyPQnHe", 
+        "gateway": "DF4TE7V8kJkttMvnoSVGnRFFRt6WYGxxiC2w1XyPQnHe"
+      }, 
+      { 
+        "id": "shipyard-telegram-37", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "Cy2wuwKpWZ3iWzKU3ZWL1qqcVfJ5Cq85dU7UHVWwv2gc.9AhC9b2zVcLnXLGriMdxjpsWJpq6iAdCavDi63udbL89@678qVUJ21uwxZBhp3r56z7GRf6gMh3NYDHruTegPtgMf", 
+        "gateway": "678qVUJ21uwxZBhp3r56z7GRf6gMh3NYDHruTegPtgMf"
+      }, 
+      { 
+        "id": "shipyard-telegram-38", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "GgUeUWW1NRSuquZYeZf3WkppE92EQUHJrFjNZtYU1jow.CSEjwrRi4f4uyw7N6L2LPKw2tB8spcMbFu99wHZzFZSj@77TSuVU8d1oXKbPzjec2xh4i3Wj5WwUyy9Lr36sm8gZm", 
+        "gateway": "77TSuVU8d1oXKbPzjec2xh4i3Wj5WwUyy9Lr36sm8gZm"
+      },
+      { 
+        "id": "shipyard-telegram-39", 
+        "description": "Nym Telegram Service Provider", 
+        "address": "kz4zWwSkYiQxqxXFPNcGUByTPQWXascD9RfYsmSxY7n.ajp3SjbBVBjrU9nXpSQXAXzbb6EHJJyhbY6cc1ajayx@BTZNB3bkkEePsT14GN8ofVtM1SJae4YLWjpBerrKYf", 
+        "gateway": "HyS2UZtZX3kQXdazbdE99DhCjBXjbG61LC9QsmXwbxrU"
+      }
+    ]
+  },
+  {
+    "id": "blockstream",
+    "description": "Blockstream Green",
+    "items": [
+      {
+        "id": "nym-blockstream",
+        "description": "Nym Blockstream Green Service Provider",
+        "address": "GiRjFWrMxt58pEMuusm4yT3RxoMD1MMPrR9M2N4VWRJP.3CNZBPq4vg7v7qozjGjdPMXcvDmkbWPCgbGCjQVw9n6Z@2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW",
+        "gateway": "2xU4CBE6QiiYt6EyBXSALwxkNvM7gqJfjHXaMkjiFmYW"
+      }
+    ]
+  }
+]`);
+export const Loaded = () => (
+  <Box width={width}>
+    <ServiceSelector services={services} />
+  </Box>
+);
+
+export const ServiceAlreadySelected = () => (
+  <Box width={width}>
+    <ServiceSelector
+      services={services}
+      currentSp={services[2].items[2]}
+      onChange={(serviceProvider) => console.log('New service provider selected: ', serviceProvider)}
+    />
+  </Box>
+);
diff --git a/nym-connect/src/components/ServiceSelector.tsx b/nym-connect/src/components/ServiceSelector.tsx
new file mode 100644
index 0000000000..895188cd23
--- /dev/null
+++ b/nym-connect/src/components/ServiceSelector.tsx
@@ -0,0 +1,179 @@
+import React, { useEffect } from 'react';
+import {
+  Box,
+  CircularProgress,
+  Divider,
+  FormControl,
+  InputLabel,
+  MenuItem,
+  Select,
+  Stack,
+  Typography,
+} from '@mui/material';
+import { Service, ServiceProvider, Services } from '../types/directory';
+import { useTauriEvents } from '../utils';
+import { ServiceProviderPopup } from './ServiceProviderPopup';
+
+export const ServiceSelector: React.FC<{
+  onChange?: (serviceProvider?: ServiceProvider) => void;
+  services?: Services;
+  currentSp?: ServiceProvider;
+}> = ({ services, currentSp, onChange }) => {
+  const [service, setService] = React.useState<Service | undefined>();
+  const [serviceProvider, setServiceProvider] = React.useState<ServiceProvider | undefined>(currentSp);
+  const [isPopupVisible, setPopupVisible] = React.useState(false);
+
+  const getService = () => {
+    if (!services || !currentSp) {
+      return undefined;
+    }
+    return services.find((s) =>
+      s.items.some(
+        ({ id, address, gateway }) =>
+          id === currentSp.id && address === currentSp.address && gateway === currentSp.gateway,
+      ),
+    );
+  };
+
+  useEffect(() => {
+    if (!service && currentSp) {
+      setServiceProvider(currentSp);
+      setService(getService());
+    }
+  }, [currentSp, services]);
+
+  /**
+   * Gets a random service provider from the currently selected service.
+   *
+   * If there is no service selected, or it does not have items, `undefined` is returned.
+   */
+  const getRandomServiceProviderForService = (serviceToUse?: Service): ServiceProvider | undefined => {
+    if (!serviceToUse?.items.length) {
+      return undefined;
+    }
+    return serviceToUse.items[Math.floor(Math.random() * serviceToUse.items.length)];
+  };
+
+  const handleServiceSelected = React.useCallback(
+    (newService?: Service) => {
+      console.log(newService?.id, service?.id);
+      // if the user has chosen a new service, then pick a random service provider
+      if (newService?.id !== service?.id) {
+        const newServiceProvider = getRandomServiceProviderForService(newService);
+        setServiceProvider(newServiceProvider);
+        onChange?.(newServiceProvider);
+        setService(newService);
+      }
+    },
+    [service],
+  );
+
+  // clears the display and fire on change (to trigger upstream storage clearance)
+  const clearServiceProviderAndFireOnChange = () => {
+    setService(undefined);
+    setServiceProvider(undefined);
+    onChange?.(undefined);
+  };
+
+  // when the user clears local storage, reset the selector
+  useTauriEvents('help://clear-storage', () => {
+    clearServiceProviderAndFireOnChange();
+  });
+
+  const handleAdvancedSpChange = (newServiceProvider?: ServiceProvider, newService?: Service) => {
+    setPopupVisible(false);
+    setService(newService);
+    setServiceProvider(newServiceProvider);
+    onChange?.(newServiceProvider);
+  };
+
+  const handleNewService = (newServiceId?: string) => {
+    const newService = (services || []).find((s) => s.id === newServiceId);
+    setService(newService);
+  };
+
+  if (!services) {
+    return (
+      <Box display="flex" alignItems="center" justifyContent="center" sx={{ my: 3 }}>
+        <Typography fontSize={14} fontWeight={700} color={(theme) => theme.palette.common.white}>
+          <CircularProgress size={14} sx={{ mr: 1 }} color="inherit" />
+          Loading services...
+        </Typography>
+      </Box>
+    );
+  }
+
+  return (
+    <Box display="flex" alignItems="center" justifyContent="space-between" sx={{ my: 3 }}>
+      <FormControl fullWidth>
+        <InputLabel
+          id="service-label"
+          sx={{
+            color: 'grey.500',
+            '&.MuiInputLabel-shrink': {
+              marginTop: '16px',
+              marginLeft: '-2px',
+            },
+            '&.Mui-focused': {
+              color: 'grey.500',
+            },
+          }}
+        >
+          Select a service
+        </InputLabel>
+        <Select
+          labelId="service-label"
+          id="service-id"
+          variant="filled"
+          value={service?.id || ''}
+          onChange={(event) => handleNewService(event.target.value)}
+          fullWidth
+          MenuProps={{
+            PaperProps: {
+              sx: {
+                background: '#383C41',
+                borderTopLeftRadius: 0,
+                borderTopRightRadius: 0,
+                '&& .Mui-selected': {
+                  backgroundColor: '#FFFFFF33',
+                },
+                '&& .Mui-focusVisible': {
+                  backgroundColor: '#FFFFFF33',
+                },
+              },
+            },
+          }}
+        >
+          {serviceProvider && (
+            <Box px={2} pb={1} sx={{ opacity: 0.5 }}>
+              <Stack direction="column" fontSize="small">
+                <Typography fontSize="inherit">{serviceProvider.description}</Typography>
+                <Typography fontSize="inherit">
+                  <code>{serviceProvider.id}</code>
+                </Typography>
+              </Stack>
+            </Box>
+          )}
+          {serviceProvider && <Divider />}
+          {services.map((item) => (
+            <MenuItem key={item.id} value={item.id} onClick={() => handleServiceSelected(item)}>
+              <Typography>{item.description}</Typography>
+            </MenuItem>
+          ))}
+          <Divider />
+          <Typography ml={2} variant="overline" display="block" sx={{ opacity: 0.5 }}>
+            Advanced
+          </Typography>
+          <MenuItem onClick={() => setPopupVisible(true)}>Choose service provider</MenuItem>
+          <MenuItem onClick={clearServiceProviderAndFireOnChange}>Clear settings</MenuItem>
+        </Select>
+      </FormControl>
+      <ServiceProviderPopup
+        open={isPopupVisible}
+        services={services}
+        onBackdropClick={() => setPopupVisible(false)}
+        onServiceProviderChanged={handleAdvancedSpChange}
+      />
+    </Box>
+  );
+};
diff --git a/nym-connect/src/context/main.tsx b/nym-connect/src/context/main.tsx
index 5d2b049bf9..17b627c823 100644
--- a/nym-connect/src/context/main.tsx
+++ b/nym-connect/src/context/main.tsx
@@ -4,11 +4,12 @@ import { invoke } from '@tauri-apps/api';
 import type { UnlistenFn } from '@tauri-apps/api/event';
 import { listen } from '@tauri-apps/api/event';
 import { forage } from '@tauri-apps/tauri-forage';
+import { Error } from 'src/types/error';
+import { TauriEvent } from 'src/types/event';
+import { getVersion } from '@tauri-apps/api/app';
 import { ConnectionStatusKind } from '../types';
 import { ConnectionStatsItem } from '../components/ConnectionStats';
 import { ServiceProvider, Services } from '../types/directory';
-import { Error } from 'src/types/error';
-import { TauriEvent } from 'src/types/event';
 
 const TAURI_EVENT_STATUS_CHANGED = 'app:connection-status-changed';
 
@@ -16,6 +17,7 @@ type ModeType = 'light' | 'dark';
 
 export type TClientContext = {
   mode: ModeType;
+  appVersion?: string;
   connectionStatus: ConnectionStatusKind;
   connectionStats?: ConnectionStatsItem[];
   connectedSince?: DateTime;
@@ -30,7 +32,7 @@ export type TClientContext = {
   setConnectionStatus: (connectionStatus: ConnectionStatusKind) => void;
   setConnectionStats: (connectionStats: ConnectionStatsItem[] | undefined) => void;
   setConnectedSince: (connectedSince: DateTime | undefined) => void;
-  setServiceProvider: (serviceProvider: ServiceProvider) => void;
+  setServiceProvider: (serviceProvider?: ServiceProvider) => void;
 
   startConnecting: () => Promise<void>;
   startDisconnecting: () => Promise<void>;
@@ -47,11 +49,26 @@ export const ClientContextProvider = ({ children }: { children: React.ReactNode
   const [serviceProvider, setRawServiceProvider] = React.useState<ServiceProvider>();
   const [showHelp, setShowHelp] = useState(false);
   const [error, setError] = useState<Error>();
+  const [appVersion, setAppVersion] = useState<string>();
+
+  const getAppVersion = async () => {
+    const version = await getVersion();
+    setAppVersion(version);
+  };
 
   useEffect(() => {
     invoke('get_services').then((result) => {
       setServices(result as Services);
     });
+    getAppVersion();
+  }, []);
+
+  useEffect(() => {
+    // when mounting, load the connection state (needed for the Growth window, that checks the connection state)
+    (async () => {
+      const currentStatus: ConnectionStatusKind = await invoke('get_connection_status');
+      setConnectionStatus(currentStatus);
+    })();
   }, []);
 
   useEffect(() => {
@@ -103,10 +120,12 @@ export const ClientContextProvider = ({ children }: { children: React.ReactNode
     } as any)();
   };
 
-  const setServiceProvider = useCallback(async (newServiceProvider: ServiceProvider) => {
-    await invoke('set_gateway', { gateway: newServiceProvider.gateway });
-    await invoke('set_service_provider', { serviceProvider: newServiceProvider.address });
-    await setSpInStorage(newServiceProvider);
+  const setServiceProvider = useCallback(async (newServiceProvider?: ServiceProvider) => {
+    await invoke('set_gateway', { gateway: newServiceProvider?.gateway });
+    await invoke('set_service_provider', { serviceProvider: newServiceProvider?.address });
+    if (newServiceProvider) {
+      await setSpInStorage(newServiceProvider);
+    }
     setRawServiceProvider(newServiceProvider);
   }, []);
 
@@ -149,6 +168,7 @@ export const ClientContextProvider = ({ children }: { children: React.ReactNode
   const contextValue = useMemo(
     () => ({
       mode,
+      appVersion,
       setMode,
       error,
       clearError,
@@ -167,7 +187,9 @@ export const ClientContextProvider = ({ children }: { children: React.ReactNode
       handleShowHelp,
     }),
     [
+      appVersion,
       mode,
+      appVersion,
       error,
       connectedSince,
       showHelp,
diff --git a/nym-connect/src/context/mocks/main.tsx b/nym-connect/src/context/mocks/main.tsx
index e2974413eb..9b09b6dc71 100644
--- a/nym-connect/src/context/mocks/main.tsx
+++ b/nym-connect/src/context/mocks/main.tsx
@@ -3,6 +3,7 @@ import { ConnectionStatusKind } from 'src/types';
 import { ClientContext, TClientContext } from '../main';
 
 const mockValues: TClientContext = {
+  appVersion: 'v1.x.x',
   mode: 'dark',
   connectionStatus: ConnectionStatusKind.disconnected,
   services: [],
@@ -19,6 +20,9 @@ const mockValues: TClientContext = {
   startDisconnecting: async () => {},
 };
 
-export const MockProvider = ({ children }: { children: React.ReactNode }) => {
-  return <ClientContext.Provider value={mockValues}>{children}</ClientContext.Provider>;
-};
+export const MockProvider: React.FC<{
+  children?: React.ReactNode;
+  connectionStatus?: ConnectionStatusKind;
+}> = ({ connectionStatus = ConnectionStatusKind.disconnected, children }) => (
+  <ClientContext.Provider value={{ ...mockValues, connectionStatus }}>{children}</ClientContext.Provider>
+);
diff --git a/nym-connect/src/growth.tsx b/nym-connect/src/growth.tsx
new file mode 100644
index 0000000000..d90a8bb462
--- /dev/null
+++ b/nym-connect/src/growth.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { ErrorBoundary } from 'react-error-boundary';
+import { ClientContextProvider } from './context/main';
+import { ErrorFallback } from './components/Error';
+import { NymShipyardTheme } from './theme';
+import { TestAndEarnPopup } from './components/Growth/TestAndEarnPopup';
+import { TestAndEarnContextProvider } from './components/Growth/context/TestAndEarnContext';
+
+const root = document.getElementById('root-growth');
+
+ReactDOM.render(
+  <ErrorBoundary FallbackComponent={ErrorFallback}>
+    <ClientContextProvider>
+      <TestAndEarnContextProvider>
+        <NymShipyardTheme mode="dark">
+          <TestAndEarnPopup />
+        </NymShipyardTheme>
+      </TestAndEarnContextProvider>
+    </ClientContextProvider>
+  </ErrorBoundary>,
+  root,
+);
diff --git a/nym-connect/src/index.tsx b/nym-connect/src/index.tsx
index 66a3e11d17..bd41e06822 100644
--- a/nym-connect/src/index.tsx
+++ b/nym-connect/src/index.tsx
@@ -6,17 +6,20 @@ import { ErrorFallback } from './components/Error';
 import { NymMixnetTheme } from './theme';
 import { App } from './App';
 import { AppWindowFrame } from './components/AppWindowFrame';
+import { TestAndEarnContextProvider } from './components/Growth/context/TestAndEarnContext';
 
 const root = document.getElementById('root');
 
 ReactDOM.render(
   <ErrorBoundary FallbackComponent={ErrorFallback}>
     <ClientContextProvider>
-      <NymMixnetTheme mode="dark">
-        <AppWindowFrame>
-          <App />
-        </AppWindowFrame>
-      </NymMixnetTheme>
+      <TestAndEarnContextProvider>
+        <NymMixnetTheme mode="dark">
+          <AppWindowFrame>
+            <App />
+          </AppWindowFrame>
+        </NymMixnetTheme>
+      </TestAndEarnContextProvider>
     </ClientContextProvider>
   </ErrorBoundary>,
   root,
diff --git a/nym-connect/src/layouts/ConnectedLayout.tsx b/nym-connect/src/layouts/ConnectedLayout.tsx
index 8e34415b39..0bf61fd4c0 100644
--- a/nym-connect/src/layouts/ConnectedLayout.tsx
+++ b/nym-connect/src/layouts/ConnectedLayout.tsx
@@ -9,6 +9,7 @@ import { ConnectionStatsItem } from '../components/ConnectionStats';
 import { ConnectionButton } from '../components/ConnectionButton';
 import { IpAddressAndPort } from '../components/IpAddressAndPort';
 import { ServiceProvider } from '../types/directory';
+import { TestAndEarnButtonArea } from '../components/Growth/TestAndEarnButtonArea';
 
 export const ConnectedLayout: React.FC<{
   status: ConnectionStatusKind;
@@ -44,5 +45,6 @@ export const ConnectedLayout: React.FC<{
     {/* <ConnectionStats stats={stats} /> */}
     <ConnectionTimer connectedSince={connectedSince} />
     <ConnectionButton status={status} busy={busy} onClick={onConnectClick} isError={isError} />
+    <TestAndEarnButtonArea />
   </>
 );
diff --git a/nym-connect/src/layouts/DefaultLayout.tsx b/nym-connect/src/layouts/DefaultLayout.tsx
index ed42aad5fe..5c414a5bc1 100644
--- a/nym-connect/src/layouts/DefaultLayout.tsx
+++ b/nym-connect/src/layouts/DefaultLayout.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
-import { Typography } from '@mui/material';
-import { Box } from '@mui/material';
+import { Box, Typography } from '@mui/material';
 import { ConnectionStatus } from 'src/components/ConnectionStatus';
 import { ConnectionTimer } from 'src/components/ConntectionTimer';
 import { InfoModal } from 'src/components/InfoModal';
 import { Error } from 'src/types/error';
 import { ConnectionButton } from '../components/ConnectionButton';
-import { ServiceProviderSelector } from '../components/ServiceProviderSelector';
+import { ServiceSelector } from '../components/ServiceSelector';
 import { useClientContext } from '../context/main';
 import { ConnectionStatusKind } from '../types';
-import { ServiceProvider, Services } from '../types/directory';
+import { Services } from '../types/directory';
+import { TestAndEarnButtonArea } from '../components/Growth/TestAndEarnButtonArea';
+import { AppVersion } from '../components/AppVersion';
 
 export const DefaultLayout: React.FC<{
   error?: Error;
@@ -19,30 +20,32 @@ export const DefaultLayout: React.FC<{
   isError?: boolean;
   clearError: () => void;
   onConnectClick?: (status: ConnectionStatusKind) => void;
-  onServiceProviderChange?: (serviceProvider: ServiceProvider) => void;
-}> = ({ status, error, services, busy, isError, onConnectClick, onServiceProviderChange, clearError }) => {
-  const handleServiceProviderChange = (newServiceProvider: ServiceProvider) => {
-    onServiceProviderChange?.(newServiceProvider);
-  };
-
-  const { serviceProvider: currentSp } = useClientContext();
+}> = ({ status, error, services, busy, isError, onConnectClick, clearError }) => {
+  const context = useClientContext();
 
   return (
     <Box pt={1}>
       {error && <InfoModal show title={error.title} description={error.message} onClose={clearError} />}
       <ConnectionStatus status={ConnectionStatusKind.disconnected} />
-      <Typography fontWeight="400" fontSize="16px" textAlign="center" pt={2}>
-        Connect to the Nym <br /> mixnet for privacy.
-      </Typography>
-      <ServiceProviderSelector services={services} onChange={handleServiceProviderChange} currentSp={currentSp} />
+      <Box px={2}>
+        <Typography fontWeight="400" fontSize="16px" textAlign="center" pt={2}>
+          Connect to the Nym <br /> mixnet for privacy.
+        </Typography>
+        <Typography textAlign="center" fontSize="small" sx={{ color: 'grey.500' }}>
+          This is experimental software. Do not rely on it for strong anonymity (yet).
+        </Typography>
+      </Box>
+      <ServiceSelector services={services} onChange={context.setServiceProvider} currentSp={context.serviceProvider} />
       <ConnectionTimer />
       <ConnectionButton
         status={status}
-        disabled={currentSp === undefined}
+        disabled={context.serviceProvider === undefined}
         busy={busy}
         isError={isError}
         onClick={onConnectClick}
       />
+      <TestAndEarnButtonArea />
+      <AppVersion />
     </Box>
   );
 };
diff --git a/nym-connect/src/log.tsx b/nym-connect/src/log.tsx
new file mode 100644
index 0000000000..cd17271368
--- /dev/null
+++ b/nym-connect/src/log.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { ErrorBoundary } from 'react-error-boundary';
+import { LogViewer } from './components/LogViewer';
+import { ErrorFallback } from './components/ErrorFallback';
+import { NymMixnetTheme } from './theme';
+
+const Log = () => (
+  <ErrorBoundary FallbackComponent={ErrorFallback}>
+    <NymMixnetTheme mode="dark">
+      <LogViewer />
+    </NymMixnetTheme>
+  </ErrorBoundary>
+);
+
+const root = document.getElementById('root-log');
+
+ReactDOM.render(<Log />, root);
diff --git a/nym-connect/src/stories/AppFlow.stories.tsx b/nym-connect/src/stories/AppFlow.stories.tsx
index 34064e6202..7055288f63 100644
--- a/nym-connect/src/stories/AppFlow.stories.tsx
+++ b/nym-connect/src/stories/AppFlow.stories.tsx
@@ -8,12 +8,16 @@ import { ConnectionStatusKind } from '../types';
 import { DefaultLayout } from '../layouts/DefaultLayout';
 import { ConnectedLayout } from '../layouts/ConnectedLayout';
 import { Services } from '../types/directory';
+import { TestAndEarnButtonArea } from '../components/Growth/TestAndEarnButtonArea';
 
 export default {
   title: 'App/Flow',
   component: AppWindowFrame,
 } as ComponentMeta<typeof AppWindowFrame>;
 
+const width = 240;
+const height = 575;
+
 export const Mock: ComponentStory<typeof AppWindowFrame> = () => {
   const context = useClientContext();
   const [busy, setBusy] = React.useState<boolean>();
@@ -67,45 +71,47 @@ export const Mock: ComponentStory<typeof AppWindowFrame> = () => {
     context.connectionStatus === ConnectionStatusKind.connecting
   ) {
     return (
-      <AppWindowFrame>
-        <DefaultLayout
-          status={context.connectionStatus}
-          busy={busy}
-          onConnectClick={handleConnectClick}
-          services={services}
-          clearError={() => {}}
-        />
-      </AppWindowFrame>
+      <Box width={width} height={height}>
+        <AppWindowFrame>
+          <DefaultLayout
+            status={context.connectionStatus}
+            busy={busy}
+            onConnectClick={handleConnectClick}
+            services={services}
+            clearError={() => {}}
+          />
+        </AppWindowFrame>
+      </Box>
     );
   }
 
   return (
-    <AppWindowFrame>
-      <ConnectedLayout
-        showInfoModal={false}
-        handleCloseInfoModal={() => {
-          return undefined;
-        }}
-        status={context.connectionStatus}
-        busy={busy}
-        onConnectClick={handleConnectClick}
-        ipAddress="127.0.0.1"
-        port={1080}
-        connectedSince={context.connectedSince}
-        serviceProvider={services[0].items[0]}
-        stats={[
-          {
-            label: 'in:',
-            totalBytes: 1024,
-            rateBytesPerSecond: 1024 * 1024 * 1024 + 10,
-          },
-          {
-            label: 'out:',
-            totalBytes: 1024 * 1024 * 1024 * 1024 * 20,
-            rateBytesPerSecond: 1024 * 1024 + 10,
-          },
-        ]}
-      />
-    </AppWindowFrame>
+    <Box width={width} height={height}>
+      <AppWindowFrame>
+        <ConnectedLayout
+          showInfoModal={false}
+          handleCloseInfoModal={() => undefined}
+          status={context.connectionStatus}
+          busy={busy}
+          onConnectClick={handleConnectClick}
+          ipAddress="127.0.0.1"
+          port={1080}
+          connectedSince={context.connectedSince}
+          serviceProvider={services[0].items[0]}
+          stats={[
+            {
+              label: 'in:',
+              totalBytes: 1024,
+              rateBytesPerSecond: 1024 * 1024 * 1024 + 10,
+            },
+            {
+              label: 'out:',
+              totalBytes: 1024 * 1024 * 1024 * 1024 * 20,
+              rateBytesPerSecond: 1024 * 1024 + 10,
+            },
+          ]}
+        />
+      </AppWindowFrame>
+    </Box>
   );
 };
diff --git a/nym-connect/src/theme/index.tsx b/nym-connect/src/theme/index.tsx
index 075aa7920a..08f5c62924 100644
--- a/nym-connect/src/theme/index.tsx
+++ b/nym-connect/src/theme/index.tsx
@@ -1,8 +1,7 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { CssBaseline } from '@mui/material';
 import { getDesignTokens } from './theme';
-import { ClientContext } from '../context/main';
 import '../../../assets/fonts/non-variable/fonts.css';
 
 /**
@@ -17,3 +16,13 @@ export const NymMixnetTheme: React.FC<{ mode: 'light' | 'dark' }> = ({ children,
     </ThemeProvider>
   );
 };
+
+export const NymShipyardTheme: React.FC<{ mode?: 'light' | 'dark' }> = ({ children, mode = 'dark' }) => {
+  const theme = React.useMemo(() => createTheme(getDesignTokens(mode, true)), [mode]);
+  return (
+    <ThemeProvider theme={theme}>
+      <CssBaseline />
+      {children}
+    </ThemeProvider>
+  );
+};
diff --git a/nym-connect/src/theme/mui-theme.d.ts b/nym-connect/src/theme/mui-theme.d.ts
index ef042f6305..6c4d88fe39 100644
--- a/nym-connect/src/theme/mui-theme.d.ts
+++ b/nym-connect/src/theme/mui-theme.d.ts
@@ -38,6 +38,7 @@ declare module '@mui/material/styles' {
       light: string;
       dark: string;
     };
+    shipyard: string;
   }
 
   interface NymPaletteVariant {
@@ -52,6 +53,9 @@ declare module '@mui/material/styles' {
     topNav: {
       background: string;
     };
+    shipyard: {
+      main: string;
+    };
   }
 
   /**
diff --git a/nym-connect/src/theme/theme.tsx b/nym-connect/src/theme/theme.tsx
index 5b70f5118b..a580ae0b4e 100644
--- a/nym-connect/src/theme/theme.tsx
+++ b/nym-connect/src/theme/theme.tsx
@@ -30,6 +30,7 @@ const nymPalette: NymPalette = {
     light: '#F2F2F2',
     dark: '#1D2125',
   },
+  shipyard: '#817FFA',
 };
 
 const darkMode: NymPaletteVariant = {
@@ -44,6 +45,9 @@ const darkMode: NymPaletteVariant = {
   topNav: {
     background: '#111826',
   },
+  shipyard: {
+    main: '#817FFA',
+  },
 };
 
 const lightMode: NymPaletteVariant = {
@@ -58,6 +62,9 @@ const lightMode: NymPaletteVariant = {
   topNav: {
     background: '#111826',
   },
+  shipyard: {
+    main: '#817FFA',
+  },
 };
 
 /**
@@ -103,6 +110,35 @@ const variantToMUIPalette = (variant: NymPaletteVariant): PaletteOptions => ({
   },
 });
 
+/**
+ * Map a Nym palette variant onto the MUI palette for Shipyard
+ */
+const variantShipyardToMUIPalette = (variant: NymPaletteVariant): PaletteOptions => ({
+  text: {
+    primary: variant.text.main,
+  },
+  primary: {
+    main: nymPalette.shipyard,
+    contrastText: '#fff',
+  },
+  secondary: {
+    main: variant.mode === 'dark' ? nymPalette.background.light : nymPalette.background.dark,
+  },
+  success: {
+    main: nymPalette.success,
+  },
+  info: {
+    main: nymPalette.info,
+  },
+  warning: {
+    main: nymPalette.warning,
+  },
+  background: {
+    default: variant.background.main,
+    paper: variant.background.paper,
+  },
+});
+
 /**
  * Returns the Network Explorer palette for light mode.
  */
@@ -125,6 +161,17 @@ const createDarkModePalette = (): PaletteOptions => ({
   ...variantToMUIPalette(darkMode),
 });
 
+/**
+ * Returns the Shipyard palette for dark mode.
+ */
+const createShipyardDarkModePalette = (): PaletteOptions => ({
+  nym: {
+    ...nymPalette,
+    ...nymMixnetPalette(darkMode),
+  },
+  ...variantShipyardToMUIPalette(darkMode),
+});
+
 /**
  * IMPORANT: if you need to get the default MUI theme, use the following
  *
@@ -157,12 +204,19 @@ const createDarkModePalette = (): PaletteOptions => ({
  *
  * @param mode     The theme mode: 'light' or 'dark'
  */
-export const getDesignTokens = (mode: PaletteMode): ThemeOptions => {
-  // first, create the palette from user's choice of light or dark mode
+export const getDesignTokens = (mode: PaletteMode, isShipyard: boolean = false): ThemeOptions => {
+  let overrides;
+  if (isShipyard) {
+    overrides = createShipyardDarkModePalette();
+  } else {
+    overrides = mode === 'light' ? createLightModePalette() : createDarkModePalette();
+  }
+
+  // create the palette from user's choice of light or dark mode
   const { palette } = createTheme({
     palette: {
       mode,
-      ...(mode === 'light' ? createLightModePalette() : createDarkModePalette()),
+      ...overrides,
     },
   });
 
diff --git a/nym-connect/src/typings/webp.d.ts b/nym-connect/src/typings/webp.d.ts
new file mode 100644
index 0000000000..d594a17f53
--- /dev/null
+++ b/nym-connect/src/typings/webp.d.ts
@@ -0,0 +1,4 @@
+declare module '*.webp' {
+  const value: any;
+  export default value;
+}
diff --git a/nym-connect/src/typings/yaml.d.ts b/nym-connect/src/typings/yaml.d.ts
new file mode 100644
index 0000000000..4c36d21ec0
--- /dev/null
+++ b/nym-connect/src/typings/yaml.d.ts
@@ -0,0 +1,9 @@
+declare module '*.yml' {
+  const content: { [key: string]: any };
+  export default content;
+}
+
+declare module '*.yaml' {
+  const content: { [key: string]: any };
+  export default content;
+}
diff --git a/nym-connect/src/utils/index.ts b/nym-connect/src/utils/index.ts
index 70b786d12e..9dc9fd09e3 100644
--- a/nym-connect/src/utils/index.ts
+++ b/nym-connect/src/utils/index.ts
@@ -1 +1,19 @@
-// TODO
+import { useEffect, useRef } from 'react';
+import { EventName, listen, UnlistenFn, EventCallback } from '@tauri-apps/api/event';
+
+export const useTauriEvents = <T>(event: EventName, handler: EventCallback<T>) => {
+  const unlisten = useRef<UnlistenFn>();
+
+  // list for events to clear local storage
+  useEffect(() => {
+    listen(event, handler).then((fn) => {
+      unlisten.current = fn;
+    });
+
+    return () => {
+      if (unlisten.current) {
+        unlisten.current();
+      }
+    };
+  }, []);
+};
diff --git a/nym-connect/webpack.common.js b/nym-connect/webpack.common.js
index 0e6b071aaa..38423b5e6b 100644
--- a/nym-connect/webpack.common.js
+++ b/nym-connect/webpack.common.js
@@ -2,6 +2,12 @@ const path = require('path');
 const { mergeWithRules } = require('webpack-merge');
 const { webpackCommon } = require('@nymproject/webpack');
 
+const entry = {
+  app: path.resolve(__dirname, 'src/index.tsx'),
+  growth: path.resolve(__dirname, 'src/growth.tsx'),
+  log: path.resolve(__dirname, 'src/log.tsx'),
+};
+
 module.exports = mergeWithRules({
   module: {
     rules: {
@@ -9,10 +15,45 @@ module.exports = mergeWithRules({
       use: 'replace',
     },
   },
-})(webpackCommon(__dirname, 'public/index.html'), {
-  entry: path.resolve(__dirname, 'src/index.tsx'),
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    publicPath: '/',
+})(
+  webpackCommon(__dirname, [
+    { filename: 'index.html', chunks: ['app'], template: path.resolve(__dirname, 'public/index.html') },
+    { filename: 'log.html', chunks: ['log'], template: path.resolve(__dirname, 'public/log.html') },
+    { filename: 'growth.html', chunks: ['growth'], template: path.resolve(__dirname, 'public/growth.html') },
+  ]),
+  {
+    module: {
+      rules: [
+        {
+          test: /\.mdx?$/,
+          use: [
+            {
+              loader: '@mdx-js/loader',
+              /** @type {import('@mdx-js/loader').Options} */
+              options: {},
+            },
+          ],
+        },
+        {
+          test: /\.ya?ml$/,
+          type: 'asset/resource',
+          use: [
+            {
+              loader: 'yaml-loader',
+              options: {
+                asJSON: true,
+              },
+            },
+          ],
+        },
+      ],
+    },
+    entry,
+    output: {
+      clean: true,
+      path: path.resolve(__dirname, 'dist'),
+      filename: '[name].bundle.js',
+      publicPath: '/',
+    },
   },
-});
+);
diff --git a/nym-connect/webpack.prod.js b/nym-connect/webpack.prod.js
index 40e7bc95d7..0e9061e25a 100644
--- a/nym-connect/webpack.prod.js
+++ b/nym-connect/webpack.prod.js
@@ -2,10 +2,16 @@ const path = require('path');
 const { default: merge } = require('webpack-merge');
 const common = require('./webpack.common');
 
+const entry = {
+  app: path.resolve(__dirname, 'src/index.tsx'),
+  growth: path.resolve(__dirname, 'src/growth.tsx'),
+  log: path.resolve(__dirname, 'src/log.tsx'),
+};
+
 module.exports = merge(common, {
   mode: 'production',
   node: {
     __dirname: false,
   },
-  entry: path.resolve(__dirname, './src/index'),
+  entry,
 });
diff --git a/nym-outfox/Cargo.toml b/nym-outfox/Cargo.toml
new file mode 100644
index 0000000000..48a05c842c
--- /dev/null
+++ b/nym-outfox/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "nym-outfox"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rayon = "1.5.1"
+blake3 = "1.3"
+zeroize = "1.5"
+chacha20 = "0.9.0"
+curve25519-dalek = "3.2"
+chacha20poly1305 = "0.10.1"
+# Need this star over here to pull in js into getrandom
+getrandom = { version = "*", features = ["js"] }
+thiserror = "1"
+
+[dev-dependencies]
+criterion = "0.4"
+fastrand = "1.8"
diff --git a/nym-outfox/src/error.rs b/nym-outfox/src/error.rs
new file mode 100644
index 0000000000..afbba2fc4b
--- /dev/null
+++ b/nym-outfox/src/error.rs
@@ -0,0 +1,20 @@
+use crate::lion::MIN_MESSAGE_LEN;
+use chacha20::cipher::InvalidLength;
+use thiserror::Error;
+
+#[derive(Debug, Error)]
+pub enum OutFoxError {
+    #[error("Lengths mismatch, expected: {expected}, got: {got}")]
+    LenMismatch { expected: usize, got: usize },
+    #[error("{source}")]
+    ChaCha20InvalidLength {
+        #[from]
+        source: InvalidLength,
+    },
+    #[error("ChaCha20Poly1305 - Opaque error")]
+    ChaCha20Poly1305Error,
+    #[error("Key length must be 32 bytes")]
+    InvalidKeyLength,
+    #[error("Message length must be greater then {MIN_MESSAGE_LEN} bytes")]
+    InvalidMessageLength,
+}
diff --git a/nym-outfox/src/format.rs b/nym-outfox/src/format.rs
new file mode 100644
index 0000000000..2ddf895e1f
--- /dev/null
+++ b/nym-outfox/src/format.rs
@@ -0,0 +1,267 @@
+//! # The `outfox` format
+//!
+//! We define a simple mix packet format geared towards simplicity and performance with the features that are
+//! specifically required by a stratified mix topology.
+//!
+//! `Outfox` assumes that all
+//! paths are the same length (no need to hide path lengths), mixes are arranged in layers and therefore
+//! know their position in a message path (no need to hide this position). These assumptions allow us
+//! to do away with some of the padding traditionally used; further we prioritize efficient computation
+//! over very low-bandwidth, as it seems the rate of public key operations is a bottleneck for mixes
+//! rather than the availablility of bandwidth.
+//!
+//! ## Overview and Parameters
+//!
+//! In a mix network with a stratified topology packets are mixed by nodes at each of the layers. Each layer
+//! 'strips' the packet from one layer of encryption, recovers the address of the mix at the next layer, and
+//! passes the decoded packet to them. An identifier per processed message is stored and checked to prevent
+//! replays of processed messages at each layer. Additional measures, such as adding delays, adding dummy
+//! traffic or dropping messages can be empued at each mix to frustrate traffic analysis.
+//!
+//!
+//! A layer of mix processing is defined by three parameters, includes in the structure [MixStageParameters]:
+//! * The `routing_information_length_bytes` (`R`) states the number of bytes representing
+//!   routing information at this layer.
+//! * The `remaining_header_length_bytes` (`H`) represents the remaining bytes of the packet header.
+//! * The `payload_length_bytes` (`P`).
+//!
+//! In addition we define two system-wide constants, namely `GROUPELEMENTBYTES` (`GE`=32) and
+//! `TAGBYTES` (`T`=24).
+//!
+//! ## Packet format, decoding
+//!
+//! A mix at this layer takes in messages of length `GE+T+R+H+P`, and outputs messages of length `H+P`.
+//!
+//! An input message is processed as follows:
+//!
+//! * The input packet is parsed as a `[Pk, Tag, Header, Payload]` of length `[GE, T, R+H, P]` respectivelly.
+//! * A master key is derived by performing scalar multiplication with the mix secret 's', ie `K = s * Pk`.
+//!   The master key is stored and checked for duplicates (if it is found processing ends.)
+//! * The master key is used to perform AEAD decryption of the `Header` with an IV of zeros and the `tag`. If
+//!   decryption fails processing ends. Otherwise the Header is parsed as `[Routing, Next_Header]` of length
+//!   `[R, H]` respectivelly. The routing data `Routing` can be used by the mix to dertermine the next mix.
+//! * Finally, the master key is used to perform lion decoding of the `Payload` into `Next_Payload`.
+//! * The output packet for the next mix is `[Next_Header, Next_Payload]`.
+//!
+//! As an AEAD we use `chacha20poly1305_ietf` and for public key operations we use `curve25519`.
+//!
+//! ## Packet encoding
+//!
+//! Encoding is
+//! performed layer by layer starting with the last hop on the route, and ending with the first. At each stage
+//! of encoding a new Secret key `Sk` and corresponding `Pk` is chosen. The layer master key for the layer is
+//! derived using the mix public key. And the master key is used to AEAD encrypt the concatenation of the
+//! routing data for the layer, and the remaining Header; separately the master key is used to lion encrypt
+//! the payload. The process is repeated for each layer (from last to first) to construct the full message.
+
+use chacha20poly1305::AeadInPlace;
+use chacha20poly1305::ChaCha20Poly1305;
+use chacha20poly1305::KeyInit;
+
+use chacha20poly1305::Tag;
+use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE;
+use curve25519_dalek::montgomery::MontgomeryPoint;
+use curve25519_dalek::scalar::Scalar;
+
+use std::convert::TryInto;
+
+const GROUPELEMENTBYTES: usize = 32;
+const TAGBYTES: usize = 16;
+
+use std::ops::Range;
+
+use crate::error::OutFoxError;
+use crate::lion::*;
+
+/// A structure that holds mix packet construction parameters. These incluse the length
+/// of the routing information at each hop, the number of hops, and the payload length.
+pub struct MixCreationParameters {
+    /// The routing length is inner first, so \[0\] is the innermost routing length, etc (in bytes)
+    pub routing_information_length_by_stage: Vec<usize>,
+    /// The payload length (in bytes)
+    pub payload_length_bytes: usize,
+}
+
+impl MixCreationParameters {
+    /// Create a set of parameters for a mix packet format.
+    pub fn new(payload_length_bytes: usize) -> MixCreationParameters {
+        MixCreationParameters {
+            routing_information_length_by_stage: Vec::new(),
+            payload_length_bytes,
+        }
+    }
+
+    /// Add another outer layer containing some byte length of routing data.
+    pub fn add_outer_layer(&mut self, routing_information_length_bytes: usize) {
+        self.routing_information_length_by_stage
+            .push(routing_information_length_bytes);
+    }
+
+    /// The length of the buffer needed to build a packet.
+    pub fn total_packet_length(&self) -> usize {
+        let mut len = self.payload_length_bytes;
+        for stage_len in &self.routing_information_length_by_stage {
+            len += stage_len + GROUPELEMENTBYTES + TAGBYTES
+        }
+        len
+    }
+
+    /// Get the mix packet parameters for a single stage of mixing.
+    pub fn get_stage_params(&self, layer_number: usize) -> (Range<usize>, MixStageParameters) {
+        assert!(layer_number < self.routing_information_length_by_stage.len());
+
+        let mut remaining_header_length_bytes = 0;
+        for (i, stage_len) in self.routing_information_length_by_stage.iter().enumerate() {
+            if i == layer_number {
+                let params = MixStageParameters {
+                    routing_information_length_bytes: *stage_len,
+                    remaining_header_length_bytes,
+                    payload_length_bytes: self.payload_length_bytes,
+                };
+
+                let total_size = self.total_packet_length();
+                let inner_size = params.incoming_packet_length();
+
+                return (total_size - inner_size..total_size, params);
+            } else {
+                remaining_header_length_bytes += stage_len + GROUPELEMENTBYTES + TAGBYTES;
+            }
+        }
+
+        unreachable!();
+    }
+}
+
+/// A structure representing the parameters of a single stage of mixing.
+pub struct MixStageParameters {
+    /// The routing information length for this stage of mixing
+    pub routing_information_length_bytes: usize,
+    /// The reamining header length for this stage of mixing
+    pub remaining_header_length_bytes: usize,
+    /// The payload length
+    pub payload_length_bytes: usize,
+}
+
+impl MixStageParameters {
+    pub fn incoming_packet_length(&self) -> usize {
+        GROUPELEMENTBYTES + TAGBYTES + self.outgoing_packet_length()
+    }
+
+    pub fn outgoing_packet_length(&self) -> usize {
+        self.routing_information_length_bytes
+            + self.remaining_header_length_bytes
+            + self.payload_length_bytes
+    }
+
+    pub fn pub_element_range(&self) -> Range<usize> {
+        0..GROUPELEMENTBYTES
+    }
+
+    pub fn tag_range(&self) -> Range<usize> {
+        GROUPELEMENTBYTES..GROUPELEMENTBYTES + TAGBYTES
+    }
+
+    pub fn routing_data_range(&self) -> Range<usize> {
+        GROUPELEMENTBYTES + TAGBYTES
+            ..GROUPELEMENTBYTES + TAGBYTES + self.routing_information_length_bytes
+    }
+
+    pub fn header_range(&self) -> Range<usize> {
+        GROUPELEMENTBYTES + TAGBYTES
+            ..GROUPELEMENTBYTES
+                + TAGBYTES
+                + self.routing_information_length_bytes
+                + self.remaining_header_length_bytes
+    }
+
+    pub fn payload_range(&self) -> Range<usize> {
+        self.incoming_packet_length() - self.payload_length_bytes..self.incoming_packet_length()
+    }
+
+    pub fn encode_mix_layer(
+        &self,
+        buffer: &mut [u8],
+        user_secret_key: &Scalar,
+        mix_public_key: &MontgomeryPoint,
+        routing_data: &[u8],
+    ) -> Result<MontgomeryPoint, OutFoxError> {
+        if buffer.len() != self.incoming_packet_length() {
+            return Err(OutFoxError::LenMismatch {
+                expected: buffer.len(),
+                got: self.incoming_packet_length(),
+            });
+        }
+
+        if routing_data.len() != self.routing_information_length_bytes {
+            return Err(OutFoxError::LenMismatch {
+                expected: routing_data.len(),
+                got: self.routing_information_length_bytes,
+            });
+        }
+
+        let user_public_key = (&ED25519_BASEPOINT_TABLE * user_secret_key).to_montgomery();
+        let shared_key = user_secret_key * mix_public_key;
+
+        // Copy rounting data into buffer
+        buffer[self.routing_data_range()].copy_from_slice(routing_data);
+
+        // Perform the AEAD
+        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.0[..])?;
+        // TODO: Should this be all 0s?
+        let nonce = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let tag = header_aead_key
+            .encrypt_in_place_detached(&nonce.into(), &[], &mut buffer[self.header_range()])
+            .map_err(|_| OutFoxError::ChaCha20Poly1305Error)?;
+
+        // Copy Tag into buffer
+        buffer[self.tag_range()].copy_from_slice(&tag[..]);
+
+        // Copy own public key into buffer
+        buffer[self.pub_element_range()].copy_from_slice(&user_public_key.0[..]);
+
+        // Do a round of LION on the payload
+        lion_transform_encrypt(&mut buffer[self.payload_range()], &shared_key.0)?;
+
+        Ok(shared_key)
+    }
+
+    pub fn decode_mix_layer(
+        &self,
+        buffer: &mut [u8],
+        mix_secret_key: &Scalar,
+    ) -> Result<MontgomeryPoint, OutFoxError> {
+        // Check the length of the incoming buffer is correct.
+        if buffer.len() != self.incoming_packet_length() {
+            return Err(OutFoxError::LenMismatch {
+                expected: buffer.len(),
+                got: self.incoming_packet_length(),
+            });
+        }
+
+        // Derive the shared key for this packet
+        let user_public_key = MontgomeryPoint(buffer[self.pub_element_range()].try_into().unwrap());
+        let shared_key = mix_secret_key * user_public_key;
+
+        // Compute the AEAD and check the Tag, if wrong return Err
+        let header_aead_key = ChaCha20Poly1305::new_from_slice(&shared_key.0[..]).unwrap();
+        let nonce = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+
+        let tag_bytes = buffer[self.tag_range()].to_vec();
+        let tag = Tag::from_slice(&tag_bytes);
+
+        header_aead_key
+            .decrypt_in_place_detached(
+                &nonce.into(),
+                &[],
+                &mut buffer[self.header_range()],
+                tag.as_slice().try_into().unwrap(),
+            )
+            .map_err(|_| OutFoxError::ChaCha20Poly1305Error)?;
+
+        // Do a round of LION on the payload
+        lion_transform_decrypt(&mut buffer[self.payload_range()], &shared_key.0)?;
+
+        Ok(shared_key)
+    }
+}
diff --git a/nym-outfox/src/lib.rs b/nym-outfox/src/lib.rs
new file mode 100644
index 0000000000..fbfcc32078
--- /dev/null
+++ b/nym-outfox/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod error;
+pub mod format;
+pub mod lion;
diff --git a/nym-outfox/src/lion.rs b/nym-outfox/src/lion.rs
new file mode 100644
index 0000000000..e4ea5e2c55
--- /dev/null
+++ b/nym-outfox/src/lion.rs
@@ -0,0 +1,114 @@
+//! # The lion all-or-nothing transform
+//!
+//! The lion transform implements a keyed permutation (block cipher) with a
+//! variable length block size. It takes a key of 32 bytes, and a message of
+//! length >= 48 bytes.
+//!
+//! The cryptographic primitives used to implement the transform are a
+//! stream cipher `PRF1(IV, KEY)` (using `crypto_stream_xsalsa20`), a message authentication
+//! code `PRF2(MSG, KEY)` (using `HMAC-SHA-512-256`) and a key derivation function `KDF(KEY, ID)`
+//! (using `Blake2b`).
+//!
+//! The message to encode is split into two parts `M = [L0, R0]`, where L is 24 bytes, and
+//! R is the remaining of the message.
+//!
+//! Encoding then proceeds in 3 steps:
+//! * `R1 = PRF1(L0, KDF(key, subkey_0)) XOR R0;`
+//! * `L1 = PRF2(R1, KDF(key, subkey_1)) XOR L0;`
+//! * `R2 = PRF1(L1, KDF(key, subkey_2)) XOR R1;`
+//!
+//! The output of the transform is the concatenated byte string `M' = [L1, R2]` which has the same
+//! length as the original message.
+//!
+//! ## Manual key schedule.
+//!
+//! If you just want to encode / decode using lion as a wide-block block cipher simply use the
+//! [lion_transform_encrypt] and [lion_transform_decrypt] functions.
+//!
+//! If you know what you are doing you can determine your own key schedule for the transform. The
+//! key schedule for encypt and decrypt are [1, 2, 3] and [3, 2, 1] respectivelly. You may define
+//! a key schedule that is symmetric (such as [1, 2, 1]) to build a transform T(k,m) that has the
+//! property m = T(k, T(k, m)).
+
+use chacha20::cipher::{KeyIvInit, StreamCipher};
+use chacha20::Key;
+use chacha20::XChaCha20;
+use chacha20::XNonce;
+use zeroize::Zeroize;
+
+use crate::error::OutFoxError;
+
+pub const MIN_MESSAGE_LEN: usize = 24 * 2;
+const CONTEXT: &str = "LIONKEYS";
+const TAG_LEN: usize = 24;
+
+/// The lion transform encryption function.
+///
+/// The `key` must be 32 bytes, and the `message` >= 48. The message is
+/// mutated to the encrypted message.
+pub fn lion_transform_encrypt(message: &mut [u8], key: &[u8]) -> Result<(), OutFoxError> {
+    lion_transform(message, key, [1, 2, 3])
+}
+
+/// The lion transform decryption function.
+///
+/// The `key` must be 32 bytes, and the `message` >= 48. The message
+/// is mutated to the decrypted message.
+pub fn lion_transform_decrypt(message: &mut [u8], key: &[u8]) -> Result<(), OutFoxError> {
+    lion_transform(message, key, [3, 2, 1])
+}
+
+/// The core of the lion transform function, that takes a message and a key,
+/// and applies the all-or-nothing transform. The key schedule represents the
+/// values of the 3 subkeys used by the 3 phases of the transform.
+///
+/// The `key` must be 32 bytes, and the `message` >= 48.
+///
+/// Unless you know what you are doing use [lion_transform_encrypt] and
+/// [lion_transform_decrypt] instead.
+pub fn lion_transform(
+    message: &mut [u8],
+    key: &[u8],
+    key_schedule: [u64; 3],
+) -> Result<(), OutFoxError> {
+    if key.len() != 32 {
+        return Err(OutFoxError::InvalidKeyLength);
+    }
+
+    if message.len() < MIN_MESSAGE_LEN {
+        return Err(OutFoxError::InvalidMessageLength);
+    }
+
+    // Stage 1: Use stream cipher with Nonce from left size, to xor to the right side
+    let mut derived_key = blake3::derive_key(&format!("{}{}", CONTEXT, key_schedule[0]), key);
+    let lion_stage_1_key = Key::from_slice(&derived_key);
+    let left_short_message = XNonce::from_slice(&message[..TAG_LEN]);
+
+    let mut cipher = XChaCha20::new(lion_stage_1_key, left_short_message);
+    cipher.apply_keystream(&mut message[TAG_LEN..]);
+
+    // Stage 2: Use HMAC of right size, and xor to the left side
+    derived_key = blake3::derive_key(&format!("{}{}", CONTEXT, key_schedule[1]), key);
+
+    let mac = blake3::keyed_hash(&derived_key, &message[TAG_LEN..]);
+    let tag_to_xor = mac.as_bytes();
+
+    // Xor resulting HMAC into the left (short) message
+    for i in 0..TAG_LEN {
+        message[i] ^= tag_to_xor[i];
+    }
+
+    // Stage 3: (same as 1)
+    derived_key = blake3::derive_key(&format!("{}{}", CONTEXT, key_schedule[2]), key);
+    let lion_stage_3_key = Key::from_slice(&derived_key);
+    let left_short_message_final = XNonce::from_slice(&message[..TAG_LEN]);
+
+    let mut cipher = XChaCha20::new(lion_stage_3_key, left_short_message_final);
+
+    cipher.apply_keystream(&mut message[TAG_LEN..]);
+
+    // clean up temp key
+    derived_key.zeroize();
+
+    Ok(())
+}
diff --git a/nym-outfox/tests/unittests.rs b/nym-outfox/tests/unittests.rs
new file mode 100644
index 0000000000..ea5b46571d
--- /dev/null
+++ b/nym-outfox/tests/unittests.rs
@@ -0,0 +1,142 @@
+extern crate nym_outfox;
+
+#[cfg(test)]
+mod tests {
+
+    use curve25519_dalek::constants::ED25519_BASEPOINT_TABLE;
+    use curve25519_dalek::scalar::Scalar;
+    use std::convert::TryInto;
+
+    use nym_outfox::format::*;
+    use nym_outfox::lion::*;
+
+    use std::iter::repeat_with;
+
+    pub fn randombytes(n: usize) -> Vec<u8> {
+        repeat_with(|| fastrand::u8(..)).take(n).collect()
+    }
+
+    #[test]
+    fn test_encode_decode() {
+        let mix_params = MixStageParameters {
+            routing_information_length_bytes: 32,
+            remaining_header_length_bytes: (32 + 16 + 32) * 4,
+            payload_length_bytes: 1024, // 1kb
+        };
+
+        let user_secret_bytes = randombytes(32);
+        let mix_secret_bytes = randombytes(32);
+
+        let user_secret = Scalar::from_bytes_mod_order(user_secret_bytes.try_into().unwrap());
+        let mix_secret = Scalar::from_bytes_mod_order(mix_secret_bytes.try_into().unwrap());
+        let mix_public_key = (&ED25519_BASEPOINT_TABLE * &mix_secret).to_montgomery();
+
+        let routing = [0; 32];
+
+        let buffer = randombytes(mix_params.incoming_packet_length());
+
+        let mut new_buffer = buffer.clone();
+
+        let _ = mix_params
+            .encode_mix_layer(
+                &mut new_buffer[..],
+                &user_secret,
+                &mix_public_key,
+                &routing[..],
+            )
+            .unwrap();
+
+        assert!(&new_buffer[mix_params.payload_range()] != &buffer[mix_params.payload_range()]);
+        assert!(&new_buffer[mix_params.routing_data_range()] != &routing[..]);
+
+        let _ = mix_params
+            .decode_mix_layer(&mut new_buffer[..], &mix_secret)
+            .unwrap();
+
+        assert!(&new_buffer[mix_params.payload_range()] == &buffer[mix_params.payload_range()]);
+        assert!(&new_buffer[mix_params.routing_data_range()] == &routing[..]);
+    }
+
+    #[test]
+    fn test_lion() {
+        let key = randombytes(32);
+        let message = randombytes(1024);
+
+        let mut message_clone = message.clone();
+        lion_transform(&mut message_clone[..], &key, [1, 2, 3]).unwrap();
+        assert!(&message_clone[..] != &message[..]);
+
+        let mut message_clone_2 = message.clone();
+        lion_transform_encrypt(&mut message_clone_2, &key).unwrap();
+        assert_eq!(message_clone_2, message_clone);
+
+        lion_transform(&mut message_clone[..], &key[..], [3, 2, 1]).unwrap();
+        assert!(&message_clone[..] == &message[..]);
+    }
+
+    #[test]
+    fn test_packet_params() {
+        // Dummy keys -- we will use the same key for each layer
+        let user_secret_bytes = randombytes(32);
+        let mix_secret_bytes = randombytes(32);
+
+        let user_secret = Scalar::from_bytes_mod_order(user_secret_bytes.try_into().unwrap());
+        let mix_secret = Scalar::from_bytes_mod_order(mix_secret_bytes.try_into().unwrap());
+        let mix_public_key = (&ED25519_BASEPOINT_TABLE * &mix_secret).to_montgomery();
+
+        let routing = [0; 32];
+
+        let mut params = MixCreationParameters::new(1025);
+        params.add_outer_layer(32);
+        params.add_outer_layer(32);
+        params.add_outer_layer(32);
+
+        let mut buf = vec![0; params.total_packet_length()];
+
+        let (range0, layer_params0) = params.get_stage_params(0);
+        let _ = layer_params0
+            .encode_mix_layer(
+                &mut buf[range0.clone()],
+                &user_secret,
+                &mix_public_key,
+                &routing[..],
+            )
+            .unwrap();
+
+        let (range1, layer_params1) = params.get_stage_params(1);
+        let _ = layer_params1
+            .encode_mix_layer(
+                &mut buf[range1.clone()],
+                &user_secret,
+                &mix_public_key,
+                &routing[..],
+            )
+            .unwrap();
+
+        let (range2, layer_params2) = params.get_stage_params(2);
+        let _ = layer_params2
+            .encode_mix_layer(
+                &mut buf[range2.clone()],
+                &user_secret,
+                &mix_public_key,
+                &routing[..],
+            )
+            .unwrap();
+
+        assert!(
+            &buf[params.total_packet_length() - 1025..params.total_packet_length()] != [0; 1025]
+        );
+
+        let _ = layer_params2
+            .decode_mix_layer(&mut buf[range2], &mix_secret)
+            .unwrap();
+
+        let _ = layer_params1
+            .decode_mix_layer(&mut buf[range1], &mix_secret)
+            .unwrap();
+
+        let _ = layer_params0
+            .decode_mix_layer(&mut buf[range0], &mix_secret)
+            .unwrap();
+    }
+}
diff --git a/nym-wallet/CHANGELOG.md b/nym-wallet/CHANGELOG.md
index 1f19602deb..2e4f234db1 100644
--- a/nym-wallet/CHANGELOG.md
+++ b/nym-wallet/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## UNRELEASED
+
+## [nym-wallet-v1.1.5](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.5) (2022-12-22)
+
+This release contains the APY calculator feature.
+
+## [nym-wallet-v1.1.4](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.4) (2022-12-20)
+
+This release contains a bugfix for hiding and displaying the mnemonic, and displays the Bity wallet address in the buy page, as well as better error handling. 
+
+- wallet: present some cases of the more technical errors (abci, ..) in a more human readable form.
+- Bug fix/hide display mnemonic by @fmtabbara in https://github.com/nymtech/nym/pull/1874
+- adding bity icon and wallet address by @gala1234 in https://github.com/nymtech/nym/pull/2689
+- remove warning error message by @gala1234 in https://github.com/nymtech/nym/pull/2694
+- ui and copy changes by @gala1234 in https://github.com/nymtech/nym/pull/2691
+
+## [nym-wallet-v1.1.3](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.3) (2022-12-13)
+
+- wallet: improved unbond screen.
+
+## [nym-wallet-v1.1.2](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.2) (2022-11-09)
+
+- wallet: Bity buy functionality
+
+## [nym-wallet-v1.1.1](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.1) (2022-11-09)
+
+- wallet: compatibility with nym-binaries-1.1.1
+
+
 ## [nym-wallet-v1.1.0](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.1.0) (2022-11-09)
 
 - wallet: Add window for showing logs for when the terminal is not available.
@@ -19,7 +48,7 @@
 
 ## [nym-wallet-v1.0.9](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.0.8) (2022-09-08)
 
-- wallet: change default `nymd` URL to https://rpc.nymtech.net
+- wallet: change default `nyxd` URL to https://rpc.nymtech.net
 
 ## [nym-wallet-v1.0.8](https://github.com/nymtech/nym/releases/tag/nym-wallet-v1.0.8) (2022-08-11)
 
@@ -116,7 +145,7 @@
 - Feature/adding discord [\#1184](https://github.com/nymtech/nym/pull/1184) ([gala1234](https://github.com/gala1234))
 - wallet: config backend for validator selection [\#1183](https://github.com/nymtech/nym/pull/1183) ([octol](https://github.com/octol))
 - Add storybook to wallet [\#1178](https://github.com/nymtech/nym/pull/1178) ([mmsinclair](https://github.com/mmsinclair))
-- wallet: connection test nymd and api urls independently [\#1170](https://github.com/nymtech/nym/pull/1170) ([octol](https://github.com/octol))
+- wallet: connection test nyxd and api urls independently [\#1170](https://github.com/nymtech/nym/pull/1170) ([octol](https://github.com/octol))
 - wallet: wire up account storage [\#1153](https://github.com/nymtech/nym/pull/1153) ([octol](https://github.com/octol))
 - Feature/signature on deposit [\#1151](https://github.com/nymtech/nym/pull/1151) ([neacsu](https://github.com/neacsu))
 
@@ -189,7 +218,7 @@
 - fix: make explorer footer year dynamic [\#1059](https://github.com/nymtech/nym/pull/1059) ([martinyung](https://github.com/martinyung))
 - Add mnemonic just on creation, to display it [\#1057](https://github.com/nymtech/nym/pull/1057) ([neacsu](https://github.com/neacsu))
 - Network Explorer: updates to API and UI to show the active set [\#1056](https://github.com/nymtech/nym/pull/1056) ([mmsinclair](https://github.com/mmsinclair))
-- Made contract addresses for query NymdClient construction optional [\#1055](https://github.com/nymtech/nym/pull/1055) ([jstuczyn](https://github.com/jstuczyn))
+- Made contract addresses for query NyxdClient construction optional [\#1055](https://github.com/nymtech/nym/pull/1055) ([jstuczyn](https://github.com/jstuczyn))
 - Introduced RPC query for total token supply [\#1053](https://github.com/nymtech/nym/pull/1053) ([jstuczyn](https://github.com/jstuczyn))
 - Feature/tokio console [\#1052](https://github.com/nymtech/nym/pull/1052) ([durch](https://github.com/durch))
 - Implemented beta clippy lint recommendations [\#1051](https://github.com/nymtech/nym/pull/1051) ([jstuczyn](https://github.com/jstuczyn))
diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock
index 999378447f..0a9ba7103f 100644
--- a/nym-wallet/Cargo.lock
+++ b/nym-wallet/Cargo.lock
@@ -14,12 +14,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
 [[package]]
 name = "aead"
 version = "0.4.3"
@@ -153,20 +147,18 @@ dependencies = [
 
 [[package]]
 name = "attohttpc"
-version = "0.19.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "262c3f7f5d61249d8c00e5546e2685cd15ebeeb1bc0f3cc5449350a1cb07319e"
+checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
 dependencies = [
  "flate2",
  "http",
  "log",
  "native-tls",
- "openssl",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "url",
- "wildmatch",
 ]
 
 [[package]]
@@ -175,7 +167,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi",
 ]
@@ -438,12 +430,11 @@ dependencies = [
 
 [[package]]
 name = "cargo_toml"
-version = "0.11.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e270ef0cd868745878982f7ce470aa898d0d4bb248af67f0cf66f54617913ef"
+checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8"
 dependencies = [
  "serde",
- "serde_derive",
  "toml",
 ]
 
@@ -520,26 +511,24 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.20"
+version = "4.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
+checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
 dependencies = [
- "atty",
  "bitflags",
  "clap_derive",
  "clap_lex",
- "indexmap",
+ "is-terminal",
  "once_cell",
  "strsim",
  "termcolor",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -550,9 +539,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
 dependencies = [
  "os_str_bytes",
 ]
@@ -1076,16 +1065,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "deflate"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
 [[package]]
 name = "der"
 version = "0.5.1"
@@ -1226,6 +1205,12 @@ dependencies = [
  "dtoa",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
+
 [[package]]
 name = "dyn-clone"
 version = "1.0.4"
@@ -1304,19 +1289,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "embed-resource"
-version = "1.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936c1354206a875581696369aef920e12396e93bbd251c43a7a3f3fa85023a7d"
-dependencies = [
- "cc",
- "rustc_version 0.4.0",
- "toml",
- "vswhom",
- "winreg 0.10.1",
-]
-
 [[package]]
 name = "embed_plist"
 version = "1.2.2"
@@ -1325,9 +1297,9 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.30"
+version = "0.8.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
+checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
 dependencies = [
  "cfg-if",
 ]
@@ -1365,6 +1337,27 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "execute"
 version = "0.1.0"
@@ -1569,21 +1562,6 @@ version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
 
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
 [[package]]
 name = "futures-macro"
 version = "0.3.21"
@@ -2057,6 +2035,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2234,12 +2221,12 @@ dependencies = [
 
 [[package]]
 name = "ico"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804"
+checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd"
 dependencies = [
  "byteorder",
- "png 0.11.0",
+ "png",
 ]
 
 [[package]]
@@ -2316,15 +2303,6 @@ dependencies = [
  "cfb",
 ]
 
-[[package]]
-name = "inflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4"
-dependencies = [
- "adler32",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2334,12 +2312,34 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9"
 
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.3"
@@ -2386,23 +2386,9 @@ dependencies = [
 
 [[package]]
 name = "jni"
-version = "0.18.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
 dependencies = [
  "cesu8",
  "combine",
@@ -2524,6 +2510,12 @@ dependencies = [
  "safemem",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "lock_api"
 version = "0.4.6"
@@ -2677,7 +2669,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -2803,17 +2795,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-iter"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
-dependencies = [
- "autocfg 1.1.0",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.1"
@@ -2840,7 +2821,7 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
 ]
 
@@ -2874,6 +2855,20 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nym-api-requests"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "coconut-interface",
+ "cosmrs",
+ "cosmwasm-std",
+ "getset",
+ "mixnet-contract-common",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "nym-types"
 version = "1.0.0"
@@ -2937,7 +2932,7 @@ dependencies = [
 
 [[package]]
 name = "nym_wallet"
-version = "1.1.1"
+version = "1.1.5"
 dependencies = [
  "aes-gcm",
  "argon2 0.3.4",
@@ -3047,9 +3042,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.14.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "opaque-debug"
@@ -3070,7 +3065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045"
 dependencies = [
  "pathdiff",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -3146,12 +3141,6 @@ dependencies = [
  "system-deps 6.0.2",
 ]
 
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -3197,7 +3186,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec 1.8.0",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]
 
 [[package]]
@@ -3290,9 +3279,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
@@ -3498,18 +3487,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "png"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925"
-dependencies = [
- "bitflags",
- "deflate",
- "inflate",
- "num-iter",
-]
-
 [[package]]
 name = "png"
 version = "0.17.6"
@@ -3598,11 +3575,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -3854,9 +3831,9 @@ dependencies = [
 
 [[package]]
 name = "raw-window-handle"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41"
+checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
 dependencies = [
  "cty",
 ]
@@ -3891,9 +3868,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3957,7 +3934,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.7.0",
+ "winreg",
 ]
 
 [[package]]
@@ -3973,13 +3950,12 @@ dependencies = [
 
 [[package]]
 name = "rfd"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f121348fd3b9035ed11be1f028e8944263c30641f8c5deacf57a4320782fb402"
+checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
 dependencies = [
  "block",
  "dispatch",
- "embed-resource",
  "glib-sys",
  "gobject-sys",
  "gtk-sys",
@@ -3993,7 +3969,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows",
+ "windows 0.37.0",
 ]
 
 [[package]]
@@ -4040,6 +4016,20 @@ dependencies = [
  "semver 1.0.6",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.36.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -4234,9 +4224,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.136"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
  "serde_derive",
 ]
@@ -4261,9 +4251,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.136"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4630,13 +4620,13 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -4679,9 +4669,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.12.2"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6fd7725dc1e593e9ecabd9fe49c112a204c8c8694db4182e78b2a5af490b1ae"
+checksum = "a1fa15735311b4816d030ff54da58560b047daca0970e1031aed5502e84231a8"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -4701,7 +4691,7 @@ dependencies = [
  "gtk",
  "image",
  "instant",
- "jni 0.19.0",
+ "jni",
  "lazy_static",
  "libc",
  "log",
@@ -4712,13 +4702,13 @@ dependencies = [
  "once_cell",
  "parking_lot 0.12.1",
  "paste",
- "png 0.17.6",
+ "png",
  "raw-window-handle",
  "scopeguard",
  "serde",
  "unicode-segmentation",
- "uuid 1.1.2",
- "windows",
+ "uuid 1.2.2",
+ "windows 0.39.0",
  "windows-implement",
  "x11-dl",
 ]
@@ -4742,9 +4732,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.0.5"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a56a8b125069c2682bd31610109b4436c050c74447bee1078217a0325c1add"
+checksum = "d8ea1d785ab2164373703817bff144c4610a69ad3f659becaca0e1ea004b98d8"
 dependencies = [
  "anyhow",
  "attohttpc",
@@ -4752,9 +4742,9 @@ dependencies = [
  "cocoa",
  "dirs-next",
  "embed_plist",
+ "encoding_rs",
  "flate2",
- "futures",
- "futures-lite",
+ "futures-util",
  "glib",
  "glob",
  "gtk",
@@ -4786,18 +4776,18 @@ dependencies = [
  "time 0.3.7",
  "tokio",
  "url",
- "uuid 1.1.2",
+ "uuid 1.2.2",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.39.0",
  "zip",
 ]
 
 [[package]]
 name = "tauri-build"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acafb1c515c5d14234a294461bd43c723639a84891a45f6a250fd3441ad2e8ed"
+checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -4811,16 +4801,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d62a3c8790d6cba686cea6e3f7f569d12c662c3274c2d165a4fd33e3871b72"
+checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251"
 dependencies = [
  "base64",
  "brotli",
  "ico",
  "json-patch",
  "plist",
- "png 0.17.6",
+ "png",
  "proc-macro2",
  "quote",
  "regex",
@@ -4831,15 +4821,15 @@ dependencies = [
  "tauri-utils",
  "thiserror",
  "time 0.3.7",
- "uuid 1.1.2",
+ "uuid 1.2.2",
  "walkdir",
 ]
 
 [[package]]
 name = "tauri-macros"
-version = "1.0.4"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7296fa17996629f43081e1c66d554703900187ed900c5bf46f97f0bcfb069278"
+checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075"
 dependencies = [
  "heck 0.4.0",
  "proc-macro2",
@@ -4851,29 +4841,29 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "0.10.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4cff3b4d9469727fa2107c4b3d2eda110df1ba45103fb420178e536362fae4"
+checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b"
 dependencies = [
  "gtk",
  "http",
  "http-range",
- "infer",
+ "rand 0.8.5",
  "raw-window-handle",
  "serde",
  "serde_json",
  "tauri-utils",
  "thiserror",
- "uuid 1.1.2",
+ "uuid 1.2.2",
  "webview2-com",
- "windows",
+ "windows 0.39.0",
 ]
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "0.10.2"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fa8c4edaf01d8b556e7172c844b1b4dd3399adcd1a606bd520fc3e65f698546"
+checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30"
 dependencies = [
  "cocoa",
  "gtk",
@@ -4882,24 +4872,25 @@ dependencies = [
  "raw-window-handle",
  "tauri-runtime",
  "tauri-utils",
- "uuid 1.1.2",
+ "uuid 1.2.2",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.39.0",
  "wry",
 ]
 
 [[package]]
 name = "tauri-utils"
-version = "1.0.3"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ff4b68d9faeb57c9c727bf58c9c9768d2b67d8e84e62ce6146e7859a2e9c6b"
+checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1"
 dependencies = [
  "brotli",
  "ctor",
  "glob",
  "heck 0.4.0",
  "html5ever",
+ "infer",
  "json-patch",
  "kuchiki",
  "memchr",
@@ -4913,7 +4904,7 @@ dependencies = [
  "thiserror",
  "url",
  "walkdir",
- "windows",
+ "windows 0.39.0",
 ]
 
 [[package]]
@@ -5046,12 +5037,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
 [[package]]
 name = "thin-slice"
 version = "0.1.1"
@@ -5326,6 +5311,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.9"
@@ -5337,9 +5328,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
+checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
 
 [[package]]
 name = "unicode-xid"
@@ -5365,13 +5356,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3"
 dependencies = [
  "form_urlencoded",
  "idna",
- "matches",
  "percent-encoding",
  "serde",
 ]
@@ -5390,27 +5380,13 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 
 [[package]]
 name = "uuid"
-version = "1.1.2"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
 dependencies = [
  "getrandom 0.2.5",
 ]
 
-[[package]]
-name = "validator-api-requests"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "coconut-interface",
- "cosmrs",
- "cosmwasm-std",
- "getset",
- "mixnet-contract-common",
- "schemars",
- "serde",
-]
-
 [[package]]
 name = "validator-client"
 version = "0.1.0"
@@ -5435,6 +5411,7 @@ dependencies = [
  "mixnet-contract-common",
  "multisig-contract-common",
  "network-defaults",
+ "nym-api-requests",
  "prost",
  "reqwest",
  "serde",
@@ -5443,7 +5420,6 @@ dependencies = [
  "thiserror",
  "tokio",
  "url",
- "validator-api-requests",
  "vesting-contract",
  "vesting-contract-common",
 ]
@@ -5497,7 +5473,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vesting-contract"
-version = "1.1.0"
+version = "1.1.2"
 dependencies = [
  "contracts-common",
  "cosmwasm-std",
@@ -5521,32 +5497,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "vswhom"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-dependencies = [
- "libc",
- "vswhom-sys",
-]
-
-[[package]]
-name = "vswhom-sys"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22025f6d8eb903ebf920ea6933b70b1e495be37e2cb4099e62c80454aaf57c39"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@@ -5664,9 +5614,9 @@ dependencies = [
 
 [[package]]
 name = "webkit2gtk"
-version = "0.18.0"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc"
+checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -5730,13 +5680,13 @@ dependencies = [
 
 [[package]]
 name = "webview2-com"
-version = "0.16.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a489a9420acabb3c2ed0434b6f71f6b56b9485ec32665a28dec1ee186d716e0f"
+checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.39.0",
  "windows-implement",
 ]
 
@@ -5753,24 +5703,19 @@ dependencies = [
 
 [[package]]
 name = "webview2-com-sys"
-version = "0.16.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0258c53ee9adc0a4f8ba1c8c317588f7a58c7048a55b621d469ba75ab3709ca1"
+checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
 dependencies = [
  "regex",
  "serde",
  "serde_json",
  "thiserror",
- "windows",
+ "windows 0.39.0",
  "windows-bindgen",
+ "windows-metadata",
 ]
 
-[[package]]
-name = "wildmatch"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5808,7 +5753,6 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
 dependencies = [
- "windows-implement",
  "windows_aarch64_msvc 0.37.0",
  "windows_i686_gnu 0.37.0",
  "windows_i686_msvc 0.37.0",
@@ -5817,10 +5761,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-bindgen"
-version = "0.37.0"
+name = "windows"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bed7be31ade0af08fec9b5343e9edcc005d22b1f11859b8a59b24797f5858e8"
+checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
+dependencies = [
+ "windows-implement",
+ "windows_aarch64_msvc 0.39.0",
+ "windows_i686_gnu 0.39.0",
+ "windows_i686_msvc 0.39.0",
+ "windows_x86_64_gnu 0.39.0",
+ "windows_x86_64_msvc 0.39.0",
+]
+
+[[package]]
+name = "windows-bindgen"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
 dependencies = [
  "windows-metadata",
  "windows-tokens",
@@ -5828,9 +5786,9 @@ dependencies = [
 
 [[package]]
 name = "windows-implement"
-version = "0.37.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a1062e555f7d9d66fd1130ed4f7c6ec41a47529ee0850cd0e926d95b26bb14"
+checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
 dependencies = [
  "syn",
  "windows-tokens",
@@ -5838,9 +5796,9 @@ dependencies = [
 
 [[package]]
 name = "windows-metadata"
-version = "0.37.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f33f2b90a6664e369c41ab5ff262d06f048fc9685d9bf8a0e99a47750bb0463"
+checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
 
 [[package]]
 name = "windows-sys"
@@ -5856,10 +5814,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-tokens"
-version = "0.37.0"
+name = "windows-sys"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows-tokens"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -5873,6 +5852,18 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
@@ -5885,6 +5876,18 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
@@ -5897,6 +5900,18 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
@@ -5909,6 +5924,24 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"
@@ -5921,6 +5954,18 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+
 [[package]]
 name = "winreg"
 version = "0.7.0"
@@ -5930,15 +5975,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winres"
 version = "0.1.12"
@@ -5950,19 +5986,23 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.19.0"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce19dddbd3ce01dc8f14eb6d4c8f914123bf8379aaa838f6da4f981ff7104a3f"
+checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98"
 dependencies = [
+ "base64",
  "block",
  "cocoa",
  "core-graphics",
+ "crossbeam-channel",
+ "dunce",
  "gdk",
  "gio",
  "glib",
  "gtk",
+ "html5ever",
  "http",
- "jni 0.18.0",
+ "kuchiki",
  "libc",
  "log",
  "objc",
@@ -5970,13 +6010,15 @@ dependencies = [
  "once_cell",
  "serde",
  "serde_json",
+ "sha2 0.10.2",
+ "soup2",
  "tao",
  "thiserror",
  "url",
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.39.0",
  "windows-implement",
 ]
 
@@ -6001,9 +6043,9 @@ dependencies = [
 
 [[package]]
 name = "x11-dl"
-version = "2.19.1"
+version = "2.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea26926b4ce81a6f5d9d0f3a0bc401e5a37c6ae14a1bfaa8ff6099ca80038c59"
+checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
 dependencies = [
  "lazy_static",
  "libc",
diff --git a/nym-wallet/nym-wallet-recovery-cli/Cargo.toml b/nym-wallet/nym-wallet-recovery-cli/Cargo.toml
index 909467a6e0..3f2569adfd 100644
--- a/nym-wallet/nym-wallet-recovery-cli/Cargo.toml
+++ b/nym-wallet/nym-wallet-recovery-cli/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0"
 argon2 = "0.4"
 base64 = "0.13"
 bip39 = "1.0"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 log = "0.4"
 pretty_env_logger = "0.4"
 serde_json = "1.0.0"
diff --git a/nym-wallet/nym-wallet-recovery-cli/src/main.rs b/nym-wallet/nym-wallet-recovery-cli/src/main.rs
index 7cb2c3e0d7..9798308fac 100644
--- a/nym-wallet/nym-wallet-recovery-cli/src/main.rs
+++ b/nym-wallet/nym-wallet-recovery-cli/src/main.rs
@@ -82,7 +82,7 @@ fn decrypt_file(file: File, passwords: &[String], parse: &ParseMode) -> Result<(
         match decrypt_login(login, passwords, parse) {
             Ok(is_success) if is_success => successes += 1,
             Ok(_) => println!("None of the provided passwords succeeded"),
-            Err(err) => println!("Failed: {}", err),
+            Err(err) => println!("Failed: {err}"),
         }
     }
 
@@ -133,9 +133,9 @@ fn decrypt_login(login: &Value, passwords: &[String], parse: &ParseMode) -> Resu
                     }
                     return Ok(true);
                 }
-                Err(err) => println!(" failed to parse\n{}", err),
+                Err(err) => println!(" failed to parse\n{err}"),
             },
-            Err(err) => println!(" failed\n{}", err),
+            Err(err) => println!(" failed\n{err}"),
         }
     }
 
@@ -160,10 +160,10 @@ fn get_login_entry(login: &Value) -> Result<(&str, &str, &str)> {
 
 fn base64_decode(ciphertext: &str, iv: &str, salt: &str) -> Result<(Vec<u8>, Vec<u8>, Vec<u8>)> {
     let ciphertext = base64::decode(ciphertext)
-        .map_err(|err| anyhow!("Unable to base64 decode ciphertext: {}", err))?;
-    let iv = base64::decode(iv).map_err(|err| anyhow!("Unable to base64 decode iv: {}", err))?;
+        .map_err(|err| anyhow!("Unable to base64 decode ciphertext: {err}"))?;
+    let iv = base64::decode(iv).map_err(|err| anyhow!("Unable to base64 decode iv: {err}"))?;
     let salt =
-        base64::decode(salt).map_err(|err| anyhow!("Unable to base64 decode salt: {}", err))?;
+        base64::decode(salt).map_err(|err| anyhow!("Unable to base64 decode salt: {err}"))?;
     Ok((ciphertext, iv, salt))
 }
 
@@ -186,7 +186,7 @@ fn decrypt_password(
     let mut key = Key::default();
     argon2
         .hash_password_into(password.as_bytes(), salt, &mut key)
-        .map_err(|err| anyhow!("Unable to hash password: {}", err))?;
+        .map_err(|err| anyhow!("Unable to hash password: {err}"))?;
 
     // Create the Cipher
     let cipher = Aes256Gcm::new(&key);
diff --git a/nym-wallet/nym-wallet-types/Cargo.toml b/nym-wallet/nym-wallet-types/Cargo.toml
index 322aca5c06..d2f0bde28a 100644
--- a/nym-wallet/nym-wallet-types/Cargo.toml
+++ b/nym-wallet/nym-wallet-types/Cargo.toml
@@ -18,7 +18,7 @@ config = { path = "../../common/config" }
 network-defaults = { path = "../../common/network-defaults" }
 mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
 validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
 # Used for Type conversion, can be extracted but its a lot of work
diff --git a/nym-wallet/nym-wallet-types/nym-wallet/src/types/rust/ValidatorUrls.ts b/nym-wallet/nym-wallet-types/nym-wallet/src/types/rust/ValidatorUrls.ts
index 2ac6693e0b..c78eefd6ae 100644
--- a/nym-wallet/nym-wallet-types/nym-wallet/src/types/rust/ValidatorUrls.ts
+++ b/nym-wallet/nym-wallet-types/nym-wallet/src/types/rust/ValidatorUrls.ts
@@ -1,2 +1,2 @@
 
-export interface Validator { nymd_url: string, nymd_name: string | null, api_url: string | null, }
\ No newline at end of file
+export interface Validator { nyxd_url: string, nyxd_name: string | null, api_url: string | null, }
\ No newline at end of file
diff --git a/nym-wallet/nym-wallet-types/src/network_config.rs b/nym-wallet/nym-wallet-types/src/network_config.rs
index b1f987d5b0..c3ec62b265 100644
--- a/nym-wallet/nym-wallet-types/src/network_config.rs
+++ b/nym-wallet/nym-wallet-types/src/network_config.rs
@@ -32,19 +32,19 @@ pub struct ValidatorUrl {
 )]
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Validator {
-    pub nymd_url: String,
-    pub nymd_name: Option<String>,
+    pub nyxd_url: String,
+    pub nyxd_name: Option<String>,
     pub api_url: Option<String>,
 }
 
 impl fmt::Display for Validator {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let nymd_url = format!("nymd_url: {}", self.nymd_url);
+        let nyxd_url = format!("nyxd_url: {}", self.nyxd_url);
         let api_url = self
             .api_url
             .as_ref()
             .map(|api_url| format!(", api_url: {}", api_url))
             .unwrap_or_default();
-        write!(f, "{nymd_url}{api_url}")
+        write!(f, "{nyxd_url}{api_url}")
     }
 }
diff --git a/nym-wallet/package.json b/nym-wallet/package.json
index a9a55d2d0b..21f885b496 100644
--- a/nym-wallet/package.json
+++ b/nym-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nymproject/nym-wallet-app",
-  "version": "1.1.1",
+  "version": "1.1.5",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
@@ -32,7 +32,7 @@
     "@nymproject/react": "^1.0.0",
     "@nymproject/types": "^1.0.0",
     "@storybook/react": "^6.5.8",
-    "@tauri-apps/api": "^1.0.2",
+    "@tauri-apps/api": "^1.2.0",
     "@tauri-apps/tauri-forage": "^1.0.0-beta.2",
     "big.js": "^6.2.1",
     "bs58": "^4.0.1",
diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml
index 835383188e..d554b65f83 100644
--- a/nym-wallet/src-tauri/Cargo.toml
+++ b/nym-wallet/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym_wallet"
-version = "1.1.1"
+version = "1.1.5"
 description = "Nym Native Wallet"
 authors = ["Nym Technologies SA"]
 license = ""
@@ -13,10 +13,10 @@ rust-version = "1.58"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "=1.0.4", features = [] }
+tauri-build = { version = "=1.2.1", features = [] }
 
-tauri-codegen = "=1.0.4"
-tauri-macros = "=1.0.4"
+tauri-codegen = "=1.2.1"
+tauri-macros = "=1.2.1"
 
 [dependencies]
 bip39 = "1.0"
@@ -38,7 +38,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_repr = "0.1"
 strum = { version = "0.23", features = ["derive"] }
-tauri = { version = "=1.0.5", features = ["clipboard-all", "shell-open", "updater", "window-maximize"] }
+tauri = { version = "=1.2.2", features = ["clipboard-all", "shell-open", "updater", "window-maximize"] }
 tendermint-rpc = "0.23.0"
 thiserror = "1.0"
 tokio = { version = "1.10", features = ["full"] }
@@ -55,7 +55,7 @@ cosmwasm-std = "1.0.0"
 cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 
 validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nymd-client",
+    "nyxd-client",
 ] }
 mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
diff --git a/nym-wallet/src-tauri/src/coin.rs b/nym-wallet/src-tauri/src/coin.rs
index 79b19171d9..4195a1736d 100644
--- a/nym-wallet/src-tauri/src/coin.rs
+++ b/nym-wallet/src-tauri/src/coin.rs
@@ -6,9 +6,9 @@ use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
 use std::str::FromStr;
 use strum::IntoEnumIterator;
-use validator_client::nymd::CosmosCoin;
-use validator_client::nymd::Denom as CosmosDenom;
-use validator_client::nymd::{Coin as BackendCoin, CosmWasmCoin};
+use validator_client::nyxd::CosmosCoin;
+use validator_client::nyxd::Denom as CosmosDenom;
+use validator_client::nyxd::{Coin as BackendCoin, CosmWasmCoin};
 
 const MINOR_IN_MAJOR: f64 = 1_000_000.;
 
diff --git a/nym-wallet/src-tauri/src/config/mod.rs b/nym-wallet/src-tauri/src/config/mod.rs
index 9da3a1b73e..d30d6236bf 100644
--- a/nym-wallet/src-tauri/src/config/mod.rs
+++ b/nym-wallet/src-tauri/src/config/mod.rs
@@ -11,7 +11,7 @@ use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use strum::IntoEnumIterator;
 use url::Url;
-use validator_client::nymd::AccountId as CosmosAccountId;
+use validator_client::nyxd::AccountId as CosmosAccountId;
 
 use config::defaults::{DenomDetailsOwned, NymNetworkDetails, ValidatorDetails};
 use nym_wallet_types::network::Network as WalletNetwork;
@@ -20,7 +20,7 @@ use nym_wallet_types::network_config;
 use crate::error::BackendError;
 use crate::platform_constants::{CONFIG_DIR_NAME, CONFIG_FILENAME};
 
-pub const REMOTE_SOURCE_OF_VALIDATOR_URLS: &str =
+pub const REMOTE_SOURCE_OF_NYXD_URLS: &str =
     "https://nymtech.net/.wellknown/wallet/validators.json";
 
 const CURRENT_GLOBAL_CONFIG_VERSION: u32 = 1;
@@ -56,12 +56,12 @@ pub struct NetworkConfig {
     version: Option<u32>,
 
     // User selected urls
-    selected_nymd_url: Option<Url>,
+    selected_nyxd_url: Option<Url>,
     selected_api_url: Option<Url>,
 
     // Additional user provided validators.
-    // It is an option for the purpuse of file serialization.
-    validator_urls: Option<Vec<ValidatorConfigEntry>>,
+    // It is an option for the purpose of file serialization.
+    nyxd_urls: Option<Vec<ValidatorConfigEntry>>,
 }
 
 impl Default for Base {
@@ -85,16 +85,16 @@ impl Default for NetworkConfig {
     fn default() -> Self {
         Self {
             version: Some(CURRENT_NETWORK_CONFIG_VERSION),
-            selected_nymd_url: None,
+            selected_nyxd_url: None,
             selected_api_url: None,
-            validator_urls: None,
+            nyxd_urls: None,
         }
     }
 }
 
 impl NetworkConfig {
     fn validators(&self) -> impl Iterator<Item = &ValidatorConfigEntry> {
-        self.validator_urls.iter().flat_map(|v| v.iter())
+        self.nyxd_urls.iter().flat_map(|v| v.iter())
     }
 }
 
@@ -167,7 +167,7 @@ impl Config {
                     Some(global)
                 }
                 Err(err) => {
-                    log::trace!("Not loading {:#?}: {}", file, err);
+                    log::trace!("Not loading {:#?}: {err}", file);
                     None
                 }
             }
@@ -182,7 +182,7 @@ impl Config {
                     log::trace!("Loaded from file {:#?}", file);
                     networks.insert(network.as_key(), config);
                 }
-                Err(err) => log::trace!("Not loading {:#?}: {}", file, err),
+                Err(err) => log::trace!("Not loading {:#?}: {err}", file),
             };
         }
 
@@ -241,41 +241,41 @@ impl Config {
             .expect("Wrong format for bandwidth claim contract address")
     }
 
-    pub fn select_validator_nymd_url(&mut self, nymd_url: Url, network: WalletNetwork) {
+    pub fn select_nyxd_url(&mut self, nyxd_url: Url, network: WalletNetwork) {
         if let Some(net) = self.networks.get_mut(&network.as_key()) {
-            net.selected_nymd_url = Some(nymd_url);
+            net.selected_nyxd_url = Some(nyxd_url);
         } else {
             self.networks.insert(
                 network.as_key(),
                 NetworkConfig {
-                    selected_nymd_url: Some(nymd_url),
+                    selected_nyxd_url: Some(nyxd_url),
                     ..NetworkConfig::default()
                 },
             );
         }
     }
 
-    pub fn select_validator_api_url(&mut self, api_url: Url, network: WalletNetwork) {
+    pub fn select_nym_api_url(&mut self, api_url: Url, network: WalletNetwork) {
         if let Some(net) = self.networks.get_mut(&network.as_key()) {
             net.selected_api_url = Some(api_url);
         } else {
             self.networks.insert(
                 network.as_key(),
                 NetworkConfig {
-                    selected_nymd_url: Some(api_url),
+                    selected_nyxd_url: Some(api_url),
                     ..NetworkConfig::default()
                 },
             );
         }
     }
 
-    pub fn get_selected_validator_nymd_url(&self, network: WalletNetwork) -> Option<Url> {
+    pub fn get_selected_validator_nyxd_url(&self, network: WalletNetwork) -> Option<Url> {
         self.networks
             .get(&network.as_key())
-            .and_then(|config| config.selected_nymd_url.clone())
+            .and_then(|config| config.selected_nyxd_url.clone())
     }
 
-    pub fn get_selected_validator_api_url(&self, network: &WalletNetwork) -> Option<Url> {
+    pub fn get_selected_nym_api_url(&self, network: &WalletNetwork) -> Option<Url> {
         self.networks
             .get(&network.as_key())
             .and_then(|config| config.selected_api_url.clone())
@@ -283,16 +283,16 @@ impl Config {
 
     pub fn add_validator_url(&mut self, url: ValidatorConfigEntry, network: WalletNetwork) {
         if let Some(network_config) = self.networks.get_mut(&network.as_key()) {
-            if let Some(ref mut urls) = network_config.validator_urls {
+            if let Some(ref mut urls) = network_config.nyxd_urls {
                 urls.push(url);
             } else {
-                network_config.validator_urls = Some(vec![url]);
+                network_config.nyxd_urls = Some(vec![url]);
             }
         } else {
             self.networks.insert(
                 network.as_key(),
                 NetworkConfig {
-                    validator_urls: Some(vec![url]),
+                    nyxd_urls: Some(vec![url]),
                     ..NetworkConfig::default()
                 },
             );
@@ -301,7 +301,7 @@ impl Config {
 
     pub fn remove_validator_url(&mut self, url: ValidatorConfigEntry, network: WalletNetwork) {
         if let Some(network_config) = self.networks.get_mut(&network.as_key()) {
-            if let Some(ref mut urls) = network_config.validator_urls {
+            if let Some(ref mut urls) = network_config.nyxd_urls {
                 // Removes duplicates too if there are any
                 urls.retain(|existing_url| existing_url != &url);
             }
@@ -321,8 +321,8 @@ where
 
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct ValidatorConfigEntry {
-    pub nymd_url: Url,
-    pub nymd_name: Option<String>,
+    pub nyxd_url: Url,
+    pub nyxd_name: Option<String>,
     pub api_url: Option<Url>,
 }
 
@@ -331,8 +331,8 @@ impl TryFrom<ValidatorDetails> for ValidatorConfigEntry {
 
     fn try_from(validator: ValidatorDetails) -> Result<Self, Self::Error> {
         Ok(ValidatorConfigEntry {
-            nymd_url: validator.nymd_url.parse()?,
-            nymd_name: None,
+            nyxd_url: validator.nyxd_url.parse()?,
+            nyxd_name: None,
             api_url: match &validator.api_url {
                 Some(url) => Some(url.parse()?),
                 None => None,
@@ -346,8 +346,8 @@ impl TryFrom<network_config::Validator> for ValidatorConfigEntry {
 
     fn try_from(validator: network_config::Validator) -> Result<Self, Self::Error> {
         Ok(ValidatorConfigEntry {
-            nymd_url: validator.nymd_url.parse()?,
-            nymd_name: validator.nymd_name,
+            nyxd_url: validator.nyxd_url.parse()?,
+            nyxd_name: validator.nyxd_name,
             api_url: match &validator.api_url {
                 Some(url) => Some(url.parse()?),
                 None => None,
@@ -358,8 +358,8 @@ impl TryFrom<network_config::Validator> for ValidatorConfigEntry {
 
 impl fmt::Display for ValidatorConfigEntry {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let s1 = format!("nymd_url: {}", self.nymd_url);
-        let name = self.nymd_name.as_ref().map(|name| format!(" ({})", name));
+        let s1 = format!("nyxd_url: {}", self.nyxd_url);
+        let name = self.nyxd_name.as_ref().map(|name| format!(" ({})", name));
         let s2 = self
             .api_url
             .as_ref()
@@ -510,23 +510,23 @@ mod tests {
 
     fn test_config() -> Config {
         let netconfig = NetworkConfig {
-            selected_nymd_url: None,
+            selected_nyxd_url: None,
             selected_api_url: Some("https://my_api_url.com".parse().unwrap()),
 
-            validator_urls: Some(vec![
+            nyxd_urls: Some(vec![
                 ValidatorConfigEntry {
-                    nymd_url: "https://foo".parse().unwrap(),
-                    nymd_name: Some("FooName".to_string()),
+                    nyxd_url: "https://foo".parse().unwrap(),
+                    nyxd_name: Some("FooName".to_string()),
                     api_url: None,
                 },
                 ValidatorConfigEntry {
-                    nymd_url: "https://bar".parse().unwrap(),
-                    nymd_name: None,
+                    nyxd_url: "https://bar".parse().unwrap(),
+                    nyxd_name: None,
                     api_url: Some("https://bar/api".parse().unwrap()),
                 },
                 ValidatorConfigEntry {
-                    nymd_url: "https://baz".parse().unwrap(),
-                    nymd_name: None,
+                    nyxd_url: "https://baz".parse().unwrap(),
+                    nyxd_name: None,
                     api_url: Some("https://baz/api".parse().unwrap()),
                 },
             ]),
@@ -551,16 +551,16 @@ mod tests {
             r#"version = 1
 selected_api_url = 'https://my_api_url.com/'
 
-[[validator_urls]]
-nymd_url = 'https://foo/'
-nymd_name = 'FooName'
+[[nyxd_urls]]
+nyxd_url = 'https://foo/'
+nyxd_name = 'FooName'
 
-[[validator_urls]]
-nymd_url = 'https://bar/'
+[[nyxd_urls]]
+nyxd_url = 'https://bar/'
 api_url = 'https://bar/api'
 
-[[validator_urls]]
-nymd_url = 'https://baz/'
+[[nyxd_urls]]
+nyxd_url = 'https://baz/'
 api_url = 'https://baz/api'
 "#
         );
@@ -575,22 +575,22 @@ api_url = 'https://baz/api'
             serde_json::to_string_pretty(netconfig).unwrap(),
             r#"{
   "version": 1,
-  "selected_nymd_url": null,
+  "selected_nyxd_url": null,
   "selected_api_url": "https://my_api_url.com/",
-  "validator_urls": [
+  "nyxd_urls": [
     {
-      "nymd_url": "https://foo/",
-      "nymd_name": "FooName",
+      "nyxd_url": "https://foo/",
+      "nyxd_name": "FooName",
       "api_url": null
     },
     {
-      "nymd_url": "https://bar/",
-      "nymd_name": null,
+      "nyxd_url": "https://bar/",
+      "nyxd_name": null,
       "api_url": "https://bar/api"
     },
     {
-      "nymd_url": "https://baz/",
-      "nymd_name": null,
+      "nyxd_url": "https://baz/",
+      "nyxd_name": null,
       "api_url": "https://baz/api"
     }
   ]
@@ -611,12 +611,12 @@ api_url = 'https://baz/api'
     fn get_urls_parsed_from_config() {
         let config = test_config();
 
-        let nymd_url = config
+        let nyxd_url = config
             .get_configured_validators(WalletNetwork::MAINNET)
             .next()
-            .map(|v| v.nymd_url)
+            .map(|v| v.nyxd_url)
             .unwrap();
-        assert_eq!(nymd_url.as_ref(), "https://foo/");
+        assert_eq!(nyxd_url.as_ref(), "https://foo/");
 
         // The first entry is missing an API URL
         let api_url = config
@@ -630,12 +630,12 @@ api_url = 'https://baz/api'
     fn get_urls_from_defaults() {
         let config = Config::default();
 
-        let nymd_url = config
+        let nyxd_url = config
             .get_base_validators(WalletNetwork::MAINNET)
             .next()
-            .map(|v| v.nymd_url)
+            .map(|v| v.nyxd_url)
             .unwrap();
-        assert_eq!(nymd_url.as_ref(), "https://rpc.nymtech.net/");
+        assert_eq!(nyxd_url.as_ref(), "https://rpc.nymtech.net/");
 
         let api_url = config
             .get_base_validators(WalletNetwork::MAINNET)
diff --git a/nym-wallet/src-tauri/src/error.rs b/nym-wallet/src-tauri/src/error.rs
index 46d8840947..e47a0ab272 100644
--- a/nym-wallet/src-tauri/src/error.rs
+++ b/nym-wallet/src-tauri/src/error.rs
@@ -4,8 +4,8 @@ use serde::{Serialize, Serializer};
 use std::io;
 use std::num::ParseIntError;
 use thiserror::Error;
-use validator_client::validator_api::error::ValidatorAPIError;
-use validator_client::{nymd::error::NymdError, ValidatorClientError};
+use validator_client::nym_api::error::NymAPIError;
+use validator_client::{nyxd::error::NyxdError, ValidatorClientError};
 
 #[derive(Error, Debug)]
 pub enum BackendError {
@@ -24,10 +24,11 @@ pub enum BackendError {
         #[from]
         source: tendermint_rpc::Error,
     },
-    #[error("{source}")]
-    NymdError {
-        #[from]
-        source: NymdError,
+    #[error("{pretty_error}")]
+    NyxdError {
+        pretty_error: String,
+        #[source]
+        source: NyxdError,
     },
     #[error("{source}")]
     CosmwasmStd {
@@ -40,9 +41,9 @@ pub enum BackendError {
         source: eyre::Report,
     },
     #[error("{source}")]
-    ValidatorApiError {
+    NymApiError {
         #[from]
-        source: ValidatorAPIError,
+        source: NymAPIError,
     },
     #[error("{source}")]
     KeyDerivationError {
@@ -110,7 +111,7 @@ pub enum BackendError {
     WalletUnexpectedMnemonicAccount,
     #[error("Failed to derive address from mnemonic")]
     FailedToDeriveAddress,
-    #[error("{0}")]
+    #[error(transparent)]
     ValueParseError(#[from] ParseIntError),
     #[error("The provided coin has an unknown denomination - {0}")]
     UnknownCoinDenom(String),
@@ -131,15 +132,41 @@ impl Serialize for BackendError {
     }
 }
 
-impl From<ValidatorClientError> for BackendError {
-    fn from(e: ValidatorClientError) -> Self {
-        match e {
-            ValidatorClientError::ValidatorAPIError { source } => source.into(),
-            ValidatorClientError::MalformedUrlProvided(e) => e.into(),
-            ValidatorClientError::NymdError(e) => e.into(),
-            ValidatorClientError::NoAPIUrlAvailable => {
-                TypesError::NoValidatorApiUrlConfigured.into()
+impl From<NyxdError> for BackendError {
+    fn from(source: NyxdError) -> Self {
+        match source {
+            NyxdError::AbciError {
+                code: _,
+                log: _,
+                ref pretty_log,
+            } => {
+                if let Some(pretty_log) = pretty_log {
+                    Self::NyxdError {
+                        pretty_error: pretty_log.to_string(),
+                        source,
+                    }
+                } else {
+                    Self::NyxdError {
+                        pretty_error: source.to_string(),
+                        source,
+                    }
+                }
             }
+            nyxd_error => Self::NyxdError {
+                pretty_error: nyxd_error.to_string(),
+                source: nyxd_error,
+            },
+        }
+    }
+}
+
+impl From<ValidatorClientError> for BackendError {
+    fn from(e: ValidatorClientError) -> Self {
+        match e {
+            ValidatorClientError::NymAPIError { source } => source.into(),
+            ValidatorClientError::MalformedUrlProvided(e) => e.into(),
+            ValidatorClientError::NyxdError(e) => e.into(),
+            ValidatorClientError::NoAPIUrlAvailable => TypesError::NoNymApiUrlConfigured.into(),
         }
     }
 }
diff --git a/nym-wallet/src-tauri/src/main.rs b/nym-wallet/src-tauri/src/main.rs
index 9bd44028c2..cc82f9f7df 100644
--- a/nym-wallet/src-tauri/src/main.rs
+++ b/nym-wallet/src-tauri/src/main.rs
@@ -10,9 +10,9 @@ use mixnet_contract_common::{Gateway, MixNode};
 use crate::menu::AddDefaultSubmenus;
 use crate::operations::help;
 use crate::operations::mixnet;
+use crate::operations::nym_api;
 use crate::operations::signatures;
 use crate::operations::simulate;
-use crate::operations::validator_api;
 use crate::operations::vesting;
 use crate::state::WalletState;
 
@@ -55,6 +55,7 @@ fn main() {
             mixnet::admin::update_contract_settings,
             mixnet::bond::bond_gateway,
             mixnet::bond::bond_mixnode,
+            mixnet::bond::pledge_more,
             mixnet::bond::gateway_bond_details,
             mixnet::bond::get_pending_operator_rewards,
             mixnet::bond::mixnode_bond_details,
@@ -72,20 +73,26 @@ fn main() {
             mixnet::delegate::get_all_mix_delegations,
             mixnet::delegate::undelegate_from_mixnode,
             mixnet::delegate::undelegate_all_from_mixnode,
+            mixnet::families::create_family,
+            mixnet::families::join_family,
+            mixnet::families::leave_family,
+            mixnet::families::kick_family_member,
             mixnet::interval::get_current_interval,
             mixnet::interval::get_pending_epoch_events,
             mixnet::interval::get_pending_interval_events,
             mixnet::rewards::claim_delegator_reward,
             mixnet::rewards::claim_operator_reward,
             mixnet::rewards::claim_locked_and_unlocked_delegator_reward,
+            mixnet::rewards::get_current_rewarding_parameters,
             mixnet::send::send,
+            mixnet::bond::get_mixnode_uptime,
             network_config::add_validator,
-            network_config::get_validator_api_urls,
-            network_config::get_validator_nymd_urls,
+            network_config::get_nym_api_urls,
+            network_config::get_nyxd_urls,
             network_config::remove_validator,
-            network_config::select_validator_api_url,
-            network_config::select_validator_nymd_url,
-            network_config::update_validator_urls,
+            network_config::select_nym_api_url,
+            network_config::select_nyxd_url,
+            network_config::update_nyxd_urls,
             state::load_config_from_files,
             state::save_config_to_files,
             utils::owns_gateway,
@@ -94,17 +101,19 @@ fn main() {
             utils::get_old_and_incorrect_hardcoded_fee,
             utils::try_convert_pubkey_to_mix_id,
             utils::default_mixnode_cost_params,
-            validator_api::status::gateway_core_node_status,
-            validator_api::status::mixnode_core_node_status,
-            validator_api::status::mixnode_inclusion_probability,
-            validator_api::status::mixnode_reward_estimation,
-            validator_api::status::mixnode_stake_saturation,
-            validator_api::status::mixnode_status,
-            validator_api::status::gateway_report,
+            nym_api::status::compute_mixnode_reward_estimation,
+            nym_api::status::gateway_core_node_status,
+            nym_api::status::mixnode_core_node_status,
+            nym_api::status::mixnode_inclusion_probability,
+            nym_api::status::mixnode_reward_estimation,
+            nym_api::status::mixnode_stake_saturation,
+            nym_api::status::mixnode_status,
+            nym_api::status::gateway_report,
             vesting::rewards::vesting_claim_delegator_reward,
             vesting::rewards::vesting_claim_operator_reward,
             vesting::bond::vesting_bond_gateway,
             vesting::bond::vesting_bond_mixnode,
+            vesting::bond::vesting_pledge_more,
             vesting::bond::vesting_unbond_gateway,
             vesting::bond::vesting_unbond_mixnode,
             vesting::bond::vesting_update_mixnode_cost_params,
@@ -130,6 +139,7 @@ fn main() {
             simulate::mixnet::simulate_bond_gateway,
             simulate::mixnet::simulate_unbond_gateway,
             simulate::mixnet::simulate_bond_mixnode,
+            simulate::mixnet::simulate_pledge_more,
             simulate::mixnet::simulate_unbond_mixnode,
             simulate::mixnet::simulate_update_mixnode_config,
             simulate::mixnet::simulate_update_mixnode_cost_params,
@@ -140,6 +150,7 @@ fn main() {
             simulate::vesting::simulate_vesting_bond_gateway,
             simulate::vesting::simulate_vesting_unbond_gateway,
             simulate::vesting::simulate_vesting_bond_mixnode,
+            simulate::vesting::simulate_vesting_pledge_more,
             simulate::vesting::simulate_vesting_unbond_mixnode,
             simulate::vesting::simulate_vesting_update_mixnode_config,
             simulate::vesting::simulate_vesting_update_mixnode_cost_params,
diff --git a/nym-wallet/src-tauri/src/network_config.rs b/nym-wallet/src-tauri/src/network_config.rs
index 43e872b717..bcac19bb62 100644
--- a/nym-wallet/src-tauri/src/network_config.rs
+++ b/nym-wallet/src-tauri/src/network_config.rs
@@ -7,17 +7,17 @@ use nym_wallet_types::network::Network as WalletNetwork;
 use nym_wallet_types::network_config::{Validator, ValidatorUrl, ValidatorUrls};
 
 #[tauri::command]
-pub async fn get_validator_nymd_urls(
+pub async fn get_nyxd_urls(
     network: WalletNetwork,
     state: tauri::State<'_, WalletState>,
 ) -> Result<ValidatorUrls, BackendError> {
     let state = state.read().await;
-    let urls: Vec<ValidatorUrl> = state.get_nymd_urls(network).collect();
+    let urls: Vec<ValidatorUrl> = state.get_nyxd_urls(network).collect();
     Ok(ValidatorUrls { urls })
 }
 
 #[tauri::command]
-pub async fn get_validator_api_urls(
+pub async fn get_nym_api_urls(
     network: WalletNetwork,
     state: tauri::State<'_, WalletState>,
 ) -> Result<ValidatorUrls, BackendError> {
@@ -27,27 +27,24 @@ pub async fn get_validator_api_urls(
 }
 
 #[tauri::command]
-pub async fn select_validator_nymd_url(
+pub async fn select_nyxd_url(
     url: &str,
     network: WalletNetwork,
     state: tauri::State<'_, WalletState>,
 ) -> Result<(), BackendError> {
-    log::debug!("Selecting new validator nymd_url for {network}: {url}");
-    state
-        .write()
-        .await
-        .select_validator_nymd_url(url, network)?;
+    log::debug!("Selecting new nyxd url for {network}: {url}");
+    state.write().await.select_nyxd_url(url, network)?;
     Ok(())
 }
 
 #[tauri::command]
-pub async fn select_validator_api_url(
+pub async fn select_nym_api_url(
     url: &str,
     network: WalletNetwork,
     state: tauri::State<'_, WalletState>,
 ) -> Result<(), BackendError> {
-    log::debug!("Selecting new validator api_url for {network}: {url}");
-    state.write().await.select_validator_api_url(url, network)?;
+    log::debug!("Selecting new  nym api url for {network}: {url}");
+    state.write().await.select_nym_api_url(url, network)?;
     Ok(())
 }
 
@@ -77,10 +74,8 @@ pub async fn remove_validator(
 
 // Update the list of validators by fecthing additional ones remotely. If it fails, just ignore.
 #[tauri::command]
-pub async fn update_validator_urls(
-    state: tauri::State<'_, WalletState>,
-) -> Result<(), BackendError> {
+pub async fn update_nyxd_urls(state: tauri::State<'_, WalletState>) -> Result<(), BackendError> {
     let mut w_state = state.write().await;
-    let _r = w_state.fetch_updated_validator_urls().await;
+    let _r = w_state.fetch_updated_nyxd_urls().await;
     Ok(())
 }
diff --git a/nym-wallet/src-tauri/src/operations/help/log.rs b/nym-wallet/src-tauri/src/operations/help/log.rs
index c8ff873f6a..c4c2357304 100644
--- a/nym-wallet/src-tauri/src/operations/help/log.rs
+++ b/nym-wallet/src-tauri/src/operations/help/log.rs
@@ -5,8 +5,8 @@ use tauri::Manager;
 pub fn help_log_toggle_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
     if let Some(current_log_window) = app_handle.windows().get("log") {
         log::info!("Closing log window...");
-        if let Err(e) = current_log_window.close() {
-            log::error!("Unable to close log window: {:?}", e);
+        if let Err(err) = current_log_window.close() {
+            log::error!("Unable to close log window: {err}");
         }
         return Ok(());
     }
@@ -17,13 +17,13 @@ pub fn help_log_toggle_window(app_handle: tauri::AppHandle) -> Result<(), Backen
         .build()
     {
         Ok(window) => {
-            if let Err(e) = window.set_focus() {
-                log::error!("Unable to focus log window: {:?}", e);
+            if let Err(err) = window.set_focus() {
+                log::error!("Unable to focus log window: {err}");
             }
             Ok(())
         }
-        Err(e) => {
-            log::error!("Unable to create log window: {:?}", e);
+        Err(err) => {
+            log::error!("Unable to create log window: {err}");
             Err(BackendError::NewWindowError)
         }
     }
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/account.rs b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
index 5811c007d1..d9f3f122d7 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/account.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/account.rs
@@ -14,8 +14,8 @@ use std::collections::HashMap;
 use std::str::FromStr;
 use strum::IntoEnumIterator;
 use url::Url;
-use validator_client::nymd::wallet::{AccountData, DirectSecp256k1HdWallet};
-use validator_client::{nymd::SigningNymdClient, Client};
+use validator_client::nyxd::wallet::{AccountData, DirectSecp256k1HdWallet};
+use validator_client::{nyxd::SigningNyxdClient, Client};
 
 #[tauri::command]
 pub async fn connect_with_mnemonic(
@@ -30,12 +30,12 @@ pub async fn connect_with_mnemonic(
 pub async fn get_balance(state: tauri::State<'_, WalletState>) -> Result<Balance, BackendError> {
     let guard = state.read().await;
     let client = guard.current_client()?;
-    let address = client.nymd.address();
+    let address = client.nyxd.address();
     let network = guard.current_network();
     let base_mix_denom = network.base_mix_denom();
 
     match client
-        .nymd
+        .nyxd
         .get_balance(address, base_mix_denom.to_string())
         .await?
     {
@@ -67,7 +67,7 @@ pub async fn switch_network(
         let client = r_state.client(network)?;
         let denom = network.mix_denom();
 
-        Account::new(client.nymd.address().to_string(), denom)
+        Account::new(client.nyxd.address().to_string(), denom)
     };
 
     let mut w_state = state.write().await;
@@ -96,7 +96,7 @@ async fn _connect_with_mnemonic(
         w_state.load_config_files();
     }
 
-    network_config::update_validator_urls(state.clone()).await?;
+    network_config::update_nyxd_urls(state.clone()).await?;
 
     let config = {
         let state = state.read().await;
@@ -115,11 +115,11 @@ async fn _connect_with_mnemonic(
     };
 
     // Get all the urls needed for the connection test
-    let (untested_nymd_urls, untested_api_urls) = {
+    let (untested_nyxd_urls, untested_api_urls) = {
         let state = state.read().await;
-        (state.get_all_nymd_urls(), state.get_all_api_urls())
+        (state.get_all_nyxd_urls(), state.get_all_api_urls())
     };
-    let default_nymd_urls: HashMap<WalletNetwork, Url> = untested_nymd_urls
+    let default_nyxd_urls: HashMap<WalletNetwork, Url> = untested_nyxd_urls
         .iter()
         .map(|(network, urls)| (*network, urls.iter().next().unwrap().clone()))
         .collect();
@@ -128,15 +128,15 @@ async fn _connect_with_mnemonic(
         .map(|(network, urls)| (*network, urls.iter().next().unwrap().clone()))
         .collect();
 
-    // Run connection tests on all nymd and validator-api endpoints
-    let (nymd_urls, api_urls) =
-        run_connection_test(untested_nymd_urls, untested_api_urls, &config).await;
+    // Run connection tests on all nyxd and nym-api endpoints
+    let (nyxd_urls, api_urls) =
+        run_connection_test(untested_nyxd_urls, untested_api_urls, &config).await;
 
     // Create clients for all networks
     let clients = create_clients(
-        &nymd_urls,
+        &nyxd_urls,
         &api_urls,
-        &default_nymd_urls,
+        &default_nyxd_urls,
         &default_api_urls,
         &config,
         &mnemonic,
@@ -149,7 +149,7 @@ async fn _connect_with_mnemonic(
         .find(|(network, _)| *network == default_network);
     let account_for_default_network = match client_for_default_network {
         Some((_, client)) => Ok(Account::new(
-            client.nymd.address().to_string(),
+            client.nyxd.address().to_string(),
             default_network.mix_denom(),
         )),
         None => Err(BackendError::NetworkNotSupported),
@@ -170,7 +170,7 @@ async fn _connect_with_mnemonic(
 }
 
 async fn run_connection_test(
-    untested_nymd_urls: HashMap<WalletNetwork, Vec<Url>>,
+    untested_nyxd_urls: HashMap<WalletNetwork, Vec<Url>>,
     untested_api_urls: HashMap<WalletNetwork, Vec<Url>>,
     config: &Config,
 ) -> (
@@ -181,7 +181,7 @@ async fn run_connection_test(
         .map(|network| (network.into(), config.get_mixnet_contract_address(network)))
         .collect::<HashMap<_, _>>();
 
-    let untested_nymd_urls = untested_nymd_urls
+    let untested_nyxd_urls = untested_nyxd_urls
         .into_iter()
         .flat_map(|(net, urls)| urls.into_iter().map(move |url| (net.into(), url)));
 
@@ -190,7 +190,7 @@ async fn run_connection_test(
         .flat_map(|(net, urls)| urls.into_iter().map(move |url| (net.into(), url)));
 
     validator_client::connection_tester::run_validator_connection_test(
-        untested_nymd_urls,
+        untested_nyxd_urls,
         untested_api_urls,
         mixnet_contract_address,
     )
@@ -198,31 +198,31 @@ async fn run_connection_test(
 }
 
 fn create_clients(
-    nymd_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
+    nyxd_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
     api_urls: &HashMap<NymNetworkDetails, Vec<(Url, bool)>>,
-    default_nymd_urls: &HashMap<WalletNetwork, Url>,
+    default_nyxd_urls: &HashMap<WalletNetwork, Url>,
     default_api_urls: &HashMap<WalletNetwork, Url>,
     config: &Config,
     mnemonic: &Mnemonic,
-) -> Result<Vec<(WalletNetwork, Client<SigningNymdClient>)>, BackendError> {
+) -> Result<Vec<(WalletNetwork, Client<SigningNyxdClient>)>, BackendError> {
     let mut clients = Vec::new();
     for network in WalletNetwork::iter() {
-        let nymd_url = if let Some(url) = config.get_selected_validator_nymd_url(network) {
-            log::debug!("Using selected nymd_url for {network}: {url}");
+        let nyxd_url = if let Some(url) = config.get_selected_validator_nyxd_url(network) {
+            log::debug!("Using selected nyxd_url for {network}: {url}");
             url.clone()
         } else {
-            let default_nymd_url = default_nymd_urls
+            let default_nyxd_url = default_nyxd_urls
                 .get(&network)
-                .expect("Expected at least one nymd_url");
-            select_random_responding_url(nymd_urls, network).unwrap_or_else(|| {
+                .expect("Expected at least one nyxd_url");
+            select_random_responding_url(nyxd_urls, network).unwrap_or_else(|| {
                 log::debug!(
-                    "No successful nymd_urls for {network}: using default: {default_nymd_url}"
+                    "No successful nyxd_urls for {network}: using default: {default_nyxd_url}"
                 );
-                default_nymd_url.clone()
+                default_nyxd_url.clone()
             })
         };
 
-        let api_url = if let Some(url) = config.get_selected_validator_api_url(&network) {
+        let api_url = if let Some(url) = config.get_selected_nym_api_url(&network) {
             log::debug!("Using selected api_url for {network}: {url}");
             url.clone()
         } else {
@@ -235,7 +235,7 @@ fn create_clients(
             })
         };
 
-        log::info!("Connecting to: nymd_url: {nymd_url} for {network}");
+        log::info!("Connecting to: nyxd_url: {nyxd_url} for {network}");
         log::info!("Connecting to: api_url: {api_url} for {network}");
 
         let network_details = NymNetworkDetails::from(network)
@@ -249,10 +249,10 @@ fn create_clients(
             ));
 
         let config = validator_client::Config::try_from_nym_network_details(&network_details)?
-            .with_urls(nymd_url, api_url);
+            .with_urls(nyxd_url, api_url);
 
         let mut client = validator_client::Client::new_signing(config, mnemonic.clone())?;
-        client.set_nymd_simulated_gas_multiplier(CUSTOM_SIMULATED_GAS_MULTIPLIER);
+        client.set_nyxd_simulated_gas_multiplier(CUSTOM_SIMULATED_GAS_MULTIPLIER);
         clients.push((network, client));
     }
     Ok(clients)
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/admin.rs b/nym-wallet/src-tauri/src/operations/mixnet/admin.rs
index 5074c5500e..3633c3ac5d 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/admin.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/admin.rs
@@ -6,8 +6,8 @@ use crate::state::WalletState;
 use mixnet_contract_common::ContractStateParams;
 use nym_types::transaction::TransactionExecuteResult;
 use nym_wallet_types::admin::TauriContractStateParams;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
-use validator_client::nymd::Fee;
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::Fee;
 
 #[tauri::command]
 pub async fn get_contract_settings(
@@ -17,7 +17,7 @@ pub async fn get_contract_settings(
 
     let guard = state.read().await;
     let reg = guard.registered_coins()?;
-    let client = &guard.current_client()?.nymd;
+    let client = &guard.current_client()?.nyxd;
 
     let res = client.get_mixnet_contract_settings().await?;
     let converted = TauriContractStateParams::from_mixnet_contract_contract_state_params(res, reg)?;
@@ -33,7 +33,7 @@ pub async fn update_contract_settings(
 ) -> Result<TransactionExecuteResult, BackendError> {
     let guard = state.read().await;
     let reg = guard.registered_coins()?;
-    let client = &guard.current_client()?.nymd;
+    let client = &guard.current_client()?.nyxd;
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
 
     let mixnet_contract_settings_params: ContractStateParams =
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/bond.rs b/nym-wallet/src-tauri/src/operations/mixnet/bond.rs
index 7098577545..c33c4c5190 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/bond.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/bond.rs
@@ -3,7 +3,7 @@
 
 use crate::error::BackendError;
 use crate::state::WalletState;
-use crate::{nymd_client, Gateway, MixNode};
+use crate::{nyxd_client, Gateway, MixNode};
 use mixnet_contract_common::{MixId, MixNodeConfigUpdate};
 use nym_types::currency::DecCoin;
 use nym_types::gateway::GatewayBond;
@@ -11,8 +11,8 @@ use nym_types::mixnode::{MixNodeCostParams, MixNodeDetails};
 use nym_types::transaction::TransactionExecuteResult;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
-use validator_client::nymd::Fee;
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::Fee;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct NodeDescription {
@@ -43,7 +43,7 @@ pub async fn bond_gateway(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .bond_gateway(gateway, owner_signature, pledge_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -61,7 +61,7 @@ pub async fn unbond_gateway(
     let guard = state.read().await;
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     log::info!(">>> Unbond gateway, fee = {:?}", fee);
-    let res = guard.current_client()?.nymd.unbond_gateway(fee).await?;
+    let res = guard.current_client()?.nyxd.unbond_gateway(fee).await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
     log::trace!("<<< {:?}", res);
     Ok(TransactionExecuteResult::from_execute_result(
@@ -92,7 +92,7 @@ pub async fn bond_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .bond_mixnode(mixnode, cost_params, owner_signature, pledge_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -102,6 +102,33 @@ pub async fn bond_mixnode(
     )?)
 }
 
+#[tauri::command]
+pub async fn pledge_more(
+    fee: Option<Fee>,
+    additional_pledge: DecCoin,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let additional_pledge_base = guard.attempt_convert_to_base_coin(additional_pledge.clone())?;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    log::info!(
+        ">>> Pledge more, additional_pledge_display = {}, additional_pledge_base = {}, fee = {:?}",
+        additional_pledge,
+        additional_pledge_base,
+        fee,
+    );
+    let res = guard
+        .current_client()?
+        .nyxd
+        .pledge_more(additional_pledge_base, fee)
+        .await?;
+    log::info!("<<< tx hash = {}", res.transaction_hash);
+    log::trace!("<<< {:?}", res);
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
+
 #[tauri::command]
 pub async fn unbond_mixnode(
     fee: Option<Fee>,
@@ -110,7 +137,7 @@ pub async fn unbond_mixnode(
     let guard = state.read().await;
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     log::info!(">>> Unbond mixnode, fee = {:?}", fee);
-    let res = guard.current_client()?.nymd.unbond_mixnode(fee).await?;
+    let res = guard.current_client()?.nyxd.unbond_mixnode(fee).await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
     log::trace!("<<< {:?}", res);
     Ok(TransactionExecuteResult::from_execute_result(
@@ -135,7 +162,7 @@ pub async fn update_mixnode_cost_params(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .update_mixnode_cost_params(cost_params, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -160,7 +187,7 @@ pub async fn update_mixnode_config(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .update_mixnode_config(update, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -177,14 +204,14 @@ pub async fn get_mixnode_avg_uptime(
     log::info!(">>> Get mixnode bond details");
     let guard = state.read().await;
     let client = guard.current_client()?;
-    let res = client.nymd.get_owned_mixnode(client.nymd.address()).await?;
+    let res = client.nyxd.get_owned_mixnode(client.nyxd.address()).await?;
 
     match res.mixnode_details {
         Some(details) => {
             let id = details.mix_id();
             log::trace!("  >>> Get average uptime percentage: mix_id = {}", id);
             let avg_uptime_percent = client
-                .validator_api
+                .nym_api
                 .get_mixnode_avg_uptime(id)
                 .await
                 .ok()
@@ -203,7 +230,7 @@ pub async fn mixnode_bond_details(
     log::info!(">>> Get mixnode bond details");
     let guard = state.read().await;
     let client = guard.current_client()?;
-    let res = client.nymd.get_owned_mixnode(client.nymd.address()).await?;
+    let res = client.nyxd.get_owned_mixnode(client.nyxd.address()).await?;
     let details = res
         .mixnode_details
         .map(|details| {
@@ -231,7 +258,7 @@ pub async fn gateway_bond_details(
     log::info!(">>> Get gateway bond details");
     let guard = state.read().await;
     let client = guard.current_client()?;
-    let bond = client.nymd.get_owned_gateway(client.nymd.address()).await?;
+    let bond = client.nyxd.get_owned_gateway(client.nyxd.address()).await?;
     let res = bond
         .gateway
         .map(|bond| {
@@ -259,7 +286,7 @@ pub async fn get_pending_operator_rewards(
     let guard = state.read().await;
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .get_pending_operator_reward(&address.parse()?)
         .await?;
 
@@ -292,7 +319,7 @@ pub async fn get_number_of_mixnode_delegators(
     mix_id: MixId,
     state: tauri::State<'_, WalletState>,
 ) -> Result<usize, BackendError> {
-    Ok(nymd_client!(state)
+    Ok(nyxd_client!(state)
         .get_mixnode_details(mix_id)
         .await?
         .mixnode_details
@@ -314,3 +341,18 @@ pub async fn get_mix_node_description(
         .json()
         .await?)
 }
+
+#[tauri::command]
+pub async fn get_mixnode_uptime(
+    mix_id: MixId,
+    state: tauri::State<'_, WalletState>,
+) -> Result<u8, BackendError> {
+    log::info!(">>> Get mixnode uptime");
+
+    let guard = state.read().await;
+    let client = guard.current_client()?;
+    let uptime = client.nym_api.get_mixnode_avg_uptime(mix_id).await?;
+
+    log::info!(">>> Uptime response: {}", uptime.avg_uptime);
+    Ok(uptime.avg_uptime)
+}
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/delegate.rs b/nym-wallet/src-tauri/src/operations/mixnet/delegate.rs
index dfbf46389b..cf26c1f527 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/delegate.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/delegate.rs
@@ -13,8 +13,8 @@ use nym_types::deprecated::{
 use nym_types::mixnode::MixNodeCostParams;
 use nym_types::pending_events::PendingEpochEvent;
 use nym_types::transaction::TransactionExecuteResult;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
-use validator_client::nymd::Fee;
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::Fee;
 
 #[tauri::command]
 pub async fn get_pending_delegation_events(
@@ -25,7 +25,7 @@ pub async fn get_pending_delegation_events(
     let reg = guard.registered_coins()?;
     let client = guard.current_client()?;
 
-    let events = client.get_all_nymd_pending_epoch_events().await?;
+    let events = client.get_all_nyxd_pending_epoch_events().await?;
     let converted = events
         .into_iter()
         .map(|e| PendingEpochEvent::try_from_mixnet_contract(e, reg))
@@ -36,9 +36,9 @@ pub async fn get_pending_delegation_events(
     // we only care about events concerning THIS client
     let mut client_specific_events = Vec::new();
     for delegation_event in delegation_events {
-        if delegation_event.address_matches(client.nymd.address().as_ref()) {
+        if delegation_event.address_matches(client.nyxd.address().as_ref()) {
             let node_identity = client
-                .nymd
+                .nyxd
                 .get_mixnode_details(delegation_event.mix_id)
                 .await?
                 .mixnode_details
@@ -82,7 +82,7 @@ pub async fn delegate_to_mixnode(
         fee,
     );
     let res = client
-        .nymd
+        .nyxd
         .delegate_to_mixnode(mix_id, delegation_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -108,7 +108,7 @@ pub async fn undelegate_from_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .undelegate_from_mixnode(mix_id, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -153,10 +153,10 @@ pub async fn get_all_mix_delegations(
     let client = guard.current_client()?;
     let reg = guard.registered_coins()?;
 
-    let address = client.nymd.address();
+    let address = client.nyxd.address();
     let network = guard.current_network();
     let base_mix_denom = network.base_mix_denom().to_string();
-    let vesting_contract = client.nymd.vesting_contract_address();
+    let vesting_contract = client.nyxd.vesting_contract_address();
 
     log::info!("  >>> Get delegations");
     let delegations = client.get_all_delegator_delegations(address).await?;
@@ -213,7 +213,7 @@ pub async fn get_all_mix_delegations(
 
         log::trace!("  >>> Get accumulated rewards: address = {}", address);
         let pending_reward = client
-            .nymd
+            .nyxd
             .get_pending_delegator_reward(address, d.mix_id, d.proxy.clone())
             .await?;
 
@@ -230,7 +230,7 @@ pub async fn get_all_mix_delegations(
         };
 
         log::trace!("  >>> Get stake saturation: mix_id = {}", d.mix_id);
-        let stake_saturation = client.nymd.get_mixnode_stake_saturation(d.mix_id).await?;
+        let stake_saturation = client.nyxd.get_mixnode_stake_saturation(d.mix_id).await?;
         log::trace!("  <<< {:?}", stake_saturation);
 
         log::trace!(
@@ -238,7 +238,7 @@ pub async fn get_all_mix_delegations(
             d.mix_id
         );
         let avg_uptime_percent = client
-            .validator_api
+            .nym_api
             .get_mixnode_avg_uptime(d.mix_id)
             .await
             .ok()
@@ -250,7 +250,7 @@ pub async fn get_all_mix_delegations(
             d.height
         );
         let timestamp = client
-            .nymd
+            .nyxd
             .get_block_timestamp(Some(d.height as u32))
             .await?;
         let delegated_on_iso_datetime = timestamp.to_rfc3339();
@@ -325,7 +325,7 @@ pub async fn get_pending_delegator_rewards(
     let guard = state.read().await;
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .get_pending_delegator_reward(&address.parse()?, mix_id, proxy)
         .await?;
 
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/families.rs b/nym-wallet/src-tauri/src/operations/mixnet/families.rs
new file mode 100644
index 0000000000..aba66c9a58
--- /dev/null
+++ b/nym-wallet/src-tauri/src/operations/mixnet/families.rs
@@ -0,0 +1,81 @@
+use crate::error::BackendError;
+use crate::state::WalletState;
+use nym_types::transaction::TransactionExecuteResult;
+use validator_client::nyxd::traits::MixnetSigningClient;
+use validator_client::nyxd::Fee;
+
+#[tauri::command]
+pub async fn create_family(
+    signature: String,
+    label: String,
+    fee: Option<Fee>,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    let res = guard
+        .current_client()?
+        .nyxd
+        .create_family(signature, label, fee)
+        .await?;
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
+
+#[tauri::command]
+pub async fn join_family(
+    signature: String,
+    family_head: String,
+    fee: Option<Fee>,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    let res = guard
+        .current_client()?
+        .nyxd
+        .join_family(signature, family_head, fee)
+        .await?;
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
+
+#[tauri::command]
+pub async fn leave_family(
+    signature: String,
+    family_head: String,
+    fee: Option<Fee>,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    let res = guard
+        .current_client()?
+        .nyxd
+        .leave_family(signature, family_head, fee)
+        .await?;
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
+
+#[tauri::command]
+pub async fn kick_family_member(
+    signature: String,
+    member: String,
+    fee: Option<Fee>,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    let res = guard
+        .current_client()?
+        .nyxd
+        .kick_family_member(signature, member, fee)
+        .await?;
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/interval.rs b/nym-wallet/src-tauri/src/operations/mixnet/interval.rs
index ce88d840b4..996f9bbf69 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/interval.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/interval.rs
@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::BackendError;
-use crate::nymd_client;
+use crate::nyxd_client;
 use crate::state::WalletState;
 use nym_types::pending_events::{PendingEpochEvent, PendingIntervalEvent};
 use nym_wallet_types::interval::Interval;
-use validator_client::nymd::traits::MixnetQueryClient;
+use validator_client::nyxd::traits::MixnetQueryClient;
 
 #[tauri::command]
 pub async fn get_current_interval(
     state: tauri::State<'_, WalletState>,
 ) -> Result<Interval, BackendError> {
     log::info!(">>> Get current interval");
-    let res = nymd_client!(state).get_current_interval_details().await?;
+    let res = nyxd_client!(state).get_current_interval_details().await?;
     log::info!("<<< current interval = {:?}", res);
     Ok(res.interval.into())
 }
@@ -26,7 +26,7 @@ pub async fn get_pending_epoch_events(
     let guard = state.read().await;
     let reg = guard.registered_coins()?;
     let client = guard.current_client()?;
-    let res = client.get_all_nymd_pending_epoch_events().await?;
+    let res = client.get_all_nyxd_pending_epoch_events().await?;
 
     log::info!("<<< got = {:?} events", res.len());
 
@@ -46,7 +46,7 @@ pub async fn get_pending_interval_events(
     let guard = state.read().await;
     let reg = guard.registered_coins()?;
     let client = guard.current_client()?;
-    let res = client.get_all_nymd_pending_interval_events().await?;
+    let res = client.get_all_nyxd_pending_interval_events().await?;
 
     log::info!("<<< got = {:?} events", res.len());
 
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/mod.rs b/nym-wallet/src-tauri/src/operations/mixnet/mod.rs
index cb94278ee2..8b19a26dd0 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/mod.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/mod.rs
@@ -2,6 +2,7 @@ pub mod account;
 pub mod admin;
 pub mod bond;
 pub mod delegate;
+pub mod families;
 pub mod interval;
 pub mod rewards;
 pub mod send;
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/rewards.rs b/nym-wallet/src-tauri/src/operations/mixnet/rewards.rs
index 6fb8893ee9..0a6fd3ae7f 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/rewards.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/rewards.rs
@@ -1,10 +1,10 @@
 use crate::error::BackendError;
 use crate::state::WalletState;
 use crate::vesting::rewards::vesting_claim_delegator_reward;
-use mixnet_contract_common::MixId;
+use mixnet_contract_common::{MixId, RewardingParams};
 use nym_types::transaction::TransactionExecuteResult;
-use validator_client::nymd::traits::{MixnetQueryClient, MixnetSigningClient};
-use validator_client::nymd::Fee;
+use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
+use validator_client::nyxd::Fee;
 
 #[tauri::command]
 pub async fn claim_operator_reward(
@@ -17,7 +17,7 @@ pub async fn claim_operator_reward(
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .withdraw_operator_reward(fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -38,7 +38,7 @@ pub async fn claim_delegator_reward(
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .withdraw_delegator_reward(mix_id, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -63,11 +63,11 @@ pub async fn claim_locked_and_unlocked_delegator_reward(
     let client = guard.current_client()?;
 
     log::trace!(">>> Get delegations: mix_id = {}", mix_id);
-    let address = client.nymd.address();
+    let address = client.nyxd.address();
     let delegations = client.get_all_delegator_delegations(address).await?;
     log::trace!("<<< {} delegations", delegations.len());
 
-    let vesting_contract = client.nymd.vesting_contract_address().to_string();
+    let vesting_contract = client.nyxd.vesting_contract_address().to_string();
     let liquid_delegation = client.get_delegation_details(mix_id, address, None).await?;
     let vesting_delegation = client
         .get_delegation_details(mix_id, address, Some(vesting_contract))
@@ -95,3 +95,17 @@ pub async fn claim_locked_and_unlocked_delegator_reward(
     log::trace!("<<< {:?}", res);
     Ok(res)
 }
+
+#[tauri::command]
+pub async fn get_current_rewarding_parameters(
+    state: tauri::State<'_, WalletState>,
+) -> Result<RewardingParams, BackendError> {
+    log::info!(">>> Get current rewarding params",);
+
+    let guard = state.read().await;
+    let client = guard.current_client()?;
+
+    let reward_params = client.nyxd.get_rewarding_parameters().await?;
+
+    Ok(reward_params)
+}
diff --git a/nym-wallet/src-tauri/src/operations/mixnet/send.rs b/nym-wallet/src-tauri/src/operations/mixnet/send.rs
index 0e4cbdd6a3..b57cf0a267 100644
--- a/nym-wallet/src-tauri/src/operations/mixnet/send.rs
+++ b/nym-wallet/src-tauri/src/operations/mixnet/send.rs
@@ -3,7 +3,7 @@ use crate::state::WalletState;
 use nym_types::currency::DecCoin;
 use nym_types::transaction::{SendTxResult, TransactionDetails};
 use std::str::FromStr;
-use validator_client::nymd::{AccountId, Fee};
+use validator_client::nyxd::{AccountId, Fee};
 
 #[tauri::command]
 pub async fn send(
@@ -17,7 +17,7 @@ pub async fn send(
     let amount_base = guard.attempt_convert_to_base_coin(amount.clone())?;
 
     let to_address = AccountId::from_str(address)?;
-    let from_address = guard.current_client()?.nymd.address().to_string();
+    let from_address = guard.current_client()?.nyxd.address().to_string();
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     log::info!(
         ">>> Send: display_amount = {}, base_amount = {}, from = {}, to = {}, fee = {:?}",
@@ -29,7 +29,7 @@ pub async fn send(
     );
     let raw_res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .send(&to_address, vec![amount_base], memo, fee)
         .await?;
     log::info!("<<< tx hash = {}", raw_res.hash.to_string());
diff --git a/nym-wallet/src-tauri/src/operations/mod.rs b/nym-wallet/src-tauri/src/operations/mod.rs
index 457971d8c8..c6c175ee12 100644
--- a/nym-wallet/src-tauri/src/operations/mod.rs
+++ b/nym-wallet/src-tauri/src/operations/mod.rs
@@ -1,6 +1,6 @@
 pub mod help;
 pub mod mixnet;
+pub mod nym_api;
 pub mod signatures;
 pub mod simulate;
-pub mod validator_api;
 pub mod vesting;
diff --git a/nym-wallet/src-tauri/src/operations/validator_api/mod.rs b/nym-wallet/src-tauri/src/operations/nym_api/mod.rs
similarity index 100%
rename from nym-wallet/src-tauri/src/operations/validator_api/mod.rs
rename to nym-wallet/src-tauri/src/operations/nym_api/mod.rs
diff --git a/nym-wallet/src-tauri/src/operations/validator_api/status.rs b/nym-wallet/src-tauri/src/operations/nym_api/status.rs
similarity index 67%
rename from nym-wallet/src-tauri/src/operations/validator_api/status.rs
rename to nym-wallet/src-tauri/src/operations/nym_api/status.rs
index 16c83cfb67..873a1fa0a4 100644
--- a/nym-wallet/src-tauri/src/operations/validator_api/status.rs
+++ b/nym-wallet/src-tauri/src/operations/nym_api/status.rs
@@ -4,11 +4,11 @@
 use crate::api_client;
 use crate::error::BackendError;
 use crate::state::WalletState;
-use mixnet_contract_common::{IdentityKeyRef, MixId};
+use mixnet_contract_common::{reward_params::Performance, Coin, IdentityKeyRef, MixId, Percent};
 use validator_client::models::{
-    GatewayCoreStatusResponse, GatewayStatusReportResponse, InclusionProbabilityResponse,
-    MixnodeCoreStatusResponse, MixnodeStatusResponse, RewardEstimationResponse,
-    StakeSaturationResponse,
+    ComputeRewardEstParam, GatewayCoreStatusResponse, GatewayStatusReportResponse,
+    InclusionProbabilityResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
+    RewardEstimationResponse, StakeSaturationResponse,
 };
 
 #[tauri::command]
@@ -59,6 +59,29 @@ pub async fn mixnode_reward_estimation(
         .await?)
 }
 
+#[tauri::command]
+pub async fn compute_mixnode_reward_estimation(
+    mix_id: u32,
+    performance: Option<Performance>,
+    pledge_amount: Option<u64>,
+    total_delegation: Option<u64>,
+    interval_operating_cost: Option<Coin>,
+    profit_margin_percent: Option<Percent>,
+    state: tauri::State<'_, WalletState>,
+) -> Result<RewardEstimationResponse, BackendError> {
+    let request_body = ComputeRewardEstParam {
+        performance,
+        active_in_rewarded_set: Some(true),
+        pledge_amount,
+        total_delegation,
+        interval_operating_cost,
+        profit_margin_percent,
+    };
+    Ok(api_client!(state)
+        .compute_mixnode_reward_estimation(mix_id, &request_body)
+        .await?)
+}
+
 #[tauri::command]
 pub async fn mixnode_stake_saturation(
     mix_id: MixId,
diff --git a/nym-wallet/src-tauri/src/operations/signatures/sign.rs b/nym-wallet/src-tauri/src/operations/signatures/sign.rs
index 4ebca7aa56..6a0b05a1e4 100644
--- a/nym-wallet/src-tauri/src/operations/signatures/sign.rs
+++ b/nym-wallet/src-tauri/src/operations/signatures/sign.rs
@@ -13,7 +13,7 @@ use serde_json::json;
 pub struct SignatureOutputJson {
     pub account_id: String,
     pub public_key: PublicKey,
-    pub signature: String,
+    pub signature_as_hex: String,
 }
 
 #[tauri::command]
@@ -23,7 +23,7 @@ pub async fn sign(
 ) -> Result<String, BackendError> {
     let guard = state.read().await;
     let client = guard.current_client()?;
-    let wallet = client.nymd.signer();
+    let wallet = client.nyxd.signer();
     let derived_accounts = wallet.try_derive_accounts()?;
     let account = derived_accounts.first().ok_or_else(|| {
         log::error!(">>> Unable to derive account");
@@ -32,14 +32,14 @@ pub async fn sign(
 
     log::info!("<<< Signing message");
     let signature = wallet.sign_raw_with_account(account, message.as_bytes())?;
-    let signature_as_hex_string = signature.to_string();
     let output = SignatureOutputJson {
         account_id: account.address().to_string(),
         public_key: account.public_key(),
-        signature: signature_as_hex_string.to_string(),
+        signature_as_hex: signature.to_string(),
     };
-    log::info!(">>> Signing data {}", json!(output),);
-    Ok(signature_as_hex_string)
+    let output_json = json!(output).to_string();
+    log::info!(">>> Signing data {}", output_json);
+    Ok(output_json)
 }
 
 async fn get_pubkey_from_account_address(
@@ -50,7 +50,7 @@ async fn get_pubkey_from_account_address(
     let guard = state.read().await;
     let client = guard.current_client()?;
     let account = client
-        .nymd
+        .nyxd
         .get_account_details(address)
         .await?
         .ok_or_else(|| {
@@ -116,7 +116,7 @@ pub async fn verify(
             // get public key from current account address
             let guard = state.read().await;
             let client = guard.current_client()?;
-            let address = client.nymd.address();
+            let address = client.nyxd.address();
             get_pubkey_from_account_address(address, &state).await?
         }
     };
diff --git a/nym-wallet/src-tauri/src/operations/simulate/admin.rs b/nym-wallet/src-tauri/src/operations/simulate/admin.rs
index 29636bebf2..5ca826bb90 100644
--- a/nym-wallet/src-tauri/src/operations/simulate/admin.rs
+++ b/nym-wallet/src-tauri/src/operations/simulate/admin.rs
@@ -18,9 +18,9 @@ pub async fn simulate_update_contract_settings(
         params.try_convert_to_mixnet_contract_params(reg)?;
 
     let client = guard.current_client()?;
-    let mixnet_contract = client.nymd.mixnet_contract_address();
+    let mixnet_contract = client.nyxd.mixnet_contract_address();
 
-    let msg = client.nymd.wrap_contract_execute_message(
+    let msg = client.nyxd.wrap_contract_execute_message(
         mixnet_contract,
         &ExecuteMsg::UpdateContractStateParams {
             updated_parameters: mixnet_contract_settings_params,
@@ -28,6 +28,6 @@ pub async fn simulate_update_contract_settings(
         vec![],
     )?;
 
-    let result = client.nymd.simulate(vec![msg]).await?;
+    let result = client.nyxd.simulate(vec![msg]).await?;
     guard.create_detailed_fee(result)
 }
diff --git a/nym-wallet/src-tauri/src/operations/simulate/cosmos.rs b/nym-wallet/src-tauri/src/operations/simulate/cosmos.rs
index 2796e02097..3679a1d863 100644
--- a/nym-wallet/src-tauri/src/operations/simulate/cosmos.rs
+++ b/nym-wallet/src-tauri/src/operations/simulate/cosmos.rs
@@ -6,7 +6,7 @@ use crate::operations::simulate::FeeDetails;
 use crate::state::WalletState;
 use nym_types::currency::DecCoin;
 use std::str::FromStr;
-use validator_client::nymd::{AccountId, MsgSend};
+use validator_client::nyxd::{AccountId, MsgSend};
 
 #[tauri::command]
 pub async fn simulate_send(
@@ -21,7 +21,7 @@ pub async fn simulate_send(
     let amount = vec![amount_base.into()];
 
     let client = guard.current_client()?;
-    let from_address = client.nymd.address().clone();
+    let from_address = client.nyxd.address().clone();
 
     // TODO: I'm still not 100% convinced whether this should be exposed here or handled somewhere else in the client code
     let msg = MsgSend {
@@ -30,6 +30,6 @@ pub async fn simulate_send(
         amount,
     };
 
-    let result = client.nymd.simulate(vec![msg]).await?;
+    let result = client.nyxd.simulate(vec![msg]).await?;
     guard.create_detailed_fee(result)
 }
diff --git a/nym-wallet/src-tauri/src/operations/simulate/mixnet.rs b/nym-wallet/src-tauri/src/operations/simulate/mixnet.rs
index 51912e1332..7adc677c74 100644
--- a/nym-wallet/src-tauri/src/operations/simulate/mixnet.rs
+++ b/nym-wallet/src-tauri/src/operations/simulate/mixnet.rs
@@ -25,13 +25,13 @@ async fn simulate_mixnet_operation(
     };
 
     let client = guard.current_client()?;
-    let mixnet_contract = client.nymd.mixnet_contract_address();
+    let mixnet_contract = client.nyxd.mixnet_contract_address();
 
     let msg = client
-        .nymd
+        .nyxd
         .wrap_contract_execute_message(mixnet_contract, &msg, funds)?;
 
-    let result = client.nymd.simulate(vec![msg]).await?;
+    let result = client.nyxd.simulate(vec![msg]).await?;
     guard.create_detailed_fee(result)
 }
 
@@ -84,6 +84,14 @@ pub async fn simulate_bond_mixnode(
     .await
 }
 
+#[tauri::command]
+pub async fn simulate_pledge_more(
+    additional_pledge: DecCoin,
+    state: tauri::State<'_, WalletState>,
+) -> Result<FeeDetails, BackendError> {
+    simulate_mixnet_operation(ExecuteMsg::PledgeMore {}, Some(additional_pledge), &state).await
+}
+
 #[tauri::command]
 pub async fn simulate_unbond_mixnode(
     state: tauri::State<'_, WalletState>,
diff --git a/nym-wallet/src-tauri/src/operations/simulate/mod.rs b/nym-wallet/src-tauri/src/operations/simulate/mod.rs
index 256f6f9a84..384b8b9085 100644
--- a/nym-wallet/src-tauri/src/operations/simulate/mod.rs
+++ b/nym-wallet/src-tauri/src/operations/simulate/mod.rs
@@ -4,8 +4,8 @@
 use cosmrs::tx;
 use cosmrs::tx::Gas;
 use nym_types::fees::FeeDetails;
-use validator_client::nymd::cosmwasm_client::types::GasInfo;
-use validator_client::nymd::{CosmosCoin, Fee, GasAdjustable, GasAdjustment, GasPrice};
+use validator_client::nyxd::cosmwasm_client::types::GasInfo;
+use validator_client::nyxd::{CosmosCoin, Fee, GasAdjustable, GasAdjustment, GasPrice};
 
 pub mod admin;
 pub mod cosmos;
diff --git a/nym-wallet/src-tauri/src/operations/simulate/vesting.rs b/nym-wallet/src-tauri/src/operations/simulate/vesting.rs
index c7cebf2ce5..aff0d9b4c5 100644
--- a/nym-wallet/src-tauri/src/operations/simulate/vesting.rs
+++ b/nym-wallet/src-tauri/src/operations/simulate/vesting.rs
@@ -26,13 +26,13 @@ async fn simulate_vesting_operation(
     };
 
     let client = guard.current_client()?;
-    let vesting_contract = client.nymd.vesting_contract_address();
+    let vesting_contract = client.nyxd.vesting_contract_address();
 
     let msg = client
-        .nymd
+        .nyxd
         .wrap_contract_execute_message(vesting_contract, &msg, funds)?;
 
-    let result = client.nymd.simulate(vec![msg]).await?;
+    let result = client.nyxd.simulate(vec![msg]).await?;
     guard.create_detailed_fee(result)
 }
 
@@ -91,6 +91,19 @@ pub async fn simulate_vesting_bond_mixnode(
     .await
 }
 
+#[tauri::command]
+pub async fn simulate_vesting_pledge_more(
+    additional_pledge: DecCoin,
+    state: tauri::State<'_, WalletState>,
+) -> Result<FeeDetails, BackendError> {
+    let guard = state.read().await;
+    let amount = guard
+        .attempt_convert_to_base_coin(additional_pledge)?
+        .into();
+
+    simulate_vesting_operation(ExecuteMsg::PledgeMore { amount }, None, &state).await
+}
+
 #[tauri::command]
 pub async fn simulate_vesting_unbond_mixnode(
     state: tauri::State<'_, WalletState>,
diff --git a/nym-wallet/src-tauri/src/operations/vesting/bond.rs b/nym-wallet/src-tauri/src/operations/vesting/bond.rs
index 99f0086d9c..cb36653b47 100644
--- a/nym-wallet/src-tauri/src/operations/vesting/bond.rs
+++ b/nym-wallet/src-tauri/src/operations/vesting/bond.rs
@@ -1,5 +1,5 @@
 use crate::error::BackendError;
-use crate::nymd_client;
+use crate::nyxd_client;
 use crate::state::WalletState;
 use crate::{Gateway, MixNode};
 use mixnet_contract_common::MixNodeConfigUpdate;
@@ -7,7 +7,7 @@ use mixnet_contract_common::MixNodeConfigUpdate;
 use nym_types::currency::DecCoin;
 use nym_types::mixnode::MixNodeCostParams;
 use nym_types::transaction::TransactionExecuteResult;
-use validator_client::nymd::{Fee, VestingSigningClient};
+use validator_client::nyxd::{Fee, VestingSigningClient};
 
 #[tauri::command]
 pub async fn vesting_bond_gateway(
@@ -30,7 +30,7 @@ pub async fn vesting_bond_gateway(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_bond_gateway(gateway, &owner_signature, pledge_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -51,7 +51,7 @@ pub async fn vesting_unbond_gateway(
         ">>> Unbond gateway bonded with locked tokens, fee = {:?}",
         fee
     );
-    let res = nymd_client!(state).vesting_unbond_gateway(fee).await?;
+    let res = nyxd_client!(state).vesting_unbond_gateway(fee).await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
     log::trace!("<<< {:?}", res);
     Ok(TransactionExecuteResult::from_execute_result(
@@ -83,7 +83,7 @@ pub async fn vesting_bond_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_bond_mixnode(mixnode, cost_params, &owner_signature, pledge_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -93,6 +93,33 @@ pub async fn vesting_bond_mixnode(
     )?)
 }
 
+#[tauri::command]
+pub async fn vesting_pledge_more(
+    fee: Option<Fee>,
+    additional_pledge: DecCoin,
+    state: tauri::State<'_, WalletState>,
+) -> Result<TransactionExecuteResult, BackendError> {
+    let guard = state.read().await;
+    let additional_pledge_base = guard.attempt_convert_to_base_coin(additional_pledge.clone())?;
+    let fee_amount = guard.convert_tx_fee(fee.as_ref());
+    log::info!(
+        ">>> Pledge more with locked tokens, additional_pledge_display = {}, additional_pledge_base = {}, fee = {:?}",
+        additional_pledge,
+        additional_pledge_base,
+        fee,
+    );
+    let res = guard
+        .current_client()?
+        .nyxd
+        .vesting_pledge_more(additional_pledge_base, fee)
+        .await?;
+    log::info!("<<< tx hash = {}", res.transaction_hash);
+    log::trace!("<<< {:?}", res);
+    Ok(TransactionExecuteResult::from_execute_result(
+        res, fee_amount,
+    )?)
+}
+
 #[tauri::command]
 pub async fn vesting_unbond_mixnode(
     fee: Option<Fee>,
@@ -106,7 +133,7 @@ pub async fn vesting_unbond_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_unbond_mixnode(fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -134,7 +161,7 @@ pub async fn withdraw_vested_coins(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .withdraw_vested_coins(amount_base, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -162,7 +189,7 @@ pub async fn vesting_update_mixnode_cost_params(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_update_mixnode_cost_params(cost_params, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -187,7 +214,7 @@ pub async fn vesting_update_mixnode_config(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_update_mixnode_config(update, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
diff --git a/nym-wallet/src-tauri/src/operations/vesting/delegate.rs b/nym-wallet/src-tauri/src/operations/vesting/delegate.rs
index 59183878e5..0b3620b129 100644
--- a/nym-wallet/src-tauri/src/operations/vesting/delegate.rs
+++ b/nym-wallet/src-tauri/src/operations/vesting/delegate.rs
@@ -6,7 +6,7 @@ use crate::state::WalletState;
 use mixnet_contract_common::MixId;
 use nym_types::currency::DecCoin;
 use nym_types::transaction::TransactionExecuteResult;
-use validator_client::nymd::{Fee, VestingSigningClient};
+use validator_client::nyxd::{Fee, VestingSigningClient};
 
 #[tauri::command]
 pub async fn vesting_delegate_to_mixnode(
@@ -28,7 +28,7 @@ pub async fn vesting_delegate_to_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_delegate_to_mixnode(mix_id, delegation, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -53,7 +53,7 @@ pub async fn vesting_undelegate_from_mixnode(
     );
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_undelegate_from_mixnode(mix_id, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
diff --git a/nym-wallet/src-tauri/src/operations/vesting/queries.rs b/nym-wallet/src-tauri/src/operations/vesting/queries.rs
index d05608fb25..5fe2d2dba7 100644
--- a/nym-wallet/src-tauri/src/operations/vesting/queries.rs
+++ b/nym-wallet/src-tauri/src/operations/vesting/queries.rs
@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::BackendError;
-use crate::nymd_client;
+use crate::nyxd_client;
 use crate::state::WalletState;
 use cosmwasm_std::Timestamp;
 use nym_types::currency::DecCoin;
 use nym_types::vesting::VestingAccountInfo;
 use nym_types::vesting::{OriginalVestingResponse, PledgeData};
-use validator_client::nymd::VestingQueryClient;
+use validator_client::nyxd::VestingQueryClient;
 use vesting_contract_common::Period;
 
 #[tauri::command]
@@ -21,9 +21,9 @@ pub async fn locked_coins(
     let client = guard.current_client()?;
 
     let res = client
-        .nymd
+        .nyxd
         .locked_coins(
-            client.nymd.address().as_ref(),
+            client.nyxd.address().as_ref(),
             block_time.map(Timestamp::from_seconds),
         )
         .await?;
@@ -42,9 +42,9 @@ pub async fn spendable_coins(
     let client = guard.current_client()?;
 
     let res = client
-        .nymd
+        .nyxd
         .spendable_coins(
-            client.nymd.address().as_ref(),
+            client.nyxd.address().as_ref(),
             block_time.map(Timestamp::from_seconds),
         )
         .await?;
@@ -65,7 +65,7 @@ pub async fn vested_coins(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vested_coins(
             vesting_account_address,
             block_time.map(Timestamp::from_seconds),
@@ -88,7 +88,7 @@ pub async fn vesting_coins(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .vesting_coins(
             vesting_account_address,
             block_time.map(Timestamp::from_seconds),
@@ -106,7 +106,7 @@ pub async fn vesting_start_time(
     state: tauri::State<'_, WalletState>,
 ) -> Result<u64, BackendError> {
     log::info!(">>> Query vesting start time");
-    let res = nymd_client!(state)
+    let res = nyxd_client!(state)
         .vesting_start_time(vesting_account_address)
         .await?
         .seconds();
@@ -120,7 +120,7 @@ pub async fn vesting_end_time(
     state: tauri::State<'_, WalletState>,
 ) -> Result<u64, BackendError> {
     log::info!(">>> Query vesting end time");
-    let res = nymd_client!(state)
+    let res = nyxd_client!(state)
         .vesting_end_time(vesting_account_address)
         .await?
         .seconds();
@@ -139,7 +139,7 @@ pub async fn original_vesting(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .original_vesting(vesting_account_address)
         .await?;
 
@@ -159,7 +159,7 @@ pub async fn delegated_free(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .delegated_free(
             vesting_account_address,
             block_time.map(Timestamp::from_seconds),
@@ -183,7 +183,7 @@ pub async fn delegated_vesting(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .delegated_vesting(
             vesting_account_address,
             block_time.map(Timestamp::from_seconds),
@@ -206,7 +206,7 @@ pub async fn vesting_get_mixnode_pledge(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .get_mixnode_pledge(address)
         .await?
         .map(|pledge| PledgeData::from_vesting_contract(pledge, reg))
@@ -227,7 +227,7 @@ pub async fn vesting_get_gateway_pledge(
 
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .get_gateway_pledge(address)
         .await?
         .map(|pledge| PledgeData::from_vesting_contract(pledge, reg))
@@ -243,7 +243,7 @@ pub async fn get_current_vesting_period(
     state: tauri::State<'_, WalletState>,
 ) -> Result<Period, BackendError> {
     log::info!(">>> Query current vesting period");
-    let res = nymd_client!(state)
+    let res = nyxd_client!(state)
         .get_current_vesting_period(address)
         .await?;
     log::info!("<<< {:?}", res);
@@ -259,7 +259,7 @@ pub async fn get_account_info(
     let guard = state.read().await;
     let res = guard.registered_coins()?;
 
-    let vesting_account = guard.current_client()?.nymd.get_account(address).await?;
+    let vesting_account = guard.current_client()?.nyxd.get_account(address).await?;
     let res = VestingAccountInfo::from_vesting_contract(vesting_account, res)?;
 
     log::info!("<<< {:?}", res);
diff --git a/nym-wallet/src-tauri/src/operations/vesting/rewards.rs b/nym-wallet/src-tauri/src/operations/vesting/rewards.rs
index ad3760a364..32fc67257a 100644
--- a/nym-wallet/src-tauri/src/operations/vesting/rewards.rs
+++ b/nym-wallet/src-tauri/src/operations/vesting/rewards.rs
@@ -5,7 +5,7 @@ use crate::error::BackendError;
 use crate::state::WalletState;
 use mixnet_contract_common::MixId;
 use nym_types::transaction::TransactionExecuteResult;
-use validator_client::nymd::Fee;
+use validator_client::nyxd::Fee;
 
 #[tauri::command]
 pub async fn vesting_claim_operator_reward(
@@ -17,7 +17,7 @@ pub async fn vesting_claim_operator_reward(
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .execute_vesting_withdraw_operator_reward(None)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
@@ -41,7 +41,7 @@ pub async fn vesting_claim_delegator_reward(
     let fee_amount = guard.convert_tx_fee(fee.as_ref());
     let res = guard
         .current_client()?
-        .nymd
+        .nyxd
         .execute_vesting_withdraw_delegator_reward(mix_id, fee)
         .await?;
     log::info!("<<< tx hash = {}", res.transaction_hash);
diff --git a/nym-wallet/src-tauri/src/state.rs b/nym-wallet/src-tauri/src/state.rs
index e36dfe1b5c..f81a58e6e0 100644
--- a/nym-wallet/src-tauri/src/state.rs
+++ b/nym-wallet/src-tauri/src/state.rs
@@ -16,8 +16,8 @@ use std::time::Duration;
 use strum::IntoEnumIterator;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 use url::Url;
-use validator_client::nymd::cosmwasm_client::types::SimulateResponse;
-use validator_client::nymd::{AccountId as CosmosAccountId, Coin, Fee, SigningNymdClient};
+use validator_client::nyxd::cosmwasm_client::types::SimulateResponse;
+use validator_client::nyxd::{AccountId as CosmosAccountId, Coin, Fee, SigningNyxdClient};
 use validator_client::Client;
 
 // Some hardcoded metadata overrides
@@ -65,7 +65,7 @@ impl WalletState {
 #[derive(Default)]
 pub struct WalletStateInner {
     config: config::Config,
-    signing_clients: HashMap<Network, Client<SigningNymdClient>>,
+    signing_clients: HashMap<Network, Client<SigningNyxdClient>>,
     current_network: Network,
 
     // All the accounts the we get from decrypting the wallet. We hold on to these for being able to
@@ -156,8 +156,8 @@ impl WalletStateInner {
     ) -> Result<FeeDetails, BackendError> {
         // this MUST succeed as we just used it before
         let client = self.current_client()?;
-        let gas_price = client.nymd.gas_price().clone();
-        let gas_adjustment = client.nymd.gas_adjustment();
+        let gas_price = client.nyxd.gas_price().clone();
+        let gas_adjustment = client.nyxd.gas_adjustment();
 
         let res = SimulateResult::new(simulate_response.gas_info, gas_price, gas_adjustment);
 
@@ -169,7 +169,7 @@ impl WalletStateInner {
         Ok(FeeDetails::new(amount, res.to_fee()))
     }
 
-    pub fn client(&self, network: Network) -> Result<&Client<SigningNymdClient>, BackendError> {
+    pub fn client(&self, network: Network) -> Result<&Client<SigningNyxdClient>, BackendError> {
         self.signing_clients
             .get(&network)
             .ok_or(BackendError::ClientNotInitialized)
@@ -178,20 +178,20 @@ impl WalletStateInner {
     pub fn client_mut(
         &mut self,
         network: Network,
-    ) -> Result<&mut Client<SigningNymdClient>, BackendError> {
+    ) -> Result<&mut Client<SigningNyxdClient>, BackendError> {
         self.signing_clients
             .get_mut(&network)
             .ok_or(BackendError::ClientNotInitialized)
     }
 
-    pub fn current_client(&self) -> Result<&Client<SigningNymdClient>, BackendError> {
+    pub fn current_client(&self) -> Result<&Client<SigningNyxdClient>, BackendError> {
         self.signing_clients
             .get(&self.current_network)
             .ok_or(BackendError::ClientNotInitialized)
     }
 
     #[allow(unused)]
-    pub fn current_client_mut(&mut self) -> Result<&mut Client<SigningNymdClient>, BackendError> {
+    pub fn current_client_mut(&mut self) -> Result<&mut Client<SigningNyxdClient>, BackendError> {
         self.signing_clients
             .get_mut(&self.current_network)
             .ok_or(BackendError::ClientNotInitialized)
@@ -211,7 +211,7 @@ impl WalletStateInner {
         Ok(self.config.save_to_files()?)
     }
 
-    pub fn add_client(&mut self, network: Network, client: Client<SigningNymdClient>) {
+    pub fn add_client(&mut self, network: Network, client: Client<SigningNyxdClient>) {
         self.signing_clients.insert(network, client);
     }
 
@@ -258,26 +258,26 @@ impl WalletStateInner {
         let validators = validators_in_config
             .chain(fetched_validators)
             .chain(default_validators)
-            .unique_by(|v| (v.nymd_url.clone(), v.api_url.clone()));
+            .unique_by(|v| (v.nyxd_url.clone(), v.api_url.clone()));
 
         // Annotate with dynamic metadata
         validators.map(|v| {
-            let metadata = self.validator_metadata.get(&v.nymd_url);
+            let metadata = self.validator_metadata.get(&v.nyxd_url);
             let name = v
-                .nymd_name
+                .nyxd_name
                 .or_else(|| metadata.and_then(|m| m.name.clone()));
             config::ValidatorConfigEntry {
-                nymd_url: v.nymd_url,
-                nymd_name: name,
+                nyxd_url: v.nyxd_url,
+                nyxd_name: name,
                 api_url: v.api_url,
             }
         })
     }
 
-    pub fn get_nymd_urls_only(&self, network: Network) -> impl Iterator<Item = Url> + '_ {
+    pub fn get_nyxd_urls_only(&self, network: Network) -> impl Iterator<Item = Url> + '_ {
         self.get_config_validator_entries(network)
             .into_iter()
-            .map(|v| v.nymd_url)
+            .map(|v| v.nyxd_url)
     }
 
     pub fn get_api_urls_only(&self, network: Network) -> impl Iterator<Item = Url> + '_ {
@@ -286,21 +286,21 @@ impl WalletStateInner {
             .filter_map(|v| v.api_url)
     }
 
-    /// Get the list of validator nymd urls in the network config format, suitable for passing on to
+    /// Get the list of validator nyxd urls in the network config format, suitable for passing on to
     /// the UI
-    pub fn get_nymd_urls(
+    pub fn get_nyxd_urls(
         &self,
         network: Network,
     ) -> impl Iterator<Item = network_config::ValidatorUrl> + '_ {
         self.get_config_validator_entries(network)
             .into_iter()
             .map(|v| network_config::ValidatorUrl {
-                url: v.nymd_url.to_string(),
-                name: v.nymd_name,
+                url: v.nyxd_url.to_string(),
+                name: v.nyxd_name,
             })
     }
 
-    /// Get the list of validator-api urls in the network config format, suitable for passing on to
+    /// Get the list of nym-api urls in the network config format, suitable for passing on to
     /// the UI
     pub fn get_api_urls(
         &self,
@@ -316,10 +316,10 @@ impl WalletStateInner {
             })
     }
 
-    pub fn get_all_nymd_urls(&self) -> HashMap<Network, Vec<Url>> {
+    pub fn get_all_nyxd_urls(&self) -> HashMap<Network, Vec<Url>> {
         Network::iter()
             .flat_map(|network| {
-                self.get_nymd_urls_only(network)
+                self.get_nyxd_urls_only(network)
                     .map(move |url| (network, url))
             })
             .into_group_map()
@@ -334,18 +334,18 @@ impl WalletStateInner {
             .into_group_map()
     }
 
-    /// Fetch validator urls remotely. These are used to in addition to the base ones, and the user
+    /// Fetch nyxd urls remotely. These are used to in addition to the base ones, and the user
     /// configured ones.
-    pub async fn fetch_updated_validator_urls(&mut self) -> Result<(), BackendError> {
+    pub async fn fetch_updated_nyxd_urls(&mut self) -> Result<(), BackendError> {
         let client = reqwest::Client::builder()
             .timeout(Duration::from_secs(3))
             .build()?;
         log::debug!(
             "Fetching validator urls from: {}",
-            crate::config::REMOTE_SOURCE_OF_VALIDATOR_URLS
+            crate::config::REMOTE_SOURCE_OF_NYXD_URLS
         );
         let response = client
-            .get(crate::config::REMOTE_SOURCE_OF_VALIDATOR_URLS.to_string())
+            .get(crate::config::REMOTE_SOURCE_OF_NYXD_URLS.to_string())
             .send()
             .await?;
 
@@ -361,13 +361,13 @@ impl WalletStateInner {
         log::debug!("Refreshing validator status");
 
         // All urls for all networks
-        let nymd_urls = self
-            .get_all_nymd_urls()
+        let nyxd_urls = self
+            .get_all_nyxd_urls()
             .into_iter()
             .flat_map(|(_, urls)| urls.into_iter());
 
         // Fetch status for all urls
-        let responses = fetch_status_for_urls(nymd_urls).await?;
+        let responses = fetch_status_for_urls(nyxd_urls).await?;
 
         // Update the stored metadata
         self.apply_responses(responses)?;
@@ -413,26 +413,18 @@ impl WalletStateInner {
         }
     }
 
-    pub fn select_validator_nymd_url(
-        &mut self,
-        url: &str,
-        network: Network,
-    ) -> Result<(), BackendError> {
-        self.config.select_validator_nymd_url(url.parse()?, network);
+    pub fn select_nyxd_url(&mut self, url: &str, network: Network) -> Result<(), BackendError> {
+        self.config.select_nyxd_url(url.parse()?, network);
         if let Ok(client) = self.client_mut(network) {
-            client.change_nymd(url.parse()?)?;
+            client.change_nyxd(url.parse()?)?;
         }
         Ok(())
     }
 
-    pub fn select_validator_api_url(
-        &mut self,
-        url: &str,
-        network: Network,
-    ) -> Result<(), BackendError> {
-        self.config.select_validator_api_url(url.parse()?, network);
+    pub fn select_nym_api_url(&mut self, url: &str, network: Network) -> Result<(), BackendError> {
+        self.config.select_nym_api_url(url.parse()?, network);
         if let Ok(client) = self.client_mut(network) {
-            client.change_validator_api(url.parse()?);
+            client.change_nym_api(url.parse()?);
         }
         Ok(())
     }
@@ -447,13 +439,13 @@ impl WalletStateInner {
 }
 
 async fn fetch_status_for_urls(
-    nymd_urls: impl Iterator<Item = Url>,
+    nyxd_urls: impl Iterator<Item = Url>,
 ) -> Result<Vec<Result<(Url, String), reqwest::Error>>, BackendError> {
     let client = reqwest::Client::builder()
         .timeout(Duration::from_secs(3))
         .build()?;
 
-    let responses = futures::future::join_all(nymd_urls.into_iter().map(|url| {
+    let responses = futures::future::join_all(nyxd_urls.into_iter().map(|url| {
         let client = &client;
         let status_url = url.join("status").unwrap_or_else(|_| url.clone());
         async move {
@@ -480,16 +472,16 @@ macro_rules! client {
 }
 
 #[macro_export]
-macro_rules! nymd_client {
+macro_rules! nyxd_client {
     ($state:ident) => {
-        $state.read().await.current_client()?.nymd
+        $state.read().await.current_client()?.nyxd
     };
 }
 
 #[macro_export]
 macro_rules! api_client {
     ($state:ident) => {
-        $state.read().await.current_client()?.validator_api
+        $state.read().await.current_client()?.nym_api
     };
 }
 
@@ -504,17 +496,17 @@ mod tests {
 
         state.add_validator_url(
             config::ValidatorConfigEntry {
-                nymd_url: "http://nymd_url.com".parse().unwrap(),
-                nymd_name: Some("NymdUrl".to_string()),
-                api_url: Some("http://nymd_url.com/api".parse().unwrap()),
+                nyxd_url: "http://nyxd_url.com".parse().unwrap(),
+                nyxd_name: Some("NyxdUrl".to_string()),
+                api_url: Some("http://nyxd_url.com/api".parse().unwrap()),
             },
             Network::MAINNET,
         );
 
         state.add_validator_url(
             config::ValidatorConfigEntry {
-                nymd_url: "http://foo.com".parse().unwrap(),
-                nymd_name: None,
+                nyxd_url: "http://foo.com".parse().unwrap(),
+                nyxd_name: None,
                 api_url: None,
             },
             Network::MAINNET,
@@ -522,8 +514,8 @@ mod tests {
 
         state.add_validator_url(
             config::ValidatorConfigEntry {
-                nymd_url: "http://bar.com".parse().unwrap(),
-                nymd_name: None,
+                nyxd_url: "http://bar.com".parse().unwrap(),
+                nyxd_name: None,
                 api_url: None,
             },
             Network::MAINNET,
@@ -531,10 +523,10 @@ mod tests {
 
         assert_eq!(
             state
-                .get_nymd_urls_only(Network::MAINNET)
+                .get_nyxd_urls_only(Network::MAINNET)
                 .collect::<Vec<_>>(),
             vec![
-                "http://nymd_url.com/".parse().unwrap(),
+                "http://nyxd_url.com/".parse().unwrap(),
                 "http://foo.com".parse().unwrap(),
                 "http://bar.com".parse().unwrap(),
                 "https://rpc.nymtech.net".parse().unwrap(),
@@ -545,18 +537,18 @@ mod tests {
                 .get_api_urls_only(Network::MAINNET)
                 .collect::<Vec<_>>(),
             vec![
-                "http://nymd_url.com/api".parse().unwrap(),
+                "http://nyxd_url.com/api".parse().unwrap(),
                 "https://validator.nymtech.net/api/".parse().unwrap(),
             ],
         );
         assert_eq!(
             state
-                .get_all_nymd_urls()
+                .get_all_nyxd_urls()
                 .get(&Network::MAINNET)
                 .unwrap()
                 .clone(),
             vec![
-                "http://nymd_url.com/".parse().unwrap(),
+                "http://nyxd_url.com/".parse().unwrap(),
                 "http://foo.com".parse().unwrap(),
                 "http://bar.com".parse().unwrap(),
                 "https://rpc.nymtech.net".parse().unwrap(),
diff --git a/nym-wallet/src-tauri/src/utils.rs b/nym-wallet/src-tauri/src/utils.rs
index f04d47722f..355a6cb6cd 100644
--- a/nym-wallet/src-tauri/src/utils.rs
+++ b/nym-wallet/src-tauri/src/utils.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::BackendError;
-use crate::nymd_client;
+use crate::nyxd_client;
 use crate::state::WalletState;
 use cosmwasm_std::Decimal;
 use mixnet_contract_common::{IdentityKey, MixId, Percent};
@@ -10,8 +10,8 @@ use nym_types::currency::DecCoin;
 use nym_types::mixnode::MixNodeCostParams;
 use nym_wallet_types::app::AppEnv;
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::traits::MixnetQueryClient;
-use validator_client::nymd::{tx, Coin, CosmosCoin, Gas, GasPrice};
+use validator_client::nyxd::traits::MixnetQueryClient;
+use validator_client::nyxd::{tx, Coin, CosmosCoin, Gas, GasPrice};
 
 fn get_env_as_option(key: &str) -> Option<String> {
     match ::std::env::var(key) {
@@ -31,8 +31,8 @@ pub fn get_env() -> AppEnv {
 
 #[tauri::command]
 pub async fn owns_mixnode(state: tauri::State<'_, WalletState>) -> Result<bool, BackendError> {
-    Ok(nymd_client!(state)
-        .get_owned_mixnode(nymd_client!(state).address())
+    Ok(nyxd_client!(state)
+        .get_owned_mixnode(nyxd_client!(state).address())
         .await?
         .mixnode_details
         .is_some())
@@ -40,8 +40,8 @@ pub async fn owns_mixnode(state: tauri::State<'_, WalletState>) -> Result<bool,
 
 #[tauri::command]
 pub async fn owns_gateway(state: tauri::State<'_, WalletState>) -> Result<bool, BackendError> {
-    Ok(nymd_client!(state)
-        .get_owned_gateway(nymd_client!(state).address())
+    Ok(nyxd_client!(state)
+        .get_owned_gateway(nyxd_client!(state).address())
         .await?
         .gateway
         .is_some())
@@ -52,7 +52,7 @@ pub async fn try_convert_pubkey_to_mix_id(
     state: tauri::State<'_, WalletState>,
     mix_identity: IdentityKey,
 ) -> Result<Option<MixId>, BackendError> {
-    let res = nymd_client!(state)
+    let res = nyxd_client!(state)
         .get_mixnode_details_by_identity(mix_identity)
         .await?;
     Ok(res.map(|mixnode_details| mixnode_details.mix_id()))
@@ -185,7 +185,7 @@ pub async fn get_old_and_incorrect_hardcoded_fee(
     operation: Operation,
 ) -> Result<DecCoin, BackendError> {
     let guard = state.read().await;
-    let mut approximate_fee = operation.default_fee(guard.current_client()?.nymd.gas_price());
+    let mut approximate_fee = operation.default_fee(guard.current_client()?.nyxd.gas_price());
     // on all our chains it should only ever contain a single type of currency
     assert_eq!(approximate_fee.amount.len(), 1);
     let coin: Coin = approximate_fee.amount.pop().unwrap().into();
diff --git a/nym-wallet/src-tauri/src/wallet_storage/account_data.rs b/nym-wallet/src-tauri/src/wallet_storage/account_data.rs
index d0027592d9..f5c7296442 100644
--- a/nym-wallet/src-tauri/src/wallet_storage/account_data.rs
+++ b/nym-wallet/src-tauri/src/wallet_storage/account_data.rs
@@ -15,7 +15,7 @@
 // instead treating as muliple accounts with one entry.
 
 use serde::{Deserialize, Serialize};
-use validator_client::nymd::bip32::DerivationPath;
+use validator_client::nyxd::bip32::DerivationPath;
 use zeroize::Zeroize;
 
 use crate::error::BackendError;
@@ -356,7 +356,7 @@ impl Drop for MnemonicAccount {
 
 mod display_hd_path {
     use serde::{Deserialize, Deserializer, Serializer};
-    use validator_client::nymd::bip32::DerivationPath;
+    use validator_client::nyxd::bip32::DerivationPath;
 
     pub fn serialize<S: Serializer>(
         hd_path: &DerivationPath,
diff --git a/nym-wallet/src-tauri/src/wallet_storage/mod.rs b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
index bf9e3c3c6c..7bca66d01b 100644
--- a/nym-wallet/src-tauri/src/wallet_storage/mod.rs
+++ b/nym-wallet/src-tauri/src/wallet_storage/mod.rs
@@ -18,7 +18,7 @@ use chrono::Local;
 use std::ffi::OsString;
 use std::fs::{self, create_dir_all, OpenOptions};
 use std::path::{Path, PathBuf};
-use validator_client::nymd::bip32::DerivationPath;
+use validator_client::nyxd::bip32::DerivationPath;
 
 #[cfg(test)]
 use self::account_data::MnemonicAccount;
diff --git a/nym-wallet/src-tauri/tauri.conf.json b/nym-wallet/src-tauri/tauri.conf.json
index b7b616b2e8..004dd66912 100644
--- a/nym-wallet/src-tauri/tauri.conf.json
+++ b/nym-wallet/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "nym-wallet",
-    "version": "1.1.1"
+    "version": "1.1.5"
   },
   "build": {
     "distDir": "../dist",
diff --git a/nym-wallet/src/components/AppBar.tsx b/nym-wallet/src/components/AppBar.tsx
index 9aedf14d1a..3022646798 100644
--- a/nym-wallet/src/components/AppBar.tsx
+++ b/nym-wallet/src/components/AppBar.tsx
@@ -15,7 +15,7 @@ export const AppBar = () => {
   const navigate = useNavigate();
 
   return (
-    <MuiAppBar position="sticky" sx={{ boxShadow: 'none', bgcolor: 'transparent', backgroundImage: 'none' }}>
+    <MuiAppBar position="sticky" sx={{ boxShadow: 'none', bgcolor: 'transparent', backgroundImage: 'none', mt: 3 }}>
       <Toolbar disableGutters>
         <Grid container justifyContent="space-between" alignItems="center" flexWrap="nowrap">
           <Grid item container alignItems="center" spacing={1}>
diff --git a/nym-wallet/src/components/Bonding/BondedMixnode.tsx b/nym-wallet/src/components/Bonding/BondedMixnode.tsx
index 5d63555ddb..6ff0151b29 100644
--- a/nym-wallet/src/components/Bonding/BondedMixnode.tsx
+++ b/nym-wallet/src/components/Bonding/BondedMixnode.tsx
@@ -114,7 +114,6 @@ export const BondedMixnode = ({
         <BondedMixnodeActions
           onActionSelect={onActionSelect}
           disabledRedeemAndCompound={(operatorRewards && Number(operatorRewards.amount) === 0) || false}
-          disabledBondMore // TODO for now disable bond more feature until backend is ready
         />
       ),
       id: 'actions-cell',
@@ -136,7 +135,7 @@ export const BondedMixnode = ({
             </Box>
             {name && (
               <Tooltip title={host} arrow>
-                <Typography fontWeight="regular" variant="h6">
+                <Typography fontWeight="regular" variant="h6" width="fit-content">
                   {name}
                 </Typography>
               </Tooltip>
diff --git a/nym-wallet/src/components/Bonding/BondedMixnodeActions.tsx b/nym-wallet/src/components/Bonding/BondedMixnodeActions.tsx
index 37b52452c7..2a7d6e6bf4 100644
--- a/nym-wallet/src/components/Bonding/BondedMixnodeActions.tsx
+++ b/nym-wallet/src/components/Bonding/BondedMixnodeActions.tsx
@@ -35,7 +35,7 @@ export const BondedMixnodeActions = ({
       )}
       <ActionsMenuItem
         title="Redeem rewards"
-        Icon={<Typography sx={{ pl: 1, fontWeight: 700 }}>R</Typography>}
+        Icon={<Typography sx={{ pl: 0.5, fontWeight: 700 }}>R</Typography>}
         onClick={() => handleActionClick('redeem')}
         disabled={disabledRedeemAndCompound}
       />
diff --git a/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx b/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
index 721d114961..6f229a403d 100644
--- a/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
+++ b/nym-wallet/src/components/Bonding/forms/BondMixnodeForm.tsx
@@ -1,14 +1,16 @@
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { Box, Checkbox, FormControlLabel, FormHelperText, Stack, TextField } from '@mui/material';
+import { Box, Checkbox, FormControlLabel, FormHelperText, Stack, TextField, Typography } from '@mui/material';
 import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
 import { IdentityKeyFormField } from '@nymproject/react/mixnodes/IdentityKeyFormField';
 import { CurrencyDenom, TNodeType } from '@nymproject/types';
 import { checkHasEnoughFunds, checkHasEnoughLockedTokens } from 'src/utils';
 import { NodeTypeSelector, TokenPoolSelector } from 'src/components';
 import { MixnodeAmount, MixnodeData } from 'src/pages/bonding/types';
+import { ModalListItem } from 'src/components/Modals/ModalListItem';
 import { amountSchema, mixnodeValidationSchema } from './mixnodeValidationSchema';
+import { AppContext } from 'src/context';
 
 const NodeFormData = ({ mixnodeData, onNext }: { mixnodeData: MixnodeData; onNext: (data: any) => void }) => {
   const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
@@ -138,6 +140,8 @@ const AmountFormData = ({
     setError,
   } = useForm({ resolver: yupResolver(amountSchema), defaultValues: amountData });
 
+  const { userBalance } = useContext(AppContext);
+
   const handleRequestValidation = async (event: { detail: { step: number } }) => {
     let hasSufficientTokens = true;
     const values = getValues();
@@ -210,6 +214,17 @@ const AmountFormData = ({
           and delegators.
         </FormHelperText>
       </Box>
+      <Box sx={{ mb: 1 }}>
+        {!hasVestingTokens && (
+          <ModalListItem
+            divider
+            label="Account balance"
+            value={userBalance.balance?.printable_balance.toUpperCase()}
+            fontWeight={600}
+          />
+        )}
+        <Typography variant="body2">Est. fee for this transaction will be calculated in the next page</Typography>
+      </Box>
     </Stack>
   );
 };
diff --git a/nym-wallet/src/components/Bonding/modals/BondMoreModal.tsx b/nym-wallet/src/components/Bonding/modals/BondMoreModal.tsx
index 88518abc28..e2145e431e 100644
--- a/nym-wallet/src/components/Bonding/modals/BondMoreModal.tsx
+++ b/nym-wallet/src/components/Bonding/modals/BondMoreModal.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Box, FormHelperText, Stack, TextField } from '@mui/material';
+import { Box, Stack } from '@mui/material';
 import { CurrencyFormField } from '@nymproject/react/currency/CurrencyFormField';
 import { ModalListItem } from 'src/components/Modals/ModalListItem';
 import { SimpleModal } from 'src/components/Modals/SimpleModal';
@@ -7,66 +7,74 @@ import { DecCoin } from '@nymproject/types';
 import { TokenPoolSelector, TPoolOption } from 'src/components/TokenPoolSelector';
 import { ConfirmTx } from 'src/components/ConfirmTX';
 import { useGetFee } from 'src/hooks/useGetFee';
-import { validateAmount, validateKey } from 'src/utils';
+import { validateAmount } from 'src/utils';
+import { simulateBondMore, simulateVestingBondMore } from 'src/requests';
+import { TBondMoreArgs } from 'src/types';
+import { TBondedMixnode } from 'src/context';
 
 export const BondMoreModal = ({
-  currentBond,
+  node,
   userBalance,
-  hasVestingTokens,
-  onConfirm,
+  onBondMore,
   onClose,
+  onError,
 }: {
-  currentBond: DecCoin;
+  node: TBondedMixnode;
   userBalance?: string;
-  hasVestingTokens: boolean;
-  onConfirm: (args: { additionalBond: DecCoin; signature: string; tokenPool: TPoolOption }) => Promise<void>;
+  onBondMore: (data: TBondMoreArgs, tokenPool: TPoolOption) => Promise<void>;
   onClose: () => void;
+  onError: (e: string) => void;
 }) => {
-  const { fee, resetFeeState } = useGetFee();
+  const { bond: currentBond, proxy } = node;
+  const { fee, getFee, resetFeeState, feeError } = useGetFee();
   const [additionalBond, setAdditionalBond] = useState<DecCoin>({ amount: '0', denom: currentBond.denom });
-  const [signature, setSignature] = useState<string>('');
-  const [tokenPool, setTokenPool] = useState<TPoolOption>('balance');
   const [errorAmount, setErrorAmount] = useState(false);
-  const [errorSignature, setErrorSignature] = useState(false);
 
-  const handleOnOk = async () => {
-    const errors = {
-      amount: false,
-      signature: false,
-    };
-
-    if (!validateKey(signature || '', 64)) {
-      errors.signature = true;
+  useEffect(() => {
+    if (feeError) {
+      onError(feeError);
     }
+  }, [feeError]);
 
-    if (!additionalBond?.amount) {
-      errors.amount = true;
-    }
+  const handleConfirm = async () => {
+    const data = { additionalPledge: additionalBond };
+    const tokenPool = proxy ? 'locked' : 'balance';
+    await onBondMore(data, tokenPool);
+  };
 
-    if (additionalBond && !(await validateAmount(additionalBond.amount, '1'))) {
-      errors.amount = true;
-    }
+  const handleAmountChanged = async (value: DecCoin) => {
+    setAdditionalBond(value);
+    const { amount } = value;
 
-    if (!errors.amount && !errors.signature) {
-      onConfirm({ additionalBond, signature, tokenPool });
+    if (!amount) {
+      setErrorAmount(true);
     } else {
-      setErrorAmount(errors.amount);
-      setErrorSignature(errors.signature);
+      const validAmount = await validateAmount(amount, '1');
+      if (!validAmount) {
+        setErrorAmount(true);
+        return;
+      }
+      setErrorAmount(false);
     }
   };
 
-  useEffect(() => {
-    setErrorAmount(false);
-  }, [additionalBond]);
+  const handleOnOk = async () => {
+    if (!proxy) {
+      await getFee<TBondMoreArgs>(simulateBondMore, { additionalPledge: additionalBond });
+    } else {
+      await getFee<TBondMoreArgs>(simulateVestingBondMore, { additionalPledge: additionalBond });
+    }
+  };
 
   if (fee)
     return (
       <ConfirmTx
-        header="Bond more details"
         open
+        header="Bond more details"
         fee={fee}
-        onConfirm={async () => onConfirm({ additionalBond, signature, tokenPool })}
+        onClose={onClose}
         onPrev={resetFeeState}
+        onConfirm={handleConfirm}
       >
         <ModalListItem label="Current bond" value={`${currentBond.amount} ${currentBond.denom}`} divider />
         <ModalListItem label="Additional bond" value={`${additionalBond?.amount} ${additionalBond?.denom}`} divider />
@@ -80,36 +88,23 @@ export const BondMoreModal = ({
       subHeader="Bond more tokens on your node and receive more rewards"
       okLabel="Next"
       onOk={handleOnOk}
-      okDisabled={errorAmount || errorSignature}
+      okDisabled={errorAmount}
       onClose={onClose}
     >
       <Stack gap={3}>
         <Box display="flex" gap={1}>
-          {hasVestingTokens && <TokenPoolSelector disabled={false} onSelect={(pool) => setTokenPool(pool)} />}
           <CurrencyFormField
             autoFocus
             label="Bond amount"
             denom={currentBond.denom}
             onChanged={(value) => {
-              setAdditionalBond(value);
-              setErrorSignature(false);
+              handleAmountChanged(value);
             }}
             fullWidth
             validationError={errorAmount ? 'Please enter a valid amount' : undefined}
           />
         </Box>
 
-        <Box>
-          <TextField
-            fullWidth
-            label="Signature"
-            value={signature}
-            onChange={(e) => setSignature(e.target.value)}
-            InputLabelProps={{ shrink: true }}
-          />
-          {errorSignature && <FormHelperText sx={{ color: 'error.main' }}>Invalid signature</FormHelperText>}
-        </Box>
-
         <Box>
           <ModalListItem label="Account balance" value={userBalance?.toUpperCase() || '-'} divider />
           <ModalListItem label="Current bond" value={`${currentBond.amount} ${currentBond.denom}`} divider />
diff --git a/nym-wallet/src/components/Bonding/modals/BondOversaturatedModal.tsx b/nym-wallet/src/components/Bonding/modals/BondOversaturatedModal.tsx
new file mode 100644
index 0000000000..be3ea33869
--- /dev/null
+++ b/nym-wallet/src/components/Bonding/modals/BondOversaturatedModal.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Stack, Typography } from '@mui/material';
+import { SimpleModal } from 'src/components/Modals/SimpleModal';
+
+export const BondOversaturatedModal: React.FC<{
+  open: boolean;
+  saturationPercentage: string;
+  onClose?: () => void;
+  onContinue?: () => void;
+}> = ({ open, saturationPercentage, onClose, onContinue }) => (
+  <SimpleModal
+    open={open}
+    onClose={onClose}
+    onOk={async () => onContinue?.()}
+    header="Bond More"
+    okLabel="Bond More"
+    buttonFullWidth
+  >
+    <Stack spacing={3} marginBottom={3}>
+      <Typography
+        fontWeight={600}
+        sx={{ color: (t) => t.palette.nym.red }}
+      >{`Your node saturation: ${saturationPercentage}%`}</Typography>
+      <Typography fontSize={14}>Your node is over saturated, are you sure you want to bond more?</Typography>
+    </Stack>
+  </SimpleModal>
+);
diff --git a/nym-wallet/src/components/Buy/SignMessageModal.stories.tsx b/nym-wallet/src/components/Buy/SignMessageModal.stories.tsx
new file mode 100644
index 0000000000..201192ac16
--- /dev/null
+++ b/nym-wallet/src/components/Buy/SignMessageModal.stories.tsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react';
+import { Button } from '@mui/material';
+import { MockBuyContextProvider } from 'src/context/mocks/buy';
+
+import { SignMessageModal } from './SignMessageModal';
+
+export default {
+  title: 'Buy/SignMessage',
+  component: SignMessageModal,
+};
+
+export const SignMessage = () => {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <MockBuyContextProvider>
+      <Button
+        variant="contained"
+        color="primary"
+        onClick={() => {
+          setOpen(true);
+        }}
+      >
+        Open Sign Modal
+      </Button>
+      {open && (
+        <SignMessageModal
+          onClose={() => {
+            setOpen(false);
+          }}
+        />
+      )}
+    </MockBuyContextProvider>
+  );
+};
diff --git a/nym-wallet/src/components/Buy/SignMessageModal.tsx b/nym-wallet/src/components/Buy/SignMessageModal.tsx
new file mode 100644
index 0000000000..d076971cd7
--- /dev/null
+++ b/nym-wallet/src/components/Buy/SignMessageModal.tsx
@@ -0,0 +1,72 @@
+import * as React from 'react';
+import { useState } from 'react';
+import { Stack, TextField, Typography } from '@mui/material';
+import { useBuyContext } from 'src/context';
+import { SimpleModal } from '../Modals/SimpleModal';
+import { ErrorModal } from '../Modals/ErrorModal';
+import { CopyToClipboard } from '../CopyToClipboard';
+
+export const SignMessageModal = ({ onClose }: { onClose: () => void }) => {
+  const [message, setMessage] = useState<string>();
+  const [signature, setSignature] = useState<string>();
+
+  const { signMessage, loading, refresh, error } = useBuyContext();
+
+  const handleSign = async () => {
+    if (!message) {
+      return;
+    }
+    signMessage(message).then((sig) => {
+      setSignature(sig);
+    });
+  };
+
+  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setMessage(event.target.value);
+  };
+
+  if (error) {
+    return (
+      <ErrorModal
+        open
+        message={`An error occured: ${error}`}
+        onClose={() => {
+          refresh();
+        }}
+      />
+    );
+  }
+
+  return (
+    <SimpleModal open header="Sign message" okLabel="Sign" onOk={handleSign} onClose={onClose} okDisabled={loading}>
+      <Stack gap={2}>
+        <TextField
+          id="outlined-multiline-static"
+          label="Message"
+          multiline
+          rows={8}
+          placeholder="Paste your message here"
+          fullWidth
+          value={message}
+          onChange={handleChange}
+        />
+        <TextField
+          id="outlined-multiline-static"
+          multiline
+          rows={3}
+          value={signature}
+          placeholder="Signature"
+          fullWidth
+          disabled
+        />
+
+        <Stack direction="row" alignItems="center" alignSelf="flex-end">
+          <Typography variant="body2" component="span" fontWeight={600} sx={{ mr: 1, color: 'text.primary' }}>
+            Copy signature
+          </Typography>
+          <CopyToClipboard text={signature} iconButton />
+        </Stack>
+      </Stack>
+    </SimpleModal>
+  );
+};
diff --git a/nym-wallet/src/components/Buy/Tutorial.stories.tsx b/nym-wallet/src/components/Buy/Tutorial.stories.tsx
new file mode 100644
index 0000000000..ec73a796eb
--- /dev/null
+++ b/nym-wallet/src/components/Buy/Tutorial.stories.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import { Tutorial } from './Tutorial';
+import { MockBuyContextProvider } from '../../context/mocks/buy';
+
+export default {
+  title: 'Buy/Tutorial',
+  component: Tutorial,
+};
+
+export const TutorialPage = () => (
+  <MockBuyContextProvider>
+    <Tutorial />
+  </MockBuyContextProvider>
+);
diff --git a/nym-wallet/src/components/Buy/Tutorial.tsx b/nym-wallet/src/components/Buy/Tutorial.tsx
new file mode 100644
index 0000000000..8d403cb2e6
--- /dev/null
+++ b/nym-wallet/src/components/Buy/Tutorial.tsx
@@ -0,0 +1,140 @@
+import React, { useContext, useState } from 'react';
+import { Button, Stack, Typography, Grid, useMediaQuery, useTheme } from '@mui/material';
+import { Tune as TuneIcon, BorderColor as BorderColorIcon } from '@mui/icons-material';
+import { CoinMark } from '@nymproject/react/coins/CoinMark';
+import { NymCard, ClientAddress } from '../../components';
+import { SignMessageModal } from './SignMessageModal';
+import { PoweredByBity } from 'src/svg-icons';
+import { AppContext } from 'src/context';
+
+// TODO retrieve this value from env
+const EXCHANGE_URL = 'https://buy.nymtech.net';
+
+const borderColor = 'rgba(141, 147, 153, 0.2)';
+
+const TutorialStep = ({
+  step,
+  title,
+  text,
+  icon,
+  borderRight,
+  borderBottom,
+}: {
+  step: number;
+  title: string;
+  text: React.ReactNode;
+  icon: React.ReactNode;
+  borderRight?: boolean;
+  borderBottom?: boolean;
+}) => (
+  <Grid
+    item
+    md={4}
+    p={3}
+    sx={{
+      borderRight: borderRight ? `1px solid ${borderColor}` : null,
+      borderBottom: borderBottom ? `1px solid ${borderColor}` : null,
+    }}
+  >
+    <Stack gap={2}>
+      <Stack direction="row" gap={1} alignItems="center">
+        {icon}
+        <Typography fontWeight={600} fontSize="12px">
+          {`STEP ${step}`}
+        </Typography>
+      </Stack>
+      <Typography fontWeight={600} variant="h6">
+        {title}
+      </Typography>
+      {text}
+    </Stack>
+  </Grid>
+);
+
+export const Tutorial = () => {
+  const { clientDetails } = useContext(AppContext);
+  const [showSignModal, setShowSignModal] = useState(false);
+  const theme = useTheme();
+  const showBorder = useMediaQuery(theme.breakpoints.up('md'));
+
+  return (
+    <NymCard borderless title="Buy NYM with BTC" sx={{ mt: 4 }} Action={<ClientAddress withCopy />}>
+      <Typography mb={2} fontSize={14}>
+        Follow below 3 steps to quickly and easily buy NYM tokens. You can purchase up to 1000 Swiss Francs per day.
+      </Typography>
+      {showSignModal && <SignMessageModal onClose={() => setShowSignModal(false)} />}
+      <Grid
+        container
+        spacing={3}
+        m={0}
+        mt={3}
+        width={1}
+        flexWrap="nowrap"
+        sx={{
+          border: `1px solid ${borderColor}`,
+          borderRadius: '8px',
+        }}
+      >
+        <TutorialStep
+          step={1}
+          title="Define purchase details"
+          icon={<TuneIcon fontSize="small" />}
+          text={
+            <Typography fontSize={14} lineHeight="24px" sx={{ color: (t) => t.palette.nym.text.muted }}>
+              Click on{' '}
+              <Typography display="inline" fontWeight={600} fontSize={14} lineHeight="24px">
+                Buy NYM
+              </Typography>{' '}
+              button and follow the steps in the browser window that opens. You will be asked for purchase details i.e.
+              amount, wallet address, etc.
+            </Typography>
+          }
+          borderRight={showBorder}
+          borderBottom={!showBorder}
+        />
+        <TutorialStep
+          step={2}
+          title="Sign message"
+          icon={<BorderColorIcon fontSize="small" />}
+          text={
+            <Typography fontSize={14} lineHeight="24px" sx={{ color: (t) => t.palette.nym.text.muted }}>
+              When asked for signature, copy the message and sign it using{' '}
+              <Typography display="inline" fontWeight={600} fontSize={14} lineHeight="24px">
+                Sign message
+              </Typography>{' '}
+              button below. Then copy and paste your signature back in the browser window.
+            </Typography>
+          }
+          borderRight={showBorder}
+          borderBottom={!showBorder}
+        />
+        <TutorialStep
+          step={3}
+          title="Send tx and receive NYM"
+          icon={<CoinMark width={20} height={20} />}
+          text={
+            <Typography fontSize={14} lineHeight="24px" sx={{ color: (t) => t.palette.nym.text.muted }}>
+              {`Send the defined BTC amount to Bity's address that's given to you. As soon as your BTC tx has 4 confirmations, Bity will send the purchased NYM tokens to your wallet.`}
+            </Typography>
+          }
+        />
+      </Grid>
+      <Stack direction="row" justifyContent="space-between" alignItems="flex-end" mt={5}>
+        <PoweredByBity sx={{ width: 126, height: 16 }} color="secondary" />
+        <Stack direction="row" gap={2} justifyContent="flex-end">
+          <Button variant="outlined" size="large" onClick={() => setShowSignModal(true)}>
+            Sign message
+          </Button>
+          <Button
+            variant="contained"
+            size="large"
+            href={`${EXCHANGE_URL}/?wallet_address=${clientDetails!.client_address}`}
+            target="_blank"
+          >
+            Buy NYM
+          </Button>
+        </Stack>
+      </Stack>
+    </NymCard>
+  );
+};
diff --git a/nym-wallet/src/components/CopyToClipboard.tsx b/nym-wallet/src/components/CopyToClipboard.tsx
index 8df15668a8..d6de5cab9b 100644
--- a/nym-wallet/src/components/CopyToClipboard.tsx
+++ b/nym-wallet/src/components/CopyToClipboard.tsx
@@ -35,6 +35,7 @@ export const CopyToClipboard = ({ text = '', iconButton }: { text?: string; icon
           sx={{
             color: 'text.primary',
           }}
+          disabled={!text}
         >
           {!copied ? <ContentCopy sx={{ fontSize: 14 }} /> : <Check color="success" sx={{ fontSize: 14 }} />}
         </IconButton>
@@ -51,6 +52,7 @@ export const CopyToClipboard = ({ text = '', iconButton }: { text?: string; icon
       }}
       onClick={() => handleCopy(text)}
       endIcon={copied && <Check sx={{ color: (theme) => theme.palette.success.light }} />}
+      disabled={!text}
     >
       {!copied ? 'Copy' : 'Copied'}
     </Button>
diff --git a/nym-wallet/src/components/Delegation/DelegationActions.tsx b/nym-wallet/src/components/Delegation/DelegationActions.tsx
index 653e2a80e2..0784114d9d 100644
--- a/nym-wallet/src/components/Delegation/DelegationActions.tsx
+++ b/nym-wallet/src/components/Delegation/DelegationActions.tsx
@@ -92,7 +92,7 @@ export const DelegationsActionsMenu: React.FC<{
       <ActionsMenuItem
         title="Redeem"
         description="Transfer your rewards to your balance"
-        Icon={<Typography sx={{ pl: 1 }}>R</Typography>}
+        Icon={<Typography sx={{ pl: 1, fontWeight: 700 }}>R</Typography>}
         onClick={() => handleActionSelect('redeem')}
         disabled={disableRedeemingRewards}
       />
diff --git a/nym-wallet/src/components/Modals/SimpleModal.stories.tsx b/nym-wallet/src/components/Modals/SimpleModal.stories.tsx
index 35c4df516e..994cf7eb48 100644
--- a/nym-wallet/src/components/Modals/SimpleModal.stories.tsx
+++ b/nym-wallet/src/components/Modals/SimpleModal.stories.tsx
@@ -225,3 +225,36 @@ export const withBackButton = () => {
     </BasePage>
   );
 };
+
+export const withBackButtonAndCustomLabel = () => {
+  const [open, setOpen] = React.useState<boolean>(false);
+  const handleClick = () => setOpen(true);
+
+  const theme = useTheme();
+
+  return (
+    <BasePage handleClick={handleClick}>
+      <SimpleModal
+        open={open}
+        hideCloseIcon
+        onClose={() => setOpen(false)}
+        onOk={async () => setOpen(false)}
+        header="This is a modal"
+        okLabel="Primary action"
+        onBack={() => setOpen(false)}
+        backLabel="Cancel"
+        backButtonFullWidth
+        {...storybookStyles(theme)}
+      >
+        <Typography sx={{ color: theme.palette.text.primary }}>
+          Tempor culpa est magna. Sit tempor cillum culpa sint ipsum nostrud ullamco voluptate exercitation dolore magna
+          elit ut mollit.
+        </Typography>
+        <ModalDivider />
+        <Typography sx={{ color: theme.palette.text.primary }}>
+          Veniam dolor laborum labore sit reprehenderit enim mollit magna nulla adipisicing fugiat. Est ex irure quis.
+        </Typography>
+      </SimpleModal>
+    </BasePage>
+  );
+};
diff --git a/nym-wallet/src/components/Modals/SimpleModal.tsx b/nym-wallet/src/components/Modals/SimpleModal.tsx
index 85c6480619..591354ffe5 100644
--- a/nym-wallet/src/components/Modals/SimpleModal.tsx
+++ b/nym-wallet/src/components/Modals/SimpleModal.tsx
@@ -20,6 +20,8 @@ export const SimpleModal: React.FC<{
   header: string | React.ReactNode;
   subHeader?: string;
   okLabel: string;
+  backLabel?: string;
+  backButtonFullWidth?: boolean;
   okDisabled?: boolean;
   sx?: SxProps;
   backdropProps?: object;
@@ -38,6 +40,8 @@ export const SimpleModal: React.FC<{
   header,
   subHeader,
   okLabel,
+  backLabel,
+  backButtonFullWidth,
   sx,
   children,
   backdropProps,
@@ -71,7 +75,7 @@ export const SimpleModal: React.FC<{
 
       {(onOk || onBack) && (
         <Box sx={{ display: 'flex', alignItems: 'center', gap: 2, mt: 2, width: buttonFullWidth ? '100%' : null }}>
-          {onBack && <StyledBackButton onBack={onBack} />}
+          {onBack && <StyledBackButton onBack={onBack} label={backLabel} fullWidth={backButtonFullWidth} />}
           {onOk && (
             <Button variant="contained" fullWidth size="large" onClick={onOk} disabled={okDisabled}>
               {okLabel}
diff --git a/nym-wallet/src/components/Nav.tsx b/nym-wallet/src/components/Nav.tsx
index 8d28658443..3036f91682 100644
--- a/nym-wallet/src/components/Nav.tsx
+++ b/nym-wallet/src/components/Nav.tsx
@@ -1,7 +1,14 @@
 import React, { useState, useContext } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { List, ListItem, ListItemIcon, ListItemText } from '@mui/material';
-import { AccountBalanceWalletOutlined, ArrowBack, ArrowForward, Description, Settings } from '@mui/icons-material';
+import {
+  AccountBalanceWalletOutlined,
+  ArrowBack,
+  ArrowForward,
+  Description,
+  Settings,
+  Toll,
+} from '@mui/icons-material';
 import { AppContext } from '../context/main';
 import { Delegate, Bonding } from '../svg-icons';
 
@@ -54,6 +61,12 @@ export const Nav = () => {
       mode: 'admin',
       onClick: () => navigate('/admin'),
     },
+    {
+      label: 'Buy',
+      route: '/buy',
+      Icon: Toll,
+      onClick: () => navigate('/buy'),
+    },
   ]);
 
   return (
diff --git a/nym-wallet/src/components/NymCard.tsx b/nym-wallet/src/components/NymCard.tsx
index b1927efaac..d3377a5fa9 100644
--- a/nym-wallet/src/components/NymCard.tsx
+++ b/nym-wallet/src/components/NymCard.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Card, CardContent, CardHeader } from '@mui/material';
+import { Card, CardContent, CardHeader, SxProps } from '@mui/material';
 import { styled, Theme } from '@mui/material/styles';
 import { Title } from './Title';
 
@@ -12,21 +12,23 @@ const CardContentNoPadding = styled(CardContent)(() => ({
 
 export const NymCard: React.FC<{
   title: string | React.ReactElement;
-  subheader?: string;
+  subheader?: string | React.ReactChild;
   Action?: React.ReactNode;
   Icon?: React.ReactNode;
   noPadding?: boolean;
   borderless?: boolean;
   dataTestid?: string;
-}> = ({ title, subheader, Action, Icon, noPadding, borderless, children, dataTestid }) => (
-  <Card variant="outlined" sx={{ overflow: 'auto', ...(borderless && { border: 'none', dropShadow: 'none' }) }}>
+  sx?: SxProps;
+  sxTitle?: SxProps;
+}> = ({ title, subheader, Action, Icon, noPadding, borderless, children, dataTestid, sx, sxTitle }) => (
+  <Card variant="outlined" sx={{ overflow: 'auto', ...(borderless && { border: 'none', dropShadow: 'none' }), ...sx }}>
     <CardHeader
       sx={{
         p: 3,
-        color: 'text.primary',
+        color: (theme: Theme) => theme.palette.text.primary,
         '& .MuiCardHeader-title h5': { fontSize: '1.25rem' },
       }}
-      title={<Title title={title} Icon={Icon} />}
+      title={<Title title={title} Icon={Icon} sx={sxTitle} />}
       subheader={subheader}
       data-testid={dataTestid || title}
       subheaderTypographyProps={{ variant: 'subtitle1' }}
diff --git a/nym-wallet/src/components/Rewards/RewardsSummary.tsx b/nym-wallet/src/components/Rewards/RewardsSummary.tsx
index df91de73d8..3cbc7b1fc5 100644
--- a/nym-wallet/src/components/Rewards/RewardsSummary.tsx
+++ b/nym-wallet/src/components/Rewards/RewardsSummary.tsx
@@ -13,14 +13,14 @@ export const RewardsSummary: React.FC<{
     <Stack direction="row" justifyContent="space-between">
       <Stack direction="row" spacing={4}>
         <Stack direction="row" spacing={1} alignItems="center">
-          <InfoTooltip title="This is the total amount you have delgated across multiple nodes" />
+          <InfoTooltip title="This is the total amount you have delegated to node(s) in the network" />
           <Typography>Total delegations:</Typography>
           <Typography fontWeight={600} fontSize={16} textTransform="uppercase">
             {isLoading ? <CircularProgress size={theme.typography.fontSize} /> : totalDelegation || '-'}
           </Typography>
         </Stack>
         <Stack direction="row" spacing={1} alignItems="center">
-          <InfoTooltip title="Awaiting rewards accrue per epoch (hourly). You can redeem or compound them" />
+          <InfoTooltip title="This is the rewards you have accrued since the last time you redeemed your rewards. Rewards are automatically compounded. You can redeem your rewards at any time" />
           <Typography>New rewards:</Typography>
           <Typography fontWeight={600} fontSize={16} textTransform="uppercase">
             {isLoading ? <CircularProgress size={theme.typography.fontSize} /> : totalRewards || '-'}
diff --git a/nym-wallet/src/components/RewardsPlayground/InclusionProbability.tsx b/nym-wallet/src/components/RewardsPlayground/InclusionProbability.tsx
new file mode 100644
index 0000000000..d60f7886c7
--- /dev/null
+++ b/nym-wallet/src/components/RewardsPlayground/InclusionProbability.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { Typography } from '@mui/material';
+import { SelectionChance } from '@nymproject/types';
+
+const colorMap: { [key in SelectionChance]: string } = {
+  Low: 'error.main',
+  Good: 'warning.main',
+  High: 'success.main',
+};
+
+const textMap: { [key in SelectionChance]: string } = {
+  Low: 'Low',
+  Good: 'Good',
+  High: 'High',
+};
+
+export const InclusionProbability = ({ probability }: { probability: SelectionChance }) => (
+  <Typography sx={{ color: colorMap[probability] }}>{textMap[probability]}</Typography>
+);
diff --git a/nym-wallet/src/components/RewardsPlayground/Inputs.tsx b/nym-wallet/src/components/RewardsPlayground/Inputs.tsx
new file mode 100644
index 0000000000..1f1dbac935
--- /dev/null
+++ b/nym-wallet/src/components/RewardsPlayground/Inputs.tsx
@@ -0,0 +1,91 @@
+import React, { useCallback } from 'react';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { Button, Grid, TextField, Typography } from '@mui/material';
+import { useForm } from 'react-hook-form';
+import { DefaultInputValues } from 'src/pages/bonding/node-settings/apy-playground';
+import { inputValidationSchema } from './inputsValidationSchema';
+
+export type InputFields = {
+  label: string;
+  name: 'profitMargin' | 'uptime' | 'bond' | 'delegations' | 'operatorCost' | 'uptime';
+  isPercentage?: boolean;
+}[];
+
+export type CalculateArgs = {
+  bond: string;
+  delegations: string;
+  uptime: string;
+  profitMargin: string;
+  operatorCost: string;
+};
+
+const inputFields: InputFields = [
+  { label: 'Profit margin', name: 'profitMargin', isPercentage: true },
+  { label: 'Operator cost', name: 'operatorCost' },
+  { label: 'Bond', name: 'bond' },
+  { label: 'Delegations', name: 'delegations' },
+  { label: 'Uptime', name: 'uptime', isPercentage: true },
+];
+
+export const Inputs = ({
+  onCalculate,
+  defaultValues,
+}: {
+  onCalculate: (args: CalculateArgs) => Promise<void>;
+  defaultValues: DefaultInputValues;
+}) => {
+  const handleCalculate = useCallback(
+    async (args: CalculateArgs) => {
+      onCalculate({
+        bond: args.bond,
+        delegations: args.delegations,
+        uptime: args.uptime,
+        profitMargin: args.profitMargin,
+        operatorCost: args.operatorCost,
+      });
+    },
+    [onCalculate],
+  );
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm({
+    resolver: yupResolver(inputValidationSchema),
+    defaultValues,
+  });
+
+  return (
+    <Grid container spacing={3}>
+      {inputFields.map((field) => (
+        <Grid item xs={12} lg={2} key={field.name}>
+          <TextField
+            {...register(field.name)}
+            fullWidth
+            label={field.label}
+            name={field.name}
+            error={Boolean(errors[field.name])}
+            helperText={errors[field.name]?.message}
+            InputProps={{
+              endAdornment: <Typography sx={{ color: 'grey.600' }}>{field.isPercentage ? '%' : 'NYM'}</Typography>,
+            }}
+            InputLabelProps={{ shrink: true }}
+          />
+        </Grid>
+      ))}{' '}
+      <Grid item xs={12} lg={2}>
+        <Button
+          variant="contained"
+          disableElevation
+          onClick={handleSubmit(handleCalculate)}
+          size="large"
+          fullWidth
+          disabled={Boolean(Object.keys(errors).length)}
+        >
+          Calculate
+        </Button>
+      </Grid>
+    </Grid>
+  );
+};
diff --git a/nym-wallet/src/components/RewardsPlayground/NodeDetail.tsx b/nym-wallet/src/components/RewardsPlayground/NodeDetail.tsx
new file mode 100644
index 0000000000..fb8a239be0
--- /dev/null
+++ b/nym-wallet/src/components/RewardsPlayground/NodeDetail.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { Card, CardContent, Divider, Stack, Typography } from '@mui/material';
+import { SelectionChance } from '@nymproject/types';
+import { InclusionProbability } from './InclusionProbability';
+
+const computeSelectionProbability = (saturation: number): SelectionChance => {
+  if (saturation < 5) return 'Low';
+
+  if (saturation > 5 && saturation < 15) return 'Good';
+
+  return 'High';
+};
+
+export const NodeDetails = ({ saturation }: { saturation?: string }) => {
+  if (!saturation) return null;
+
+  return (
+    <Card variant="outlined" sx={{ p: 1 }}>
+      <CardContent>
+        <Stack direction="row" justifyContent="space-between">
+          <Typography fontWeight="medium">Stake saturation</Typography>
+          <Typography>{saturation || '- '}%</Typography>
+        </Stack>
+        <Divider sx={{ my: 1 }} />
+        <Stack direction="row" justifyContent="space-between">
+          <Typography fontWeight="medium">Selection probability</Typography>
+          <InclusionProbability probability={computeSelectionProbability(parseInt(saturation))} />
+        </Stack>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/nym-wallet/src/components/RewardsPlayground/ResultsTable.tsx b/nym-wallet/src/components/RewardsPlayground/ResultsTable.tsx
new file mode 100644
index 0000000000..19196c176d
--- /dev/null
+++ b/nym-wallet/src/components/RewardsPlayground/ResultsTable.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import {
+  Card,
+  CardContent,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  Typography,
+} from '@mui/material';
+
+export type Results = {
+  operator: {
+    daily: string;
+    monthly: string;
+    yearly: string;
+  };
+  delegator: {
+    daily: string;
+    monthly: string;
+    yearly: string;
+  };
+  total: {
+    daily: string;
+    monthly: string;
+    yearly: string;
+  };
+};
+
+const tableHeader = [
+  { title: 'Estimated rewards', bold: true },
+  { title: 'Per day' },
+  { title: 'Per month' },
+  { title: 'Per year' },
+];
+
+export const ResultsTable = ({ results }: { results: Results }) => {
+  const tableRows = [
+    { title: 'Total node reward', ...results.total },
+    { title: 'Operator rewards', ...results.operator },
+    { title: 'Delegator rewards', ...results.delegator },
+  ];
+
+  return (
+    <Card variant="outlined" sx={{ p: 1 }}>
+      <CardContent>
+        <TableContainer>
+          <Table>
+            <TableHead>
+              <TableRow>
+                {tableHeader.map((header) => (
+                  <TableCell>
+                    <Typography fontWeight={header.bold ? 'bold' : 'regular'}>{header.title}</Typography>
+                  </TableCell>
+                ))}
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {tableRows.map((row) => (
+                <TableRow>
+                  <TableCell>{row.title}</TableCell>
+                  <TableCell>{row.daily}</TableCell>
+                  <TableCell>{row.monthly}</TableCell>
+                  <TableCell>{row.yearly}</TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+      </CardContent>
+    </Card>
+  );
+};
diff --git a/nym-wallet/src/components/RewardsPlayground/inputsValidationSchema.ts b/nym-wallet/src/components/RewardsPlayground/inputsValidationSchema.ts
new file mode 100644
index 0000000000..ef5d9ecc0d
--- /dev/null
+++ b/nym-wallet/src/components/RewardsPlayground/inputsValidationSchema.ts
@@ -0,0 +1,41 @@
+import * as Yup from 'yup';
+import { isGreaterThan, isLessThan } from 'src/utils';
+
+export const inputValidationSchema = Yup.object().shape({
+  profitMargin: Yup.string()
+    .required('profit margin is a required field')
+    .test('Is valid profit margin value', (value, ctx) => {
+      const stringValueToNumber = Math.round(Number(value));
+
+      if (isGreaterThan(stringValueToNumber, -1) && isLessThan(stringValueToNumber, 101)) return true;
+      return ctx.createError({ message: 'Profit margin must be a number from 0 and 100' });
+    }),
+  uptime: Yup.string()
+    .required()
+    .test('Is valid uptime value', (value, ctx) => {
+      const stringValueToNumber = Math.round(Number(value));
+      if (stringValueToNumber && isGreaterThan(stringValueToNumber, 0) && isLessThan(stringValueToNumber, 101))
+        return true;
+      return ctx.createError({ message: 'Uptime must be a number between 0 and 100' });
+    }),
+  bond: Yup.string()
+    .required()
+    .test('Is valid bond value', (value, ctx) => {
+      if (Number(value)) return true;
+      return ctx.createError({ message: 'Bond must be a valid number' });
+    }),
+  delegations: Yup.string()
+    .required()
+    .test('Is valid delegation value', (value, ctx) => {
+      if (Number(value)) return true;
+      return ctx.createError({ message: 'Delegations must be a valid number' });
+    }),
+  operatorCost: Yup.string()
+    .required('operator cost is a required field')
+    .test('Is valid operator cost value', (value, ctx) => {
+      const stringValueToNumber = Math.round(Number(value));
+
+      if (isGreaterThan(stringValueToNumber, -1) && isLessThan(stringValueToNumber, 101)) return true;
+      return ctx.createError({ message: 'Operator cost must be a valid number' });
+    }),
+});
diff --git a/nym-wallet/src/components/Send/SendSuccessModal.tsx b/nym-wallet/src/components/Send/SendSuccessModal.tsx
index 29f3ffa1e9..cee7c2fdff 100644
--- a/nym-wallet/src/components/Send/SendSuccessModal.tsx
+++ b/nym-wallet/src/components/Send/SendSuccessModal.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { Stack, Typography, SxProps } from '@mui/material';
 import { Link } from '@nymproject/react/link/Link';
 import { TTransactionDetails } from './types';
 import { ConfirmationModal } from '../Modals/ConfirmationModal';
+import { AppContext } from 'src/context';
 
 export const SendSuccessModal = ({
   txDetails,
@@ -14,26 +15,35 @@ export const SendSuccessModal = ({
   onClose: () => void;
   sx?: SxProps;
   backdropProps?: object;
-}) => (
-  <ConfirmationModal
-    open
-    onConfirm={onClose}
-    onClose={onClose}
-    title=""
-    confirmButton="Done"
-    maxWidth="xs"
-    fullWidth
-    sx={sx}
-    backdropProps={backdropProps}
-  >
-    <Stack alignItems="center" spacing={2}>
-      <Typography>You sent</Typography>
-      {txDetails && (
-        <>
-          <Typography variant="h5">{txDetails.amount}</Typography>
-          <Link href={txDetails.txUrl} target="_blank" sx={{ ml: 1 }} text="View on blockchain" />
-        </>
-      )}
-    </Stack>
-  </ConfirmationModal>
-);
+}) => {
+  const { userBalance } = useContext(AppContext);
+
+  const handleClose = async () => {
+    await userBalance.refreshBalances();
+    onClose();
+  };
+
+  return (
+    <ConfirmationModal
+      open
+      onConfirm={handleClose}
+      onClose={handleClose}
+      title=""
+      confirmButton="Done"
+      maxWidth="xs"
+      fullWidth
+      sx={sx}
+      backdropProps={backdropProps}
+    >
+      <Stack alignItems="center" spacing={2}>
+        <Typography>You sent</Typography>
+        {txDetails && (
+          <>
+            <Typography variant="h5">{txDetails.amount}</Typography>
+            <Link href={txDetails.txUrl} target="_blank" sx={{ ml: 1 }} text="View on blockchain" />
+          </>
+        )}
+      </Stack>
+    </ConfirmationModal>
+  );
+};
diff --git a/nym-wallet/src/components/StyledBackButton.tsx b/nym-wallet/src/components/StyledBackButton.tsx
index 319bb84c02..bc7e084536 100644
--- a/nym-wallet/src/components/StyledBackButton.tsx
+++ b/nym-wallet/src/components/StyledBackButton.tsx
@@ -2,8 +2,18 @@ import React from 'react';
 import { Button, SxProps } from '@mui/material';
 import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
 
-export const StyledBackButton = ({ onBack, sx }: { onBack: () => void; sx?: SxProps }) => (
-  <Button disableFocusRipple size="large" variant="outlined" onClick={onBack} sx={sx}>
-    <ArrowBackIosNewIcon fontSize="small" />
+export const StyledBackButton = ({
+  onBack,
+  label,
+  fullWidth,
+  sx,
+}: {
+  onBack: () => void;
+  label?: string;
+  fullWidth?: boolean;
+  sx?: SxProps;
+}) => (
+  <Button disableFocusRipple size="large" fullWidth={fullWidth} variant="outlined" onClick={onBack} sx={sx}>
+    {label || <ArrowBackIosNewIcon fontSize="small" />}
   </Button>
 );
diff --git a/nym-wallet/src/components/Title.tsx b/nym-wallet/src/components/Title.tsx
index f595a4d2bf..530b9deed8 100644
--- a/nym-wallet/src/components/Title.tsx
+++ b/nym-wallet/src/components/Title.tsx
@@ -1,10 +1,14 @@
 import React from 'react';
-import { Box, Typography } from '@mui/material';
+import { Box, SxProps, Typography } from '@mui/material';
 
-export const Title: React.FC<{ title: string | React.ReactNode; Icon?: React.ReactNode }> = ({ title, Icon }) => (
+export const Title: React.FC<{ title: string | React.ReactNode; Icon?: React.ReactNode; sx?: SxProps }> = ({
+  title,
+  Icon,
+  sx,
+}) => (
   <Box width="100%" display="flex" alignItems="center">
     {Icon}
-    <Typography width="100%" variant="h5" sx={{ fontWeight: 600 }}>
+    <Typography width="100%" variant="h5" sx={{ fontWeight: 600, ...sx }}>
       {title}
     </Typography>
   </Box>
diff --git a/nym-wallet/src/components/TokenPoolSelector.tsx b/nym-wallet/src/components/TokenPoolSelector.tsx
index 9ea0803975..b289e90392 100644
--- a/nym-wallet/src/components/TokenPoolSelector.tsx
+++ b/nym-wallet/src/components/TokenPoolSelector.tsx
@@ -53,7 +53,6 @@ export const TokenPoolSelector: React.FC<{ disabled: boolean; onSelect: (pool: T
               secondary={`${
                 +tokenAllocation.locked + +tokenAllocation.spendable
               } ${clientDetails?.display_mix_denom.toUpperCase()}`}
-              sx={{ textTransform: 'uppercase' }}
             />
           )}
         </MenuItem>
diff --git a/nym-wallet/src/components/textfields.tsx b/nym-wallet/src/components/textfields.tsx
index 085ede1ab3..afcbcfedb7 100644
--- a/nym-wallet/src/components/textfields.tsx
+++ b/nym-wallet/src/components/textfields.tsx
@@ -10,22 +10,17 @@ export const MnemonicInput: React.FC<{
   error?: string;
   onUpdateMnemonic: (mnemonic: string) => void;
 }> = ({ mnemonic, error, onUpdateMnemonic }) => {
-  const [showPassword, setShowPassword] = useState(false);
+  const [showMnemonic, setShowMnemonic] = useState(false);
   return (
     <Stack spacing={2}>
       <TextField
         label="Mnemonic"
-        type="input"
-        value={showPassword ? mnemonic : mnemonic.replaceAll(/./g, '*')}
+        type={showMnemonic ? 'input' : 'password'}
+        value={mnemonic}
         onChange={(e) => onUpdateMnemonic(e.target.value)}
-        multiline
         autoFocus
         fullWidth
-        inputProps={{
-          style: {
-            height: '160px',
-          },
-        }}
+        multiline={showMnemonic}
         InputLabelProps={{ shrink: true }}
         sx={{
           'input::-webkit-textfield-decoration-container': {
@@ -34,7 +29,7 @@ export const MnemonicInput: React.FC<{
         }}
       />
       <FormControlLabel
-        control={<Checkbox checked={Boolean(showPassword)} onChange={() => setShowPassword((show) => !show)} />}
+        control={<Checkbox checked={Boolean(showMnemonic)} onChange={() => setShowMnemonic((show) => !show)} />}
         label="Reveal my mnemonic"
       />
       {error && <Error message={error} />}
diff --git a/nym-wallet/src/context/bonding.tsx b/nym-wallet/src/context/bonding.tsx
index 524a9ea0be..94bf5271ca 100644
--- a/nym-wallet/src/context/bonding.tsx
+++ b/nym-wallet/src/context/bonding.tsx
@@ -8,7 +8,7 @@ import {
 } from '@nymproject/types';
 import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import Big from 'big.js';
-import { isGateway, isMixnode, TBondGatewayArgs, TBondMixNodeArgs } from 'src/types';
+import { isGateway, isMixnode, TBondGatewayArgs, TBondMixNodeArgs, TBondMoreArgs } from 'src/types';
 import { Console } from 'src/utils/console';
 import {
   bondGateway as bondGatewayRequest,
@@ -18,11 +18,12 @@ import {
   getMixnodeBondDetails,
   unbondGateway as unbondGatewayRequest,
   unbondMixNode as unbondMixnodeRequest,
+  bondMore as bondMoreRequest,
+  vestingBondMore,
   vestingBondGateway,
   vestingBondMixNode,
   vestingUnbondGateway,
   vestingUnbondMixnode,
-  getPendingEpochEvents,
   updateMixnodeCostParams as updateMixnodeCostParamsRequest,
   vestingUpdateMixnodeCostParams as updateMixnodeVestingCostParamsRequest,
   getNodeDescription as getNodeDescriptionRequest,
@@ -34,6 +35,7 @@ import {
   getMixnodeAvgUptime,
   getMixnodeRewardEstimation,
   getGatewayReport,
+  getMixnodeUptime,
 } from '../requests';
 import { useCheckOwnership } from '../hooks/useCheckOwnership';
 import { AppContext } from './main';
@@ -69,10 +71,12 @@ export type TBondedMixnode = {
   verlocPort: number;
   version: string;
   isUnbonding: boolean;
+  uptime: number;
 };
 
 export interface TBondedGateway {
-  name: string;
+  name?: string;
+  id: number;
   identityKey: string;
   ip: string;
   bond: DecCoin;
@@ -100,7 +104,7 @@ export type TBondingContext = {
   bondMixnode: (data: TBondMixNodeArgs, tokenPool: TokenPool) => Promise<TransactionExecuteResult | undefined>;
   bondGateway: (data: TBondGatewayArgs, tokenPool: TokenPool) => Promise<TransactionExecuteResult | undefined>;
   unbond: (fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
-  bondMore: (signature: string, amount: DecCoin, fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
+  bondMore: (data: TBondMoreArgs, tokenPool: TokenPool) => Promise<TransactionExecuteResult | undefined>;
   redeemRewards: (fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
   updateMixnode: (pm: string, fee?: FeeDetails) => Promise<TransactionExecuteResult | undefined>;
   checkOwnership: () => Promise<void>;
@@ -152,14 +156,18 @@ export const BondingContextProvider = ({ children }: { children?: React.ReactNod
       status: MixnodeStatus;
       stakeSaturation: string;
       estimatedRewards?: DecCoin;
+      uptime: number;
     } = {
       status: 'not_found',
       stakeSaturation: '0',
+      uptime: 0,
     };
 
     try {
       const statusResponse = await getMixnodeStatus(mixId);
+      const uptime = await getMixnodeUptime(mixId);
       additionalDetails.status = statusResponse.status;
+      additionalDetails.uptime = uptime;
     } catch (e) {
       Console.log('getMixnodeStatus fails', e);
     }
@@ -258,7 +266,7 @@ export const BondingContextProvider = ({ children }: { children?: React.ReactNod
             bond_information: { mix_id },
           } = data;
 
-          const { status, stakeSaturation, estimatedRewards } = await getAdditionalMixnodeDetails(mix_id);
+          const { status, stakeSaturation, estimatedRewards, uptime } = await getAdditionalMixnodeDetails(mix_id);
           const setProbabilities = await getSetProbabilities(mix_id);
           const nodeDescription = await getNodeDescription(
             bond_information.mix_node.host,
@@ -266,6 +274,7 @@ export const BondingContextProvider = ({ children }: { children?: React.ReactNod
           );
           const routingScore = await getAvgUptime();
           setBondedNode({
+            id: data.bond_information.mix_id,
             name: nodeDescription?.name,
             mixId: mix_id,
             identityKey: bond_information.mix_node.identity_key,
@@ -278,6 +287,7 @@ export const BondingContextProvider = ({ children }: { children?: React.ReactNod
             delegators: rewarding_details.unique_delegations,
             proxy: bond_information.proxy,
             operatorRewards,
+            uptime,
             status,
             stakeSaturation,
             operatorCost: decCoinToDisplay(rewarding_details.cost_params.interval_operating_cost),
@@ -431,9 +441,28 @@ export const BondingContextProvider = ({ children }: { children?: React.ReactNod
     return tx;
   };
 
-  const bondMore = async (_signature: string, _additionalBond: DecCoin) =>
-    // TODO to implement
-    undefined;
+  const bondMore = async (data: TBondMoreArgs, tokenPool: TokenPool) => {
+    let tx: TransactionExecuteResult | undefined;
+    setIsLoading(true);
+    try {
+      if (tokenPool === 'balance') {
+        tx = await bondMoreRequest(data);
+        await userBalance.fetchBalance();
+      }
+      if (tokenPool === 'locked') {
+        tx = await vestingBondMore(data);
+        await userBalance.fetchTokenAllocation();
+      }
+
+      return tx;
+    } catch (e: any) {
+      Console.warn(e);
+      setError(`an error occurred: ${e}`);
+    } finally {
+      setIsLoading(false);
+    }
+    return undefined;
+  };
 
   const memoizedValue = useMemo(
     () => ({
diff --git a/nym-wallet/src/context/buy.tsx b/nym-wallet/src/context/buy.tsx
new file mode 100644
index 0000000000..855f5e988a
--- /dev/null
+++ b/nym-wallet/src/context/buy.tsx
@@ -0,0 +1,58 @@
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
+import { sign } from 'src/requests';
+import { Console } from 'src/utils/console';
+// import { AppContext } from './main';
+
+export type TBuyContext = {
+  loading: boolean;
+  error?: string;
+  signMessage: (message: string) => Promise<string | undefined>;
+  refresh: () => Promise<void>;
+};
+
+export const BuyContext = createContext<TBuyContext>({
+  loading: false,
+  signMessage: async () => '',
+  refresh: async () => undefined,
+});
+
+export const BuyContextProvider = ({ children }: { children?: React.ReactNode }): JSX.Element => {
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string>();
+
+  const refresh = useCallback(async () => {
+    setError(undefined);
+  }, []);
+
+  useEffect(() => {
+    refresh();
+  }, [refresh]);
+
+  const signMessage = async (message: string) => {
+    let signature;
+    setLoading(true);
+    try {
+      signature = await sign(message);
+    } catch (e: any) {
+      Console.log(`Sign message operation failed: ${e}`);
+      setError(`Sign message operation failed: ${e}`);
+    } finally {
+      setLoading(false);
+    }
+    return signature;
+  };
+
+  const memoizedValue = useMemo(
+    () => ({
+      loading,
+      error,
+      refresh,
+      signMessage,
+    }),
+    [loading, error],
+  );
+
+  return <BuyContext.Provider value={memoizedValue}>{children}</BuyContext.Provider>;
+};
+
+export const useBuyContext = () => useContext<TBuyContext>(BuyContext);
diff --git a/nym-wallet/src/context/index.tsx b/nym-wallet/src/context/index.tsx
index 6cfbf5ffd4..5007dd7b17 100644
--- a/nym-wallet/src/context/index.tsx
+++ b/nym-wallet/src/context/index.tsx
@@ -2,3 +2,4 @@ export * from './main';
 export * from './auth';
 export * from './accounts';
 export * from './bonding';
+export * from './buy';
diff --git a/nym-wallet/src/context/mocks/bonding.tsx b/nym-wallet/src/context/mocks/bonding.tsx
index 8d97deb090..f38168ee28 100644
--- a/nym-wallet/src/context/mocks/bonding.tsx
+++ b/nym-wallet/src/context/mocks/bonding.tsx
@@ -7,8 +7,8 @@ import { mockSleep } from './utils';
 const SLEEP_MS = 1000;
 
 const bondedMixnodeMock: TBondedMixnode = {
-  name: 'Monster node',
   mixId: 1,
+  name: 'Monster node',
   identityKey: '7mjM2fYbtN6kxMwp1TrmQ4VwPks3URR5pBgWPWhzT98F',
   stake: { denom: 'nym', amount: '1234' },
   bond: { denom: 'nym', amount: '1234' },
@@ -28,9 +28,11 @@ const bondedMixnodeMock: TBondedMixnode = {
   verlocPort: 1790,
   version: '1.0.2',
   isUnbonding: false,
+  uptime: 1,
 };
 
 const bondedGatewayMock: TBondedGateway = {
+  id: 1,
   name: 'Monster node',
   identityKey: 'WayM2fYbtN6kxMwp1TrmQ4VwPks3URR5pBgWPWhzT98F',
   ip: '112.43.234.57',
@@ -152,7 +154,7 @@ export const MockBondingContextProvider = ({
     return TxResultMock;
   };
 
-  const bondMore = async (_signature: string, _additionalBond: DecCoin) => {
+  const bondMore = async (): Promise<TransactionExecuteResult> => {
     setIsLoading(true);
     await mockSleep(SLEEP_MS);
     triggerStateUpdate();
diff --git a/nym-wallet/src/context/mocks/buy.tsx b/nym-wallet/src/context/mocks/buy.tsx
new file mode 100644
index 0000000000..0d7bca418d
--- /dev/null
+++ b/nym-wallet/src/context/mocks/buy.tsx
@@ -0,0 +1,35 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { BuyContext } from '../buy';
+import { mockSleep } from './utils';
+
+export const MockBuyContextProvider = ({ children }: { children?: React.ReactNode }): JSX.Element => {
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string>();
+
+  const refresh = useCallback(async () => {
+    setError(undefined);
+  }, []);
+
+  const signMessage = async (message: string) => {
+    setLoading(true);
+    await mockSleep(1042);
+    setLoading(false);
+    return `imagineareallyrealisticsignaturehash${message}`;
+  };
+
+  useEffect(() => {
+    refresh();
+  }, [refresh]);
+
+  const memoizedValue = useMemo(
+    () => ({
+      loading,
+      error,
+      refresh,
+      signMessage,
+    }),
+    [loading, error],
+  );
+
+  return <BuyContext.Provider value={memoizedValue}>{children}</BuyContext.Provider>;
+};
diff --git a/nym-wallet/src/layouts/AppLayout.tsx b/nym-wallet/src/layouts/AppLayout.tsx
index 3745eead86..807c369801 100644
--- a/nym-wallet/src/layouts/AppLayout.tsx
+++ b/nym-wallet/src/layouts/AppLayout.tsx
@@ -26,14 +26,14 @@ export const ApplicationLayout: React.FC = ({ children }) => {
           sx={{
             background: (t) => t.palette.nym.nymWallet.nav.background,
             overflow: 'auto',
-            py: 5,
+            py: 4,
           }}
           display="flex"
           flexDirection="column"
           justifyContent="space-between"
         >
           <Box>
-            <Box sx={{ ml: 5, mb: 3 }}>
+            <Box sx={{ ml: 5, mb: 7 }}>
               <NymWordmark height={14} />
             </Box>
             <Nav />
diff --git a/nym-wallet/src/pages/balance/balance.tsx b/nym-wallet/src/pages/balance/balance.tsx
index 97c3e5e004..82a5fec102 100644
--- a/nym-wallet/src/pages/balance/balance.tsx
+++ b/nym-wallet/src/pages/balance/balance.tsx
@@ -31,7 +31,7 @@ export const BalanceCard = () => {
               sx={{
                 color: 'text.primary',
                 textTransform: 'uppercase',
-                fontWeight: (theme) => (theme.palette.mode === 'light' ? '600' : '400'),
+                fontWeight: '600',
                 fontSize: 28,
               }}
               variant="h5"
diff --git a/nym-wallet/src/pages/balance/components/vesting-timeline.tsx b/nym-wallet/src/pages/balance/components/vesting-timeline.tsx
index f8feeea7ef..5b5230604e 100644
--- a/nym-wallet/src/pages/balance/components/vesting-timeline.tsx
+++ b/nym-wallet/src/pages/balance/components/vesting-timeline.tsx
@@ -23,7 +23,6 @@ export const VestingTimeline: React.FC<{ percentageComplete: number }> = ({ perc
   } = useContext(AppContext);
 
   const theme = useTheme();
-  const { mode } = theme.palette;
 
   const nextPeriod =
     typeof currentVestingPeriod === 'object' && !!vestingAccountInfo?.periods
@@ -33,22 +32,14 @@ export const VestingTimeline: React.FC<{ percentageComplete: number }> = ({ perc
   return (
     <Box display="flex" flexDirection="column" gap={1} position="relative" width="100%">
       <svg width="100%" height="12">
-        <rect y="2" width="100%" height="6" rx="0" fill="text.dark" />
-        <rect
-          y="2"
-          width={`${percentageComplete}%`}
-          height="6"
-          rx="0"
-          fill={mode === 'light' ? 'text.dark' : theme.palette.success.main}
-        />
+        <rect y="2" width="100%" height="6" rx="0" fill="#E6E6E6" />
+        <rect y="2" width={`${percentageComplete}%`} height="6" rx="0" fill={theme.palette.success.main} />
         {vestingAccountInfo?.periods.map((period, i, arr) => (
           <Marker
             position={`${calculateMarkerPosition(arr.length, i)}%`}
             color={
-              +percentageComplete.toFixed(2) >= calculateMarkerPosition(arr.length, i)
-                ? mode === 'light'
-                  ? 'text.dark'
-                  : theme.palette.success.main
+              Math.ceil(+percentageComplete) >= calculateMarkerPosition(arr.length, i)
+                ? theme.palette.success.main
                 : '#B9B9B9'
             }
             tooltipText={format(new Date(Number(period.start_time) * 1000), 'HH:mm do MMM yyyy')}
@@ -57,15 +48,12 @@ export const VestingTimeline: React.FC<{ percentageComplete: number }> = ({ perc
         ))}
         <Marker
           position="calc(100% - 4px)"
-          color={percentageComplete === 100 ? (mode === 'light' ? 'text.dark' : theme.palette.success.main) : '#B9B9B9'}
+          color={percentageComplete === 100 ? theme.palette.success.main : '#B9B9B9'}
           tooltipText="End of vesting schedule"
         />
       </svg>
       {!!nextPeriod && (
-        <Typography
-          variant="caption"
-          sx={{ color: (theme) => theme.palette.text.disabled, position: 'absolute', top: 15, left: 0 }}
-        >
+        <Typography variant="caption" sx={{ color: 'nym.text.muted', position: 'absolute', top: 15, left: 0 }}>
           Next vesting period: {format(new Date(nextPeriod * 1000), 'HH:mm do MMM yyyy')}
         </Typography>
       )}
diff --git a/nym-wallet/src/pages/balance/index.tsx b/nym-wallet/src/pages/balance/index.tsx
index 4bb42f6b28..a788a1c460 100644
--- a/nym-wallet/src/pages/balance/index.tsx
+++ b/nym-wallet/src/pages/balance/index.tsx
@@ -9,25 +9,9 @@ import { TransferModal } from './components/TransferModal';
 
 export const Balance = () => {
   const [showTransferModal, setShowTransferModal] = useState(false);
-  const [showVestingCard, setShowVestingCard] = useState(false);
 
   const { userBalance } = useContext(AppContext);
 
-  useEffect(() => {
-    const { originalVesting, currentVestingPeriod, tokenAllocation } = userBalance;
-    if (
-      originalVesting &&
-      currentVestingPeriod === 'After' &&
-      tokenAllocation?.locked === '0' &&
-      tokenAllocation?.vesting === '0' &&
-      tokenAllocation?.spendable === '0'
-    ) {
-      setShowVestingCard(false);
-    } else if (originalVesting) {
-      setShowVestingCard(true);
-    }
-  }, [userBalance]);
-
   const handleShowTransferModal = async () => {
     await userBalance.refreshBalances();
     setShowTransferModal(true);
@@ -35,9 +19,9 @@ export const Balance = () => {
 
   return (
     <PageLayout>
-      <Box display="flex" flexDirection="column" gap={2}>
+      <Box display="flex" flexDirection="column" gap={4}>
         <BalanceCard />
-        {showVestingCard && <VestingCard onTransfer={handleShowTransferModal} />}
+        <VestingCard onTransfer={handleShowTransferModal} />
         {showTransferModal && <TransferModal onClose={() => setShowTransferModal(false)} />}
       </Box>
     </PageLayout>
diff --git a/nym-wallet/src/pages/balance/vesting.tsx b/nym-wallet/src/pages/balance/vesting.tsx
index c58c1454dd..1ef8e0f30e 100644
--- a/nym-wallet/src/pages/balance/vesting.tsx
+++ b/nym-wallet/src/pages/balance/vesting.tsx
@@ -1,10 +1,11 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react';
+import React from 'react';
+import { Refresh } from '@mui/icons-material';
 import {
   Box,
   Button,
-  Grid,
   IconButton,
   Table,
+  TableBody,
   TableCell,
   TableCellProps,
   TableContainer,
@@ -12,9 +13,9 @@ import {
   TableRow,
   Typography,
 } from '@mui/material';
-import { InfoOutlined, Refresh } from '@mui/icons-material';
 import { useSnackbar } from 'notistack';
-import { InfoTooltip, NymCard, Title } from 'src/components';
+import { useContext, useEffect, useState } from 'react';
+import { NymCard } from 'src/components';
 import { AppContext } from 'src/context/main';
 import { Period } from 'src/types';
 import { VestingTimeline } from './components/vesting-timeline';
@@ -54,7 +55,7 @@ const VestingSchedule = () => {
   }, [userBalance.tokenAllocation, calculatePercentage]);
 
   return (
-    <TableContainer>
+    <TableContainer sx={{ py: 1 }}>
       <Table>
         <TableHead>
           <TableRow>
@@ -64,10 +65,12 @@ const VestingSchedule = () => {
               </TableCell>
             ))}
           </TableRow>
+        </TableHead>
+        <TableBody>
           <TableRow>
             <TableCell
               sx={{
-                color: (t) => (t.palette.mode === 'light' ? t.palette.nym.text.muted : 'text.primary'),
+                color: 'text.primary',
                 borderBottom: 'none',
                 textTransform: 'uppercase',
               }}
@@ -78,7 +81,7 @@ const VestingSchedule = () => {
             <TableCell
               align="left"
               sx={{
-                color: (t) => (t.palette.mode === 'light' ? t.palette.nym.text.muted : 'text.primary'),
+                color: 'text.primary',
                 borderBottom: 'none',
               }}
             >
@@ -86,7 +89,7 @@ const VestingSchedule = () => {
             </TableCell>
             <TableCell
               sx={{
-                color: (t) => (t.palette.mode === 'light' ? t.palette.nym.text.muted : 'text.primary'),
+                color: 'text.primary',
                 borderBottom: 'none',
               }}
             >
@@ -97,7 +100,7 @@ const VestingSchedule = () => {
             </TableCell>
             <TableCell
               sx={{
-                color: (t) => (t.palette.mode === 'light' ? t.palette.nym.text.muted : 'text.primary'),
+                color: 'text.primary',
                 borderBottom: 'none',
                 textTransform: 'uppercase',
               }}
@@ -107,7 +110,7 @@ const VestingSchedule = () => {
               {clientDetails?.display_mix_denom.toUpperCase()}
             </TableCell>
           </TableRow>
-        </TableHead>
+        </TableBody>
       </Table>
     </TableContainer>
   );
@@ -115,29 +118,22 @@ const VestingSchedule = () => {
 
 const TokenTransfer = () => {
   const { userBalance, clientDetails } = useContext(AppContext);
-  const icon = useCallback(
-    () => (
-      <Box sx={{ display: 'flex', mr: 1 }}>
-        <InfoTooltip title="Unlocked tokens that are available to transfer to your balance" size="medium" />
-      </Box>
-    ),
-    [],
-  );
-  return (
-    <Grid container sx={{ my: 2 }} direction="column" spacing={2}>
-      <Grid item>
-        <Title title="Transfer unlocked tokens" Icon={icon} />
-      </Grid>
-      <Grid item>
-        <Typography variant="subtitle2" sx={{ color: (t) => t.palette.nym.text.muted, mt: 2 }}>
-          Unlocked transferable tokens
-        </Typography>
 
-        <Typography data-testid="refresh-success" sx={{ color: 'text.primary' }} variant="h5" textTransform="uppercase">
-          {userBalance.tokenAllocation?.spendable || 'n/a'} {clientDetails?.display_mix_denom.toUpperCase()}
-        </Typography>
-      </Grid>
-    </Grid>
+  return (
+    <Box sx={{ my: 3 }}>
+      <Typography variant="subtitle2" sx={{ mb: 3, fontWeight: '600' }}>
+        Unlocked transferable tokens
+      </Typography>
+
+      <Typography
+        data-testid="refresh-success"
+        sx={{ color: 'text.primary', fontWeight: '600', fontSize: 28 }}
+        variant="h5"
+        textTransform="uppercase"
+      >
+        {userBalance.tokenAllocation?.spendable || 'n/a'} {clientDetails?.display_mix_denom.toUpperCase()}
+      </Typography>
+    </Box>
   );
 };
 
@@ -160,6 +156,12 @@ export const VestingCard = ({ onTransfer }: { onTransfer: () => Promise<void> })
   return (
     <NymCard
       title="Vesting Schedule"
+      subheader={
+        <Typography variant="caption" sx={{ color: 'nym.text.muted' }}>
+          You can use up to 10% of your locked tokens for bonding and delegating
+        </Typography>
+      }
+      borderless
       data-testid="check-unvested-tokens"
       Action={
         <IconButton
diff --git a/nym-wallet/src/pages/bonding/Bonding.tsx b/nym-wallet/src/pages/bonding/Bonding.tsx
index d1ec197b0f..1aa6bd5ef2 100644
--- a/nym-wallet/src/pages/bonding/Bonding.tsx
+++ b/nym-wallet/src/pages/bonding/Bonding.tsx
@@ -1,6 +1,6 @@
 import React, { useContext, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { FeeDetails } from '@nymproject/types';
+import { FeeDetails, decimalToFloatApproximation } from '@nymproject/types';
 import { Box } from '@mui/material';
 import { TPoolOption } from 'src/components';
 import { Bond } from 'src/components/Bonding/Bond';
@@ -8,28 +8,35 @@ import { BondedMixnode } from 'src/components/Bonding/BondedMixnode';
 import { TBondedMixnodeActions } from 'src/components/Bonding/BondedMixnodeActions';
 import { BondGatewayModal } from 'src/components/Bonding/modals/BondGatewayModal';
 import { BondMixnodeModal } from 'src/components/Bonding/modals/BondMixnodeModal';
+import { BondMoreModal } from 'src/components/Bonding/modals/BondMoreModal';
+import { BondOversaturatedModal } from 'src/components/Bonding/modals/BondOversaturatedModal';
 import { ConfirmationDetailProps, ConfirmationDetailsModal } from 'src/components/Bonding/modals/ConfirmationModal';
 import { ErrorModal } from 'src/components/Modals/ErrorModal';
 import { LoadingModal } from 'src/components/Modals/LoadingModal';
 import { AppContext, urls } from 'src/context/main';
-import { isGateway, isMixnode, TBondGatewayArgs, TBondMixNodeArgs } from 'src/types';
+import { isGateway, isMixnode, TBondGatewayArgs, TBondMixNodeArgs, TBondMoreArgs } from 'src/types';
 import { BondedGateway } from 'src/components/Bonding/BondedGateway';
 import { RedeemRewardsModal } from 'src/components/Bonding/modals/RedeemRewardsModal';
 import { BondingContextProvider, useBondingContext } from '../../context';
+import { getMixnodeStakeSaturation } from '../../requests';
 
 const Bonding = () => {
-  const [showModal, setShowModal] = useState<'bond-mixnode' | 'bond-gateway' | 'bond-more' | 'unbond' | 'redeem'>();
+  const [showModal, setShowModal] = useState<
+    'bond-mixnode' | 'bond-gateway' | 'bond-more' | 'bond-more-oversaturated' | 'unbond' | 'redeem'
+  >();
   const [confirmationDetails, setConfirmationDetails] = useState<ConfirmationDetailProps>();
+  const [saturationPercentage, setSaturationPercentage] = useState<string | undefined>();
 
   const {
     network,
     clientDetails,
-    userBalance: { originalVesting },
+    userBalance: { originalVesting, balance },
   } = useContext(AppContext);
 
   const navigate = useNavigate();
 
-  const { bondedNode, bondMixnode, bondGateway, redeemRewards, isLoading, checkOwnership } = useBondingContext();
+  const { bondedNode, bondMixnode, bondGateway, redeemRewards, isLoading, checkOwnership, bondMore } =
+    useBondingContext();
 
   const handleCloseModal = async () => {
     setShowModal(undefined);
@@ -66,6 +73,16 @@ const Bonding = () => {
     });
   };
 
+  const handleBondMore = async (data: TBondMoreArgs, tokenPool: TPoolOption) => {
+    setShowModal(undefined);
+    const tx = await bondMore(data, tokenPool);
+    setConfirmationDetails({
+      status: 'success',
+      title: 'Bond More successful',
+      txUrl: `${urls(network).blockExplorer}/transaction/${tx?.transaction_hash}`,
+    });
+  };
+
   const handleRedeemReward = async (fee?: FeeDetails) => {
     setShowModal(undefined);
     const tx = await redeemRewards(fee);
@@ -76,9 +93,33 @@ const Bonding = () => {
     });
   };
 
-  const handleBondedMixnodeAction = (action: TBondedMixnodeActions) => {
+  const handleCheckStakeSaturation = async (newMixId: number) => {
+    try {
+      const newSaturation = decimalToFloatApproximation(
+        (await getMixnodeStakeSaturation(newMixId)).uncapped_saturation,
+      );
+      if (newSaturation && newSaturation > 1) {
+        const saturationPercentage = Math.round(newSaturation * 100);
+        return { isOverSaturated: true, saturationPercentage };
+      }
+      return { isOverSaturated: false, saturationPercentage: undefined };
+    } catch (e) {
+      console.error('Error fetching the saturation, error:', e);
+      return { isOverSaturated: false, saturationPercentage: undefined };
+    }
+  };
+
+  const handleBondedMixnodeAction = async (action: TBondedMixnodeActions) => {
     switch (action) {
       case 'bondMore': {
+        if (bondedNode && isMixnode(bondedNode)) {
+          const { isOverSaturated, saturationPercentage } = await handleCheckStakeSaturation(bondedNode.mixId);
+          if (isOverSaturated && saturationPercentage) {
+            setShowModal('bond-more-oversaturated');
+            setSaturationPercentage(saturationPercentage.toString());
+            break;
+          }
+        }
         setShowModal('bond-more');
         break;
       }
@@ -112,6 +153,7 @@ const Bonding = () => {
       {bondedNode && isGateway(bondedNode) && (
         <BondedGateway gateway={bondedNode} onActionSelect={handleBondedMixnodeAction} network={network} />
       )}
+
       {showModal === 'bond-mixnode' && (
         <BondMixnodeModal
           denom={clientDetails?.display_mix_denom || 'nym'}
@@ -134,6 +176,25 @@ const Bonding = () => {
         />
       )}
 
+      {showModal === 'bond-more-oversaturated' && saturationPercentage && (
+        <BondOversaturatedModal
+          open={true}
+          onClose={() => setShowModal(undefined)}
+          onContinue={() => setShowModal('bond-more')}
+          saturationPercentage={saturationPercentage}
+        />
+      )}
+
+      {showModal === 'bond-more' && bondedNode && isMixnode(bondedNode) && (
+        <BondMoreModal
+          node={bondedNode}
+          userBalance={balance?.printable_balance}
+          onBondMore={handleBondMore}
+          onClose={() => setShowModal(undefined)}
+          onError={handleError}
+        />
+      )}
+
       {showModal === 'redeem' && bondedNode && isMixnode(bondedNode) && (
         <RedeemRewardsModal
           node={bondedNode}
diff --git a/nym-wallet/src/pages/bonding/node-settings/NodeSettings.tsx b/nym-wallet/src/pages/bonding/node-settings/NodeSettings.tsx
index da50bc2d2d..798993dc49 100644
--- a/nym-wallet/src/pages/bonding/node-settings/NodeSettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/NodeSettings.tsx
@@ -10,13 +10,14 @@ import { LoadingModal } from 'src/components/Modals/LoadingModal';
 import { NymCard } from 'src/components';
 import { PageLayout } from 'src/layouts';
 import { Tabs } from 'src/components/Tabs';
-import { useBondingContext, BondingContextProvider } from 'src/context';
+import { useBondingContext, BondingContextProvider, TBondedMixnode } from 'src/context';
 import { AppContext, urls } from 'src/context/main';
 
 import { NodeGeneralSettings } from './settings-pages/general-settings';
 import { NodeUnbondPage } from './settings-pages/NodeUnbondPage';
 import { createNavItems } from './node-settings.constant';
 import { isMixnode } from 'src/types';
+import { ApyPlayground } from './apy-playground';
 
 export const NodeSettings = () => {
   const theme = useTheme();
@@ -123,6 +124,7 @@ export const NodeSettings = () => {
         {value === 'Unbond' && bondedNode && (
           <NodeUnbondPage bondedNode={bondedNode} onConfirm={handleUnbond} onError={handleError} />
         )}
+        {value === 'Playground' && bondedNode && <ApyPlayground bondedNode={bondedNode as TBondedMixnode} />}
         {confirmationDetails && confirmationDetails.status === 'success' && (
           <ConfirmationDetailsModal
             title={confirmationDetails.title}
diff --git a/nym-wallet/src/pages/bonding/node-settings/apy-playground/index.tsx b/nym-wallet/src/pages/bonding/node-settings/apy-playground/index.tsx
new file mode 100644
index 0000000000..5a3b5f4c6b
--- /dev/null
+++ b/nym-wallet/src/pages/bonding/node-settings/apy-playground/index.tsx
@@ -0,0 +1,139 @@
+import React, { useState, useEffect, useContext } from 'react';
+import { Box, Card, CardContent, CardHeader, Grid, Typography } from '@mui/material';
+import { decimalToPercentage, percentToDecimal } from '@nymproject/types';
+import { ResultsTable } from 'src/components/RewardsPlayground/ResultsTable';
+import { getDelegationSummary } from 'src/requests';
+import { NodeDetails } from 'src/components/RewardsPlayground/NodeDetail';
+import { Inputs, CalculateArgs } from 'src/components/RewardsPlayground/Inputs';
+import { AppContext, TBondedMixnode } from 'src/context';
+import { computeEstimate, computeStakeSaturation, handleCalculatePeriodRewards } from './utils';
+import { useSnackbar } from 'notistack';
+import { LoadingModal } from 'src/components/Modals/LoadingModal';
+
+export type DefaultInputValues = {
+  profitMargin: string;
+  uptime: string;
+  bond: string;
+  delegations: string;
+  operatorCost: string;
+};
+
+export const ApyPlayground = ({ bondedNode }: { bondedNode: TBondedMixnode }) => {
+  const { enqueueSnackbar } = useSnackbar();
+
+  const [results, setResults] = useState({
+    total: { daily: '-', monthly: '-', yearly: '-' },
+    operator: { daily: '-', monthly: '-', yearly: '-' },
+    delegator: { daily: '-', monthly: '-', yearly: '-' },
+  });
+
+  const [defaultInputValues, setDefaultInputValues] = useState<DefaultInputValues>();
+  const [stakeSaturation, setStakeSaturation] = useState<string>();
+  const [isLoading, setIsLoading] = useState(true);
+
+  const initialise = async (node: TBondedMixnode) => {
+    try {
+      const delegations = await getDelegationSummary();
+
+      const { estimation } = await computeEstimate({
+        mixId: node.mixId,
+        uptime: node.uptime.toString(),
+        profitMargin: node.profitMargin,
+        operatorCost: node.operatorCost.amount,
+        totalDelegation: delegations.total_delegations.amount,
+        pledgeAmount: node.bond.amount,
+      });
+
+      setResults(
+        handleCalculatePeriodRewards({
+          estimatedOperatorReward: estimation.operator,
+          estimatedDelegatorsReward: estimation.delegates,
+        }),
+      );
+
+      setStakeSaturation(node.stakeSaturation);
+
+      setDefaultInputValues({
+        profitMargin: node.profitMargin,
+        uptime: (node.uptime || 0).toString(),
+        bond: node.bond.amount || '',
+        delegations: delegations.total_delegations.amount,
+        operatorCost: node.operatorCost.amount,
+      });
+      setIsLoading(false);
+    } catch (e) {
+      enqueueSnackbar(e as string, { variant: 'error' });
+    }
+  };
+
+  useEffect(() => {
+    if (bondedNode) {
+      initialise(bondedNode);
+    }
+  }, []);
+
+  if (isLoading) return <LoadingModal />;
+
+  const handleCalculateEstimate = async ({ bond, delegations, uptime, profitMargin, operatorCost }: CalculateArgs) => {
+    try {
+      const { estimation, reward_params } = await computeEstimate({
+        mixId: bondedNode.mixId,
+        uptime: uptime,
+        profitMargin: profitMargin,
+        operatorCost: operatorCost,
+        totalDelegation: delegations,
+        pledgeAmount: bond,
+      });
+
+      const estimationResult = handleCalculatePeriodRewards({
+        estimatedOperatorReward: estimation.operator,
+        estimatedDelegatorsReward: estimation.delegates,
+      });
+
+      const computedStakeSaturation = computeStakeSaturation(
+        bond,
+        delegations,
+        reward_params.interval.stake_saturation_point,
+      );
+
+      setStakeSaturation(computedStakeSaturation);
+      setResults(estimationResult);
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  return (
+    <Box sx={{ p: 3 }}>
+      <Typography fontWeight="medium" sx={{ mb: 1 }}>
+        Playground
+      </Typography>
+      <Typography variant="body2" sx={{ color: 'grey.600', mb: 2 }}>
+        This is your parameters playground - change the parameters below to see the node specific estimations in the
+        table
+      </Typography>
+      {defaultInputValues && (
+        <Card variant="outlined" sx={{ p: 1, mb: 3 }}>
+          <CardHeader
+            title={
+              <Typography variant="body2" fontWeight="medium">
+                Estimation calculator
+              </Typography>
+            }
+          />
+          <CardContent>
+            <Inputs onCalculate={handleCalculateEstimate} defaultValues={defaultInputValues} />
+          </CardContent>
+        </Card>
+      )}
+      <Grid container spacing={3}>
+        <Grid item xs={12} md={8}>
+          <ResultsTable results={results} />
+        </Grid>
+        <Grid item xs={12} md={4}>
+          <NodeDetails saturation={stakeSaturation} />
+        </Grid>
+      </Grid>
+    </Box>
+  );
+};
diff --git a/nym-wallet/src/pages/bonding/node-settings/apy-playground/utils.tsx b/nym-wallet/src/pages/bonding/node-settings/apy-playground/utils.tsx
new file mode 100644
index 0000000000..bc99898b45
--- /dev/null
+++ b/nym-wallet/src/pages/bonding/node-settings/apy-playground/utils.tsx
@@ -0,0 +1,66 @@
+import { decimalToPercentage, percentToDecimal } from '@nymproject/types';
+import { computeMixnodeRewardEstimation } from 'src/requests';
+
+const SCALE_FACTOR = 1_000_000;
+
+export const computeStakeSaturation = (bond: string, delegations: string, stakeSaturationPoint: string) => {
+  const res = ((+bond + +delegations) * SCALE_FACTOR) / +stakeSaturationPoint;
+  return decimalToPercentage(res.toFixed(18).toString());
+};
+
+export const computeEstimate = async ({
+  mixId,
+  uptime,
+  pledgeAmount,
+  totalDelegation,
+  profitMargin,
+  operatorCost,
+}: {
+  mixId: number;
+  uptime: string;
+  pledgeAmount: string;
+  totalDelegation: string;
+  profitMargin: string;
+  operatorCost: string;
+}) => {
+  const computedEstimate = await computeMixnodeRewardEstimation({
+    mixId: mixId,
+    performance: percentToDecimal(uptime),
+    pledgeAmount: Math.round(+pledgeAmount * SCALE_FACTOR),
+    totalDelegation: Math.round(+totalDelegation * SCALE_FACTOR),
+    profitMarginPercent: percentToDecimal(profitMargin),
+    intervalOperatingCost: { denom: 'unym', amount: Math.round(+operatorCost * SCALE_FACTOR).toString() },
+  });
+
+  return computedEstimate;
+};
+
+export const handleCalculatePeriodRewards = ({
+  estimatedOperatorReward,
+  estimatedDelegatorsReward,
+}: {
+  estimatedOperatorReward: string;
+  estimatedDelegatorsReward: string;
+}) => {
+  const dailyOperatorReward = (+estimatedOperatorReward / SCALE_FACTOR) * 24; // epoch_reward * 1 epoch_per_hour * 24 hours
+  const dailyDelegatorReward = (+estimatedDelegatorsReward / SCALE_FACTOR) * 24;
+  const dailyTotal = dailyOperatorReward + dailyDelegatorReward;
+
+  return {
+    total: {
+      daily: dailyTotal.toFixed(3).toString(),
+      monthly: (dailyTotal * 30).toFixed(3).toString(),
+      yearly: (dailyTotal * 365).toFixed(3).toString(),
+    },
+    operator: {
+      daily: dailyOperatorReward.toFixed(3).toString(),
+      monthly: (dailyOperatorReward * 30).toFixed(3).toString(),
+      yearly: (dailyOperatorReward * 365).toFixed(3).toString(),
+    },
+    delegator: {
+      daily: dailyDelegatorReward.toFixed(3).toString(),
+      monthly: (dailyDelegatorReward * 30).toFixed(3).toString(),
+      yearly: (dailyDelegatorReward * 365).toFixed(3).toString(),
+    },
+  };
+};
diff --git a/nym-wallet/src/pages/bonding/node-settings/node-settings.constant.tsx b/nym-wallet/src/pages/bonding/node-settings/node-settings.constant.tsx
index f00409a182..0e8b6204fd 100644
--- a/nym-wallet/src/pages/bonding/node-settings/node-settings.constant.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/node-settings.constant.tsx
@@ -1,5 +1,5 @@
 export const createNavItems = (isMixnode: boolean) => {
   const navItems = ['Unbond'];
-  if (isMixnode) return ['General', ...navItems];
+  if (isMixnode) return ['General', 'Playground', ...navItems];
   return navItems;
 };
diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx
index f576afccd9..347ed2467a 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/NodeUnbondPage.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Box, Button, Typography, Grid, TextField } from '@mui/material';
+import { Box, Button, Typography, Grid, TextField, Stack } from '@mui/material';
 import { TBondedMixnode, TBondedGateway } from 'src/context/bonding';
 import { Error } from 'src/components/Error';
 import { UnbondModal } from 'src/components/Bonding/modals/UnbondModal';
@@ -15,38 +15,29 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => {
   const [isConfirmed, setIsConfirmed] = useState(false);
   //TODO: Check what happens with a gateway
   return (
-    <Box sx={{ pl: 3, minHeight: '450px' }}>
-      <Grid container direction="row" alignItems="start" justifyContent={'space-between'}>
-        <Grid item container direction={'column'} width={0.5} spacing={1} sx={{ pt: 3 }}>
-          <Grid item>
+    <Box sx={{ p: 3, minHeight: '450px' }}>
+      <Grid container justifyContent="space-between">
+        <Grid item xs={12} lg={4} sx={{ mb: 3 }}>
+          <Stack gap={1}>
             <Typography variant="body1" fontWeight={600}>
               Unbond
             </Typography>
-          </Grid>
-          {isMixnode(bondedNode) && (
-            <Grid item>
-              <Typography variant="body2" sx={{ color: (theme) => theme.palette.nym.text.muted }}>
-                If you unbond you will loose all delegations!
-              </Typography>
-            </Grid>
-          )}
+
+            {isMixnode(bondedNode) && (
+              <Grid item>
+                <Typography variant="body2" sx={{ color: (theme) => theme.palette.nym.text.muted }}>
+                  Remember you should only unbond if you want to remove your node from the network for good.
+                </Typography>
+              </Grid>
+            )}
+          </Stack>
         </Grid>
-        <Grid item container direction={'column'} spacing={2} width={0.5} padding={3}>
-          <Grid item>
-            <Box sx={{ mb: 1 }}>
-              <Error
-                message={`Remember you should only unbond if you want to remove your ${
-                  isMixnode(bondedNode) ? 'node' : 'gateway'
-                } from the network for good.`}
-              />
-            </Box>
-            <Error
-              message={`Unbonding is irreversible and it won’t be possible to restore the current state of your ${
-                isMixnode(bondedNode) ? 'node' : 'gateway'
-              } again.`}
-            />
-          </Grid>
-          <Grid item>
+        <Grid item xs={12} lg={6}>
+          <Stack gap={3}>
+            {isMixnode(bondedNode) && (
+              <Error message="Unbonding is irreversible. You will lose all your delegations. It won’t be possible to restore the current state of your node again." />
+            )}
+
             <Typography variant="body2">
               To unbond, type{' '}
               <Typography display="inline" component="span" sx={{ color: (t) => t.palette.nym.highlight }}>
@@ -54,16 +45,14 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => {
               </Typography>{' '}
               in the field below and click continue
             </Typography>
-          </Grid>
-          <Grid item>
+
             <TextField
               fullWidth
               value={confirmField}
               onChange={(e) => setConfirmField(e.target.value)}
               InputLabelProps={{ shrink: true }}
             />
-          </Grid>
-          <Grid item sx={{ mt: 2 }}>
+
             <Button
               size="large"
               variant="contained"
@@ -75,7 +64,7 @@ export const NodeUnbondPage = ({ bondedNode, onConfirm, onError }: Props) => {
             >
               Continue
             </Button>
-          </Grid>
+          </Stack>
         </Grid>
       </Grid>
       {isConfirmed && (
diff --git a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/ParametersSettings.tsx b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/ParametersSettings.tsx
index aebb21c8c1..7aa7407a48 100644
--- a/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/ParametersSettings.tsx
+++ b/nym-wallet/src/pages/bonding/node-settings/settings-pages/general-settings/ParametersSettings.tsx
@@ -88,7 +88,11 @@ export const ParametersSettings = ({ bondedNode }: { bondedNode: TBondedMixnode
 
   const getPendingEvents = async () => {
     const events = await getPendingIntervalEvents();
-    const latestEvent = events.reverse().find((evt) => 'ChangeMixCostParams' in evt.event) as unknown as
+    const latestEvent = events
+      .reverse()
+      .find(
+        (evt) => 'ChangeMixCostParams' in evt.event && evt.event.ChangeMixCostParams.mix_id === bondedNode.mixId,
+      ) as unknown as
       | {
           id: number;
           event: {
diff --git a/nym-wallet/src/pages/buy/index.stories.tsx b/nym-wallet/src/pages/buy/index.stories.tsx
new file mode 100644
index 0000000000..5782f4298f
--- /dev/null
+++ b/nym-wallet/src/pages/buy/index.stories.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+import { Tutorial } from '../../components/Buy/Tutorial';
+import { MockBuyContextProvider } from '../../context/mocks/buy';
+
+export default {
+  title: 'Buy/Page',
+  component: Tutorial,
+};
+
+export const BuyPage = () => (
+  <MockBuyContextProvider>
+    <Tutorial />
+  </MockBuyContextProvider>
+);
diff --git a/nym-wallet/src/pages/buy/index.tsx b/nym-wallet/src/pages/buy/index.tsx
new file mode 100644
index 0000000000..894d080727
--- /dev/null
+++ b/nym-wallet/src/pages/buy/index.tsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { BuyContextProvider } from 'src/context';
+import { Tutorial } from 'src/components/Buy/Tutorial';
+
+export const BuyPage = () => (
+  <BuyContextProvider>
+    <Tutorial />
+  </BuyContextProvider>
+);
diff --git a/nym-wallet/src/pages/delegation/index.tsx b/nym-wallet/src/pages/delegation/index.tsx
index a70300388f..f2a668e59e 100644
--- a/nym-wallet/src/pages/delegation/index.tsx
+++ b/nym-wallet/src/pages/delegation/index.tsx
@@ -232,6 +232,7 @@ export const Delegation: FC<{ isStorybook?: boolean }> = ({ isStorybook }) => {
       setConfirmationModalProps({
         status: 'success',
         action: 'undelegate',
+        message: 'This operation can take up to one hour to process',
         ...balances,
         transactions: [
           {
diff --git a/nym-wallet/src/pages/index.ts b/nym-wallet/src/pages/index.ts
index fe29cb1dd2..c2944d771c 100644
--- a/nym-wallet/src/pages/index.ts
+++ b/nym-wallet/src/pages/index.ts
@@ -4,3 +4,4 @@ export * from './balance';
 export * from './bonding';
 export * from './delegation';
 export * from './internal-docs';
+export * from './buy';
diff --git a/nym-wallet/src/requests/actions.ts b/nym-wallet/src/requests/actions.ts
index 2e070c7fe3..b4aaa144c0 100644
--- a/nym-wallet/src/requests/actions.ts
+++ b/nym-wallet/src/requests/actions.ts
@@ -6,7 +6,7 @@ import {
   MixNodeConfigUpdate,
   MixNodeCostParams,
 } from '@nymproject/types';
-import { EnumNodeType, TBondGatewayArgs, TBondMixNodeArgs } from '../types';
+import { EnumNodeType, TBondGatewayArgs, TBondMixNodeArgs, TBondMoreArgs } from '../types';
 import { invokeWrapper } from './wrapper';
 
 export const bondGateway = async (args: TBondGatewayArgs) =>
@@ -32,3 +32,6 @@ export const unbond = async (type: EnumNodeType) => {
   if (type === EnumNodeType.mixnode) return unbondMixNode();
   return unbondGateway();
 };
+
+export const bondMore = async (args: TBondMoreArgs) =>
+  invokeWrapper<TransactionExecuteResult>('pledge_more', args);
diff --git a/nym-wallet/src/requests/queries.ts b/nym-wallet/src/requests/queries.ts
index 5fba51beec..640fc79abb 100644
--- a/nym-wallet/src/requests/queries.ts
+++ b/nym-wallet/src/requests/queries.ts
@@ -8,6 +8,7 @@ import {
   RewardEstimationResponse,
   WrappedDelegationEvent,
   PendingIntervalEvent,
+  Coin,
 } from '@nymproject/types';
 import { Interval, TGatewayReport, TNodeDescription } from 'src/types';
 import { invokeWrapper } from './wrapper';
@@ -51,3 +52,17 @@ export const getPendingIntervalEvents = async () =>
 
 export const getGatewayReport = async (identity: string) =>
   invokeWrapper<TGatewayReport>('gateway_report', { identity });
+
+export const computeMixnodeRewardEstimation = async (args: {
+  mixId: number;
+  performance: string;
+  pledgeAmount: number;
+  totalDelegation: number;
+  profitMarginPercent: string;
+  intervalOperatingCost: { denom: 'unym'; amount: string };
+}) => {
+  console.log(args);
+
+  return invokeWrapper<RewardEstimationResponse>('compute_mixnode_reward_estimation', args);
+};
+export const getMixnodeUptime = async (mixId: number) => invokeWrapper<number>('get_mixnode_uptime', { mixId });
diff --git a/nym-wallet/src/requests/rewards.ts b/nym-wallet/src/requests/rewards.ts
index 5c8c63e34e..36b90838e7 100644
--- a/nym-wallet/src/requests/rewards.ts
+++ b/nym-wallet/src/requests/rewards.ts
@@ -1,4 +1,4 @@
-import { Fee, FeeDetails, TransactionExecuteResult } from '@nymproject/types';
+import { Fee, FeeDetails, RewardingParams, TransactionExecuteResult } from '@nymproject/types';
 import { invokeWrapper } from './wrapper';
 
 export const claimOperatorReward = async (fee?: Fee) =>
@@ -9,3 +9,6 @@ export const claimDelegatorRewards = async (mixId: number, fee?: FeeDetails) =>
     mixId,
     fee: fee?.fee,
   });
+
+export const getCurrentRewardingParameter = async () =>
+  invokeWrapper<RewardingParams>('get_current_rewarding_parameters', {});
diff --git a/nym-wallet/src/requests/simulate.ts b/nym-wallet/src/requests/simulate.ts
index ddeae6ab2e..4a1b82f0d4 100644
--- a/nym-wallet/src/requests/simulate.ts
+++ b/nym-wallet/src/requests/simulate.ts
@@ -63,3 +63,9 @@ export const simulateClaimOperatorReward = async () => invokeWrapper<FeeDetails>
 
 export const simulateVestingClaimOperatorReward = async () =>
   invokeWrapper<FeeDetails>('simulate_vesting_claim_operator_reward');
+
+export const simulateBondMore = async (args: any) =>
+  invokeWrapper<FeeDetails>('simulate_pledge_more', args);
+
+export const simulateVestingBondMore = async (args: any) =>
+  invokeWrapper<FeeDetails>('simulate_vesting_pledge_more', args);
diff --git a/nym-wallet/src/requests/vesting.ts b/nym-wallet/src/requests/vesting.ts
index 907f42c499..bad2f7febf 100644
--- a/nym-wallet/src/requests/vesting.ts
+++ b/nym-wallet/src/requests/vesting.ts
@@ -105,3 +105,14 @@ export const vestingClaimOperatorReward = async (fee?: Fee) =>
 
 export const vestingClaimDelegatorRewards = async (mixId: number) =>
   invokeWrapper<TransactionExecuteResult>('vesting_claim_delegator_reward', { mixId });
+
+export const vestingBondMore = async ({
+  fee,
+  additionalPledge,
+}: {
+  fee?: Fee;
+  additionalPledge: DecCoin;
+}) => invokeWrapper<TransactionExecuteResult>('vesting_pledge_more', {
+  fee,
+  additionalPledge,
+});
diff --git a/nym-wallet/src/routes/app.tsx b/nym-wallet/src/routes/app.tsx
index 0fbc9edc6c..689a080fc4 100644
--- a/nym-wallet/src/routes/app.tsx
+++ b/nym-wallet/src/routes/app.tsx
@@ -4,7 +4,7 @@ import { ApplicationLayout } from 'src/layouts';
 import { Terminal } from 'src/pages/terminal';
 import { Send } from 'src/components/Send';
 import { Receive } from '../components/Receive';
-import { Balance, InternalDocs, DelegationPage, Admin, BondingPage, NodeSettingsPage } from '../pages';
+import { Balance, InternalDocs, DelegationPage, Admin, BondingPage, NodeSettingsPage, BuyPage } from '../pages';
 
 export const AppRoutes = () => (
   <ApplicationLayout>
@@ -18,6 +18,7 @@ export const AppRoutes = () => (
       <Route path="/delegation" element={<DelegationPage />} />
       <Route path="/docs" element={<InternalDocs />} />
       <Route path="/admin" element={<Admin />} />
+      <Route path="/buy" element={<BuyPage />} />
     </Routes>
   </ApplicationLayout>
 );
diff --git a/nym-wallet/src/svg-icons/index.ts b/nym-wallet/src/svg-icons/index.ts
index ec0d4b9c49..e0bd754736 100644
--- a/nym-wallet/src/svg-icons/index.ts
+++ b/nym-wallet/src/svg-icons/index.ts
@@ -3,3 +3,4 @@ export * from './undelegate';
 export * from './bond';
 export * from './unbond';
 export * from './bonding';
+export * from './poweredByBity';
diff --git a/nym-wallet/src/svg-icons/poweredByBity.tsx b/nym-wallet/src/svg-icons/poweredByBity.tsx
new file mode 100644
index 0000000000..3b061ae7d3
--- /dev/null
+++ b/nym-wallet/src/svg-icons/poweredByBity.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { SvgIcon, SvgIconProps } from '@mui/material';
+
+export const PoweredByBity = (props: SvgIconProps) => (
+  <SvgIcon {...props} inheritViewBox>
+    <svg width="126" height="16" viewBox="0 0 126 16" xmlns="http://www.w3.org/2000/svg">
+      <path d="M6.60938 6.92969C6.60938 7.79688 6.3125 8.46484 5.71875 8.93359C5.12891 9.39844 4.2832 9.63086 3.18164 9.63086H2.17383V13H1.17773V4.43359H3.39844C5.53906 4.43359 6.60938 5.26562 6.60938 6.92969ZM2.17383 8.77539H3.07031C3.95312 8.77539 4.5918 8.63281 4.98633 8.34766C5.38086 8.0625 5.57812 7.60547 5.57812 6.97656C5.57812 6.41016 5.39258 5.98828 5.02148 5.71094C4.65039 5.43359 4.07227 5.29492 3.28711 5.29492H2.17383V8.77539ZM13.8047 9.7832C13.8047 10.8301 13.541 11.6484 13.0137 12.2383C12.4863 12.8242 11.7578 13.1172 10.8281 13.1172C10.2539 13.1172 9.74414 12.9824 9.29883 12.7129C8.85352 12.4434 8.50977 12.0566 8.26758 11.5527C8.02539 11.0488 7.9043 10.459 7.9043 9.7832C7.9043 8.73633 8.16602 7.92188 8.68945 7.33984C9.21289 6.75391 9.93945 6.46094 10.8691 6.46094C11.7676 6.46094 12.4805 6.75977 13.0078 7.35742C13.5391 7.95508 13.8047 8.76367 13.8047 9.7832ZM8.91211 9.7832C8.91211 10.6035 9.07617 11.2285 9.4043 11.6582C9.73242 12.0879 10.2148 12.3027 10.8516 12.3027C11.4883 12.3027 11.9707 12.0898 12.2988 11.6641C12.6309 11.2344 12.7969 10.6074 12.7969 9.7832C12.7969 8.9668 12.6309 8.34766 12.2988 7.92578C11.9707 7.5 11.4844 7.28711 10.8398 7.28711C10.2031 7.28711 9.72266 7.49609 9.39844 7.91406C9.07422 8.33203 8.91211 8.95508 8.91211 9.7832ZM20.7598 13L19.582 9.23242C19.5078 9.00195 19.3691 8.47852 19.166 7.66211H19.1191C18.9629 8.3457 18.8262 8.87305 18.709 9.24414L17.4961 13H16.3711L14.6191 6.57812H15.6387C16.0527 8.19141 16.3672 9.41992 16.582 10.2637C16.8008 11.1074 16.9258 11.6758 16.957 11.9688H17.0039C17.0469 11.7461 17.1152 11.459 17.209 11.1074C17.3066 10.752 17.3906 10.4707 17.4609 10.2637L18.6387 6.57812H19.6934L20.8418 10.2637C21.0605 10.9355 21.209 11.5 21.2871 11.957H21.334C21.3496 11.8164 21.3906 11.5996 21.457 11.3066C21.5273 11.0137 21.9355 9.4375 22.6816 6.57812H23.6895L21.9141 13H20.7598ZM27.5684 13.1172C26.6191 13.1172 25.8691 12.8281 25.3184 12.25C24.7715 11.6719 24.498 10.8691 24.498 9.8418C24.498 8.80664 24.752 7.98438 25.2598 7.375C25.7715 6.76562 26.457 6.46094 27.3164 6.46094C28.1211 6.46094 28.7578 6.72656 29.2266 7.25781C29.6953 7.78516 29.9297 8.48242 29.9297 9.34961V9.96484H25.5059C25.5254 10.7188 25.7148 11.291 26.0742 11.6816C26.4375 12.0723 26.9473 12.2676 27.6035 12.2676C28.2949 12.2676 28.9785 12.123 29.6543 11.834V12.7012C29.3105 12.8496 28.9844 12.9551 28.6758 13.0176C28.3711 13.084 28.002 13.1172 27.5684 13.1172ZM27.3047 7.27539C26.7891 7.27539 26.377 7.44336 26.0684 7.7793C25.7637 8.11523 25.584 8.58008 25.5293 9.17383H28.8867C28.8867 8.56055 28.75 8.0918 28.4766 7.76758C28.2031 7.43945 27.8125 7.27539 27.3047 7.27539ZM34.5234 6.46094C34.8086 6.46094 35.0645 6.48438 35.291 6.53125L35.1562 7.43359C34.8906 7.375 34.6562 7.3457 34.4531 7.3457C33.9336 7.3457 33.4883 7.55664 33.1172 7.97852C32.75 8.40039 32.5664 8.92578 32.5664 9.55469V13H31.5938V6.57812H32.3965L32.5078 7.76758H32.5547C32.793 7.34961 33.0801 7.02734 33.416 6.80078C33.752 6.57422 34.1211 6.46094 34.5234 6.46094ZM39.2051 13.1172C38.2559 13.1172 37.5059 12.8281 36.9551 12.25C36.4082 11.6719 36.1348 10.8691 36.1348 9.8418C36.1348 8.80664 36.3887 7.98438 36.8965 7.375C37.4082 6.76562 38.0938 6.46094 38.9531 6.46094C39.7578 6.46094 40.3945 6.72656 40.8633 7.25781C41.332 7.78516 41.5664 8.48242 41.5664 9.34961V9.96484H37.1426C37.1621 10.7188 37.3516 11.291 37.7109 11.6816C38.0742 12.0723 38.584 12.2676 39.2402 12.2676C39.9316 12.2676 40.6152 12.123 41.291 11.834V12.7012C40.9473 12.8496 40.6211 12.9551 40.3125 13.0176C40.0078 13.084 39.6387 13.1172 39.2051 13.1172ZM38.9414 7.27539C38.4258 7.27539 38.0137 7.44336 37.7051 7.7793C37.4004 8.11523 37.2207 8.58008 37.166 9.17383H40.5234C40.5234 8.56055 40.3867 8.0918 40.1133 7.76758C39.8398 7.43945 39.4492 7.27539 38.9414 7.27539ZM47.6016 12.1387H47.5488C47.0996 12.791 46.4277 13.1172 45.5332 13.1172C44.6934 13.1172 44.0391 12.8301 43.5703 12.2559C43.1055 11.6816 42.873 10.8652 42.873 9.80664C42.873 8.74805 43.1074 7.92578 43.5762 7.33984C44.0449 6.75391 44.6973 6.46094 45.5332 6.46094C46.4043 6.46094 47.0723 6.77734 47.5371 7.41016H47.6133L47.5723 6.94727L47.5488 6.49609V3.88281H48.5215V13H47.7305L47.6016 12.1387ZM45.6562 12.3027C46.3203 12.3027 46.8008 12.123 47.0977 11.7637C47.3984 11.4004 47.5488 10.8164 47.5488 10.0117V9.80664C47.5488 8.89648 47.3965 8.24805 47.0918 7.86133C46.791 7.4707 46.3086 7.27539 45.6445 7.27539C45.0742 7.27539 44.6367 7.49805 44.332 7.94336C44.0312 8.38477 43.8809 9.00977 43.8809 9.81836C43.8809 10.6387 44.0312 11.2578 44.332 11.6758C44.6328 12.0938 45.0742 12.3027 45.6562 12.3027ZM56.6953 6.47266C57.5391 6.47266 58.1934 6.76172 58.6582 7.33984C59.127 7.91406 59.3613 8.72852 59.3613 9.7832C59.3613 10.8379 59.125 11.6582 58.6523 12.2441C58.1836 12.8262 57.5312 13.1172 56.6953 13.1172C56.2773 13.1172 55.8945 13.041 55.5469 12.8887C55.2031 12.7324 54.9141 12.4941 54.6797 12.1738H54.6094L54.4043 13H53.707V3.88281H54.6797V6.09766C54.6797 6.59375 54.6641 7.03906 54.6328 7.43359H54.6797C55.1328 6.79297 55.8047 6.47266 56.6953 6.47266ZM56.5547 7.28711C55.8906 7.28711 55.4121 7.47852 55.1191 7.86133C54.8262 8.24023 54.6797 8.88086 54.6797 9.7832C54.6797 10.6855 54.8301 11.332 55.1309 11.7227C55.4316 12.1094 55.9141 12.3027 56.5781 12.3027C57.1758 12.3027 57.6211 12.0859 57.9141 11.6523C58.207 11.2148 58.3535 10.5879 58.3535 9.77148C58.3535 8.93555 58.207 8.3125 57.9141 7.90234C57.6211 7.49219 57.168 7.28711 56.5547 7.28711ZM60.0469 6.57812H61.0898L62.4961 10.2402C62.8047 11.0762 62.9961 11.6797 63.0703 12.0508H63.1172C63.168 11.8516 63.2734 11.5117 63.4336 11.0312C63.5977 10.5469 64.1289 9.0625 65.0273 6.57812H66.0703L63.3105 13.8906C63.0371 14.6133 62.7168 15.125 62.3496 15.4258C61.9863 15.7305 61.5391 15.8828 61.0078 15.8828C60.7109 15.8828 60.418 15.8496 60.1289 15.7832V15.0039C60.3438 15.0508 60.584 15.0742 60.8496 15.0742C61.5176 15.0742 61.9941 14.6992 62.2793 13.9492L62.6367 13.0352L60.0469 6.57812Z" />
+      <g clip-path="url(#clip0_4705_34634)">
+        <path d="M97.553 10.5857C97.553 9.53941 96.7819 9.24022 95.5098 9.24022H93.6675V11.9311H95.5098C96.7819 11.9311 97.553 11.632 97.553 10.5857ZM93.6663 5.40987V7.77381H95.239C96.3756 7.77381 97.1201 7.52859 97.1201 6.48232C97.1201 5.55865 96.2539 5.40987 95.239 5.40987H93.6663ZM99.2717 10.5857C99.2717 12.8826 97.7425 13.4531 95.5098 13.4531H92.5122C92.1723 13.4531 91.8965 13.1752 91.8965 12.8352V4.55977C91.8965 4.2181 92.1723 3.94182 92.5122 3.94182H95.239C97.35 3.94182 98.7033 4.7298 98.7033 6.48232C98.7033 7.4207 98.3108 8.0321 97.6207 8.3983C98.6356 8.60265 99.2717 9.1585 99.2717 10.5857Z" />
+        <path d="M103.709 13.5625C103.22 13.5625 102.822 13.1635 102.822 12.6712V4.73282C102.822 4.24219 103.22 3.84314 103.709 3.84314C104.199 3.84314 104.596 4.24219 104.596 4.73282V12.6712C104.596 13.1635 104.199 13.5625 103.709 13.5625Z" />
+        <path d="M114.992 3.95172H108.508C108.026 3.95172 107.636 4.34406 107.636 4.82795C107.636 5.31021 108.026 5.70255 108.508 5.70255H110.863V12.6732C110.863 13.1636 111.26 13.5625 111.75 13.5625C112.24 13.5625 112.637 13.1636 112.637 12.6732V5.70255H114.992C115.474 5.70255 115.865 5.31021 115.865 4.82795C115.865 4.34406 115.474 3.95172 114.992 3.95172Z" />
+        <path d="M124.97 3.84314C124.48 3.84314 124.084 4.24219 124.084 4.73282V6.42875C124.084 7.38548 123.492 8.35038 122.171 8.35038C121.219 8.35038 120.259 7.75672 120.259 6.42875V4.73282C120.259 4.24219 119.862 3.84314 119.372 3.84314C118.882 3.84314 118.485 4.24219 118.485 4.73282V6.42875C118.485 8.26207 119.618 9.66527 121.282 10.0349V12.6712C121.282 13.1635 121.679 13.5625 122.169 13.5625C122.658 13.5625 123.056 13.1635 123.056 12.6712V10.0349C124.721 9.66854 125.857 8.26534 125.857 6.42875V4.73282C125.857 4.24219 125.46 3.84314 124.97 3.84314Z" />
+        <path
+          d="M85.5517 5.36302C85.1955 5.56814 85.034 5.99302 85.1462 6.39023C85.3007 6.9372 85.3839 7.51349 85.3839 8.10931C85.3839 11.0623 83.3582 13.5498 80.6287 14.2449C80.2327 14.3458 79.9527 14.6974 79.9527 15.1077V15.1093C79.9527 15.6888 80.4973 16.1154 81.058 15.9721C84.5588 15.0849 87.1575 11.8958 87.1575 8.10931C87.1575 7.34419 87.0503 6.60349 86.8515 5.90023C86.6923 5.33861 86.0559 5.07 85.5517 5.36302Z"
+          fill="#0061FF"
+        />
+        <path
+          d="M73.4953 3.8356C73.8504 4.04132 74.2946 3.96997 74.5819 3.67632C75.7265 2.50506 77.3188 1.77676 79.0782 1.77676C80.8334 1.77676 82.4223 2.50174 83.5662 3.66803C83.8535 3.96167 84.2972 4.03135 84.6516 3.82564H84.6518C85.156 3.53365 85.2453 2.8435 84.8371 2.42709C83.3707 0.927346 81.3309 -0.0033586 79.0782 -0.0033586C76.8203 -0.0033586 74.7764 0.932317 73.3091 2.43704C72.9022 2.85345 72.9917 3.54361 73.4953 3.8356Z"
+          fill="#0061FF"
+        />
+        <path
+          d="M78.1785 15.101C78.1785 14.6924 77.9 14.3392 77.5059 14.2382C74.7879 13.535 72.7736 11.0542 72.7736 8.10788C72.7736 7.51698 72.8557 6.94398 73.0081 6.40029C73.1193 6.00311 72.958 5.57987 72.602 5.37477C72.0974 5.08176 71.4601 5.35035 71.3019 5.91357C71.1055 6.6119 71 7.34769 71 8.10788C71 11.8844 73.5846 15.0652 77.0708 15.9637C77.6319 16.1086 78.1785 15.6821 78.1785 15.101Z"
+          fill="#0061FF"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_4705_34634">
+          <rect width="54.8571" height="16" transform="translate(71)" />
+        </clipPath>
+      </defs>
+    </svg>
+  </SvgIcon>
+);
diff --git a/nym-wallet/src/types/global.ts b/nym-wallet/src/types/global.ts
index d5bb61c26d..2c16901cfe 100644
--- a/nym-wallet/src/types/global.ts
+++ b/nym-wallet/src/types/global.ts
@@ -49,6 +49,12 @@ export type TBondMixNodeArgs = {
   fee?: Fee;
 };
 
+export type TBondMoreArgs = {
+  additionalPledge: DecCoin;
+  fee?: Fee;
+
+};
+
 export type TNodeDescription = {
   name: string;
   description: string;
diff --git a/nym-wallet/src/types/rust/AppEnv.ts b/nym-wallet/src/types/rust/AppEnv.ts
index 3f47419469..861ecd9ef5 100644
--- a/nym-wallet/src/types/rust/AppEnv.ts
+++ b/nym-wallet/src/types/rust/AppEnv.ts
@@ -1,2 +1,5 @@
-
-export interface AppEnv { ADMIN_ADDRESS: string | null, SHOW_TERMINAL: string | null, ENABLE_QA_MODE: string | null, }
\ No newline at end of file
+export interface AppEnv {
+  ADMIN_ADDRESS: string | null;
+  SHOW_TERMINAL: string | null;
+  ENABLE_QA_MODE: string | null;
+}
diff --git a/nym-wallet/src/types/rust/Network.ts b/nym-wallet/src/types/rust/Network.ts
index fd31bccafa..f8615cd992 100644
--- a/nym-wallet/src/types/rust/Network.ts
+++ b/nym-wallet/src/types/rust/Network.ts
@@ -1,2 +1 @@
-
-export type Network = "QA" | "SANDBOX" | "MAINNET";
\ No newline at end of file
+export type Network = 'QA' | 'SANDBOX' | 'MAINNET';
diff --git a/nym-wallet/src/types/rust/StateParams.ts b/nym-wallet/src/types/rust/StateParams.ts
index 85c362a3b2..c9420f50dc 100644
--- a/nym-wallet/src/types/rust/StateParams.ts
+++ b/nym-wallet/src/types/rust/StateParams.ts
@@ -1,3 +1,7 @@
-import type { DecCoin } from "../../../../ts-packages/types/src/types/rust/DecCoin";
+import type { DecCoin } from '../../../../ts-packages/types/src/types/rust/DecCoin';
 
-export interface TauriContractStateParams { minimum_mixnode_pledge: DecCoin, minimum_gateway_pledge: DecCoin, minimum_mixnode_delegation: DecCoin | null, }
\ No newline at end of file
+export interface TauriContractStateParams {
+  minimum_mixnode_pledge: DecCoin;
+  minimum_gateway_pledge: DecCoin;
+  minimum_mixnode_delegation: DecCoin | null;
+}
diff --git a/nym-wallet/src/types/rust/ValidatorUrl.ts b/nym-wallet/src/types/rust/ValidatorUrl.ts
index 9c74679bac..801e045a00 100644
--- a/nym-wallet/src/types/rust/ValidatorUrl.ts
+++ b/nym-wallet/src/types/rust/ValidatorUrl.ts
@@ -1,2 +1,4 @@
-
-export interface ValidatorUrl { url: string, name: string | null, }
\ No newline at end of file
+export interface ValidatorUrl {
+  url: string;
+  name: string | null;
+}
diff --git a/nym-wallet/src/types/rust/ValidatorUrls.ts b/nym-wallet/src/types/rust/ValidatorUrls.ts
index 3a104150b1..98ca799fb5 100644
--- a/nym-wallet/src/types/rust/ValidatorUrls.ts
+++ b/nym-wallet/src/types/rust/ValidatorUrls.ts
@@ -1,3 +1,5 @@
-import type { ValidatorUrl } from "./ValidatorUrl";
+import type { ValidatorUrl } from './ValidatorUrl';
 
-export interface ValidatorUrls { urls: Array<ValidatorUrl>, }
\ No newline at end of file
+export interface ValidatorUrls {
+  urls: Array<ValidatorUrl>;
+}
diff --git a/sdk/typescript/examples/plain-html/src/index.ts b/sdk/typescript/examples/plain-html/src/index.ts
index 16f53c380c..d279586b72 100644
--- a/sdk/typescript/examples/plain-html/src/index.ts
+++ b/sdk/typescript/examples/plain-html/src/index.ts
@@ -15,11 +15,11 @@ async function main() {
   }
 
   // // mixnet v1
-  // const validatorApiUrl = 'https://validator.nymtech.net/api';
+  // const nymApiUrl = 'https://validator.nymtech.net/api';
   // const preferredGatewayIdentityKey = 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM';
 
   // mixnet v2
-  const validatorApiUrl = 'https://qwerty-validator-api.qa.nymte.ch/api'; // "http://localhost:8081";
+  const nymApiUrl = 'https://qwerty-validator-api.qa.nymte.ch/api'; // "http://localhost:8081";
   const preferredGatewayIdentityKey = undefined; // '36vfvEyBzo5cWEFbnP7fqgY39kFw9PQhvwzbispeNaxL';
 
   // subscribe to connect event, so that we can show the client's address
@@ -46,7 +46,7 @@ async function main() {
   // start up the client
   await nym.client.start({
     clientId: 'My awesome client',
-    validatorApiUrl,
+    nymApiUrl,
     preferredGatewayIdentityKey,
   });
 }
diff --git a/sdk/typescript/examples/react-webpack-with-theme-example/src/App.tsx b/sdk/typescript/examples/react-webpack-with-theme-example/src/App.tsx
index 6f6f4c2039..73c028d062 100644
--- a/sdk/typescript/examples/react-webpack-with-theme-example/src/App.tsx
+++ b/sdk/typescript/examples/react-webpack-with-theme-example/src/App.tsx
@@ -95,16 +95,16 @@ export const Content: React.FC = () => {
   React.useEffect(() => {
     if (isReady) {
       // // mixnet v1
-      // const validatorApiUrl = 'https://validator.nymtech.net/api';
+      // const nymApiUrl = 'https://validator.nymtech.net/api';
       // const preferredGatewayIdentityKey = 'E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM';
 
       // mixnet v2
-      const validatorApiUrl = 'https://qwerty-validator-api.qa.nymte.ch/api'; // "http://localhost:8081";
+      const nymApiUrl = 'https://qwerty-validator-api.qa.nymte.ch/api'; // "http://localhost:8081";
       const preferredGatewayIdentityKey = undefined; // '36vfvEyBzo5cWEFbnP7fqgY39kFw9PQhvwzbispeNaxL';
 
       connect({
         clientId: 'Example Client',
-        validatorApiUrl,
+        nymApiUrl,
         preferredGatewayIdentityKey,
       });
     }
diff --git a/sdk/typescript/packages/sdk/README.md b/sdk/typescript/packages/sdk/README.md
index e5f2fd51c5..af847d969a 100644
--- a/sdk/typescript/packages/sdk/README.md
+++ b/sdk/typescript/packages/sdk/README.md
@@ -18,7 +18,7 @@ import { createNymMixnetClient } from '@nymproject/sdk';
 const main = async () => {
   const nym = await createNymMixnetClient();
 
-  const validatorApiUrl = 'https://validator.nymtech.net/api';
+  const nymApiUrl = 'https://validator.nymtech.net/api';
 
   // show message payload content when received 
   nym.events.subscribeToTextMessageReceivedEvent((e) => {
@@ -28,7 +28,7 @@ const main = async () => {
   // start the client and connect to a gateway
   await nym.client.start({
     clientId: 'My awesome client',
-    validatorApiUrl,
+    nymApiUrl,
   });
 
   // send a message to yourself
diff --git a/sdk/typescript/packages/sdk/src/mixnet/wasm/types.ts b/sdk/typescript/packages/sdk/src/mixnet/wasm/types.ts
index 36aacd5adb..498e1b40de 100644
--- a/sdk/typescript/packages/sdk/src/mixnet/wasm/types.ts
+++ b/sdk/typescript/packages/sdk/src/mixnet/wasm/types.ts
@@ -21,13 +21,13 @@ export interface NymClientConfig {
   /**
    * The URL of a validator API to query for the network topology.
    */
-  validatorApiUrl: string;
+  nymApiUrl: string;
 
   /**
    * Optional. The identity key of the preferred gateway to connect to.
    */
   preferredGatewayIdentityKey?: string;
-  
+
   /**
    * Optional. The listener websocket of the preferred gateway to connect to.
    */
diff --git a/sdk/typescript/packages/sdk/src/mixnet/wasm/worker.ts b/sdk/typescript/packages/sdk/src/mixnet/wasm/worker.ts
index cb1c8a32e4..87d44bbb4b 100644
--- a/sdk/typescript/packages/sdk/src/mixnet/wasm/worker.ts
+++ b/sdk/typescript/packages/sdk/src/mixnet/wasm/worker.ts
@@ -130,19 +130,19 @@ wasm_bindgen(wasmUrl)
     const startHandler = async (config: NymClientConfig) => {
       // fetch the gateway details (randomly chosen if no preferred gateway is set)
       const gatewayEndpoint = await wasm_bindgen.get_gateway(
-        config.validatorApiUrl,
+        config.nymApiUrl,
         config.preferredGatewayIdentityKey,
       );
-      
+
       // set a different gatewayListener in order to avoid workaround ws over https error
       if (config.gatewayListener)
-            gatewayEndpoint.gateway_listener  = config.gatewayListener;
-      
+        gatewayEndpoint.gateway_listener = config.gatewayListener;
+
       // create the client, passing handlers for events
       wrapper.init(
         new wasm_bindgen.Config(
           config.clientId,
-          config.validatorApiUrl,
+          config.nymApiUrl,
           gatewayEndpoint,
           config.debug || wasm_bindgen.default_debug(),
         ),
diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml
index 72e6c0685e..eca04d024e 100644
--- a/service-providers/network-requester/Cargo.toml
+++ b/service-providers/network-requester/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-network-requester"
-version = "1.1.1"
+version = "1.1.4"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
 rust-version = "1.65"
@@ -12,7 +12,7 @@ rust-version = "1.65"
 
 [dependencies]
 async-trait = { version = "0.1.51" }
-clap = {version = "3.2", features = ["derive"]}
+clap = {version = "4.0", features = ["derive"]}
 dirs = "4.0"
 futures = "0.3.24"
 ipnetwork = "0.20.0"
diff --git a/service-providers/network-requester/src/allowed_hosts.rs b/service-providers/network-requester/src/allowed_hosts.rs
index 3746d9a706..0350ab1f7c 100644
--- a/service-providers/network-requester/src/allowed_hosts.rs
+++ b/service-providers/network-requester/src/allowed_hosts.rs
@@ -39,7 +39,7 @@ impl OutboundRequestFilter {
     ) -> OutboundRequestFilter {
         let domain_list = match Self::fetch_domain_list() {
             Ok(list) => list,
-            Err(e) => panic!("Couldn't fetch domain list for request filtering, do you have an internet connection?: {:?}", e),
+            Err(err) => panic!("Couldn't fetch domain list for request filtering, do you have an internet connection?: {err}"),
         };
         OutboundRequestFilter {
             allowed_hosts,
diff --git a/service-providers/network-requester/src/connection.rs b/service-providers/network-requester/src/connection.rs
index 95bdac06a3..3457375737 100644
--- a/service-providers/network-requester/src/connection.rs
+++ b/service-providers/network-requester/src/connection.rs
@@ -1,13 +1,13 @@
 // Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::core::ReturnAddress;
 use client_connections::LaneQueueLengths;
-use nymsphinx::addressing::clients::Recipient;
 use proxy_helpers::connection_controller::ConnectionReceiver;
 use proxy_helpers::proxy_runner::{MixProxySender, ProxyRunner};
 use socks5_requests::{ConnectionId, Message as Socks5Message, RemoteAddress, Response};
 use std::io;
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio::net::TcpStream;
 
 /// A TCP connection between the Socks5 service provider, which makes
@@ -18,14 +18,14 @@ pub(crate) struct Connection {
     id: ConnectionId,
     address: RemoteAddress,
     conn: Option<TcpStream>,
-    return_address: Recipient,
+    return_address: ReturnAddress,
 }
 
 impl Connection {
     pub(crate) async fn new(
         id: ConnectionId,
         address: RemoteAddress,
-        return_address: Recipient,
+        return_address: ReturnAddress,
     ) -> io::Result<Self> {
         let conn = TcpStream::connect(&address).await?;
 
@@ -40,14 +40,14 @@ impl Connection {
     pub(crate) async fn run_proxy(
         &mut self,
         mix_receiver: ConnectionReceiver,
-        mix_sender: MixProxySender<(Socks5Message, Recipient)>,
+        mix_sender: MixProxySender<(Socks5Message, ReturnAddress)>,
         lane_queue_lengths: LaneQueueLengths,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
         let stream = self.conn.take().unwrap();
         let remote_source_address = "???".to_string(); // we don't know ip address of requester
         let connection_id = self.id;
-        let recipient = self.return_address;
+        let return_address = self.return_address.clone();
         let (stream, _) = ProxyRunner::new(
             stream,
             self.address.clone(),
@@ -61,7 +61,7 @@ impl Connection {
         .run(move |conn_id, read_data, socket_closed| {
             (
                 Socks5Message::Response(Response::new(conn_id, read_data, socket_closed)),
-                recipient,
+                return_address.clone(),
             )
         })
         .await
diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs
index 870376d896..42ded9fbd0 100644
--- a/service-providers/network-requester/src/core.rs
+++ b/service-providers/network-requester/src/core.rs
@@ -15,18 +15,20 @@ use futures::stream::{SplitSink, SplitStream};
 use futures::{SinkExt, StreamExt};
 use log::*;
 use nymsphinx::addressing::clients::Recipient;
+use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nymsphinx::receiver::ReconstructedMessage;
 use proxy_helpers::connection_controller::{
     BroadcastActiveConnections, Controller, ControllerCommand, ControllerSender,
 };
 use proxy_helpers::proxy_runner::{MixProxyReader, MixProxySender};
 use socks5_requests::{
-    ConnectionId, Message as Socks5Message, NetworkRequesterResponse, Request, Response,
+    ConnectRequest, ConnectionId, Message as Socks5Message, NetworkRequesterResponse, Request,
+    Response,
 };
 use statistics_common::collector::StatisticsSender;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicUsize, Ordering};
-use task::ShutdownListener;
+use task::TaskClient;
 use tokio_tungstenite::tungstenite::protocol::Message;
 use websocket_requests::{requests::ClientRequest, responses::ServerResponse};
 
@@ -41,6 +43,56 @@ pub struct ServiceProvider {
     stats_provider_addr: Option<Recipient>,
 }
 
+// TODO: move elsewhere after things settle
+#[derive(Debug, Clone)]
+pub enum ReturnAddress {
+    Known(Box<Recipient>),
+    Anonymous(AnonymousSenderTag),
+}
+
+impl From<Recipient> for ReturnAddress {
+    fn from(recipient: Recipient) -> Self {
+        ReturnAddress::Known(Box::new(recipient))
+    }
+}
+
+impl From<AnonymousSenderTag> for ReturnAddress {
+    fn from(sender_tag: AnonymousSenderTag) -> Self {
+        ReturnAddress::Anonymous(sender_tag)
+    }
+}
+
+impl ReturnAddress {
+    fn new(
+        explicit_return_address: Option<Recipient>,
+        implicit_tag: Option<AnonymousSenderTag>,
+    ) -> Option<Self> {
+        // if somehow we received both, always prefer the explicit address since it's way easier to use
+        if let Some(recipient) = explicit_return_address {
+            return Some(ReturnAddress::Known(Box::new(recipient)));
+        }
+        if let Some(sender_tag) = implicit_tag {
+            return Some(ReturnAddress::Anonymous(sender_tag));
+        }
+        None
+    }
+
+    fn send_back_to(self, message: Vec<u8>, connection_id: u64) -> ClientRequest {
+        match self {
+            ReturnAddress::Known(recipient) => ClientRequest::Send {
+                recipient: *recipient,
+                message,
+                connection_id: Some(connection_id),
+            },
+            ReturnAddress::Anonymous(sender_tag) => ClientRequest::Reply {
+                message,
+                sender_tag,
+                connection_id: Some(connection_id),
+            },
+        }
+    }
+}
+
 impl ServiceProvider {
     pub fn new(
         listening_address: String,
@@ -72,13 +124,12 @@ impl ServiceProvider {
     /// via the `websocket_writer`.
     async fn mixnet_response_listener(
         mut websocket_writer: SplitSink<TSWebsocketStream, Message>,
-        mut mix_reader: MixProxyReader<(Socks5Message, Recipient)>,
+        mut mix_reader: MixProxyReader<(Socks5Message, ReturnAddress)>,
         stats_collector: Option<ServiceStatisticsCollector>,
         mut client_connection_rx: ConnectionCommandReceiver,
     ) {
         loop {
             tokio::select! {
-                // TODO: wire SURBs in here once they're available
                 socks5_msg = mix_reader.recv() => {
                     if let Some((msg, return_address)) = socks5_msg {
                         if let Some(stats_collector) = stats_collector.as_ref() {
@@ -95,15 +146,10 @@ impl ServiceProvider {
                                     .processed(remote_addr, msg.size() as u32);
                             }
                         }
-                        let conn_id = msg.conn_id();
 
                         // make 'request' to native-websocket client
-                        let response_message = ClientRequest::Send {
-                            recipient: return_address,
-                            message: msg.into_bytes(),
-                            with_reply_surb: false,
-                            connection_id: Some(conn_id),
-                        };
+                        let conn_id = msg.conn_id();
+                        let response_message = return_address.send_back_to(msg.into_bytes(), conn_id);
 
                         let message = Message::Binary(response_message.serialize());
                         websocket_writer.send(message).await.unwrap();
@@ -157,9 +203,13 @@ impl ServiceProvider {
         lane_queue_lengths: LaneQueueLengths,
     ) -> Option<ReconstructedMessage> {
         while let Some(msg) = websocket_reader.next().await {
-            let data = msg
-                .expect("we failed to read from the websocket!")
-                .into_data();
+            let data = match msg {
+                Ok(msg) => msg.into_data(),
+                Err(err) => {
+                    log::error!("Failed to read from the websocket: {err}");
+                    continue;
+                }
+            };
 
             // try to recover the actual message from the mix network...
             let deserialized_message = match ServerResponse::deserialize(&data) {
@@ -175,7 +225,7 @@ impl ServiceProvider {
 
             let received = match deserialized_message {
                 ServerResponse::Received(received) => received,
-                ServerResponse::LaneQueueLength(lane, queue_length) => {
+                ServerResponse::LaneQueueLength { lane, queue_length } => {
                     Self::handle_lane_queue_length_response(
                         &lane_queue_lengths,
                         lane,
@@ -184,7 +234,7 @@ impl ServiceProvider {
                     continue;
                 }
                 ServerResponse::Error(err) => {
-                    panic!("received error from native client! - {}", err)
+                    panic!("received error from native client! - {err}")
                 }
                 _ => unimplemented!("probably should never be reached?"),
             };
@@ -196,33 +246,34 @@ impl ServiceProvider {
     async fn start_proxy(
         conn_id: ConnectionId,
         remote_addr: String,
-        return_address: Recipient,
+        return_address: ReturnAddress,
         controller_sender: ControllerSender,
-        mix_input_sender: MixProxySender<(Socks5Message, Recipient)>,
+        mix_input_sender: MixProxySender<(Socks5Message, ReturnAddress)>,
         lane_queue_lengths: LaneQueueLengths,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
-        let mut conn = match Connection::new(conn_id, remote_addr.clone(), return_address).await {
-            Ok(conn) => conn,
-            Err(err) => {
-                error!(
-                    "error while connecting to {:?} ! - {:?}",
-                    remote_addr.clone(),
-                    err
-                );
+        let mut conn =
+            match Connection::new(conn_id, remote_addr.clone(), return_address.clone()).await {
+                Ok(conn) => conn,
+                Err(err) => {
+                    error!(
+                        "error while connecting to {:?} ! - {:?}",
+                        remote_addr.clone(),
+                        err
+                    );
 
-                // inform the remote that the connection is closed before it even was established
-                mix_input_sender
-                    .send((
-                        Socks5Message::Response(Response::new(conn_id, Vec::new(), true)),
-                        return_address,
-                    ))
-                    .await
-                    .expect("InputMessageReceiver has stopped receiving!");
+                    // inform the remote that the connection is closed before it even was established
+                    mix_input_sender
+                        .send((
+                            Socks5Message::Response(Response::new(conn_id, Vec::new(), true)),
+                            return_address,
+                        ))
+                        .await
+                        .expect("InputMessageReceiver has stopped receiving!");
 
-                return;
-            }
-        };
+                    return;
+                }
+            };
 
         // Connect implies it's a fresh connection - register it with our controller
         let (mix_sender, mix_receiver) = mpsc::unbounded();
@@ -258,13 +309,25 @@ impl ServiceProvider {
     async fn handle_proxy_connect(
         &mut self,
         controller_sender: &mut ControllerSender,
-        mix_input_sender: &MixProxySender<(Socks5Message, Recipient)>,
+        mix_input_sender: &MixProxySender<(Socks5Message, ReturnAddress)>,
         lane_queue_lengths: LaneQueueLengths,
-        conn_id: ConnectionId,
-        remote_addr: String,
-        return_address: Recipient,
-        shutdown: ShutdownListener,
+        sender_tag: Option<AnonymousSenderTag>,
+        connect_req: Box<ConnectRequest>,
+        shutdown: TaskClient,
     ) {
+        let return_address = match ReturnAddress::new(connect_req.return_address, sender_tag) {
+            Some(address) => address,
+            None => {
+                log::warn!(
+                "attempted to start connection with no way of returning data back to the sender"
+            );
+                return;
+            }
+        };
+
+        let remote_addr = connect_req.remote_addr;
+        let conn_id = connect_req.conn_id;
+
         if !self.open_proxy && !self.outbound_request_filter.check(&remote_addr) {
             let log_msg = format!("Domain {:?} failed filter check", remote_addr);
             log::info!("{}", log_msg);
@@ -311,23 +374,24 @@ impl ServiceProvider {
 
     async fn handle_proxy_message(
         &mut self,
-        raw_request: &[u8],
+        message: ReconstructedMessage,
         controller_sender: &mut ControllerSender,
-        mix_input_sender: &MixProxySender<(Socks5Message, Recipient)>,
+        mix_input_sender: &MixProxySender<(Socks5Message, ReturnAddress)>,
         lane_queue_lengths: LaneQueueLengths,
         stats_collector: Option<ServiceStatisticsCollector>,
-        shutdown: ShutdownListener,
+        shutdown: TaskClient,
     ) {
-        let deserialized_msg = match Socks5Message::try_from_bytes(raw_request) {
+        let deserialized_msg = match Socks5Message::try_from_bytes(&message.message) {
             Ok(msg) => msg,
             Err(err) => {
-                error!("Failed to deserialized received message! - {}", err);
+                error!("Failed to deserialized received message! - {err}");
                 return;
             }
         };
         match deserialized_msg {
             Socks5Message::Request(deserialized_request) => match deserialized_request {
                 Request::Connect(req) => {
+                    // TODO: stats might be invalid if connection fails to start
                     if let Some(stats_collector) = stats_collector {
                         stats_collector
                             .connected_services
@@ -339,9 +403,8 @@ impl ServiceProvider {
                         controller_sender,
                         mix_input_sender,
                         lane_queue_lengths,
-                        req.conn_id,
-                        req.remote_addr,
-                        req.return_address,
+                        message.sender_tag,
+                        req,
                         shutdown,
                     )
                     .await
@@ -379,10 +442,10 @@ impl ServiceProvider {
         // channels responsible for managing messages that are to be sent to the mix network. The receiver is
         // going to be used by `mixnet_response_listener`
         let (mix_input_sender, mix_input_receiver) =
-            tokio::sync::mpsc::channel::<(Socks5Message, Recipient)>(1);
+            tokio::sync::mpsc::channel::<(Socks5Message, ReturnAddress)>(1);
 
         // Used to notify tasks to shutdown. Not all tasks fully supports this (yet).
-        let shutdown = task::ShutdownNotifier::default();
+        let shutdown = task::TaskManager::default();
 
         // Channel for announcing client connection state by the controller.
         // The `mixnet_response_listener` will use this to either report closed connection to the
@@ -433,7 +496,7 @@ impl ServiceProvider {
             .await;
         });
 
-        println!("\nAll systems go. Press CTRL-C to stop the server.");
+        log::info!("All systems go. Press CTRL-C to stop the server.");
         // for each incoming message from the websocket... (which in 99.99% cases is going to be a mix message)
         loop {
             let Some(received) = Self::read_websocket_message(
@@ -443,14 +506,11 @@ impl ServiceProvider {
                 .await
             else {
                 log::error!("The websocket stream has finished!");
-                return Ok(());
+                return Err(NetworkRequesterError::ConnectionClosed);
             };
 
-            let raw_message = received.message;
-            // TODO: here be potential SURB (i.e. received.reply_SURB)
-
             self.handle_proxy_message(
-                &raw_message,
+                received,
                 &mut controller_sender,
                 &mix_input_sender,
                 shared_lane_queue_lengths.clone(),
diff --git a/service-providers/network-requester/src/error.rs b/service-providers/network-requester/src/error.rs
index ab5390b19d..6e033305d0 100644
--- a/service-providers/network-requester/src/error.rs
+++ b/service-providers/network-requester/src/error.rs
@@ -7,4 +7,7 @@ pub enum NetworkRequesterError {
 
     #[error("Websocket error")]
     WebsocketConnectionError(#[from] WebsocketConnectionError),
+
+    #[error("Websocket connection closed")]
+    ConnectionClosed,
 }
diff --git a/service-providers/network-requester/src/main.rs b/service-providers/network-requester/src/main.rs
index e6cb277610..2b585dfe13 100644
--- a/service-providers/network-requester/src/main.rs
+++ b/service-providers/network-requester/src/main.rs
@@ -63,7 +63,7 @@ impl Run {
                 .unwrap_or(&DEFAULT_WEBSOCKET_LISTENING_PORT.to_string())
         );
 
-        println!("Starting socks5 service provider:");
+        log::info!("Starting socks5 service provider");
         let mut server = core::ServiceProvider::new(
             uri,
             self.open_proxy,
@@ -98,8 +98,8 @@ pub(crate) async fn execute(args: Cli) -> Result<(), NetworkRequesterError> {
 
     match &args.command {
         Commands::Run(r) => r.execute().await?,
-        Commands::Completions(s) => s.generate(&mut crate::Cli::into_app(), bin_name),
-        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::into_app(), bin_name),
+        Commands::Completions(s) => s.generate(&mut crate::Cli::command(), bin_name),
+        Commands::GenerateFigSpec => fig_generate(&mut crate::Cli::command(), bin_name),
     }
     Ok(())
 }
diff --git a/service-providers/network-requester/src/statistics/collector.rs b/service-providers/network-requester/src/statistics/collector.rs
index ac43252c33..73e6918ea5 100644
--- a/service-providers/network-requester/src/statistics/collector.rs
+++ b/service-providers/network-requester/src/statistics/collector.rs
@@ -12,6 +12,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::RwLock;
 
+use crate::core::ReturnAddress;
 use nymsphinx::addressing::clients::Recipient;
 use ordered_buffer::OrderedMessageSender;
 use socks5_requests::{ConnectionId, Message as Socks5Message, RemoteAddress, Request};
@@ -77,13 +78,13 @@ pub struct ServiceStatisticsCollector {
     pub(crate) response_stats_data: Arc<RwLock<StatsData>>,
     pub(crate) connected_services: Arc<RwLock<HashMap<ConnectionId, RemoteAddress>>>,
     stats_provider_addr: Recipient,
-    mix_input_sender: MixProxySender<(Socks5Message, Recipient)>,
+    mix_input_sender: MixProxySender<(Socks5Message, ReturnAddress)>,
 }
 
 impl ServiceStatisticsCollector {
     pub async fn new(
         stats_provider_addr: Option<Recipient>,
-        mix_input_sender: MixProxySender<(Socks5Message, Recipient)>,
+        mix_input_sender: MixProxySender<(Socks5Message, ReturnAddress)>,
     ) -> Result<Self, StatsError> {
         let client = reqwest::Client::builder()
             .timeout(Duration::from_secs(3))
@@ -173,12 +174,12 @@ impl StatisticsCollector for ServiceStatisticsCollector {
                 "{}:{}",
                 DEFAULT_STATISTICS_SERVICE_ADDRESS, DEFAULT_STATISTICS_SERVICE_PORT
             ),
-            self.stats_provider_addr,
+            Some(self.stats_provider_addr),
         );
         self.mix_input_sender
             .send((
                 Socks5Message::Request(connect_req),
-                self.stats_provider_addr,
+                self.stats_provider_addr.into(),
             ))
             .await
             .expect("MixProxyReader has stopped receiving!");
@@ -188,7 +189,10 @@ impl StatisticsCollector for ServiceStatisticsCollector {
         let ordered_msg = message_sender.wrap_message(msg).into_bytes();
         let send_req = Request::new_send(conn_id, ordered_msg, true);
         self.mix_input_sender
-            .send((Socks5Message::Request(send_req), self.stats_provider_addr))
+            .send((
+                Socks5Message::Request(send_req),
+                self.stats_provider_addr.into(),
+            ))
             .await
             .expect("MixProxyReader has stopped receiving!");
 
diff --git a/service-providers/network-statistics/Cargo.toml b/service-providers/network-statistics/Cargo.toml
index eb97366ecb..00b76f524e 100644
--- a/service-providers/network-statistics/Cargo.toml
+++ b/service-providers/network-statistics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nym-network-statistics"
-version = "1.0.2"
+version = "1.1.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/service-providers/network-statistics/src/api/error.rs b/service-providers/network-statistics/src/api/error.rs
index d2b190840e..bebafc2fde 100644
--- a/service-providers/network-statistics/src/api/error.rs
+++ b/service-providers/network-statistics/src/api/error.rs
@@ -12,10 +12,10 @@ pub type Result<T> = std::result::Result<T, NetworkStatisticsAPIError>;
 
 #[derive(Debug, thiserror::Error)]
 pub enum NetworkStatisticsAPIError {
-    #[error("{0}")]
+    #[error(transparent)]
     RocketError(#[from] Box<rocket::Error>),
 
-    #[error("{0}")]
+    #[error(transparent)]
     StorageError(#[from] NetworkStatisticsStorageError),
 }
 
diff --git a/testnet-faucet/yarn.lock b/testnet-faucet/yarn.lock
index b867973f6a..5404231e90 100644
--- a/testnet-faucet/yarn.lock
+++ b/testnet-faucet/yarn.lock
@@ -2655,9 +2655,9 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 json5@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.2.1"
diff --git a/tools/nym-cli/Cargo.toml b/tools/nym-cli/Cargo.toml
index 362e3005b5..aa73944ab8 100644
--- a/tools/nym-cli/Cargo.toml
+++ b/tools/nym-cli/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "nym-cli"
-version = "1.1.1"
+version = "1.1.4"
 authors = ["Nym Technologies SA"]
 edition = "2021"
 
 [dependencies]
 base64 = "0.13.0"
 bs58 = "0.4"
-clap = { version = "3.2", features = ["derive"] }
-clap_complete = "3.2"
-clap_complete_fig = "3.2"
+clap = { version = "4.0", features = ["derive"] }
+clap_complete = "4.0"
+clap_complete_fig = "4.0"
 dotenv = "0.15.0"
 log = "0.4"
 pretty_env_logger = "0.4"
@@ -22,5 +22,5 @@ tap = "1"
 
 nym-cli-commands = { path = "../../common/commands" }
 logging = { path = "../../common/logging"}
-validator-client = { path = "../../common/client-libs/validator-client", features = ["nymd-client"] }
+validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 network-defaults = { path = "../../common/network-defaults" }
diff --git a/tools/nym-cli/README.md b/tools/nym-cli/README.md
index 415e500564..b2ad624a6d 100644
--- a/tools/nym-cli/README.md
+++ b/tools/nym-cli/README.md
@@ -5,7 +5,7 @@ This is a CLI tool for interacting with:
 - the Nyx blockchain
 - the smart contracts for the Mixnet
 
-It provides a convenient wrapper around the [`nymd client`](../../common/client-libs) with similar functionality to the`nyxd` binary for querying the chain or executing smart contract methods.
+It provides a convenient wrapper around the [`nyxd client`](../../common/client-libs) with similar functionality to the`nyxd` binary for querying the chain or executing smart contract methods.
 
 And in the future it will provide an easy way to interact with Coconut, to issue and verify Coconut credenitals.
 
@@ -41,7 +41,7 @@ You will need to pass the following with every command as an argument:
 
 ```
 --mnemonic <MNEMONIC>                    
---nymd-url <NYMD_URL>                    
+--nyxd-url <nyxd_URL>                    
 --mixnet-contract <MIXNET_CONTRACT_ADDRESS>      
 --vesting-contract <VESTING_CONTRACT_ADDRESS>
 ```
diff --git a/tools/nym-cli/src/main.rs b/tools/nym-cli/src/main.rs
index ce81cd6a56..49183df58a 100644
--- a/tools/nym-cli/src/main.rs
+++ b/tools/nym-cli/src/main.rs
@@ -5,7 +5,7 @@ use clap::{CommandFactory, Parser, Subcommand};
 use log::{error, warn};
 use logging::setup_logging;
 use nym_cli_commands::context::{get_network_details, ClientArgs};
-use validator_client::nymd::AccountId;
+use validator_client::nyxd::AccountId;
 
 mod completion;
 mod validator;
@@ -28,15 +28,15 @@ pub(crate) struct Cli {
 
     #[clap(long, global = true)]
     #[clap(
-        help = "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file"
+        help = "Overrides the nyxd URL provided either as an environment variable NYXD_VALIDATOR or in a config file"
     )]
-    pub(crate) nymd_url: Option<String>,
+    pub(crate) nyxd_url: Option<String>,
 
     #[clap(long, global = true)]
     #[clap(
         help = "Overrides the validator API URL provided either as an environment variable API_VALIDATOR or in a config file"
     )]
-    pub(crate) validator_api_url: Option<String>,
+    pub(crate) nym_api_url: Option<String>,
 
     #[clap(long, global = true)]
     #[clap(
@@ -76,8 +76,8 @@ pub(crate) enum Commands {
 
 async fn execute(cli: Cli) -> anyhow::Result<()> {
     let args = ClientArgs {
-        nymd_url: cli.nymd_url,
-        validator_api_url: cli.validator_api_url,
+        nyxd_url: cli.nyxd_url,
+        nym_api_url: cli.nym_api_url,
         mnemonic: cli.mnemonic,
         mixnet_contract_address: cli.mixnet_contract_address,
         vesting_contract_address: cli.vesting_contract_address,
diff --git a/tools/nym-cli/src/validator/account.rs b/tools/nym-cli/src/validator/account.rs
index 36fc3460ba..e3d8d5c12d 100644
--- a/tools/nym-cli/src/validator/account.rs
+++ b/tools/nym-cli/src/validator/account.rs
@@ -3,7 +3,7 @@
 
 use network_defaults::NymNetworkDetails;
 use nym_cli_commands::context::{create_query_client, create_signing_client, ClientArgs};
-use validator_client::nymd::AccountId;
+use validator_client::nyxd::AccountId;
 
 pub(crate) async fn execute(
     global_args: ClientArgs,
diff --git a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs
index ed1ac2f211..3e40d2d26a 100644
--- a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs
+++ b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs
@@ -3,7 +3,7 @@
 
 use network_defaults::NymNetworkDetails;
 use nym_cli_commands::context::{
-    create_signing_client, create_signing_client_with_validator_api, ClientArgs,
+    create_signing_client, create_signing_client_with_nym_api, ClientArgs,
 };
 
 pub(crate) mod rewards;
@@ -24,7 +24,7 @@ pub(crate) async fn execute(
             nym_cli_commands::validator::mixnet::delegators::undelegate_from_mixnode::undelegate_from_mixnode(args, create_signing_client(global_args, network_details)?).await
         }
         nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::List(args) => {
-            nym_cli_commands::validator::mixnet::delegators::query_for_delegations::execute(args, create_signing_client_with_validator_api(global_args, network_details)?).await
+            nym_cli_commands::validator::mixnet::delegators::query_for_delegations::execute(args, create_signing_client_with_nym_api(global_args, network_details)?).await
         }
         _ => unreachable!(),
     }
diff --git a/tools/nym-cli/src/validator/mixnet/query/mod.rs b/tools/nym-cli/src/validator/mixnet/query/mod.rs
index 21afb8c833..ea41ebd7d6 100644
--- a/tools/nym-cli/src/validator/mixnet/query/mod.rs
+++ b/tools/nym-cli/src/validator/mixnet/query/mod.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use network_defaults::NymNetworkDetails;
-use nym_cli_commands::context::create_query_client_with_validator_api;
+use nym_cli_commands::context::create_query_client_with_nym_api;
 
 pub(crate) async fn execute(
     query: nym_cli_commands::validator::mixnet::query::MixnetQuery,
@@ -12,14 +12,14 @@ pub(crate) async fn execute(
         nym_cli_commands::validator::mixnet::query::MixnetQueryCommands::Mixnodes(args) => {
             nym_cli_commands::validator::mixnet::query::query_all_mixnodes::query(
                 args,
-                &create_query_client_with_validator_api(network_details)?,
+                &create_query_client_with_nym_api(network_details)?,
             )
             .await
         }
         nym_cli_commands::validator::mixnet::query::MixnetQueryCommands::Gateways(args) => {
             nym_cli_commands::validator::mixnet::query::query_all_gateways::query(
                 args,
-                &create_query_client_with_validator_api(network_details)?,
+                &create_query_client_with_nym_api(network_details)?,
             )
             .await
         }
diff --git a/tools/nym-cli/user-docs/fig-spec.ts b/tools/nym-cli/user-docs/fig-spec.ts
index 95825de55d..3fbb1c213a 100644
--- a/tools/nym-cli/user-docs/fig-spec.ts
+++ b/tools/nym-cli/user-docs/fig-spec.ts
@@ -34,10 +34,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -100,10 +100,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -170,10 +170,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -251,10 +251,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -317,10 +317,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -373,10 +373,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -435,10 +435,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -496,10 +496,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -565,10 +565,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -621,10 +621,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -683,10 +683,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -744,10 +744,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -805,10 +805,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -863,10 +863,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -919,10 +919,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -994,10 +994,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1095,10 +1095,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1176,10 +1176,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1252,10 +1252,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1322,10 +1322,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1378,10 +1378,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -1440,10 +1440,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1501,10 +1501,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1562,10 +1562,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1618,10 +1618,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -1720,10 +1720,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1778,10 +1778,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1840,10 +1840,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1902,10 +1902,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -1963,10 +1963,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -2019,10 +2019,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -2085,10 +2085,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2147,10 +2147,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2209,10 +2209,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2265,10 +2265,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -2327,10 +2327,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2395,10 +2395,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -2459,10 +2459,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -2517,10 +2517,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -2573,10 +2573,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2643,10 +2643,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2707,10 +2707,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2777,10 +2777,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2841,10 +2841,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2899,10 +2899,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -2955,10 +2955,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -3031,10 +3031,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3089,10 +3089,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3145,10 +3145,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -3207,10 +3207,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3272,10 +3272,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3330,10 +3330,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3386,10 +3386,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -3454,10 +3454,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3525,10 +3525,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3583,10 +3583,10 @@ const completion: Fig.Spec = {
                           },
                         },
                         {
-                          name: "--nymd-url",
-                          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                          name: "--nyxd-url",
+                          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                           args: {
-                            name: "nymd-url",
+                            name: "nyxd-url",
                             isOptional: true,
                           },
                         },
@@ -3639,10 +3639,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -3762,10 +3762,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -3823,10 +3823,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -3953,10 +3953,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4021,10 +4021,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4079,10 +4079,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4135,10 +4135,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -4255,10 +4255,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4316,10 +4316,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4432,10 +4432,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4493,10 +4493,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4551,10 +4551,10 @@ const completion: Fig.Spec = {
                       },
                     },
                     {
-                      name: "--nymd-url",
-                      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                      name: "--nyxd-url",
+                      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                       args: {
-                        name: "nymd-url",
+                        name: "nyxd-url",
                         isOptional: true,
                       },
                     },
@@ -4607,10 +4607,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -4665,10 +4665,10 @@ const completion: Fig.Spec = {
                   },
                 },
                 {
-                  name: "--nymd-url",
-                  description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+                  name: "--nyxd-url",
+                  description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
                   args: {
-                    name: "nymd-url",
+                    name: "nyxd-url",
                     isOptional: true,
                   },
                 },
@@ -4721,10 +4721,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -4779,10 +4779,10 @@ const completion: Fig.Spec = {
               },
             },
             {
-              name: "--nymd-url",
-              description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+              name: "--nyxd-url",
+              description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
               args: {
-                name: "nymd-url",
+                name: "nyxd-url",
                 isOptional: true,
               },
             },
@@ -4835,10 +4835,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -4893,10 +4893,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -4951,10 +4951,10 @@ const completion: Fig.Spec = {
           },
         },
         {
-          name: "--nymd-url",
-          description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+          name: "--nyxd-url",
+          description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
           args: {
-            name: "nymd-url",
+            name: "nyxd-url",
             isOptional: true,
           },
         },
@@ -5007,10 +5007,10 @@ const completion: Fig.Spec = {
       },
     },
     {
-      name: "--nymd-url",
-      description: "Overrides the nymd URL provided either as an environment variable NYMD_VALIDATOR or in a config file",
+      name: "--nyxd-url",
+      description: "Overrides the nyxd URL provided either as an environment variable nyxd_VALIDATOR or in a config file",
       args: {
-        name: "nymd-url",
+        name: "nyxd-url",
         isOptional: true,
       },
     },
diff --git a/tools/ts-rs-cli/Cargo.toml b/tools/ts-rs-cli/Cargo.toml
index e6c3fa879e..9d03747efe 100644
--- a/tools/ts-rs-cli/Cargo.toml
+++ b/tools/ts-rs-cli/Cargo.toml
@@ -11,9 +11,9 @@ ts-rs = "6.1.2"
 walkdir = "2"
 
 validator-client = { path = "../../common/client-libs/validator-client", features = [
-    "nymd-client", "generate-ts"
+    "nyxd-client", "generate-ts"
 ] }
-validator-api-requests = { path = "../../validator-api/validator-api-requests", features = ["generate-ts"] }
+nym-api-requests = { path = "../../nym-api/nym-api-requests", features = ["generate-ts"] }
 mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract", features = [ "generate-ts" ] }
 vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract", features = [ "generate-ts" ] }
 nym-types = { path = "../../common/types", features = [ "generate-ts" ] }
diff --git a/tools/ts-rs-cli/src/main.rs b/tools/ts-rs-cli/src/main.rs
index 42217d4d8b..762dd4b03f 100644
--- a/tools/ts-rs-cli/src/main.rs
+++ b/tools/ts-rs-cli/src/main.rs
@@ -3,6 +3,11 @@ use mixnet_contract_common::{
     Interval as ContractInterval, IntervalRewardParams, IntervalRewardingParamsUpdate, MixNode,
     MixNodeConfigUpdate, RewardedSetNodeStatus, RewardingParams, UnbondedMixnode,
 };
+use nym_api_requests::models::{
+    GatewayCoreStatusResponse, InclusionProbabilityResponse, MixnodeCoreStatusResponse,
+    MixnodeStatus, MixnodeStatusResponse, RewardEstimationResponse, SelectionChance,
+    StakeSaturationResponse,
+};
 use nym_types::account::{Account, AccountEntry, AccountWithMnemonic, Balance};
 use nym_types::currency::{CurrencyDenom, DecCoin};
 use nym_types::delegation::{
@@ -27,11 +32,6 @@ use nym_wallet_types::network::Network;
 use nym_wallet_types::network_config::{Validator, ValidatorUrl, ValidatorUrls};
 use std::path::Path;
 use ts_rs::TS;
-use validator_api_requests::models::{
-    GatewayCoreStatusResponse, InclusionProbabilityResponse, MixnodeCoreStatusResponse,
-    MixnodeStatus, MixnodeStatusResponse, RewardEstimationResponse, SelectionChance,
-    StakeSaturationResponse,
-};
 use vesting_contract_common::Period;
 use walkdir::WalkDir;
 
@@ -112,7 +112,7 @@ fn main() {
     do_export!(VestingPeriod);
     do_export!(WrappedDelegationEvent);
 
-    // validator-api-requests
+    // nym-api-requests
     do_export!(MixnodeCoreStatusResponse);
     do_export!(GatewayCoreStatusResponse);
     do_export!(InclusionProbabilityResponse);
diff --git a/ts-packages/mui-theme/src/theme/theme.ts b/ts-packages/mui-theme/src/theme/theme.ts
index a12e706e9e..bb4dcae533 100644
--- a/ts-packages/mui-theme/src/theme/theme.ts
+++ b/ts-packages/mui-theme/src/theme/theme.ts
@@ -84,6 +84,7 @@ export const getDesignTokens = (mode: PaletteMode): ThemeOptions => {
       ].join(','),
       fontSize: 14,
       fontWeightRegular: 500,
+      fontWeightMedium: 600,
       button: {
         textTransform: 'none',
         fontWeight: '600',
diff --git a/ts-packages/react-components/package.json b/ts-packages/react-components/package.json
index 5ccf942c02..24011b0149 100644
--- a/ts-packages/react-components/package.json
+++ b/ts-packages/react-components/package.json
@@ -28,7 +28,8 @@
     "react-dom": "17",
     "@nymproject/nym-validator-client": "^0.18.0",
     "@nymproject/types": "1",
-    "base58": "4"
+    "base58": "4",
+    "bech32": "^1.1.4"
   },
   "dependencies": {
     "flat": "^5.0.2",
diff --git a/ts-packages/react-components/src/components/account/WalletAddressFormField.stories.tsx b/ts-packages/react-components/src/components/account/WalletAddressFormField.stories.tsx
new file mode 100644
index 0000000000..af85590431
--- /dev/null
+++ b/ts-packages/react-components/src/components/account/WalletAddressFormField.stories.tsx
@@ -0,0 +1,42 @@
+import * as React from 'react';
+import { ComponentMeta } from '@storybook/react';
+import { Box } from '@mui/material';
+import { WalletAddressFormField } from './WalletAddressFormField';
+
+export default {
+  title: 'Accounts/Wallet Address',
+  component: WalletAddressFormField,
+} as ComponentMeta<typeof WalletAddressFormField>;
+
+export const Empty = () => <WalletAddressFormField />;
+
+export const ErrorValue = () => <WalletAddressFormField initialValue="this is a bad value" />;
+
+export const ValidValue = () => <WalletAddressFormField initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec" />;
+
+export const ReadOnlyValidValue = () => (
+  <WalletAddressFormField readOnly initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec" />
+);
+
+export const ReadOnlyErrorValue = () => <WalletAddressFormField readOnly initialValue="this is a bad value" />;
+
+export const WithLabel = () => (
+  <Box p={2}>
+    <WalletAddressFormField
+      initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec"
+      textFieldProps={{ label: 'Identity Key' }}
+    />
+  </Box>
+);
+
+export const WithPlaceholder = () => (
+  <WalletAddressFormField textFieldProps={{ placeholder: 'Please enter an wallet address' }} />
+);
+
+export const FullWidth = () => (
+  <WalletAddressFormField fullWidth initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec" />
+);
+
+export const HideValidTick = () => (
+  <WalletAddressFormField showTickOnValid={false} fullWidth initialValue="n1xr4w0kddak8d8zlfmu8sl6dk2r4p9uhhzzlaec" />
+);
diff --git a/ts-packages/react-components/src/components/account/WalletAddressFormField.tsx b/ts-packages/react-components/src/components/account/WalletAddressFormField.tsx
new file mode 100644
index 0000000000..147f7c8b99
--- /dev/null
+++ b/ts-packages/react-components/src/components/account/WalletAddressFormField.tsx
@@ -0,0 +1,105 @@
+import * as React from 'react';
+import { ChangeEvent } from 'react';
+import { InputAdornment, TextField } from '@mui/material';
+import { TextFieldProps } from '@mui/material/TextField/TextField';
+import { validateWalletAddress } from '@nymproject/types';
+import DoneIcon from '@mui/icons-material/Done';
+import { SxProps } from '@mui/system';
+
+export const WalletAddressFormField: React.FC<{
+  showTickOnValid?: boolean;
+  fullWidth?: boolean;
+  required?: boolean;
+  readOnly?: boolean;
+  initialValue?: string;
+  placeholder?: string;
+  label?: string;
+  helperText?: string;
+  onChanged?: (newValue: string) => void;
+  onValidate?: (isValid: boolean, error?: string) => void;
+  textFieldProps?: TextFieldProps;
+  errorText?: string;
+  sx?: SxProps;
+}> = ({
+  required,
+  fullWidth,
+  placeholder,
+  label,
+  readOnly,
+  initialValue,
+  errorText,
+  sx,
+  onChanged,
+  onValidate,
+  textFieldProps,
+  showTickOnValid = true,
+}) => {
+  const [value, setValue] = React.useState<string | undefined>(initialValue);
+  const [validationError, setValidationError] = React.useState<string | undefined>();
+
+  const doValidation = (newValue?: string): boolean => {
+    if (validateWalletAddress(newValue)) {
+      setValidationError(undefined);
+      if (onValidate) {
+        onValidate(true);
+      }
+      return true;
+    }
+
+    const newValidationError = 'Account address is not valid';
+    setValidationError(newValidationError);
+    if (onValidate) {
+      onValidate(false, newValidationError);
+    }
+
+    return false;
+  };
+
+  React.useEffect(() => {
+    // validate initial value (only if set), so that validation error UI hints are set without the user typing
+    if (initialValue) {
+      doValidation(initialValue);
+    }
+
+    if (errorText) {
+      setValidationError(errorText);
+    }
+  }, [initialValue, errorText]);
+
+  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const newValue = event.target.value;
+
+    if (doValidation(newValue)) {
+      setValue(newValue);
+    }
+
+    if (onChanged) {
+      onChanged(newValue);
+    }
+  };
+
+  return (
+    <TextField
+      fullWidth={fullWidth}
+      InputProps={{
+        readOnly,
+        required,
+        endAdornment: showTickOnValid && value && validationError === undefined && (
+          <InputAdornment position="end">
+            <DoneIcon color="success" />
+          </InputAdornment>
+        ),
+      }}
+      placeholder={placeholder}
+      label={label}
+      sx={sx}
+      {...textFieldProps}
+      aria-readonly={readOnly}
+      error={validationError !== undefined}
+      helperText={validationError}
+      defaultValue={initialValue}
+      onChange={handleChange}
+      InputLabelProps={{ shrink: true }}
+    />
+  );
+};
diff --git a/ts-packages/types/package.json b/ts-packages/types/package.json
index 0cbaede674..7017554f51 100644
--- a/ts-packages/types/package.json
+++ b/ts-packages/types/package.json
@@ -6,7 +6,8 @@
   "types": "dist/index.d.ts",
   "peerDependencies": {
     "@cosmjs/math": "^0.27.1",
-    "bs58": "4"
+    "bs58": "4",
+    "bech32": "^1.1.4"
   },
   "devDependencies": {
     "@nymproject/eslint-config-react-typescript": "^1.0.0",
diff --git a/ts-packages/types/src/types/rust/Account.ts b/ts-packages/types/src/types/rust/Account.ts
index ea0586828f..da0afb666e 100644
--- a/ts-packages/types/src/types/rust/Account.ts
+++ b/ts-packages/types/src/types/rust/Account.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { CurrencyDenom } from './CurrencyDenom';
 
 export interface Account {
diff --git a/ts-packages/types/src/types/rust/AccountEntry.ts b/ts-packages/types/src/types/rust/AccountEntry.ts
index f6ad1b53a9..472a9befcd 100644
--- a/ts-packages/types/src/types/rust/AccountEntry.ts
+++ b/ts-packages/types/src/types/rust/AccountEntry.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface AccountEntry {
   id: string;
   address: string;
diff --git a/ts-packages/types/src/types/rust/AccountWithMnemonic.ts b/ts-packages/types/src/types/rust/AccountWithMnemonic.ts
index 6b3757bdab..edbf9b9de6 100644
--- a/ts-packages/types/src/types/rust/AccountWithMnemonic.ts
+++ b/ts-packages/types/src/types/rust/AccountWithMnemonic.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Account } from './Account';
 
 export interface AccountWithMnemonic {
diff --git a/ts-packages/types/src/types/rust/Balance.ts b/ts-packages/types/src/types/rust/Balance.ts
index ba6be26651..fe11917327 100644
--- a/ts-packages/types/src/types/rust/Balance.ts
+++ b/ts-packages/types/src/types/rust/Balance.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface Balance {
diff --git a/ts-packages/types/src/types/rust/Coin.ts b/ts-packages/types/src/types/rust/Coin.ts
index dda00291d7..493c2e6b41 100644
--- a/ts-packages/types/src/types/rust/Coin.ts
+++ b/ts-packages/types/src/types/rust/Coin.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface Coin {
   denom: string;
   amount: bigint;
diff --git a/ts-packages/types/src/types/rust/CosmosFee.ts b/ts-packages/types/src/types/rust/CosmosFee.ts
index 54c0f689bc..d77c4d3dd8 100644
--- a/ts-packages/types/src/types/rust/CosmosFee.ts
+++ b/ts-packages/types/src/types/rust/CosmosFee.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Coin } from './Coin';
 
 export interface CosmosFee {
diff --git a/ts-packages/types/src/types/rust/CurrencyDenom.ts b/ts-packages/types/src/types/rust/CurrencyDenom.ts
index 04760b4fd7..3e7696c28d 100644
--- a/ts-packages/types/src/types/rust/CurrencyDenom.ts
+++ b/ts-packages/types/src/types/rust/CurrencyDenom.ts
@@ -1 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export type CurrencyDenom = 'unknown' | 'nym' | 'nymt' | 'nyx' | 'nyxt';
diff --git a/ts-packages/types/src/types/rust/DecCoin.ts b/ts-packages/types/src/types/rust/DecCoin.ts
index d2b1b4dd69..9411bf358b 100644
--- a/ts-packages/types/src/types/rust/DecCoin.ts
+++ b/ts-packages/types/src/types/rust/DecCoin.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { CurrencyDenom } from './CurrencyDenom';
 
 export type DecCoin = { denom: CurrencyDenom; amount: string };
diff --git a/ts-packages/types/src/types/rust/Delegation.ts b/ts-packages/types/src/types/rust/Delegation.ts
index 18d6df201f..58de13e6cc 100644
--- a/ts-packages/types/src/types/rust/Delegation.ts
+++ b/ts-packages/types/src/types/rust/Delegation.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface Delegation {
diff --git a/ts-packages/types/src/types/rust/DelegationEvent.ts b/ts-packages/types/src/types/rust/DelegationEvent.ts
index d9e2c0a21d..30ff21943f 100644
--- a/ts-packages/types/src/types/rust/DelegationEvent.ts
+++ b/ts-packages/types/src/types/rust/DelegationEvent.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { DelegationEventKind } from './DelegationEventKind';
 
diff --git a/ts-packages/types/src/types/rust/DelegationEventKind.ts b/ts-packages/types/src/types/rust/DelegationEventKind.ts
index a1db5fac12..a242220102 100644
--- a/ts-packages/types/src/types/rust/DelegationEventKind.ts
+++ b/ts-packages/types/src/types/rust/DelegationEventKind.ts
@@ -1 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export type DelegationEventKind = 'Delegate' | 'Undelegate';
diff --git a/ts-packages/types/src/types/rust/DelegationResult.ts b/ts-packages/types/src/types/rust/DelegationResult.ts
index f6d29d9435..d8f8a77ce3 100644
--- a/ts-packages/types/src/types/rust/DelegationResult.ts
+++ b/ts-packages/types/src/types/rust/DelegationResult.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface DelegationResult {
diff --git a/ts-packages/types/src/types/rust/DelegationSummaryResponse.ts b/ts-packages/types/src/types/rust/DelegationSummaryResponse.ts
index 0cb9346c59..21e85d513b 100644
--- a/ts-packages/types/src/types/rust/DelegationSummaryResponse.ts
+++ b/ts-packages/types/src/types/rust/DelegationSummaryResponse.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { DelegationWithEverything } from './DelegationWithEverything';
 
diff --git a/ts-packages/types/src/types/rust/DelegationWithEverything.ts b/ts-packages/types/src/types/rust/DelegationWithEverything.ts
index 0d3423a133..ecf949c5ae 100644
--- a/ts-packages/types/src/types/rust/DelegationWithEverything.ts
+++ b/ts-packages/types/src/types/rust/DelegationWithEverything.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { DelegationEvent } from './DelegationEvent';
 import type { MixNodeCostParams } from './MixNodeCostParams';
diff --git a/ts-packages/types/src/types/rust/Fee.ts b/ts-packages/types/src/types/rust/Fee.ts
index 5a7a0af56e..1e3f747e92 100644
--- a/ts-packages/types/src/types/rust/Fee.ts
+++ b/ts-packages/types/src/types/rust/Fee.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { CosmosFee } from './CosmosFee';
 
 export type Fee = { Manual: CosmosFee } | { Auto: number | null };
diff --git a/ts-packages/types/src/types/rust/FeeDetails.ts b/ts-packages/types/src/types/rust/FeeDetails.ts
index 60bcd4cae5..7db283dbc1 100644
--- a/ts-packages/types/src/types/rust/FeeDetails.ts
+++ b/ts-packages/types/src/types/rust/FeeDetails.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { Fee } from './Fee';
 
diff --git a/ts-packages/types/src/types/rust/Gas.ts b/ts-packages/types/src/types/rust/Gas.ts
index e207dcb1e1..2b93e47509 100644
--- a/ts-packages/types/src/types/rust/Gas.ts
+++ b/ts-packages/types/src/types/rust/Gas.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface Gas {
   gas_units: bigint;
 }
diff --git a/ts-packages/types/src/types/rust/GasInfo.ts b/ts-packages/types/src/types/rust/GasInfo.ts
index fd5b21e582..3e34323018 100644
--- a/ts-packages/types/src/types/rust/GasInfo.ts
+++ b/ts-packages/types/src/types/rust/GasInfo.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { Gas } from './Gas';
 
 export interface GasInfo {
diff --git a/ts-packages/types/src/types/rust/Gateway.ts b/ts-packages/types/src/types/rust/Gateway.ts
index 1dbba0e5ed..4c449b578d 100644
--- a/ts-packages/types/src/types/rust/Gateway.ts
+++ b/ts-packages/types/src/types/rust/Gateway.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface Gateway {
   host: string;
   mix_port: number;
diff --git a/ts-packages/types/src/types/rust/GatewayBond.ts b/ts-packages/types/src/types/rust/GatewayBond.ts
index 277994efac..405c1cab92 100644
--- a/ts-packages/types/src/types/rust/GatewayBond.ts
+++ b/ts-packages/types/src/types/rust/GatewayBond.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { Gateway } from './Gateway';
 
diff --git a/ts-packages/types/src/types/rust/InclusionProbabilityResponse.ts b/ts-packages/types/src/types/rust/InclusionProbabilityResponse.ts
index 56d81bde41..3f80b794a0 100644
--- a/ts-packages/types/src/types/rust/InclusionProbabilityResponse.ts
+++ b/ts-packages/types/src/types/rust/InclusionProbabilityResponse.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { SelectionChance } from './SelectionChance';
 
 export interface InclusionProbabilityResponse {
diff --git a/ts-packages/types/src/types/rust/Interval.ts b/ts-packages/types/src/types/rust/Interval.ts
index b47687ae22..7a7fa7bb4d 100644
--- a/ts-packages/types/src/types/rust/Interval.ts
+++ b/ts-packages/types/src/types/rust/Interval.ts
@@ -3,6 +3,6 @@ export interface Interval {
   epochs_in_interval: number;
   current_epoch_start: string;
   current_epoch_id: number;
-  epoch_length: string;
+  epoch_length: { secs: number; nanos: number };
   total_elapsed_epochs: number;
 }
diff --git a/ts-packages/types/src/types/rust/MixNodeBond.ts b/ts-packages/types/src/types/rust/MixNodeBond.ts
index 37059b9b61..173ce9599d 100644
--- a/ts-packages/types/src/types/rust/MixNodeBond.ts
+++ b/ts-packages/types/src/types/rust/MixNodeBond.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { MixNode } from './Mixnode';
 
diff --git a/ts-packages/types/src/types/rust/Mixnode.ts b/ts-packages/types/src/types/rust/Mixnode.ts
index 0deaa5b919..8dddce4eb2 100644
--- a/ts-packages/types/src/types/rust/Mixnode.ts
+++ b/ts-packages/types/src/types/rust/Mixnode.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface MixNode {
   host: string;
   mix_port: number;
diff --git a/ts-packages/types/src/types/rust/MixnodeStatus.ts b/ts-packages/types/src/types/rust/MixnodeStatus.ts
index da89c7e8a7..6421988dce 100644
--- a/ts-packages/types/src/types/rust/MixnodeStatus.ts
+++ b/ts-packages/types/src/types/rust/MixnodeStatus.ts
@@ -1 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export type MixnodeStatus = 'active' | 'standby' | 'inactive' | 'not_found';
diff --git a/ts-packages/types/src/types/rust/MixnodeStatusResponse.ts b/ts-packages/types/src/types/rust/MixnodeStatusResponse.ts
index 2225b26df3..2dd6bb6f54 100644
--- a/ts-packages/types/src/types/rust/MixnodeStatusResponse.ts
+++ b/ts-packages/types/src/types/rust/MixnodeStatusResponse.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { MixnodeStatus } from './MixnodeStatus';
 
 export interface MixnodeStatusResponse {
diff --git a/ts-packages/types/src/types/rust/OriginalVestingResponse.ts b/ts-packages/types/src/types/rust/OriginalVestingResponse.ts
index 8d781d5ad0..ea10cd24af 100644
--- a/ts-packages/types/src/types/rust/OriginalVestingResponse.ts
+++ b/ts-packages/types/src/types/rust/OriginalVestingResponse.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface OriginalVestingResponse {
diff --git a/ts-packages/types/src/types/rust/Period.ts b/ts-packages/types/src/types/rust/Period.ts
index 05d9890d5f..76a8876b31 100644
--- a/ts-packages/types/src/types/rust/Period.ts
+++ b/ts-packages/types/src/types/rust/Period.ts
@@ -1 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export type Period = 'Before' | { In: number } | 'After';
diff --git a/ts-packages/types/src/types/rust/PledgeData.ts b/ts-packages/types/src/types/rust/PledgeData.ts
index 9fb19f9aaf..76adc23018 100644
--- a/ts-packages/types/src/types/rust/PledgeData.ts
+++ b/ts-packages/types/src/types/rust/PledgeData.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface PledgeData {
diff --git a/ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts b/ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts
index 8ddd13d047..5a8da8dbea 100644
--- a/ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts
+++ b/ts-packages/types/src/types/rust/RewardedSetNodeStatus.ts
@@ -1 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export type RewardedSetNodeStatus = 'Active' | 'Standby';
diff --git a/ts-packages/types/src/types/rust/RpcTransactionResponse.ts b/ts-packages/types/src/types/rust/RpcTransactionResponse.ts
index 2463e3dd20..2f9c3bdc8a 100644
--- a/ts-packages/types/src/types/rust/RpcTransactionResponse.ts
+++ b/ts-packages/types/src/types/rust/RpcTransactionResponse.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { Gas } from './Gas';
 
diff --git a/ts-packages/types/src/types/rust/SendTxResult.ts b/ts-packages/types/src/types/rust/SendTxResult.ts
index b44de3324d..02fb0b5b0c 100644
--- a/ts-packages/types/src/types/rust/SendTxResult.ts
+++ b/ts-packages/types/src/types/rust/SendTxResult.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { Gas } from './Gas';
 import type { TransactionDetails } from './TransactionDetails';
diff --git a/ts-packages/types/src/types/rust/StakeSaturationResponse.ts b/ts-packages/types/src/types/rust/StakeSaturationResponse.ts
index 038d261c46..6be2ae0e0e 100644
--- a/ts-packages/types/src/types/rust/StakeSaturationResponse.ts
+++ b/ts-packages/types/src/types/rust/StakeSaturationResponse.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface StakeSaturationResponse {
   saturation: string;
   uncapped_saturation: string;
diff --git a/ts-packages/types/src/types/rust/TransactionDetails.ts b/ts-packages/types/src/types/rust/TransactionDetails.ts
index 8de1cf9ec3..043db71473 100644
--- a/ts-packages/types/src/types/rust/TransactionDetails.ts
+++ b/ts-packages/types/src/types/rust/TransactionDetails.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 
 export interface TransactionDetails {
diff --git a/ts-packages/types/src/types/rust/TransactionExecuteResult.ts b/ts-packages/types/src/types/rust/TransactionExecuteResult.ts
index e6d93e8448..ce06484dd1 100644
--- a/ts-packages/types/src/types/rust/TransactionExecuteResult.ts
+++ b/ts-packages/types/src/types/rust/TransactionExecuteResult.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { GasInfo } from './GasInfo';
 
diff --git a/ts-packages/types/src/types/rust/VestingAccountInfo.ts b/ts-packages/types/src/types/rust/VestingAccountInfo.ts
index d317d045d1..538e941edb 100644
--- a/ts-packages/types/src/types/rust/VestingAccountInfo.ts
+++ b/ts-packages/types/src/types/rust/VestingAccountInfo.ts
@@ -1,3 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { DecCoin } from './DecCoin';
 import type { VestingPeriod } from './VestingPeriod';
 
diff --git a/ts-packages/types/src/types/rust/VestingPeriod.ts b/ts-packages/types/src/types/rust/VestingPeriod.ts
index de1089005f..dae6901c10 100644
--- a/ts-packages/types/src/types/rust/VestingPeriod.ts
+++ b/ts-packages/types/src/types/rust/VestingPeriod.ts
@@ -1,3 +1,5 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
 export interface VestingPeriod {
   start_time: bigint;
   period_seconds: bigint;
diff --git a/ts-packages/types/src/utils/accounts/index.ts b/ts-packages/types/src/utils/accounts/index.ts
new file mode 100644
index 0000000000..ef756b31a9
--- /dev/null
+++ b/ts-packages/types/src/utils/accounts/index.ts
@@ -0,0 +1,28 @@
+import { decode } from 'bech32';
+
+export const validateWalletAddress = (address?: string, prefix: string = 'n', logErrorToConsole = false): boolean => {
+  if (!address) {
+    return false;
+  }
+
+  if (address.length < 1) {
+    return false;
+  }
+
+  if (!address.startsWith(prefix)) {
+    return false;
+  }
+
+  try {
+    // try to decode the address
+    decode(address);
+  } catch (e) {
+    if (logErrorToConsole) {
+      // eslint-disable-next-line no-console
+      console.error('Failed to decode address', e);
+    }
+    return false;
+  }
+
+  return true;
+};
diff --git a/ts-packages/types/src/utils/decimal/index.ts b/ts-packages/types/src/utils/decimal/index.ts
index 2f58196372..62807f25d6 100644
--- a/ts-packages/types/src/utils/decimal/index.ts
+++ b/ts-packages/types/src/utils/decimal/index.ts
@@ -10,5 +10,8 @@ export const stringToDecimal = (raw: string): Decimal => Decimal.fromUserInput(r
 export const decimalToPercentage = (raw: string) =>
   Math.round(Decimal.fromUserInput(raw, 18).toFloatApproximation() * 100).toString();
 
+export const percentToDecimal = (raw: string) =>
+  (Decimal.fromUserInput(raw, 18).toFloatApproximation() / 100).toString();
+
 export const decimalToFloatApproximation = (raw: string): number =>
   Decimal.fromUserInput(raw, 18).toFloatApproximation();
diff --git a/ts-packages/types/src/utils/index.ts b/ts-packages/types/src/utils/index.ts
index b1c792c669..7a8f61fd81 100644
--- a/ts-packages/types/src/utils/index.ts
+++ b/ts-packages/types/src/utils/index.ts
@@ -1,3 +1,4 @@
 export * from './coin';
 export * from './keys';
 export * from './decimal';
+export * from './accounts';
diff --git a/ts-packages/webpack/webpack.common.js b/ts-packages/webpack/webpack.common.js
index d352518ef7..6c74ed3a13 100644
--- a/ts-packages/webpack/webpack.common.js
+++ b/ts-packages/webpack/webpack.common.js
@@ -35,7 +35,7 @@ module.exports = (baseDir, htmlPath) => ({
         use: ['@svgr/webpack'],
       },
       {
-        test: /\.(png|jpe?g|gif|md)$/i,
+        test: /\.(png|jpe?g|gif|md|webp)$/i,
         // More information here https://webpack.js.org/guides/asset-modules/
         type: 'asset',
       },
diff --git a/validator-api/src/coconut/dkg/dealing.rs b/validator-api/src/coconut/dkg/dealing.rs
deleted file mode 100644
index fea2d4e98f..0000000000
--- a/validator-api/src/coconut/dkg/dealing.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::{ConsistentState, State};
-use crate::coconut::error::CoconutError;
-use coconut_dkg_common::types::TOTAL_DEALINGS;
-use contracts_common::dealings::ContractSafeBytes;
-use dkg::bte::setup;
-use dkg::Dealing;
-use rand::RngCore;
-
-pub(crate) async fn dealing_exchange(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    rng: impl RngCore + Clone,
-) -> Result<(), CoconutError> {
-    if state.receiver_index().is_some() {
-        return Ok(());
-    }
-
-    let dealers = dkg_client.get_current_dealers().await?;
-    // note: ceiling in integer division can be achieved via q = (x + y - 1) / y;
-    let threshold = (2 * dealers.len() as u64 + 3 - 1) / 3;
-
-    state.set_dealers(dealers);
-    state.set_threshold(threshold);
-    let receivers = state.current_dealers_by_idx();
-    let params = setup();
-    let dealer_index = state.node_index_value()?;
-    let receiver_index = receivers
-        .keys()
-        .position(|node_index| *node_index == dealer_index);
-    for _ in 0..TOTAL_DEALINGS {
-        let (dealing, _) = Dealing::create(
-            rng.clone(),
-            &params,
-            dealer_index,
-            threshold,
-            &receivers,
-            None,
-        );
-        dkg_client
-            .submit_dealing(ContractSafeBytes::from(&dealing))
-            .await?;
-    }
-
-    info!("DKG: Finished submitting dealing");
-    state.set_receiver_index(receiver_index);
-
-    Ok(())
-}
diff --git a/validator-api/src/coconut/dkg/public_key.rs b/validator-api/src/coconut/dkg/public_key.rs
deleted file mode 100644
index 6669db09ca..0000000000
--- a/validator-api/src/coconut/dkg/public_key.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::state::State;
-use crate::coconut::error::CoconutError;
-
-pub(crate) async fn public_key_submission(
-    dkg_client: &DkgClient,
-    state: &mut State,
-) -> Result<(), CoconutError> {
-    if state.node_index().is_some() {
-        return Ok(());
-    }
-
-    let bte_key = bs58::encode(&state.dkg_keypair().public_key().to_bytes()).into_string();
-    let index = if let Some(details) = dkg_client
-        .get_self_registered_dealer_details()
-        .await?
-        .details
-    {
-        details.assigned_index
-    } else {
-        dkg_client
-            .register_dealer(bte_key, state.announce_address().to_string())
-            .await?
-    };
-    state.set_node_index(index);
-    info!("DKG: Using node index {}", index);
-
-    Ok(())
-}
diff --git a/validator-api/src/coconut/dkg/verification_key.rs b/validator-api/src/coconut/dkg/verification_key.rs
deleted file mode 100644
index 08c352255d..0000000000
--- a/validator-api/src/coconut/dkg/verification_key.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::coconut::dkg::client::DkgClient;
-use crate::coconut::dkg::complaints::ComplaintReason;
-use crate::coconut::dkg::state::{ConsistentState, State};
-use crate::coconut::error::CoconutError;
-use coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID;
-use coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS};
-use coconut_dkg_common::verification_key::owner_from_cosmos_msgs;
-use coconut_interface::KeyPair as CoconutKeyPair;
-use cosmwasm_std::Addr;
-use credentials::coconut::bandwidth::{PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};
-use cw3::{ProposalResponse, Status};
-use dkg::bte::{decrypt_share, setup};
-use dkg::{combine_shares, try_recover_verification_keys, Dealing, Threshold};
-use nymcoconut::tests::helpers::transpose_matrix;
-use nymcoconut::{check_vk_pairing, Base58, KeyPair, Parameters, SecretKey, VerificationKey};
-use pemstore::KeyPairPath;
-use std::collections::BTreeMap;
-use validator_client::nymd::cosmwasm_client::logs::find_attribute;
-
-// Filter the dealers based on what dealing they posted (or not) in the contract
-async fn deterministic_filter_dealers(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    threshold: Threshold,
-) -> Result<Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>, CoconutError> {
-    let mut dealings_maps = vec![];
-    let initial_dealers_by_addr = state.current_dealers_by_addr();
-    let initial_receivers = state.current_dealers_by_idx();
-    let params = setup();
-
-    for idx in 0..TOTAL_DEALINGS {
-        let dealings = dkg_client.get_dealings(idx).await?;
-        let dealings_map =
-            BTreeMap::from_iter(dealings.into_iter().filter_map(|contract_dealing| {
-                match Dealing::try_from(&contract_dealing.dealing) {
-                    Ok(dealing) => {
-                        if let Err(err) =
-                            dealing.verify(&params, threshold, &initial_receivers, None)
-                        {
-                            state.mark_bad_dealer(
-                                &contract_dealing.dealer,
-                                ComplaintReason::DealingVerificationError(err),
-                            );
-                            None
-                        } else if let Some(idx) =
-                            initial_dealers_by_addr.get(&contract_dealing.dealer)
-                        {
-                            Some((*idx, (contract_dealing.dealer, dealing)))
-                        } else {
-                            None
-                        }
-                    }
-                    Err(err) => {
-                        state.mark_bad_dealer(
-                            &contract_dealing.dealer,
-                            ComplaintReason::MalformedDealing(err),
-                        );
-                        None
-                    }
-                }
-            }));
-        dealings_maps.push(dealings_map);
-    }
-    for (addr, _) in initial_dealers_by_addr.iter() {
-        for dealings_map in dealings_maps.iter() {
-            if !dealings_map.iter().any(|(_, (address, _))| address == addr) {
-                state.mark_bad_dealer(addr, ComplaintReason::MissingDealing);
-                break;
-            }
-        }
-    }
-
-    Ok(dealings_maps)
-}
-
-fn derive_partial_keypair(
-    state: &mut State,
-    threshold: Threshold,
-    dealings_maps: Vec<BTreeMap<NodeIndex, (Addr, Dealing)>>,
-) -> Result<KeyPair, CoconutError> {
-    let filtered_receivers_by_idx = state.current_dealers_by_idx();
-    let filtered_dealers_by_addr = state.current_dealers_by_addr();
-    let dk = state.dkg_keypair().private_key();
-    let node_index_value = state.receiver_index_value()?;
-    let mut scalars = vec![];
-    let mut recovered_vks = vec![];
-    for dealings_map in dealings_maps.into_iter() {
-        let filtered_dealings: Vec<_> = dealings_map
-            .into_iter()
-            .filter_map(|(_, (addr, dealing))| {
-                if filtered_dealers_by_addr.keys().any(|a| addr == *a) {
-                    Some(dealing)
-                } else {
-                    None
-                }
-            })
-            .collect();
-        let recovered = try_recover_verification_keys(
-            &filtered_dealings,
-            threshold,
-            &filtered_receivers_by_idx,
-        )?;
-        recovered_vks.push(recovered);
-
-        let shares = filtered_dealings
-            .iter()
-            .map(|dealing| decrypt_share(dk, node_index_value, &dealing.ciphertexts, None))
-            .collect::<Result<_, _>>()?;
-        let scalar = combine_shares(
-            shares,
-            &filtered_receivers_by_idx
-                .keys()
-                .copied()
-                .collect::<Vec<_>>(),
-        )?;
-        scalars.push(scalar);
-    }
-    state.set_recovered_vks(recovered_vks);
-
-    let params = Parameters::new(PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES)?;
-    let x = scalars.pop().unwrap();
-    let sk = SecretKey::create_from_raw(x, scalars);
-    let vk = sk.verification_key(&params);
-
-    Ok(CoconutKeyPair::from_keys(sk, vk))
-}
-
-pub(crate) async fn verification_key_submission(
-    dkg_client: &DkgClient,
-    state: &mut State,
-    keypair_path: &KeyPairPath,
-) -> Result<(), CoconutError> {
-    if state.coconut_keypair_is_some().await {
-        return Ok(());
-    }
-
-    let threshold = state.threshold()?;
-    let dealings_maps = deterministic_filter_dealers(dkg_client, state, threshold).await?;
-    let coconut_keypair = derive_partial_keypair(state, threshold, dealings_maps)?;
-    let vk_share = coconut_keypair.verification_key().to_bs58();
-    pemstore::store_keypair(&coconut_keypair, keypair_path)?;
-    let res = dkg_client.submit_verification_key_share(vk_share).await?;
-    let proposal_id = find_attribute(&res.logs, "wasm", DKG_PROPOSAL_ID)
-        .ok_or(CoconutError::ProposalIdError {
-            reason: String::from("proposal id not found"),
-        })?
-        .value
-        .parse::<u64>()
-        .map_err(|_| CoconutError::ProposalIdError {
-            reason: String::from("proposal id could not be parsed to u64"),
-        })?;
-    state.set_proposal_id(proposal_id);
-    state.set_coconut_keypair(coconut_keypair).await;
-    info!("DKG: Submitted own verification key");
-
-    Ok(())
-}
-
-fn validate_proposal(proposal: &ProposalResponse) -> Option<(Addr, u64)> {
-    if proposal.status == Status::Open {
-        if let Some(owner) = owner_from_cosmos_msgs(&proposal.msgs) {
-            return Some((owner, proposal.id));
-        }
-    }
-    None
-}
-
-pub(crate) async fn verification_key_validation(
-    dkg_client: &DkgClient,
-    state: &mut State,
-) -> Result<(), CoconutError> {
-    if state.voted_vks() {
-        return Ok(());
-    }
-
-    let vk_shares = dkg_client.get_verification_key_shares().await?;
-    let proposal_ids = BTreeMap::from_iter(
-        dkg_client
-            .list_proposals()
-            .await?
-            .iter()
-            .filter_map(validate_proposal),
-    );
-    let filtered_receivers_by_idx: Vec<_> =
-        state.current_dealers_by_idx().keys().copied().collect();
-    let recovered_partials: Vec<_> = state
-        .recovered_vks()
-        .iter()
-        .map(|recovered_vk| recovered_vk.recovered_partials.clone())
-        .collect();
-    let recovered_partials = transpose_matrix(recovered_partials);
-    let params = Parameters::new(PUBLIC_ATTRIBUTES + PRIVATE_ATTRIBUTES)?;
-    for contract_share in vk_shares {
-        if let Some(proposal_id) = proposal_ids.get(&contract_share.owner).copied() {
-            match VerificationKey::try_from_bs58(contract_share.share) {
-                Ok(vk) => {
-                    if let Some(idx) = filtered_receivers_by_idx
-                        .iter()
-                        .position(|node_index| contract_share.node_index == *node_index)
-                    {
-                        if !check_vk_pairing(&params, &recovered_partials[idx], &vk) {
-                            dkg_client
-                                .vote_verification_key_share(proposal_id, false)
-                                .await?;
-                        } else {
-                            dkg_client
-                                .vote_verification_key_share(proposal_id, true)
-                                .await?;
-                        }
-                    }
-                }
-                Err(_) => {
-                    dkg_client
-                        .vote_verification_key_share(proposal_id, false)
-                        .await?
-                }
-            }
-        }
-    }
-    state.set_voted_vks();
-    info!("DKG: Validated the other verification keys");
-    Ok(())
-}
-
-pub(crate) async fn verification_key_finalization(
-    dkg_client: &DkgClient,
-    state: &mut State,
-) -> Result<(), CoconutError> {
-    if state.executed_proposal() {
-        return Ok(());
-    }
-
-    let proposal_id = state.proposal_id_value()?;
-    dkg_client
-        .execute_verification_key_share(proposal_id)
-        .await?;
-    state.set_executed_proposal();
-    info!("DKG: Finalized own verification key on chain");
-
-    Ok(())
-}
diff --git a/validator-api/src/main.rs b/validator-api/src/main.rs
deleted file mode 100644
index 5116896858..0000000000
--- a/validator-api/src/main.rs
+++ /dev/null
@@ -1,666 +0,0 @@
-// Copyright 2020 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-#[macro_use]
-extern crate rocket;
-
-use crate::config::Config;
-use crate::contract_cache::ValidatorCacheRefresher;
-use crate::network_monitor::NetworkMonitorBuilder;
-use crate::node_status_api::uptime_updater::HistoricalUptimeUpdater;
-use crate::nymd_client::Client;
-use crate::storage::ValidatorApiStorage;
-use ::config::defaults::mainnet::read_var_if_not_default;
-use ::config::defaults::setup_env;
-use ::config::defaults::var_names::{CONFIGURED, MIXNET_CONTRACT_ADDRESS, MIX_DENOM};
-use ::config::NymConfig;
-use anyhow::Result;
-use clap::{crate_version, App, Arg, ArgMatches};
-use contract_cache::ValidatorCache;
-use log::{info, warn};
-use node_status_api::NodeStatusCache;
-use okapi::openapi3::OpenApi;
-use rocket::fairing::AdHoc;
-use rocket::http::Method;
-use rocket::{Ignite, Rocket};
-use rocket_cors::{AllowedHeaders, AllowedOrigins, Cors};
-use rocket_okapi::mount_endpoints_and_merged_docs;
-use rocket_okapi::swagger_ui::make_swagger_ui;
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::sync::Arc;
-use std::time::Duration;
-use std::{fs, process};
-use task::ShutdownNotifier;
-use tokio::sync::Notify;
-#[cfg(feature = "coconut")]
-use url::Url;
-use validator_client::nymd::SigningNymdClient;
-
-use crate::epoch_operations::RewardedSetUpdater;
-#[cfg(feature = "coconut")]
-use coconut::{
-    comm::QueryCommunicationChannel,
-    dkg::controller::{init_keypair, DkgController},
-    InternalSignRequest,
-};
-use logging::setup_logging;
-#[cfg(feature = "coconut")]
-use validator_client::nymd::bip32::secp256k1::elliptic_curve::rand_core::OsRng;
-
-pub(crate) mod config;
-pub(crate) mod contract_cache;
-mod epoch_operations;
-mod network_monitor;
-mod node_status_api;
-pub(crate) mod nymd_client;
-pub(crate) mod storage;
-mod swagger;
-
-#[cfg(feature = "coconut")]
-mod coconut;
-
-const ID: &str = "id";
-const CONFIG_ENV_FILE: &str = "config-env-file";
-const MONITORING_ENABLED: &str = "enable-monitor";
-const REWARDING_ENABLED: &str = "enable-rewarding";
-const MIXNET_CONTRACT_ARG: &str = "mixnet-contract";
-const MNEMONIC_ARG: &str = "mnemonic";
-const WRITE_CONFIG_ARG: &str = "save-config";
-const NYMD_VALIDATOR_ARG: &str = "nymd-validator";
-const ENABLED_CREDENTIALS_MODE_ARG_NAME: &str = "enabled-credentials-mode";
-
-#[cfg(feature = "coconut")]
-const ANNOUNCE_ADDRESS: &str = "announce-address";
-#[cfg(feature = "coconut")]
-const COCONUT_ENABLED: &str = "enable-coconut";
-
-const REWARDING_MONITOR_THRESHOLD_ARG: &str = "monitor-threshold";
-
-const MIN_MIXNODE_RELIABILITY_ARG: &str = "min_mixnode_reliability";
-const MIN_GATEWAY_RELIABILITY_ARG: &str = "min_gateway_reliability";
-
-fn long_version() -> String {
-    format!(
-        r#"
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-{:<20}{}
-"#,
-        "Build Timestamp:",
-        env!("VERGEN_BUILD_TIMESTAMP"),
-        "Build Version:",
-        env!("VERGEN_BUILD_SEMVER"),
-        "Commit SHA:",
-        env!("VERGEN_GIT_SHA"),
-        "Commit Date:",
-        env!("VERGEN_GIT_COMMIT_TIMESTAMP"),
-        "Commit Branch:",
-        env!("VERGEN_GIT_BRANCH"),
-        "rustc Version:",
-        env!("VERGEN_RUSTC_SEMVER"),
-        "rustc Channel:",
-        env!("VERGEN_RUSTC_CHANNEL"),
-        "cargo Profile:",
-        env!("VERGEN_CARGO_PROFILE")
-    )
-}
-
-fn parse_args() -> ArgMatches {
-    let build_details = long_version();
-    let base_app = App::new("Nym Validator API")
-        .version(crate_version!())
-        .long_version(&*build_details)
-        .author("Nymtech")
-        .arg(
-            Arg::with_name(CONFIG_ENV_FILE)
-                .help("Path pointing to an env file that configures the validator API")
-                .long(CONFIG_ENV_FILE)
-                .takes_value(true)
-        )
-        .arg(
-            Arg::with_name(ID)
-                .help("Id of the validator-api we want to run")
-                .long(ID)
-                .takes_value(true)
-        )
-        .arg(
-            Arg::with_name(MONITORING_ENABLED)
-                .help("specifies whether a network monitoring is enabled on this API")
-                .long(MONITORING_ENABLED)
-                .short('m')
-        )
-        .arg(
-            Arg::with_name(REWARDING_ENABLED)
-                .help("specifies whether a network rewarding is enabled on this API")
-                .long(REWARDING_ENABLED)
-                .short('r')
-                .requires_all(&[MONITORING_ENABLED, MNEMONIC_ARG])
-        )
-        .arg(
-            Arg::with_name(NYMD_VALIDATOR_ARG)
-                .help("Endpoint to nymd part of the validator from which the monitor will grab nodes to test")
-                .long(NYMD_VALIDATOR_ARG)
-                .takes_value(true)
-        )
-        .arg(Arg::with_name(MIXNET_CONTRACT_ARG)
-                 .long(MIXNET_CONTRACT_ARG)
-                 .help("Address of the validator contract managing the network")
-                 .takes_value(true),
-        )
-        .arg(Arg::with_name(MNEMONIC_ARG)
-                 .long(MNEMONIC_ARG)
-                 .help("Mnemonic of the network monitor used for rewarding operators")
-                 .takes_value(true)
-        )
-        .arg(
-            Arg::with_name(WRITE_CONFIG_ARG)
-                .help("specifies whether a config file based on provided arguments should be saved to a file")
-                .long(WRITE_CONFIG_ARG)
-                .short('w')
-        )
-        .arg(
-            Arg::with_name(REWARDING_MONITOR_THRESHOLD_ARG)
-                .help("Specifies the minimum percentage of monitor test run data present in order to distribute rewards for given interval.")
-                .takes_value(true)
-                .long(REWARDING_MONITOR_THRESHOLD_ARG)
-        )
-        .arg(
-            Arg::with_name(MIN_MIXNODE_RELIABILITY_ARG)
-                .long(MIN_MIXNODE_RELIABILITY_ARG)
-                .help("Mixnodes with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.")
-                .takes_value(true)
-        )
-        .arg(
-            Arg::with_name(MIN_GATEWAY_RELIABILITY_ARG)
-                .long(MIN_GATEWAY_RELIABILITY_ARG)
-                .help("Gateways with relialability lower the this get blacklisted by network monitor, get no traffic and cannot be selected into a rewarded set.")
-                .takes_value(true)
-        )
-        .arg(
-            Arg::with_name(ENABLED_CREDENTIALS_MODE_ARG_NAME)
-                .long(ENABLED_CREDENTIALS_MODE_ARG_NAME)
-                .help("Set this validator api to work in a enabled credentials that would attempt to use gateway with the bandwidth credential requirement")
-        );
-
-    #[cfg(feature = "coconut")]
-    let base_app = base_app
-        .arg(
-            Arg::with_name(ANNOUNCE_ADDRESS)
-                .help("Announced address where coconut clients will connect.")
-                .long(ANNOUNCE_ADDRESS)
-                .takes_value(true),
-        )
-        .arg(
-            Arg::with_name(COCONUT_ENABLED)
-                .help("Flag to indicate whether coconut signer authority is enabled on this API")
-                .requires_all(&[MNEMONIC_ARG, ANNOUNCE_ADDRESS])
-                .long(COCONUT_ENABLED),
-        );
-    base_app.get_matches()
-}
-
-async fn wait_for_interrupt(mut shutdown: ShutdownNotifier) {
-    wait_for_signal().await;
-
-    log::info!("Sending shutdown");
-    shutdown.signal_shutdown().ok();
-
-    log::info!("Waiting for tasks to finish... (Press ctrl-c to force)");
-    shutdown.wait_for_shutdown().await;
-
-    log::info!("Stopping nym validator API");
-}
-
-#[cfg(unix)]
-async fn wait_for_signal() {
-    use tokio::signal::unix::{signal, SignalKind};
-    let mut sigterm = signal(SignalKind::terminate()).expect("Failed to setup SIGTERM channel");
-    let mut sigquit = signal(SignalKind::quit()).expect("Failed to setup SIGQUIT channel");
-
-    tokio::select! {
-        _ = tokio::signal::ctrl_c() => {
-            log::info!("Received SIGINT");
-        },
-        _ = sigterm.recv() => {
-            log::info!("Received SIGTERM");
-        }
-        _ = sigquit.recv() => {
-            log::info!("Received SIGQUIT");
-        }
-    }
-}
-
-#[cfg(not(unix))]
-async fn wait_for_signal() {
-    tokio::select! {
-        _ = tokio::signal::ctrl_c() => {
-            log::info!("Received SIGINT");
-        },
-    }
-}
-
-fn override_config(mut config: Config, matches: &ArgMatches) -> Config {
-    if let Some(id) = matches.value_of(ID) {
-        fs::create_dir_all(Config::default_config_directory(Some(id)))
-            .expect("Could not create config directory");
-        fs::create_dir_all(Config::default_data_directory(Some(id)))
-            .expect("Could not create data directory");
-        config = config.with_id(id);
-    }
-
-    if matches.is_present(MONITORING_ENABLED) {
-        config = config.with_network_monitor_enabled(true)
-    }
-
-    if matches.is_present(REWARDING_ENABLED) {
-        config = config.with_rewarding_enabled(true)
-    }
-
-    #[cfg(feature = "coconut")]
-    if matches.is_present(COCONUT_ENABLED) {
-        config = config.with_coconut_signer_enabled(true)
-    }
-
-    #[cfg(feature = "coconut")]
-    if let Some(announce_address) = matches.value_of(ANNOUNCE_ADDRESS) {
-        config = config.with_announce_address(
-            Url::parse(announce_address).expect("Could not parse announce address"),
-        );
-    }
-
-    if let Some(raw_validator) = matches.value_of(NYMD_VALIDATOR_ARG) {
-        let parsed = match raw_validator.parse() {
-            Err(err) => {
-                error!("Passed validator argument is invalid - {}", err);
-                process::exit(1)
-            }
-            Ok(url) => url,
-        };
-        config = config.with_custom_nymd_validator(parsed);
-    }
-
-    if let Some(mixnet_contract) = matches.value_of(MIXNET_CONTRACT_ARG) {
-        config = config.with_custom_mixnet_contract(mixnet_contract)
-    } else if std::env::var(CONFIGURED).is_ok() {
-        if let Some(mixnet_contract) = read_var_if_not_default(MIXNET_CONTRACT_ADDRESS) {
-            config = config.with_custom_mixnet_contract(mixnet_contract)
-        }
-    }
-
-    if let Some(mnemonic) = matches.value_of(MNEMONIC_ARG) {
-        config = config.with_mnemonic(mnemonic)
-    }
-
-    if let Some(monitor_threshold) = matches
-        .value_of(REWARDING_MONITOR_THRESHOLD_ARG)
-        .map(|t| t.parse::<u8>())
-    {
-        let monitor_threshold =
-            monitor_threshold.expect("Provided monitor threshold is not a number!");
-        assert!(
-            monitor_threshold <= 100,
-            "Provided monitor threshold is greater than 100!"
-        );
-        config = config.with_minimum_interval_monitor_threshold(monitor_threshold)
-    }
-
-    if let Some(reliability) = matches
-        .value_of(MIN_MIXNODE_RELIABILITY_ARG)
-        .map(|t| t.parse::<u8>())
-    {
-        config = config.with_min_mixnode_reliability(
-            reliability.expect("Provided reliability is not a u8 number!"),
-        )
-    }
-
-    if let Some(reliability) = matches
-        .value_of(MIN_GATEWAY_RELIABILITY_ARG)
-        .map(|t| t.parse::<u8>())
-    {
-        config = config.with_min_gateway_reliability(
-            reliability.expect("Provided reliability is not a u8 number!"),
-        )
-    }
-
-    if matches.is_present(ENABLED_CREDENTIALS_MODE_ARG_NAME) {
-        config = config.with_disabled_credentials_mode(false)
-    }
-
-    if matches.is_present(WRITE_CONFIG_ARG) {
-        info!("Saving the configuration to a file");
-        if let Err(err) = config.save_to_file(None) {
-            error!("Failed to write config to a file - {}", err);
-            process::exit(1)
-        }
-    }
-
-    config
-}
-
-fn setup_cors() -> Result<Cors> {
-    let allowed_origins = AllowedOrigins::all();
-
-    // You can also deserialize this
-    let cors = rocket_cors::CorsOptions {
-        allowed_origins,
-        allowed_methods: vec![Method::Post, Method::Get]
-            .into_iter()
-            .map(From::from)
-            .collect(),
-        allowed_headers: AllowedHeaders::all(),
-        allow_credentials: true,
-        ..Default::default()
-    }
-    .to_cors()?;
-
-    Ok(cors)
-}
-
-fn setup_liftoff_notify(notify: Arc<Notify>) -> AdHoc {
-    AdHoc::on_liftoff("Liftoff notifier", |_| {
-        Box::pin(async move { notify.notify_one() })
-    })
-}
-
-fn setup_network_monitor<'a>(
-    config: &'a Config,
-    _nymd_client: Client<SigningNymdClient>,
-    system_version: &str,
-    rocket: &Rocket<Ignite>,
-) -> Option<NetworkMonitorBuilder<'a>> {
-    if !config.get_network_monitor_enabled() {
-        return None;
-    }
-
-    // get instances of managed states
-    let node_status_storage = rocket.state::<ValidatorApiStorage>().unwrap().clone();
-    let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
-
-    Some(NetworkMonitorBuilder::new(
-        config,
-        _nymd_client,
-        system_version,
-        node_status_storage,
-        validator_cache,
-    ))
-}
-
-// TODO: Remove if still unused
-#[allow(dead_code)]
-fn expected_monitor_test_runs(config: &Config, interval_length: Duration) -> usize {
-    let test_delay = config.get_network_monitor_run_interval();
-
-    // this is just a rough estimate. In real world there will be slightly fewer test runs
-    // as they are not instantaneous and hence do not happen exactly every test_delay
-    (interval_length.as_secs() / test_delay.as_secs()) as usize
-}
-
-async fn setup_rocket(
-    config: &Config,
-    _mix_denom: String,
-    liftoff_notify: Arc<Notify>,
-    _nymd_client: Client<SigningNymdClient>,
-    #[cfg(feature = "coconut")] coconut_keypair: coconut::keypair::KeyPair,
-) -> Result<Rocket<Ignite>> {
-    let openapi_settings = rocket_okapi::settings::OpenApiSettings::default();
-    let mut rocket = rocket::build();
-
-    let custom_route_spec = (vec![], custom_openapi_spec());
-
-    mount_endpoints_and_merged_docs! {
-        rocket,
-        "/v1".to_owned(),
-        openapi_settings,
-        "/" => custom_route_spec,
-        "" => contract_cache::validator_cache_routes(&openapi_settings),
-        "/status" => node_status_api::node_status_routes(&openapi_settings, config.get_network_monitor_enabled()),
-    }
-
-    let rocket = rocket
-        .mount("/swagger", make_swagger_ui(&swagger::get_docs()))
-        .attach(setup_cors()?)
-        .attach(setup_liftoff_notify(liftoff_notify))
-        .attach(ValidatorCache::stage())
-        .attach(NodeStatusCache::stage());
-
-    // This is not a very nice approach. A lazy value would be more suitable, but that's still
-    // a nightly feature: https://github.com/rust-lang/rust/issues/74465
-    let storage = if cfg!(feature = "coconut") || config.get_network_monitor_enabled() {
-        Some(ValidatorApiStorage::init(config.get_node_status_api_database_path()).await?)
-    } else {
-        None
-    };
-
-    #[cfg(feature = "coconut")]
-    let rocket = if config.get_coconut_signer_enabled() {
-        rocket.attach(InternalSignRequest::stage(
-            _nymd_client.clone(),
-            _mix_denom,
-            coconut_keypair,
-            QueryCommunicationChannel::new(_nymd_client),
-            storage.clone().unwrap(),
-        ))
-    } else {
-        rocket
-    };
-
-    // see if we should start up network monitor
-    let rocket = if config.get_network_monitor_enabled() {
-        rocket.attach(storage::ValidatorApiStorage::stage(storage.unwrap()))
-    } else {
-        rocket
-    };
-
-    Ok(rocket.ignite().await?)
-}
-
-fn custom_openapi_spec() -> OpenApi {
-    use rocket_okapi::okapi::openapi3::*;
-    OpenApi {
-        openapi: OpenApi::default_version(),
-        info: Info {
-            title: "Validator API".to_owned(),
-            description: None,
-            terms_of_service: None,
-            contact: None,
-            license: None,
-            version: env!("CARGO_PKG_VERSION").to_owned(),
-            ..Default::default()
-        },
-        servers: get_servers(),
-        ..Default::default()
-    }
-}
-
-fn get_servers() -> Vec<rocket_okapi::okapi::openapi3::Server> {
-    if std::env::var_os("CARGO").is_some() {
-        return vec![];
-    }
-    vec![rocket_okapi::okapi::openapi3::Server {
-        url: std::env::var("OPEN_API_BASE").unwrap_or_else(|_| "/api/v1/".to_owned()),
-        description: Some("API".to_owned()),
-        ..Default::default()
-    }]
-}
-
-async fn run_validator_api(matches: ArgMatches) -> Result<()> {
-    let system_version = env!("CARGO_PKG_VERSION");
-
-    // try to load config from the file, if it doesn't exist, use default values
-    let id = matches.value_of(ID);
-    let (config, _already_inited) = match Config::load_from_file(id) {
-        Ok(cfg) => (cfg, true),
-        Err(_) => {
-            let config_path = Config::default_config_file_path(id)
-                .into_os_string()
-                .into_string()
-                .unwrap();
-            warn!(
-                "Could not load the configuration file from {}. Either the file did not exist or was malformed. Using the default values instead",
-                config_path
-            );
-            (Config::new(), false)
-        }
-    };
-
-    let config = override_config(config, &matches);
-
-    #[cfg(feature = "coconut")]
-    if !_already_inited {
-        init_keypair(&config)?;
-    }
-
-    // if we just wanted to write data to the config, exit
-    if matches.is_present(WRITE_CONFIG_ARG) {
-        return Ok(());
-    }
-    let mix_denom = std::env::var(MIX_DENOM).expect("mix denom not set");
-
-    let signing_nymd_client = Client::new_signing(&config);
-
-    let liftoff_notify = Arc::new(Notify::new());
-    // We need a bigger timeout
-    let shutdown = ShutdownNotifier::new(10);
-
-    #[cfg(feature = "coconut")]
-    let coconut_keypair = coconut::keypair::KeyPair::new();
-
-    // let's build our rocket!
-    let rocket = setup_rocket(
-        &config,
-        mix_denom,
-        Arc::clone(&liftoff_notify),
-        signing_nymd_client.clone(),
-        #[cfg(feature = "coconut")]
-        coconut_keypair.clone(),
-    )
-    .await?;
-    let monitor_builder = setup_network_monitor(
-        &config,
-        signing_nymd_client.clone(),
-        system_version,
-        &rocket,
-    );
-
-    let validator_cache = rocket.state::<ValidatorCache>().unwrap().clone();
-    let node_status_cache = rocket.state::<NodeStatusCache>().unwrap().clone();
-
-    #[cfg(feature = "coconut")]
-    {
-        let dkg_controller =
-            DkgController::new(&config, signing_nymd_client.clone(), coconut_keypair, OsRng)
-                .await?;
-        let shutdown_listener = shutdown.subscribe();
-        tokio::spawn(async move { dkg_controller.run(shutdown_listener).await });
-    }
-
-    // if network monitor is disabled, we're not going to be sending any rewarding hence
-    // we're not starting signing client
-    let validator_cache_listener = if config.get_network_monitor_enabled() {
-        // Main storage
-        let storage = rocket.state::<ValidatorApiStorage>().unwrap().clone();
-
-        // setup our daily uptime updater. Note that if network monitor is disabled, then we have
-        // no data for the updates and hence we don't need to start it up
-        let uptime_updater = HistoricalUptimeUpdater::new(storage.clone());
-        let shutdown_listener = shutdown.subscribe();
-        tokio::spawn(async move { uptime_updater.run(shutdown_listener).await });
-
-        // spawn the validator cache refresher
-        let validator_cache_refresher = ValidatorCacheRefresher::new(
-            signing_nymd_client.clone(),
-            config.get_caching_interval(),
-            validator_cache.clone(),
-            Some(storage.clone()),
-        );
-        let validator_cache_listener = validator_cache_refresher.subscribe();
-        let shutdown_listener = shutdown.subscribe();
-        tokio::spawn(async move { validator_cache_refresher.run(shutdown_listener).await });
-
-        // spawn rewarded set updater
-        let mut rewarded_set_updater =
-            RewardedSetUpdater::new(signing_nymd_client, validator_cache.clone(), storage).await?;
-        let shutdown_listener = shutdown.subscribe();
-        tokio::spawn(async move { rewarded_set_updater.run(shutdown_listener).await.unwrap() });
-
-        validator_cache_listener
-    } else {
-        // Spawn the validator cache refresher.
-        // When the network monitor is not enabled, we spawn the validator cache refresher task
-        // with just a nymd client, in contrast to a signing client.
-        let nymd_client = Client::new_query(&config);
-        let validator_cache_refresher = ValidatorCacheRefresher::new(
-            nymd_client,
-            config.get_caching_interval(),
-            validator_cache.clone(),
-            None,
-        );
-        let validator_cache_listener = validator_cache_refresher.subscribe();
-        let shutdown_listener = shutdown.subscribe();
-        tokio::spawn(async move { validator_cache_refresher.run(shutdown_listener).await });
-
-        validator_cache_listener
-    };
-
-    // Spawn the node status cache refresher.
-    // It is primarily refreshed in-sync with the validator cache, however provide a fallback
-    // caching interval that is twice the validator cache
-    let mut validator_api_cache_refresher = node_status_api::NodeStatusCacheRefresher::new(
-        node_status_cache,
-        validator_cache,
-        validator_cache_listener,
-        config.get_caching_interval().saturating_mul(2),
-    );
-    let shutdown_listener = shutdown.subscribe();
-    tokio::spawn(async move { validator_api_cache_refresher.run(shutdown_listener).await });
-
-    // launch the rocket!
-    // Rocket handles shutdown on it's own, but its shutdown handling should be incorporated
-    // with that of the rest of the tasks.
-    // Currently it's runtime is forcefully terminated once the validator-api exits.
-    let shutdown_handle = rocket.shutdown();
-    tokio::spawn(rocket.launch());
-
-    // to finish building our monitor, we need to have rocket up and running so that we could
-    // obtain our bandwidth credential
-    if let Some(monitor_builder) = monitor_builder {
-        info!("Starting network monitor...");
-        // wait for rocket's liftoff stage
-        liftoff_notify.notified().await;
-
-        // we're ready to go! spawn the network monitor!
-        let runnables = monitor_builder.build().await;
-        runnables.spawn_tasks(&shutdown);
-    } else {
-        info!("Network monitoring is disabled.");
-    }
-
-    wait_for_interrupt(shutdown).await;
-    shutdown_handle.notify();
-
-    Ok(())
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    println!("Starting validator api...");
-
-    cfg_if::cfg_if! {if #[cfg(feature = "console-subscriber")] {
-        // instriment tokio console subscriber needs RUSTFLAGS="--cfg tokio_unstable" at build time
-        console_subscriber::init();
-    }}
-
-    setup_logging();
-    let args = parse_args();
-    let config_env_file = args
-        .value_of(CONFIG_ENV_FILE)
-        .map(|s| PathBuf::from_str(s).expect("invalid env config file"));
-    setup_env(config_env_file);
-    run_validator_api(args).await
-}
diff --git a/validator-api/src/node_status_api/cache.rs b/validator-api/src/node_status_api/cache.rs
deleted file mode 100644
index ef5df963bf..0000000000
--- a/validator-api/src/node_status_api/cache.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::contract_cache::{Cache, CacheNotification, ValidatorCache};
-use contracts_common::truncate_decimal;
-use mixnet_contract_common::{MixId, MixNodeDetails, RewardingParams};
-use rocket::fairing::AdHoc;
-use serde::Serialize;
-use std::{sync::Arc, time::Duration};
-use tap::TapFallible;
-use task::ShutdownListener;
-use tokio::{
-    sync::{watch, RwLock},
-    time,
-};
-use validator_api_requests::models::InclusionProbability;
-
-const CACHE_TIMOUT_MS: u64 = 100;
-const MAX_SIMULATION_SAMPLES: u64 = 5000;
-const MAX_SIMULATION_TIME_SEC: u64 = 15;
-
-enum NodeStatusCacheError {
-    SimulationFailed,
-}
-
-// A node status cache suitable for caching values computed in one sweep, such as active set
-// inclusion probabilities that are computed for all mixnodes at the same time.
-//
-// The cache can be triggered to update on contract cache changes, and/or periodically on a timer.
-#[derive(Clone)]
-pub struct NodeStatusCache {
-    inner: Arc<RwLock<NodeStatusCacheInner>>,
-}
-
-struct NodeStatusCacheInner {
-    inclusion_probabilities: Cache<InclusionProbabilities>,
-}
-
-#[derive(Clone, Default, Serialize, schemars::JsonSchema)]
-pub(crate) struct InclusionProbabilities {
-    pub inclusion_probabilities: Vec<InclusionProbability>,
-    pub samples: u64,
-    pub elapsed: Duration,
-    pub delta_max: f64,
-    pub delta_l2: f64,
-}
-
-impl InclusionProbabilities {
-    pub fn node(&self, mix_id: MixId) -> Option<&InclusionProbability> {
-        self.inclusion_probabilities
-            .iter()
-            .find(|x| x.mix_id == mix_id)
-    }
-}
-
-impl NodeStatusCache {
-    fn new() -> Self {
-        NodeStatusCache {
-            inner: Arc::new(RwLock::new(NodeStatusCacheInner::new())),
-        }
-    }
-
-    pub fn stage() -> AdHoc {
-        AdHoc::on_ignite("Node Status Cache", |rocket| async {
-            rocket.manage(Self::new())
-        })
-    }
-
-    async fn update_cache(&self, inclusion_probabilities: InclusionProbabilities) {
-        match time::timeout(Duration::from_millis(CACHE_TIMOUT_MS), self.inner.write()).await {
-            Ok(mut cache) => {
-                cache
-                    .inclusion_probabilities
-                    .update(inclusion_probabilities);
-            }
-            Err(e) => error!("{e}"),
-        }
-    }
-
-    pub(crate) async fn inclusion_probabilities(&self) -> Option<Cache<InclusionProbabilities>> {
-        match time::timeout(Duration::from_millis(CACHE_TIMOUT_MS), self.inner.read()).await {
-            Ok(cache) => Some(cache.inclusion_probabilities.clone()),
-            Err(e) => {
-                error!("{e}");
-                None
-            }
-        }
-    }
-}
-
-impl NodeStatusCacheInner {
-    pub fn new() -> Self {
-        Self {
-            inclusion_probabilities: Default::default(),
-        }
-    }
-}
-
-// Long running task responsible of keeping the cache up-to-date.
-pub struct NodeStatusCacheRefresher {
-    cache: NodeStatusCache,
-    contract_cache: ValidatorCache,
-    contract_cache_listener: watch::Receiver<CacheNotification>,
-    fallback_caching_interval: Duration,
-}
-
-impl NodeStatusCacheRefresher {
-    pub(crate) fn new(
-        cache: NodeStatusCache,
-        contract_cache: ValidatorCache,
-        contract_cache_listener: watch::Receiver<CacheNotification>,
-        fallback_caching_interval: Duration,
-    ) -> Self {
-        Self {
-            cache,
-            contract_cache,
-            contract_cache_listener,
-            fallback_caching_interval,
-        }
-    }
-
-    pub async fn run(&mut self, mut shutdown: ShutdownListener) {
-        let mut fallback_interval = time::interval(self.fallback_caching_interval);
-        while !shutdown.is_shutdown() {
-            tokio::select! {
-                biased;
-                _ = shutdown.recv() => {
-                    log::trace!("NodeStatusCacheRefresher: Received shutdown");
-                }
-                // Update node status cache when the contract cache / validator cache is updated
-                Ok(_) = self.contract_cache_listener.changed() => {
-                    tokio::select! {
-                        _ = self.update_on_notify(&mut fallback_interval) => (),
-                        _ = shutdown.recv() => {
-                            log::trace!("NodeStatusCacheRefresher: Received shutdown");
-                        }
-                    }
-                }
-                // ... however, if we don't receive any notifications we fall back to periodic
-                // refreshes
-                _ = fallback_interval.tick() => {
-                    tokio::select! {
-                        _ = self.update_on_timer() => (),
-                        _ = shutdown.recv() => {
-                            log::trace!("NodeStatusCacheRefresher: Received shutdown");
-                        }
-                    }
-                }
-            }
-        }
-        log::info!("NodeStatusCacheRefresher: Exiting");
-    }
-
-    async fn update_on_notify(&self, fallback_interval: &mut time::Interval) {
-        log::debug!(
-            "Validator cache event detected: {:?}",
-            &*self.contract_cache_listener.borrow(),
-        );
-        let _ = self.refresh_cache().await;
-        fallback_interval.reset();
-    }
-
-    async fn update_on_timer(&self) {
-        log::debug!("Timed trigger for the node status cache");
-        let have_contract_cache_data =
-            *self.contract_cache_listener.borrow() != CacheNotification::Start;
-
-        if have_contract_cache_data {
-            let _ = self.refresh_cache().await;
-        } else {
-            log::trace!(
-                "Skipping updating node status cache, is the contract cache not yet available?"
-            );
-        }
-    }
-
-    async fn refresh_cache(&self) -> Result<(), NodeStatusCacheError> {
-        log::info!("Updating node status cache");
-        let mixnode_bonds = self.contract_cache.mixnodes().await;
-        let params = self
-            .contract_cache
-            .interval_reward_params()
-            .await
-            .into_inner()
-            .ok_or(NodeStatusCacheError::SimulationFailed)?;
-        let inclusion_probabilities = compute_inclusion_probabilities(&mixnode_bonds, params)
-            .ok_or_else(|| {
-                error!(
-                    "Failed to simulate selection probabilties for mixnodes, not updating cache"
-                );
-                NodeStatusCacheError::SimulationFailed
-            })?;
-
-        self.cache.update_cache(inclusion_probabilities).await;
-        Ok(())
-    }
-}
-
-fn compute_inclusion_probabilities(
-    mixnodes: &[MixNodeDetails],
-    params: RewardingParams,
-) -> Option<InclusionProbabilities> {
-    let active_set_size = params.active_set_size;
-    let standby_set_size = params.rewarded_set_size - active_set_size;
-
-    // Unzip list of total bonds into ids and bonds.
-    // We need to go through this zip/unzip procedure to make sure we have matching identities
-    // for the input to the simulator, which assumes the identity is the position in the vec
-    let (ids, mixnode_total_bonds) = unzip_into_mixnode_ids_and_total_bonds(mixnodes);
-
-    // Compute inclusion probabilitites and keep track of how long time it took.
-    let mut rng = rand::thread_rng();
-    let results = inclusion_probability::simulate_selection_probability_mixnodes(
-        &mixnode_total_bonds,
-        active_set_size as usize,
-        standby_set_size as usize,
-        MAX_SIMULATION_SAMPLES,
-        Duration::from_secs(MAX_SIMULATION_TIME_SEC),
-        &mut rng,
-    )
-    .tap_err(|err| error!("{err}"))
-    .ok()?;
-
-    Some(InclusionProbabilities {
-        inclusion_probabilities: zip_ids_together_with_results(&ids, &results),
-        samples: results.samples,
-        elapsed: results.time,
-        delta_max: results.delta_max,
-        delta_l2: results.delta_l2,
-    })
-}
-
-fn unzip_into_mixnode_ids_and_total_bonds(mixnodes: &[MixNodeDetails]) -> (Vec<MixId>, Vec<u128>) {
-    mixnodes
-        .iter()
-        .map(|m| (m.mix_id(), truncate_decimal(m.total_stake()).u128()))
-        .unzip()
-}
-
-fn zip_ids_together_with_results(
-    ids: &[MixId],
-    results: &inclusion_probability::SelectionProbability,
-) -> Vec<InclusionProbability> {
-    ids.iter()
-        .zip(results.active_set_probability.iter())
-        .zip(results.reserve_set_probability.iter())
-        .map(|((&mix_id, a), r)| InclusionProbability {
-            mix_id,
-            in_active: *a,
-            in_reserve: *r,
-        })
-        .collect()
-}
diff --git a/yarn.lock b/yarn.lock
index e5b2cfa58e..d8b9c5dc56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2826,6 +2826,14 @@
     npmlog "^4.1.2"
     write-file-atomic "^3.0.3"
 
+"@mdx-js/loader@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-2.1.5.tgz#4e764c65333530fd786dfe4f36e918dfeac0200b"
+  integrity sha512-oXjfTa/iAcMmW8DdQ+hQFodPCLqw5VKT2yoZkLwrZfPVVpUgKrI+5/ZePYq328xxtAUStZmR3ed0PWJrwd5Pkg==
+  dependencies:
+    "@mdx-js/mdx" "^2.0.0"
+    source-map "^0.7.0"
+
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
@@ -2851,6 +2859,29 @@
     unist-builder "2.0.3"
     unist-util-visit "2.0.3"
 
+"@mdx-js/mdx@^2.0.0":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-2.1.5.tgz#577937349fd555154382c2f805f5f52834a64903"
+  integrity sha512-zEG0lt+Bl/r5U6e0TOS7qDbsXICtemfAPquxWFsMbdzrvlWaqMGemLl+sjVpqlyaaiCiGVQBSGdCk0t1qXjkQg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/mdx" "^2.0.0"
+    estree-util-build-jsx "^2.0.0"
+    estree-util-is-identifier-name "^2.0.0"
+    estree-util-to-js "^1.1.0"
+    estree-walker "^3.0.0"
+    hast-util-to-estree "^2.0.0"
+    markdown-extensions "^1.0.0"
+    periscopic "^3.0.0"
+    remark-mdx "^2.0.0"
+    remark-parse "^10.0.0"
+    remark-rehype "^10.0.0"
+    unified "^10.0.0"
+    unist-util-position-from-estree "^1.0.0"
+    unist-util-stringify-position "^3.0.0"
+    unist-util-visit "^4.0.0"
+    vfile "^5.0.0"
+
 "@mdx-js/react@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573"
@@ -4538,105 +4569,100 @@
     "@svgr/plugin-jsx" "^6.2.1"
     "@svgr/plugin-svgo" "^6.2.0"
 
-"@tauri-apps/api@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.2.tgz#5228720e35d50fd08df87067dc29e7306c1f7a10"
-  integrity sha512-yuNW0oeJ1/ZA7wNF1KgxhHrSu5viPVzY/UgUczzN5ptLM8dH15Juy5rEGkoHfeXGju90Y/l22hi3BtIrp/za+w==
-
-"@tauri-apps/api@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.1.0.tgz#2c5756f6aeecd36f7683183eaba021690711bedf"
-  integrity sha512-n13pIqdPd3KtaMmmAcrU7BTfdMtIlGNnfZD0dNX8L4p8dgmuNyikm6JAA+yCpl9gqq6I8x5cV2Y0muqdgD0cWw==
+"@tauri-apps/api@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.2.0.tgz#1f196b3e012971227f41b98214c846430a4eb477"
+  integrity sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==
 
 "@tauri-apps/cli-darwin-arm64@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.5.tgz#6fd17a8d9e0e7982b5c9887639407fdec783a744"
   integrity sha512-oxpFb9ZeMiC3xPUJ9NsXWCnnwFSVkPbJUvDKpc9IaoDIUpsMTV72W4P0Nh0uQRbyhx4modPpstt7+ONypNVYNg==
 
-"@tauri-apps/cli-darwin-arm64@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.1.1.tgz#c6f4553cfb338f24131910a1ebbe9fe74d89b8ae"
-  integrity sha512-qBG11ig525/qf0f5OQxn0ON3hT8YdpTfpa4Y4kVqBJhdW50R5fadPv6tv5Dpl2TS2X7nWh/zg5mEXYoCK3HZ9w==
+"@tauri-apps/cli-darwin-arm64@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.2.2.tgz#f18b0689b399b64dc67da41c0fd4da474be324fe"
+  integrity sha512-W+Cp2weUMlvmGkRJeUjypbz9Lpl6o98xkgKAtobZSum5SNwpsBQfawJTESakNoD+FXyVg/snIk5sRdHge+tAaA==
 
 "@tauri-apps/cli-darwin-x64@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.5.tgz#6aaaadd68739c4c4f86546f3d17b2fb60a5a0c04"
   integrity sha512-hRNYC6L9edz2dEqK33tssPylF2ti6x6udidBlGWc5GSoeEb/05qKMEA1MESQYKBG+4q+wjJvACA2vvz6AfgJ3Q==
 
-"@tauri-apps/cli-darwin-x64@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.1.1.tgz#11beb8b3dfc43725f0acd3736cd9d181f93526a2"
-  integrity sha512-M3dMsp78OdxisbTwAWGvy3jIb3uqThtQcUYVvqOu9LeEOHyldOBFDSht+6PTBpaJLAHFMQK2rmNxiWgigklJaA==
+"@tauri-apps/cli-darwin-x64@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.2.2.tgz#4450bd244f586da346651f62a5a41686cee36db7"
+  integrity sha512-vmVAqt+ECH2d6cbcGJ7ddcCAZgmKe5xmxlL5r4xoaphu7OqU4gnv4VFURYkVltOfwzIFQVOPVSqwYyIDToCYNQ==
 
 "@tauri-apps/cli-linux-arm-gnueabihf@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.5.tgz#d2d01c8b85ee3771656386bfda3852af8ed811da"
   integrity sha512-hc/Jp3TtFpxB8XVkLEwWy7MNcUBlS8rNCafQBUt4KSElXB+/oGo50jPO+wd5GSMSOR59UCzH08v11P0b+sAa/w==
 
-"@tauri-apps/cli-linux-arm-gnueabihf@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.1.1.tgz#f4bd3f5839cfcd69132d213efee09ce5da5c6d90"
-  integrity sha512-LYlvdAd73cq+yTi6rw7j/DWIvDpeApwgQkIn+HYsNNeFhyFmABU7tmw+pekK3W3nHAkYAJ69Rl4ZdoxdNGKmHg==
+"@tauri-apps/cli-linux-arm-gnueabihf@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.2.2.tgz#a4d5b95665620605fb0f54cb77f8134239b58370"
+  integrity sha512-yYTdQurgi4QZR8z+fANjl522jdQz/VtesFpw+C/A0+zXg7tiRjicsywBDdPsvNzCqFeGKKkmTR+Lny5qxhGaeQ==
 
 "@tauri-apps/cli-linux-arm64-gnu@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.5.tgz#7ca848120c2e90b57188aaa9daee11cf29e2e2f4"
   integrity sha512-btFlkD2PG+yzJBZzWeJmyCy8ZV+iys2Jl66Fs4g9lSi3KrBDnyfQ26RpGZb2pRfkkcVP8/x1WSfByO+Rj+PTBA==
 
-"@tauri-apps/cli-linux-arm64-gnu@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.1.1.tgz#2631b2a68e7901ea7281af022d8826c0d82b9edd"
-  integrity sha512-o/hbMQIKuFI7cTNpeQBHD/OCNJOBIci78faKms/t6AstLXx0QJuRHDk477Rg6VVy/I3BBKbyATALbmcTq+ti0A==
+"@tauri-apps/cli-linux-arm64-gnu@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.2.2.tgz#c992907586b42e2085160d45b3a17316c99febea"
+  integrity sha512-ZSOVT6Eq1ay2+27B8KfA0MnpO7KYzONU6TjenH7DNcQki6eWGG5JoNu8QQ9Mdn3dAzY0XBP9i1ZHQOFu4iPtEg==
 
 "@tauri-apps/cli-linux-arm64-musl@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.5.tgz#5ba65790849e0737f560f3ccd12f7a2a88c25b23"
   integrity sha512-p5JFdWab2AWhfgAZW/mgOLu+YiIJXKV0NdATGmdiBgQCMmz1k/FM8iOFApCgGbo3/zkR58cJ7Z7hyWmQ07M6Pw==
 
-"@tauri-apps/cli-linux-arm64-musl@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.1.1.tgz#11a4bdc52696583152fc70ea373cf31717cb0f4c"
-  integrity sha512-8Ci4qlDnXIp93XqUrtzFCBDatUzPHpZq7L3bociUbWpvy/bnlzxp1C/C+vwdc4uS1MiAp9v3BFgrU4i0f0Z3QQ==
+"@tauri-apps/cli-linux-arm64-musl@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.2.2.tgz#f8bd7901ce525b8433919e2cfe7ec22aace0f776"
+  integrity sha512-/NHSkqNQ+Pr4PshvyD1CeNFaPCaCpe1OeuAQgVi0rboSecC9fXN96G5dQbSBoxOUcCo6f8aTVE7zkZ4WchFVog==
 
 "@tauri-apps/cli-linux-x64-gnu@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.5.tgz#d06430c608316cb5a29ec805d4c5d078a293c3ae"
   integrity sha512-fOXR635AXxwSO7MCfBhMLnGpcg1H83XGw9ocuyg4jjvtE8QoYPwC4ksfb5lLhDVMui9iIKY93NAK3EkQiSGGmQ==
 
-"@tauri-apps/cli-linux-x64-gnu@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.1.1.tgz#11acbcc4743562cc8166c92ffc3bc12f68e0987f"
-  integrity sha512-ES4Bkx2JAI8+dDNDJswhLS3yqt+yT/4C6UfGOPIHFxcXUh6fe36eUllrTt+HLRS9xTZbYnteJy7ebq2TqMkaxw==
+"@tauri-apps/cli-linux-x64-gnu@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.2.2.tgz#a558862d7101b0a641c5a994c9ee74edb8300fc5"
+  integrity sha512-4YTmfPuyvlHsvCkATDMwhklfuQm3HKxYXv/IOW9H0ra6pS9efVhrFYIC9Vfv6XaKN85Vnn/FYTEGMJLwCxZw2Q==
 
 "@tauri-apps/cli-linux-x64-musl@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.5.tgz#813c90531f4001453e73b3ad2d4c75929412a249"
   integrity sha512-8be4zJVkuMs427JqONhFx5Ia5zWsQ5tbZXd80C3dHNL+5/3VIOK6nGQ0iijyZSLXiE9JKEH2jp1EHB+1TVJRcw==
 
-"@tauri-apps/cli-linux-x64-musl@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.1.1.tgz#7dd81b8380d7e7183fb43a2ccbbc26931718204a"
-  integrity sha512-qrN1WOMAaDl+LE8P8iO0+DYlrWNTc9jIu/CsnVY/LImTn79ZPxEkcVBo0UGeKRI7f10TfvkVmLCBLxTz8QhEyA==
+"@tauri-apps/cli-linux-x64-musl@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.2.2.tgz#573e965a638864a65b606783d3dbd34114939277"
+  integrity sha512-wr46tbscwFuCcA931R+ItOiUTT0djMmgKLd1HFCmFF82V9BKE2reIjr6O9l0NCXCo2WeD4pe3jA/Pt1dxDu+JA==
 
 "@tauri-apps/cli-win32-ia32-msvc@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.5.tgz#a3eb6f56c3f4ba35f6311e1fb31bd30e6892b316"
   integrity sha512-WpnIfzS1e4InGhvd1IDSKC3w6kbI5c6oJgMmtkMTBlhjhiZXhZmQF4XA784A5Y13pzsbXnbNJKOp8DuPVkoTRQ==
 
-"@tauri-apps/cli-win32-ia32-msvc@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.1.1.tgz#1d106ae1c3766f95d7f49bac51eba0d2cd2daf33"
-  integrity sha512-vw7VOmrQlywHhFV3pf54udf2FRNj9dg9WP1gL0My55FnB+w+PWS9Ipm871kX5qepmChdnZHKq9fsqE2uTjX//Q==
+"@tauri-apps/cli-win32-ia32-msvc@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.2.2.tgz#0fe38283ffeb71acac6a6a317951dc75ec2d3dad"
+  integrity sha512-6VmbVJOWUZJK5/JKhb3mNFKrKGfq0KV7lJGumfN95WJgkHeyL61p8bZit+o6ZgUGUhrOabkAawhDkrRY+ZQhIw==
 
 "@tauri-apps/cli-win32-x64-msvc@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.5.tgz#f1e0860166e8f86b550e35aaf22ef95d6da5a7c8"
   integrity sha512-8iEhVD3X4LZfrlxEPOV+mAj4QrJrEqKTICiJnwmgjvhYQOOsNHzg5kca7pcBbqcgorQOBydLpfGJtxWRusVPaw==
 
-"@tauri-apps/cli-win32-x64-msvc@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.1.1.tgz#ce931d299fcc8c60aceec3f9e18b0987f9951c25"
-  integrity sha512-OukxlLLi3AoCN4ABnqCDTiiC7xJGWukAjrKCIx7wFISrLjNfsrnH7/UOzuopfGpZChSe2c+AamVmcpBfVsEmJA==
+"@tauri-apps/cli-win32-x64-msvc@1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.2.2.tgz#9b8ea7c63f2883af105e204fc4f1f11a83990a59"
+  integrity sha512-YRPJguJma+zSuRZpFoSZqls6+laggG1vqG0FPQWQTi+ywATgMpai2b2RZnffDlpHKp9mt4V/s2dtqOy6bpGZHg==
 
 "@tauri-apps/cli@^1.0.5":
   version "1.0.5"
@@ -4653,20 +4679,20 @@
     "@tauri-apps/cli-win32-ia32-msvc" "1.0.5"
     "@tauri-apps/cli-win32-x64-msvc" "1.0.5"
 
-"@tauri-apps/cli@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.1.1.tgz#480d5e1ab758aa1d7efcbf97d801bf9812b15cd4"
-  integrity sha512-80kjMEMPBwLYCp0tTKSquy90PHHGGBvZsneNr3B/mWxNsvjzA1C0vOyGJGFrJuT2OmkvrdvuJZ5mch5hL8O1Xg==
+"@tauri-apps/cli@^1.2.2":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.2.2.tgz#cf7cb90d11c3c3b757efe07b7e2c48abde045ada"
+  integrity sha512-D8zib3A0vWCvPPSyYLxww/OdDlVcY7fpcDVBH6qUvheOjj2aCyU7H9AYMRBwpgCfz8zY5+vomee+laLeB0H13w==
   optionalDependencies:
-    "@tauri-apps/cli-darwin-arm64" "1.1.1"
-    "@tauri-apps/cli-darwin-x64" "1.1.1"
-    "@tauri-apps/cli-linux-arm-gnueabihf" "1.1.1"
-    "@tauri-apps/cli-linux-arm64-gnu" "1.1.1"
-    "@tauri-apps/cli-linux-arm64-musl" "1.1.1"
-    "@tauri-apps/cli-linux-x64-gnu" "1.1.1"
-    "@tauri-apps/cli-linux-x64-musl" "1.1.1"
-    "@tauri-apps/cli-win32-ia32-msvc" "1.1.1"
-    "@tauri-apps/cli-win32-x64-msvc" "1.1.1"
+    "@tauri-apps/cli-darwin-arm64" "1.2.2"
+    "@tauri-apps/cli-darwin-x64" "1.2.2"
+    "@tauri-apps/cli-linux-arm-gnueabihf" "1.2.2"
+    "@tauri-apps/cli-linux-arm64-gnu" "1.2.2"
+    "@tauri-apps/cli-linux-arm64-musl" "1.2.2"
+    "@tauri-apps/cli-linux-x64-gnu" "1.2.2"
+    "@tauri-apps/cli-linux-x64-musl" "1.2.2"
+    "@tauri-apps/cli-win32-ia32-msvc" "1.2.2"
+    "@tauri-apps/cli-win32-x64-msvc" "1.2.2"
 
 "@tauri-apps/tauri-forage@^1.0.0-beta.2":
   version "1.0.0-beta.2"
@@ -4733,6 +4759,13 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@types/acorn@^4.0.0":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.6.tgz#d61ca5480300ac41a7d973dd5b84d0a591154a22"
+  integrity sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/aria-query@^4.2.0":
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc"
@@ -4876,6 +4909,13 @@
     "@types/d3-interpolate" "^1"
     "@types/d3-selection" "^1"
 
+"@types/debug@^4.0.0":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
@@ -4892,11 +4932,23 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
+"@types/estree-jsx@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree-jsx/-/estree-jsx-1.0.0.tgz#7bfc979ab9f692b492017df42520f7f765e98df1"
+  integrity sha512-3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/estree@*", "@types/estree@^0.0.51":
   version "0.0.51"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
+"@types/estree@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -5036,6 +5088,11 @@
   dependencies:
     "@types/unist" "*"
 
+"@types/mdx@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/mdx/-/mdx-2.0.3.tgz#43fd32414f17fcbeced3578109a6edd877a2d96e"
+  integrity sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -5051,6 +5108,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
+
 "@types/node-fetch@^2.5.7":
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975"
@@ -5114,7 +5176,7 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
   integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
 
-"@types/prop-types@^15.7.5":
+"@types/prop-types@^15.0.0", "@types/prop-types@^15.7.5":
   version "15.7.5"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
   integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
@@ -5890,7 +5952,7 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.0.0, acorn-jsx@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -5910,6 +5972,11 @@ acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.0.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+
 acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -6342,6 +6409,11 @@ astral-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
+astring@^1.8.0:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.3.tgz#1a0ae738c7cc558f8e5ddc8e3120636f5cebcb85"
+  integrity sha512-sRpyiNrx2dEYIMmUXprS8nlpRg2Drs8m9ElX9vVEXaCB4XEAJhKfs7IcX0IwShjuOAjLR6wzIrgoptz1n19i1A==
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -6628,6 +6700,11 @@ bail@^1.0.0:
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
+bail@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.2.tgz#d26f5cd8fe5d6f832a31517b9f7c356040ba6d5d"
+  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
+
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -7214,6 +7291,11 @@ ccount@^1.0.0:
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
   integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
+ccount@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
+  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
+
 chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -7244,21 +7326,41 @@ char-regex@^1.0.2:
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
+character-entities-html4@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.1.0.tgz#1f1adb940c971a4b22ba39ddca6b618dc6e56b2b"
+  integrity sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==
+
 character-entities-legacy@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
   integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
 
+character-entities-legacy@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
+  integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
+
 character-entities@^1.0.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
   integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
 
+character-entities@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
+  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
+
 character-reference-invalid@^1.0.0:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
   integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
 
+character-reference-invalid@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.1.tgz#85c66b041e43b47210faf401278abf808ac45cb9"
+  integrity sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==
+
 charcodes@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
@@ -7613,6 +7715,11 @@ comma-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
   integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
 
+comma-separated-tokens@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz#4e89c9458acb61bc8fef19f4529973b2392839ee"
+  integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==
+
 commander@2, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -8429,7 +8536,7 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   dependencies:
     ms "2.1.2"
 
-debug@4.3.4, debug@^4.0.1, debug@^4.3.4:
+debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -8476,10 +8583,17 @@ decimal.js@^10.2.1:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
   integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
 
+decode-named-character-reference@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
+  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
+  dependencies:
+    character-entities "^2.0.0"
+
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^6.0.0:
   version "6.0.0"
@@ -8516,9 +8630,9 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deep-object-diff@^1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.7.tgz#348b3246f426427dd633eaa50e1ed1fc2eafc7e4"
-  integrity sha512-QkgBca0mL08P6HiOjoqvmm6xOAl2W6CT2+34Ljhg0OeFan8cwlcdq8jrLKsBBuUFAZLsN5b6y491KdKEoSo9lg==
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.9.tgz#6df7ef035ad6a0caa44479c536ed7b02570f4595"
+  integrity sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==
 
 deepmerge@^4.2.2:
   version "4.2.2"
@@ -8629,6 +8743,11 @@ deprecation@^2.0.0, deprecation@^2.3.1:
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
+dequal@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 des.js@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -8727,6 +8846,11 @@ diff@^3.1.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -9540,6 +9664,49 @@ estree-to-babel@^3.1.0:
     "@babel/types" "^7.2.0"
     c8 "^7.6.0"
 
+estree-util-attach-comments@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.1.0.tgz#47d69900588bcbc6bf58c3798803ec5f1f3008de"
+  integrity sha512-rJz6I4L0GaXYtHpoMScgDIwM0/Vwbu5shbMeER596rB2D1EWF6+Gj0e0UKzJPZrpoOc87+Q2kgVFHfjAymIqmw==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
+estree-util-build-jsx@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/estree-util-build-jsx/-/estree-util-build-jsx-2.2.0.tgz#d4307bbeee28c14eb4d63b75c9aad28fa61d84f5"
+  integrity sha512-apsfRxF9uLrqosApvHVtYZjISPvTJ+lBiIydpC+9wE6cF6ssbhnjyQLqaIjgzGxvC2Hbmec1M7g91PoBayYoQQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    estree-util-is-identifier-name "^2.0.0"
+    estree-walker "^3.0.0"
+
+estree-util-is-identifier-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz#cf07867f42705892718d9d89eb2d85eaa8f0fcb5"
+  integrity sha512-rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ==
+
+estree-util-to-js@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/estree-util-to-js/-/estree-util-to-js-1.1.0.tgz#3bd9bb86354063537cc3d81259be2f0d4c3af39f"
+  integrity sha512-490lbfCcpLk+ofK6HCgqDfYs4KAfq6QVvDw3+Bm1YoKRgiOjKiKYGAVQE1uwh7zVxBgWhqp4FDtp5SqunpUk1A==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    astring "^1.8.0"
+    source-map "^0.7.0"
+
+estree-util-visit@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/estree-util-visit/-/estree-util-visit-1.2.0.tgz#aa0311a9c2f2aa56e9ae5e8b9d87eac14e4ec8f8"
+  integrity sha512-wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/unist" "^2.0.0"
+
+estree-walker@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.1.tgz#c2a9fb4a30232f5039b7c030b37ead691932debd"
+  integrity sha512-woY0RUD87WzMBUiZLx8NsYr23N5BKsOMZHhu2hoNRVh6NXGfoiT1KOL8G3UHlJAnEDGmfa5ubNA/AacfG+Kb0g==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -10754,6 +10921,27 @@ hast-util-raw@6.0.1:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-to-estree@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-estree/-/hast-util-to-estree-2.1.0.tgz#aeac70aad0102ae309570907b3f56a08231d5323"
+  integrity sha512-Vwch1etMRmm89xGgz+voWXvVHba2iiMdGMKmaMfYt35rbVtFDq8JNwwAIvi8zHMkO6Gvqo9oTMwJTmzVRfXh4g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^2.0.0"
+    "@types/unist" "^2.0.0"
+    comma-separated-tokens "^2.0.0"
+    estree-util-attach-comments "^2.0.0"
+    estree-util-is-identifier-name "^2.0.0"
+    hast-util-whitespace "^2.0.0"
+    mdast-util-mdx-expression "^1.0.0"
+    mdast-util-mdxjs-esm "^1.0.0"
+    property-information "^6.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^0.3.0"
+    unist-util-position "^4.0.0"
+    zwitch "^2.0.0"
+
 hast-util-to-parse5@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-6.0.0.tgz#1ec44650b631d72952066cea9b1445df699f8479"
@@ -10765,6 +10953,11 @@ hast-util-to-parse5@^6.0.0:
     xtend "^4.0.0"
     zwitch "^1.0.0"
 
+hast-util-whitespace@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c"
+  integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg==
+
 hastscript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640"
@@ -11284,6 +11477,11 @@ is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
   integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
 
+is-alphabetical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.1.tgz#01072053ea7c1036df3c7d19a6daaec7f19e789b"
+  integrity sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==
+
 is-alphanumerical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
@@ -11292,6 +11490,14 @@ is-alphanumerical@^1.0.0:
     is-alphabetical "^1.0.0"
     is-decimal "^1.0.0"
 
+is-alphanumerical@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.1.tgz#7c03fbe96e3e931113e57f964b0a368cc2dfd875"
+  integrity sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==
+  dependencies:
+    is-alphabetical "^2.0.0"
+    is-decimal "^2.0.0"
+
 is-arguments@^1.0.4, is-arguments@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
@@ -11394,6 +11600,11 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
   integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
 
+is-decimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.1.tgz#9469d2dc190d0214fd87d78b78caecc0cc14eef7"
+  integrity sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -11488,6 +11699,11 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
+is-hexadecimal@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.1.tgz#86b5bf668fca307498d319dfc03289d781a90027"
+  integrity sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==
+
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
@@ -11576,6 +11792,11 @@ is-plain-obj@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
+is-plain-obj@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
+  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
+
 is-plain-object@5.0.0, is-plain-object@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
@@ -11593,6 +11814,13 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
+is-reference@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.0.tgz#b1380c03d96ddf7089709781e3208fceb0c92cd6"
+  integrity sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==
+  dependencies:
+    "@types/estree" "*"
+
 is-regex@^1.0.4, is-regex@^1.1.2, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -11813,6 +12041,11 @@ iterate-value@^1.0.2:
     es-get-iterator "^1.0.2"
     iterate-iterator "^1.0.1"
 
+javascript-stringify@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79"
+  integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
+
 jest-changed-files@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
@@ -12439,16 +12672,14 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@2.x, json5@^2.1.0, json5@^2.1.2, json5@^2.1.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -12607,6 +12838,11 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+kleur@^4.0.3:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
+
 klona@^2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
@@ -12772,9 +13008,9 @@ loader-runner@^4.1.0, loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^1.2.3, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -12919,6 +13155,11 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
+longest-streak@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
+  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
+
 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -13087,6 +13328,11 @@ markdown-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
+markdown-extensions@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3"
+  integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==
+
 marked@^4.0.16:
   version "4.0.18"
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz#cd0ac54b2e5610cfb90e8fd46ccaa8292c9ed569"
@@ -13115,6 +13361,80 @@ mdast-util-definitions@^4.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+mdast-util-definitions@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz#2c1d684b28e53f84938bb06317944bee8efa79db"
+  integrity sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    unist-util-visit "^4.0.0"
+
+mdast-util-from-markdown@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz#84df2924ccc6c995dec1e2368b2b208ad0a76268"
+  integrity sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    mdast-util-to-string "^3.1.0"
+    micromark "^3.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-decode-string "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-stringify-position "^3.0.0"
+    uvu "^0.5.0"
+
+mdast-util-mdx-expression@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.1.tgz#2224cf0b5b150093704a3c225bd529d2de21f50f"
+  integrity sha512-TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    mdast-util-to-markdown "^1.0.0"
+
+mdast-util-mdx-jsx@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-2.1.0.tgz#029f5a9c38485dbb5cf482059557ee7d788f1947"
+  integrity sha512-KzgzfWMhdteDkrY4mQtyvTU5bc/W4ppxhe9SzelO6QUUiwLAM+Et2Dnjjprik74a336kHdo0zKm7Tp+n6FFeRg==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    ccount "^2.0.0"
+    mdast-util-to-markdown "^1.3.0"
+    parse-entities "^4.0.0"
+    stringify-entities "^4.0.0"
+    unist-util-remove-position "^4.0.0"
+    unist-util-stringify-position "^3.0.0"
+    vfile-message "^3.0.0"
+
+mdast-util-mdx@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdx/-/mdast-util-mdx-2.0.0.tgz#dd4f6c993cf27da32725e50a04874f595b7b63fb"
+  integrity sha512-M09lW0CcBT1VrJUaF/PYxemxxHa7SLDHdSn94Q9FhxjCQfuW7nMAWKWimTmA3OyDMSTH981NN1csW1X+HPSluw==
+  dependencies:
+    mdast-util-mdx-expression "^1.0.0"
+    mdast-util-mdx-jsx "^2.0.0"
+    mdast-util-mdxjs-esm "^1.0.0"
+
+mdast-util-mdxjs-esm@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.0.tgz#137345ef827169aeeeb6069277cd3e090830ce9a"
+  integrity sha512-7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g==
+  dependencies:
+    "@types/estree-jsx" "^1.0.0"
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    mdast-util-to-markdown "^1.0.0"
+
 mdast-util-to-hast@10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
@@ -13129,11 +13449,44 @@ mdast-util-to-hast@10.0.1:
     unist-util-position "^3.0.0"
     unist-util-visit "^2.0.0"
 
+mdast-util-to-hast@^12.1.0:
+  version "12.2.4"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.2.4.tgz#34c1ef2b6cf01c27b3e3504e2c977c76f722e7e1"
+  integrity sha512-a21xoxSef1l8VhHxS1Dnyioz6grrJkoaCUgGzMD/7dWHvboYX3VW53esRUfB5tgTyz4Yos1n25SPcj35dJqmAg==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-definitions "^5.0.0"
+    micromark-util-sanitize-uri "^1.1.0"
+    trim-lines "^3.0.0"
+    unist-builder "^3.0.0"
+    unist-util-generated "^2.0.0"
+    unist-util-position "^4.0.0"
+    unist-util-visit "^4.0.0"
+
+mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz#38b6cdc8dc417de642a469c4fc2abdf8c931bd1e"
+  integrity sha512-6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.0"
+    longest-streak "^3.0.0"
+    mdast-util-to-string "^3.0.0"
+    micromark-util-decode-string "^1.0.0"
+    unist-util-visit "^4.0.0"
+    zwitch "^2.0.0"
+
 mdast-util-to-string@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
+mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
+  integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
+
 mdn-data@2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
@@ -13250,6 +13603,291 @@ microevent.ts@~0.1.1:
   resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
   integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
 
+micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz#edff4c72e5993d93724a3c206970f5a15b0585ad"
+  integrity sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-factory-destination "^1.0.0"
+    micromark-factory-label "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-factory-title "^1.0.0"
+    micromark-factory-whitespace "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-classify-character "^1.0.0"
+    micromark-util-html-tag-name "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
+micromark-extension-mdx-expression@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.3.tgz#cd3843573921bf55afcfff4ae0cd2e857a16dcfa"
+  integrity sha512-TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA==
+  dependencies:
+    micromark-factory-mdx-expression "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-events-to-acorn "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-extension-mdx-jsx@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.3.tgz#9f196be5f65eb09d2a49b237a7b3398bba2999be"
+  integrity sha512-VfA369RdqUISF0qGgv2FfV7gGjHDfn9+Qfiv5hEwpyr1xscRj/CiVRkU7rywGFCO7JwJ5L0e7CJz60lY52+qOA==
+  dependencies:
+    "@types/acorn" "^4.0.0"
+    estree-util-is-identifier-name "^2.0.0"
+    micromark-factory-mdx-expression "^1.0.0"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+    vfile-message "^3.0.0"
+
+micromark-extension-mdx-md@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdx-md/-/micromark-extension-mdx-md-1.0.0.tgz#382f5df9ee3706dd120b51782a211f31f4760d22"
+  integrity sha512-xaRAMoSkKdqZXDAoSgp20Azm0aRQKGOl0RrS81yGu8Hr/JhMsBmfs4wR7m9kgVUIO36cMUQjNyiyDKPrsv8gOw==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
+micromark-extension-mdxjs-esm@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-1.0.3.tgz#630d9dc9db2c2fd470cac8c1e7a824851267404d"
+  integrity sha512-2N13ol4KMoxb85rdDwTAC6uzs8lMX0zeqpcyx7FhS7PxXomOnLactu8WI8iBNXW8AVyea3KIJd/1CKnUmwrK9A==
+  dependencies:
+    micromark-core-commonmark "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-events-to-acorn "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-position-from-estree "^1.1.0"
+    uvu "^0.5.0"
+    vfile-message "^3.0.0"
+
+micromark-extension-mdxjs@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-extension-mdxjs/-/micromark-extension-mdxjs-1.0.0.tgz#772644e12fc8299a33e50f59c5aa15727f6689dd"
+  integrity sha512-TZZRZgeHvtgm+IhtgC2+uDMR7h8eTKF0QUX9YsgoL9+bADBpBY6SiLvWqnBlLbCEevITmTqmEuY3FoxMKVs1rQ==
+  dependencies:
+    acorn "^8.0.0"
+    acorn-jsx "^5.0.0"
+    micromark-extension-mdx-expression "^1.0.0"
+    micromark-extension-mdx-jsx "^1.0.0"
+    micromark-extension-mdx-md "^1.0.0"
+    micromark-extension-mdxjs-esm "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-destination@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e"
+  integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-label@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz#6be2551fa8d13542fcbbac478258fb7a20047137"
+  integrity sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-mdx-expression@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz#917e17d16e6e9c2551f3a862e6a9ebdd22056476"
+  integrity sha512-WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-events-to-acorn "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    unist-util-position-from-estree "^1.0.0"
+    uvu "^0.5.0"
+    vfile-message "^3.0.0"
+
+micromark-factory-space@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633"
+  integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-factory-title@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz#7e09287c3748ff1693930f176e1c4a328382494f"
+  integrity sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-factory-whitespace@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c"
+  integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==
+  dependencies:
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-character@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86"
+  integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-chunked@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06"
+  integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-classify-character@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20"
+  integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-combine-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5"
+  integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-types "^1.0.0"
+
+micromark-util-decode-numeric-character-reference@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946"
+  integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-decode-string@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz#942252ab7a76dec2dbf089cc32505ee2bc3acf02"
+  integrity sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==
+  dependencies:
+    decode-named-character-reference "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-encode@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz#2c1c22d3800870ad770ece5686ebca5920353383"
+  integrity sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==
+
+micromark-util-events-to-acorn@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.0.tgz#65785cb77299d791bfefdc6a5213ab57ceead115"
+  integrity sha512-WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw==
+  dependencies:
+    "@types/acorn" "^4.0.0"
+    "@types/estree" "^1.0.0"
+    estree-util-visit "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+    vfile-location "^4.0.0"
+    vfile-message "^3.0.0"
+
+micromark-util-html-tag-name@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.1.0.tgz#eb227118befd51f48858e879b7a419fc0df20497"
+  integrity sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==
+
+micromark-util-normalize-identifier@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828"
+  integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==
+  dependencies:
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-resolve-all@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88"
+  integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==
+  dependencies:
+    micromark-util-types "^1.0.0"
+
+micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee"
+  integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==
+  dependencies:
+    micromark-util-character "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+
+micromark-util-subtokenize@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz#ff6f1af6ac836f8bfdbf9b02f40431760ad89105"
+  integrity sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==
+  dependencies:
+    micromark-util-chunked "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.0"
+    uvu "^0.5.0"
+
+micromark-util-symbol@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz#b90344db62042ce454f351cf0bebcc0a6da4920e"
+  integrity sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==
+
+micromark-util-types@^1.0.0, micromark-util-types@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.2.tgz#f4220fdb319205812f99c40f8c87a9be83eded20"
+  integrity sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==
+
+micromark@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.1.0.tgz#eeba0fe0ac1c9aaef675157b52c166f125e89f62"
+  integrity sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==
+  dependencies:
+    "@types/debug" "^4.0.0"
+    debug "^4.0.0"
+    decode-named-character-reference "^1.0.0"
+    micromark-core-commonmark "^1.0.1"
+    micromark-factory-space "^1.0.0"
+    micromark-util-character "^1.0.0"
+    micromark-util-chunked "^1.0.0"
+    micromark-util-combine-extensions "^1.0.0"
+    micromark-util-decode-numeric-character-reference "^1.0.0"
+    micromark-util-encode "^1.0.0"
+    micromark-util-normalize-identifier "^1.0.0"
+    micromark-util-resolve-all "^1.0.0"
+    micromark-util-sanitize-uri "^1.0.0"
+    micromark-util-subtokenize "^1.0.0"
+    micromark-util-symbol "^1.0.0"
+    micromark-util-types "^1.0.1"
+    uvu "^0.5.0"
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -13395,9 +14033,9 @@ minimist-options@4.1.0:
     kind-of "^6.0.3"
 
 minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -13571,6 +14209,11 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -14480,6 +15123,20 @@ parse-entities@^2.0.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
+parse-entities@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.0.tgz#f67c856d4e3fe19b1a445c3fabe78dcdc1053eeb"
+  integrity sha512-5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    character-entities "^2.0.0"
+    character-entities-legacy "^3.0.0"
+    character-reference-invalid "^2.0.0"
+    decode-named-character-reference "^1.0.0"
+    is-alphanumerical "^2.0.0"
+    is-decimal "^2.0.0"
+    is-hexadecimal "^2.0.0"
+
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -14654,6 +15311,14 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+periscopic@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.0.4.tgz#b3fbed0d1bc844976b977173ca2cd4a0ef4fa8d1"
+  integrity sha512-SFx68DxCv0Iyo6APZuw/AKewkkThGwssmU0QWtTlvov3VAtPX+QJ4CadwSaz8nrT5jPIuxdvJWB4PnD2KNDxQg==
+  dependencies:
+    estree-walker "^3.0.0"
+    is-reference "^3.0.0"
+
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -15295,6 +15960,11 @@ property-information@^5.0.0, property-information@^5.3.0:
   dependencies:
     xtend "^4.0.0"
 
+property-information@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d"
+  integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -15693,6 +16363,27 @@ react-load-script@^0.0.6:
   resolved "https://registry.yarnpkg.com/react-load-script/-/react-load-script-0.0.6.tgz#db6851236aaa25bb622677a2eb51dad4f8d2c258"
   integrity sha512-aRGxDGP9VoLxcsaYvKWIW+LRrMOzz2eEcubTS4NvQPPugjk2VvMhow0wWTkSl7RxookomD1MwcP4l5UStg5ShQ==
 
+react-markdown@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.4.tgz#b5ff1f0f29ead71a7a6f98815eb1a70bcc2a036e"
+  integrity sha512-2oxHa6oDxc1apg/Gnc1Goh06t3B617xeywqI/92wmDV9FELI6ayRkwge7w7DoEqM0gRpZGTNU6xQG+YpJISnVg==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/prop-types" "^15.0.0"
+    "@types/unist" "^2.0.0"
+    comma-separated-tokens "^2.0.0"
+    hast-util-whitespace "^2.0.0"
+    prop-types "^15.0.0"
+    property-information "^6.0.0"
+    react-is "^18.0.0"
+    remark-parse "^10.0.0"
+    remark-rehype "^10.0.0"
+    space-separated-tokens "^2.0.0"
+    style-to-object "^0.3.0"
+    unified "^10.0.0"
+    unist-util-visit "^4.0.0"
+    vfile "^5.0.0"
+
 react-merge-refs@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-1.1.0.tgz#73d88b892c6c68cbb7a66e0800faa374f4c38b06"
@@ -16191,6 +16882,14 @@ remark-mdx@1.6.22:
     remark-parse "8.0.3"
     unified "9.2.0"
 
+remark-mdx@^2.0.0:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-2.1.5.tgz#69b19ec42d30a289e0663c3fc7656ebdca0a8d8e"
+  integrity sha512-A8vw5s+BgOa968Irt8BO7DfWJTE0Fe7Ge3hX8zzDB1DnwMZTNdK6qF2IcFao+/7nzk1vSysKcFp+3ku4vhMpaQ==
+  dependencies:
+    mdast-util-mdx "^2.0.0"
+    micromark-extension-mdxjs "^1.0.0"
+
 remark-parse@8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
@@ -16213,6 +16912,25 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
+remark-parse@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.1.tgz#6f60ae53edbf0cf38ea223fe643db64d112e0775"
+  integrity sha512-1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-from-markdown "^1.0.0"
+    unified "^10.0.0"
+
+remark-rehype@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
+  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
+  dependencies:
+    "@types/hast" "^2.0.0"
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-hast "^12.1.0"
+    unified "^10.0.0"
+
 remark-slug@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.1.0.tgz#0503268d5f0c4ecb1f33315c00465ccdd97923ce"
@@ -16469,6 +17187,13 @@ rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
+sade@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -17015,6 +17740,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.0:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
+
 source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
@@ -17025,6 +17755,11 @@ space-separated-tokens@^1.0.0:
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
   integrity sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==
 
+space-separated-tokens@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f"
+  integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -17311,6 +18046,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.3.tgz#cfabd7039d22ad30f3cc435b0ca2c1574fc88ef8"
+  integrity sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==
+  dependencies:
+    character-entities-html4 "^2.0.0"
+    character-entities-legacy "^3.0.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -17871,6 +18614,11 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
+trim-lines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
+  integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -17896,6 +18644,11 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
+trough@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"
+  integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
+
 ts-dedent@^2.0.0, ts-dedent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
@@ -18204,6 +18957,19 @@ unified@9.2.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
+unified@^10.0.0:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.2.tgz#b1d64e55dafe1f0b98bb6c719881103ecf6c86df"
+  integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    bail "^2.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^4.0.0"
+    trough "^2.0.0"
+    vfile "^5.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -18233,21 +18999,52 @@ unist-builder@2.0.3, unist-builder@^2.0.0:
   resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
   integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
 
+unist-builder@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-3.0.0.tgz#728baca4767c0e784e1e64bb44b5a5a753021a04"
+  integrity sha512-GFxmfEAa0vi9i5sd0R2kcrI9ks0r82NasRq5QHh2ysGngrc6GiqD5CDf1FjPenY4vApmFASBIIlk/jj5J5YbmQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
 unist-util-generated@^1.0.0:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
   integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
 
+unist-util-generated@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113"
+  integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==
+
 unist-util-is@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
   integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
 
+unist-util-is@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236"
+  integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==
+
+unist-util-position-from-estree@^1.0.0, unist-util-position-from-estree@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.1.tgz#96f4d543dfb0428edc01ebb928570b602d280c4c"
+  integrity sha512-xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
 unist-util-position@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
   integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
 
+unist-util-position@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.3.tgz#5290547b014f6222dff95c48d5c3c13a88fadd07"
+  integrity sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
 unist-util-remove-position@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc"
@@ -18255,6 +19052,14 @@ unist-util-remove-position@^2.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
+unist-util-remove-position@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-4.0.1.tgz#d5b46a7304ac114c8d91990ece085ca7c2c135c8"
+  integrity sha512-0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-visit "^4.0.0"
+
 unist-util-remove@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-remove/-/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588"
@@ -18269,6 +19074,13 @@ unist-util-stringify-position@^2.0.0:
   dependencies:
     "@types/unist" "^2.0.2"
 
+unist-util-stringify-position@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz#5c6aa07c90b1deffd9153be170dce628a869a447"
+  integrity sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+
 unist-util-visit-parents@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6"
@@ -18277,6 +19089,14 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
+unist-util-visit-parents@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz#868f353e6fce6bf8fa875b251b0f4fec3be709bb"
+  integrity sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+
 unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
@@ -18286,6 +19106,15 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
+unist-util-visit@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.1.1.tgz#1c4842d70bd3df6cc545276f5164f933390a9aad"
+  integrity sha512-n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^5.0.0"
+    unist-util-visit-parents "^5.1.1"
+
 universal-user-agent@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
@@ -18436,6 +19265,16 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+uvu@^0.5.0:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
+  integrity sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==
+  dependencies:
+    dequal "^2.0.0"
+    diff "^5.0.0"
+    kleur "^4.0.3"
+    sade "^1.7.3"
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -18489,6 +19328,14 @@ vfile-location@^3.0.0, vfile-location@^3.2.0:
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
   integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
 
+vfile-location@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.0.1.tgz#06f2b9244a3565bef91f099359486a08b10d3a95"
+  integrity sha512-JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    vfile "^5.0.0"
+
 vfile-message@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
@@ -18497,6 +19344,14 @@ vfile-message@^2.0.0:
     "@types/unist" "^2.0.0"
     unist-util-stringify-position "^2.0.0"
 
+vfile-message@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz#1360c27a99234bebf7bddbbbca67807115e6b0dd"
+  integrity sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+
 vfile@^4.0.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
@@ -18507,6 +19362,16 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+vfile@^5.0.0:
+  version "5.3.6"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz#61b2e70690cc835a5d0d0fd135beae74e5a39546"
+  integrity sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^3.0.0"
+    vfile-message "^3.0.0"
+
 vinyl@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
@@ -19140,11 +20005,25 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml-loader@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/yaml-loader/-/yaml-loader-0.8.0.tgz#c839325e3fdee082b3768b2a21fe34fde5d96f61"
+  integrity sha512-LjeKnTzVBKWiQBeE2L9ssl6WprqaUIxCSNs5tle8PaDydgu3wVFXTbMfsvF2MSErpy9TDVa092n4q6adYwJaWg==
+  dependencies:
+    javascript-stringify "^2.0.1"
+    loader-utils "^2.0.0"
+    yaml "^2.0.0"
+
 yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.3.tgz#9b3a4c8aff9821b696275c79a8bee8399d945207"
+  integrity sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==
+
 yargs-parser@20.2.4:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
@@ -19205,3 +20084,8 @@ zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
   integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
+
+zwitch@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"
+  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==