From e5306908e451a0ee929371ffba0ed230227fbb70 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 13:18:52 +0100
Subject: [PATCH 01/42] feat: add entrypoint script

---
 nym-node/Dockerfile    |  6 +++++-
 nym-node/entrypoint.sh | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 nym-node/entrypoint.sh

diff --git a/nym-node/Dockerfile b/nym-node/Dockerfile
index 87b6783669..226979bae2 100644
--- a/nym-node/Dockerfile
+++ b/nym-node/Dockerfile
@@ -69,5 +69,9 @@ FROM ubuntu:24.04
 
 WORKDIR /nym
 
+RUN apt update && apt install -y wget
+
 COPY --from=builder /usr/src/nym/target/release/nym-node ./
-ENTRYPOINT [ "/nym/nym-node" ]
+COPY ./nym-node/entrypoint.sh ./
+RUN wget https://builds.ci.nymte.ch/develop/nym-node
+ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/nym-node/entrypoint.sh b/nym-node/entrypoint.sh
new file mode 100755
index 0000000000..63c26eafd7
--- /dev/null
+++ b/nym-node/entrypoint.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+./nym-node run --init-only
+
+BOND_INFO=$(./nym-node bonding-information)
+IDENTITY_KEY=$(grep -oP '(?<=Identity Key: ).*' <<<"$BOND_INFO")
+SPHINX_KEY=$(grep -oP '(?<=Sphinx Key: ).*' <<<"$BOND_INFO")
+VERSION=$(grep -oP '(?<=Version: ).*' <<<"$BOND_INFO" | sed 's/+.*//')
+
+echo "Entering into signature signing..."
+CONTRACT_MSG=$(./nym-cli --mnemonic "$NYMNODE_MNEMONIC" mixnet operators nymnode create-node-bonding-sign-payload --host "$NYMNODE_PUBLIC_IPS" --identity-key "$IDENTITY_KEY" --amount 100000000)
+SIGNATURE=$(./nym-node sign --contract-msg "$CONTRACT_MSG" | grep -A1 'is:' | tail -n1 | sed 's/^\s*//')
+
+echo "Starting the bond node flow..."
+./nym-cli --mnemonic "$NYMNODE_MNEMONIC" mixnet operators nymnode bond --host "$NYMNODE_PUBLIC_IPS" --identity-key "$IDENTITY_KEY" --amount 100000000 --signature "$SIGNATURE"
+
+./nym-node run --deny-init

From 24661128290b8b8e705f483b86a8a90f8cc58f10 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 13:19:18 +0100
Subject: [PATCH 02/42] test version

---
 nym-node/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index 75cfde1b15..af51052ced 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.2.0"
+version = "1.2.0-test1"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

From cf2ab08b4d6abede8c915f0e68ab8f974f495a92 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 14:20:43 +0100
Subject: [PATCH 03/42] fix dockerfile

---
 nym-node/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Dockerfile b/nym-node/Dockerfile
index 226979bae2..46b474209e 100644
--- a/nym-node/Dockerfile
+++ b/nym-node/Dockerfile
@@ -73,5 +73,5 @@ RUN apt update && apt install -y wget
 
 COPY --from=builder /usr/src/nym/target/release/nym-node ./
 COPY ./nym-node/entrypoint.sh ./
-RUN wget https://builds.ci.nymte.ch/develop/nym-node
+RUN wget https://builds.ci.nymte.ch/develop/nym-cli
 ENTRYPOINT [ "./entrypoint.sh" ]

From 7b8458630a1ea9e9fc6213072896fd820efef240 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 14:22:07 +0100
Subject: [PATCH 04/42] bump version

---
 nym-node/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index af51052ced..34298486e4 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.2.0-test1"
+version = "1.2.0-test2"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

From 656838811a4c95c9ffbf306f0830552592a8c218 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 14:34:10 +0100
Subject: [PATCH 05/42] fix permissions

---
 nym-node/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nym-node/Dockerfile b/nym-node/Dockerfile
index 46b474209e..53faa4ce3f 100644
--- a/nym-node/Dockerfile
+++ b/nym-node/Dockerfile
@@ -74,4 +74,6 @@ RUN apt update && apt install -y wget
 COPY --from=builder /usr/src/nym/target/release/nym-node ./
 COPY ./nym-node/entrypoint.sh ./
 RUN wget https://builds.ci.nymte.ch/develop/nym-cli
+RUN chmod +x nym-cli
+
 ENTRYPOINT [ "./entrypoint.sh" ]

From 5f06414a122381862c301a6618a4688d63d4eca1 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Fri, 20 Dec 2024 14:34:34 +0100
Subject: [PATCH 06/42] bump version

---
 nym-node/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index 34298486e4..d5ed421aaa 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.2.0-test2"
+version = "1.2.0-test3"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

From dfd1df570676093937d099bc0cf30adf2c19aa53 Mon Sep 17 00:00:00 2001
From: Marc <139238001+marcdbz@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:26:04 +0100
Subject: [PATCH 07/42] Update README.md

Updated the Tauri link
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba378a2a7a..a80c0bb547 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 * `nym-client` - an executable which you can build into your own applications. Use it for interacting with Nym nodes.
 * `nym-socks5-client` - a Socks5 proxy you can run on your machine and use with existing applications.
 * `nym-explorer` - a (projected) block explorer and (existing) mixnet viewer.
-* `nym-wallet` - a desktop wallet implemented using the [Tauri](https://tauri.studio/en/docs/about/intro) framework.
+* `nym-wallet` - a desktop wallet implemented using the [Tauri](https://tauri.app)) framework.
 * `nym-cli` - a tool for interacting with the network from the CLI.
 <!-- coming soon
 * `nym-network-monitor` - sends packets through the full system to check that they are working as expected, and stores node uptime histories as the basis of a rewards system ("mixmining" or "proof-of-mixing").

From 01c7ea72dd7b4222de643429d93d939e41bd12f2 Mon Sep 17 00:00:00 2001
From: Marc <139238001+marcdbz@users.noreply.github.com>
Date: Thu, 9 Jan 2025 20:28:18 +0100
Subject: [PATCH 08/42] Update README.md

Fixed typo and updated operators link
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba378a2a7a..f8ac93f7e3 100644
--- a/README.md
+++ b/README.md
@@ -66,4 +66,4 @@ As a general approach, licensing is as follows this pattern:
 - libraries and components are Apache 2.0 or MIT
 - documentation is Apache 2.0 or CC0-1.0
 
-Nym Node Operators and Validators Temrs and Conditions can be found [here](https://nym.com/terms-and-conditions/operators/v1.0.0).
+Nym Node Operators and Validators Terms and Conditions can be found [here](https://nym.com/operators-validators-terms).

From b0a5b609453797390cfc30f6226f206cdb5b7bc1 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Thu, 16 Jan 2025 10:06:34 +0100
Subject: [PATCH 09/42] update version

---
 nym-node/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index d5ed421aaa..8d78e6a3dc 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.2.0-test3"
+version = "1.2.1"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

From a0daabab033f9860c5215f7050fba5e823aab713 Mon Sep 17 00:00:00 2001
From: Fran Arbanas <arbanasfran@gmail.com>
Date: Thu, 16 Jan 2025 10:10:16 +0100
Subject: [PATCH 10/42] fix version

---
 nym-node/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nym-node/Cargo.toml b/nym-node/Cargo.toml
index 8d78e6a3dc..75cfde1b15 100644
--- a/nym-node/Cargo.toml
+++ b/nym-node/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.2.1"
+version = "1.2.0"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

From e67b2b020a7da327c48d86d33940e74130aed10a Mon Sep 17 00:00:00 2001
From: import this <97586125+serinko@users.noreply.github.com>
Date: Fri, 17 Jan 2025 18:12:12 +0000
Subject: [PATCH 11/42] [DOCs/operators]: Bump release version (#5362)

* bump release version

* bump version in setup guide

* PR finished
---
 documentation/docs/pages/operators/changelog.mdx       | 10 +++++-----
 .../docs/pages/operators/nodes/nym-node/setup.mdx      |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/documentation/docs/pages/operators/changelog.mdx b/documentation/docs/pages/operators/changelog.mdx
index 7d69a4ab76..96d73d3183 100644
--- a/documentation/docs/pages/operators/changelog.mdx
+++ b/documentation/docs/pages/operators/changelog.mdx
@@ -41,15 +41,15 @@ This page displays a full list of all the changes during our release cycle from
 ## `v2025.1-reeses`
 
 - [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.1-reeses)
-- [`nym-node`](nodes/nym-node.mdx) version `1.3.0`
+- [`nym-node`](nodes/nym-node.mdx) version `1.3.1`
 
 ```
 nym-node
 Binary Name:        nym-node
-Build Timestamp:    2025-01-15T09:50:54.404428047Z
-Build Version:      1.3.0
-Commit SHA:         c202e2d598fabda5fc16a6c1e110255857a2b1ca
-Commit Date:        2025-01-15T10:27:39.000000000+01:00
+Build Timestamp:    2025-01-16T11:54:17.079662337Z
+Build Version:      1.3.1
+Commit SHA:         5ab164d229f85bd2dd27ec6e38292c281df2f678
+Commit Date:        2025-01-16T12:51:53.000000000+01:00
 Commit Branch:      HEAD
 rustc Version:      1.84.0
 rustc Channel:      stable
diff --git a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
index 1bd496fe10..6b613511d7 100644
--- a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
+++ b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
@@ -20,10 +20,10 @@ This documentation page provides a guide on how to set up and run a [NYM NODE](.
 ```sh
 nym-node
 Binary Name:        nym-node
-Build Timestamp:    2025-01-15T09:50:54.404428047Z
-Build Version:      1.3.0
-Commit SHA:         c202e2d598fabda5fc16a6c1e110255857a2b1ca
-Commit Date:        2025-01-15T10:27:39.000000000+01:00
+Build Timestamp:    2025-01-16T11:54:17.079662337Z
+Build Version:      1.3.1
+Commit SHA:         5ab164d229f85bd2dd27ec6e38292c281df2f678
+Commit Date:        2025-01-16T12:51:53.000000000+01:00
 Commit Branch:      HEAD
 rustc Version:      1.84.0
 rustc Channel:      stable

From 8e05386a0b6f803cca526d12d462db93ac1204cf Mon Sep 17 00:00:00 2001
From: mfahampshire <maxhampshire@pm.me>
Date: Mon, 20 Jan 2025 13:02:56 +0000
Subject: [PATCH 12/42] Max/tssdk docs maintenance (#5364)

* add temp warning
---
 .../typescript/examples/cosmos-kit.mdx        | 36 +++++++++++--------
 .../typescript/examples/mix-fetch.mdx         | 12 ++++---
 .../developers/typescript/examples/mixnet.mdx |  4 ++-
 .../examples/nym-smart-contracts.mdx          | 28 ++++++++-------
 .../typescript/playground/cosmos-kit.mdx      |  7 +++-
 .../typescript/playground/mixfetch.mdx        |  4 +++
 .../typescript/playground/mixnodes.mdx        |  5 +++
 .../typescript/playground/traffic.mdx         |  3 ++
 .../typescript/playground/wallet.mdx          |  7 ++++
 9 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/documentation/docs/pages/developers/typescript/examples/cosmos-kit.mdx b/documentation/docs/pages/developers/typescript/examples/cosmos-kit.mdx
index c25403aa7f..1df3855ffa 100644
--- a/documentation/docs/pages/developers/typescript/examples/cosmos-kit.mdx
+++ b/documentation/docs/pages/developers/typescript/examples/cosmos-kit.mdx
@@ -1,5 +1,11 @@
+import { Callout } from 'nextra/components'
+
 # Cosmos Kit
 
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
+
 The wonderful people of Cosmology have made some [fantastic components](https://cosmoskit.com/) that can be used with
 Nym. These include:
 
@@ -17,7 +23,7 @@ npm create vite@latest
 During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
 ```bash
 cd < YOUR_APP >
-npm i 
+npm i
 npm run dev
 ```
 
@@ -57,7 +63,7 @@ export default defineConfig({
 Your components have to be wrapped into a [ChainProvider](https://docs.cosmoskit.com/chain-provider),
 in order to use the `useChain('nyx')` hook. The nyx chain is provided in the 'chain-registry' NPM package by default.
 
-Now, go to the `src` folder and open your `App.tsx` file to replace all the code with the following, which will allow you to connect and disconnect a Ledger or Keplr wallet to Nyx: 
+Now, go to the `src` folder and open your `App.tsx` file to replace all the code with the following, which will allow you to connect and disconnect a Ledger or Keplr wallet to Nyx:
 
 ```ts
 import "./App.css";
@@ -68,7 +74,7 @@ import { wallets as ledger } from '@cosmos-kit/ledger';
 import { wallets as keplr } from '@cosmos-kit/keplr';
 import { AminoMsg, makeSignDoc } from '@cosmjs/amino';
 import { MsgSend } from 'cosmjs-types/cosmos/bank/v1beta1/tx';
- 
+
 export const getDoc = (address: string) => {
   const chainId = 'nyx';
   const msg: AminoMsg = {
@@ -89,28 +95,28 @@ export const getDoc = (address: string) => {
   const doc = makeSignDoc([msg], fee, chainId, memo, accountNumber, sequence);
   return doc
 };
- 
+
 function MyComponent() {
   const {wallet, address, connect, disconnect, getOfflineSignerAmino } =
   useChain('nyx');
- 
+
   React.useEffect(() => {
     connect();
     disconnect();
   }, []);
- 
+
   const sign = async () => {
     if (!address) return
     const doc = getDoc(address);
     return getOfflineSignerAmino().signAmino(address, doc);
   };
- 
+
   return (
-    <div>  
+    <div>
       <div>
-        {wallet && 
-        <div> 
-          <div>Connected to {wallet?.prettyName} </div> 
+        {wallet &&
+        <div>
+          <div>Connected to {wallet?.prettyName} </div>
           <div>Address: <code>{address}</code></div>
         </div>}
       </div>
@@ -126,7 +132,7 @@ function MyComponent() {
     </div>
   );
 }
- 
+
 export default function App() {
     const assetsFixedUp = React.useMemo(() => {
     const nyx = assets.find((a) => a.chain_name === 'nyx');
@@ -139,7 +145,7 @@ export default function App() {
     }
     return assets;
   }, [assets]);
- 
+
   return (
      <ChainProvider
       chains={[chains.find((c) => c.chain_id === 'nyx')!]}
@@ -149,10 +155,10 @@ export default function App() {
         preferredSignType: () => 'amino',
       }}
     >
- 
+
         <MyComponent/>
     </ChainProvider>
- 
+
   )
 }
 ```
diff --git a/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx b/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
index 1633c4f4a4..ceb9064502 100644
--- a/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
+++ b/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
@@ -1,7 +1,9 @@
 import { Callout } from 'nextra/components';
 
 # `mixFetch`
-
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
 An easy way to secure parts or all of your web app is to replace calls to [`fetch`](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch) with `mixFetch`:
 
 MixFetch works the same as vanilla `fetch` as it's a proxied wrapper around the original function.
@@ -35,9 +37,9 @@ curl -X 'GET' \
 import type { SetupMixFetchOps } from '@nymproject/mix-fetch';
 
 const mixFetchOptions: SetupMixFetchOps = {
-  preferredGateway: '6Gb7ftQdKveMjPyrxDXeAtfYAX7Zg5mVZHtnRC5MmZ1B', // with WSS
+  preferredGateway: '23A7CSaBSA2L67PWuFTPXUnYrCdyVcB7ATYsjUsfdftb', // with WSS
   preferredNetworkRequester:
-    '8rRGWy54oC8drFL9DepMegBt2DLrsqQwCoHMXt9nsnTo.2XjCPVbb4FpQ9hNRcXwb9mTzEAVVk1zf1tcch3wdtNEA@6Gb7ftQdKveMjPyrxDXeAtfYAX7Zg5mVZHtnRC5MmZ1B',
+    'HuNL1pFprNSKW6jdqppibXP5KNKCNJxDh7ivpYcoULN9.C62NahRTUf6kqpNtDVHXoVriQr6yyaU5LtxdgpbsGrtA@23A7CSaBSA2L67PWuFTPXUnYrCdyVcB7ATYsjUsfdftb',
   mixFetchOverride: {
     requestTimeoutMs: 60_000,
   },
@@ -90,9 +92,9 @@ import { mixFetch, SetupMixFetchOps } from '@nymproject/mix-fetch-full-fat';
 import React from 'react';
 
 const mixFetchOptions: SetupMixFetchOps = {
-  preferredGateway: '6Gb7ftQdKveMjPyrxDXeAtfYAX7Zg5mVZHtnRC5MmZ1B', // with WSS
+  preferredGateway: '23A7CSaBSA2L67PWuFTPXUnYrCdyVcB7ATYsjUsfdftb', // with WSS
   preferredNetworkRequester:
-    '8rRGWy54oC8drFL9DepMegBt2DLrsqQwCoHMXt9nsnTo.2XjCPVbb4FpQ9hNRcXwb9mTzEAVVk1zf1tcch3wdtNEA@6Gb7ftQdKveMjPyrxDXeAtfYAX7Zg5mVZHtnRC5MmZ1B',
+    'HuNL1pFprNSKW6jdqppibXP5KNKCNJxDh7ivpYcoULN9.C62NahRTUf6kqpNtDVHXoVriQr6yyaU5LtxdgpbsGrtA@23A7CSaBSA2L67PWuFTPXUnYrCdyVcB7ATYsjUsfdftb',
   mixFetchOverride: {
     requestTimeoutMs: 60_000,
   },
diff --git a/documentation/docs/pages/developers/typescript/examples/mixnet.mdx b/documentation/docs/pages/developers/typescript/examples/mixnet.mdx
index 00bd17d5d0..e5210a1780 100644
--- a/documentation/docs/pages/developers/typescript/examples/mixnet.mdx
+++ b/documentation/docs/pages/developers/typescript/examples/mixnet.mdx
@@ -1,7 +1,9 @@
 import { Callout } from 'nextra/components'
 
 # Mixnet Client
-
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
 As you know by now, in order to send or receive messages over the mixnet, you'll need to use the [`SDK Client`](https://www.npmjs.com/package/@nymproject/sdk), which will allow you to create apps that can use the Nym mixnet and Coconut credentials.
 
 This client is message based - it can only send a one-way message to another client's address.
diff --git a/documentation/docs/pages/developers/typescript/examples/nym-smart-contracts.mdx b/documentation/docs/pages/developers/typescript/examples/nym-smart-contracts.mdx
index 669d284611..d0e4ca7faf 100644
--- a/documentation/docs/pages/developers/typescript/examples/nym-smart-contracts.mdx
+++ b/documentation/docs/pages/developers/typescript/examples/nym-smart-contracts.mdx
@@ -1,7 +1,9 @@
 import { Callout } from 'nextra/components'
 
 # Nym Smart Contract Clients
-
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
 As previously mentioned, to query or execute on any of the Nym contracts, you'll need to use one of the [`Contract Clients`](https://www.npmjs.com/package/@nymproject/contract-clients), which contains read-only query and signing clients for all of Nym's smart contracts.
 
 ##### Contract Clients list
@@ -29,14 +31,14 @@ npm create vite@latest
 During the environment setup, choose React and subsequently opt for Typescript if you want your application to function smoothly following this tutorial. Next, navigate to your application directory and run the following commands:
 ```bash
 cd < YOUR_APP >
-npm i 
+npm i
 npm run dev
 ```
 
 ##### Installation
 Install the packages and their dependencies if you don't already have them:
 ```bash
-npm install @nymproject/contract-clients @cosmjs/cosmwasm-stargate 
+npm install @nymproject/contract-clients @cosmjs/cosmwasm-stargate
 ```
 
 ## Query clients
@@ -143,7 +145,7 @@ import { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing";
 import { GasPrice } from "@cosmjs/stargate";
 import { settings } from "./settings";
- 
+
 export default function Exec() {
   let signer: DirectSecp256k1HdWallet;
   let signerMixnetClient: any;
@@ -153,7 +155,7 @@ export default function Exec() {
   let nodeAddress: string;
   let amountToSend: string;
   let delegations: any;
- 
+
   async function ExecuteOnNyx() {
     // Cosmos client
     signer = await DirectSecp256k1HdWallet.fromMnemonic(settings.mnemonic, {
@@ -168,7 +170,7 @@ export default function Exec() {
     );
     // Save globally
     cosmWasmSigningClient = cosmWasmClient;
- 
+
     // Nym client
     const mixnetClient = new contracts.Mixnet.MixnetClient(
       cosmWasmSigningClient,
@@ -177,9 +179,9 @@ export default function Exec() {
     );
     // Save globally
     signerMixnetClient = mixnetClient;
- 
+
   }
- 
+
   // Get delegations
   const getDelegations = async () => {
     if (!signerMixnetClient) {
@@ -190,7 +192,7 @@ export default function Exec() {
     });
     delegations = delegationsObject;
   };
- 
+
   // Make delegation
   const doDelegation = async () => {
     if (!signerMixnetClient) {
@@ -204,7 +206,7 @@ export default function Exec() {
     );
     console.log(res);
   };
- 
+
   // Undelegate all
   const doUndelegateAll = async () => {
     for (const delegation of delegations.delegations) {
@@ -214,7 +216,7 @@ export default function Exec() {
       );
     }
   };
- 
+
   // Sending tokens
   const doSendTokens = async () => {
     const memo = "test sending tokens";
@@ -227,10 +229,10 @@ export default function Exec() {
     );
     console.log(res);
   };
- 
+
   ExecuteOnNyx();
   setTimeout(() => getDelegations(), 1000);
- 
+
   return (
     <div>
       <p>Exec</p>
diff --git a/documentation/docs/pages/developers/typescript/playground/cosmos-kit.mdx b/documentation/docs/pages/developers/typescript/playground/cosmos-kit.mdx
index 6fcea580fb..f1dfb89ea3 100644
--- a/documentation/docs/pages/developers/typescript/playground/cosmos-kit.mdx
+++ b/documentation/docs/pages/developers/typescript/playground/cosmos-kit.mdx
@@ -1,10 +1,15 @@
 import "@interchain-ui/react/styles"
 import { CosmosKit } from "../../../../components/cosmos-kit";
-import { Callout } from 'nextra/components'
 import FormattedCosmoskitExampleCode from '../../../../code-examples/sdk/typescript/cosmoskit-example-code.mdx';
 
 # Cosmos Kit
 
+import { Callout } from 'nextra/components'
+
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
+
 Below is an example that uses [CosmosKit](https://cosmoskit.com/) to connect and sign a fake transaction with your [Keplr wallet](https://www.keplr.app/) or
 [Ledger hardware wallet](https://www.ledger.com/) to this page:
 
diff --git a/documentation/docs/pages/developers/typescript/playground/mixfetch.mdx b/documentation/docs/pages/developers/typescript/playground/mixfetch.mdx
index e2ce824853..b1dccf5ae2 100644
--- a/documentation/docs/pages/developers/typescript/playground/mixfetch.mdx
+++ b/documentation/docs/pages/developers/typescript/playground/mixfetch.mdx
@@ -5,6 +5,10 @@ import Box from '@mui/material/Box';
 import FormattedMixFetchExampleCode from '../../../../code-examples/sdk/typescript/mixfetch-example-code.mdx';
 import { Callout } from 'nextra/components'
 
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
+
 <Callout type="info" emoji="ℹ️">
   Right now Gateways are not required to run a Secure Websocket (WSS) listener, so only a subset of nodes running in Gateway mode have configured their nodes to do so.
 
diff --git a/documentation/docs/pages/developers/typescript/playground/mixnodes.mdx b/documentation/docs/pages/developers/typescript/playground/mixnodes.mdx
index 3327f3d650..4937051fb2 100644
--- a/documentation/docs/pages/developers/typescript/playground/mixnodes.mdx
+++ b/documentation/docs/pages/developers/typescript/playground/mixnodes.mdx
@@ -3,6 +3,11 @@
 import { Mixnodes } from '../../../../components/mixnodes';
 import Box from '@mui/material/Box';
 import FormattedExampleCode from '../../../../code-examples/sdk/typescript/mixnodes-example-code.mdx';
+import { Callout } from 'nextra/components'
+
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
 
 The Nym Mixnet contract keeps a directory of all mixnodes that can be used to mix traffic.
 
diff --git a/documentation/docs/pages/developers/typescript/playground/traffic.mdx b/documentation/docs/pages/developers/typescript/playground/traffic.mdx
index 81af690fed..d1851b878b 100644
--- a/documentation/docs/pages/developers/typescript/playground/traffic.mdx
+++ b/documentation/docs/pages/developers/typescript/playground/traffic.mdx
@@ -4,6 +4,9 @@ import { Traffic } from '../../../../components/traffic';
 import Box from '@mui/material/Box';
 import FormattedTrafficExampleCode from '../../../../code-examples/sdk/typescript/traffic-example-code.mdx';
 
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
 
 Use this tool to experiment with the mixnet: send and receive messages!
 
diff --git a/documentation/docs/pages/developers/typescript/playground/wallet.mdx b/documentation/docs/pages/developers/typescript/playground/wallet.mdx
index f384dd226a..99f39816cc 100644
--- a/documentation/docs/pages/developers/typescript/playground/wallet.mdx
+++ b/documentation/docs/pages/developers/typescript/playground/wallet.mdx
@@ -10,6 +10,13 @@ import FormattedWalletConnectCode from '../../../../code-examples/sdk/typescript
 import FormattedWalletSendTokensCode from '../../../../code-examples/sdk/typescript/wallet-sendTokens-code.mdx';
 import FormattedWalletDelegationsCode from '../../../../code-examples/sdk/typescript/wallet-delegations-code.mdx';
 
+
+import { Callout } from 'nextra/components'
+
+<Callout type="warning">
+The Typescript SDK is currently undergoing maintenance: a network upgrade elsewhere has temporarily caused a problem. These docs are likely to change after we upgrade the SDK.
+</Callout>
+
 Here's a small wallet example using testnet for you to test out!
 
 <WalletContextProvider>

From 57c38ef22250f797ebf2ec334026687e7fc2f49e Mon Sep 17 00:00:00 2001
From: mfahampshire <maxhampshire@pm.me>
Date: Wed, 22 Jan 2025 10:09:47 +0000
Subject: [PATCH 13/42] temp remove cargodoc command (#5375)

---
 documentation/docs/pages/developers/rust.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/documentation/docs/pages/developers/rust.md b/documentation/docs/pages/developers/rust.md
index eb2e7bf459..e396395bfa 100644
--- a/documentation/docs/pages/developers/rust.md
+++ b/documentation/docs/pages/developers/rust.md
@@ -2,6 +2,3 @@
 The Rust SDK allows developers building applications in Rust to import and interact with Nym clients as they would any other dependency, instead of running the client as a separate process on their machine.
 
 Check the [development status](./rust/development-status) page to see the various modules that make up the SDK, and the [FFI](./rust/ffi) page for Go/C++ developers.
-
-### Generate Crate Docs
-In order to generate the crate docs run `cargo doc --open` from `nym/sdk/rust/nym-sdk/`

From 86706939529f507cdc575ede3534ac2c316a58aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Wed, 22 Jan 2025 12:12:06 +0100
Subject: [PATCH 14/42] Uncouple storage reference for bandwidth client (#5372)

---
 .../gateways-storage/src/backend/fs_backend/mod.rs   |  1 +
 .../gateways-storage/src/backend/mem_backend.rs      |  4 ++--
 .../src/client/base_client/storage/mod.rs            |  3 ++-
 .../src/client/key_manager/persistence.rs            |  6 ++++--
 .../surb-storage/src/backend/fs_backend/mod.rs       |  2 +-
 common/client-core/surb-storage/src/backend/mod.rs   |  2 +-
 common/credential-storage/src/storage.rs             |  2 +-
 sdk/rust/nym-sdk/examples/manually_handle_storage.rs |  3 +++
 sdk/rust/nym-sdk/src/bandwidth/client.rs             | 12 ++++++------
 sdk/rust/nym-sdk/src/mixnet/client.rs                |  8 ++++----
 10 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/common/client-core/gateways-storage/src/backend/fs_backend/mod.rs b/common/client-core/gateways-storage/src/backend/fs_backend/mod.rs
index c83a5bbd68..db89a3b83f 100644
--- a/common/client-core/gateways-storage/src/backend/fs_backend/mod.rs
+++ b/common/client-core/gateways-storage/src/backend/fs_backend/mod.rs
@@ -15,6 +15,7 @@ pub mod error;
 mod manager;
 mod models;
 
+#[derive(Clone)]
 pub struct OnDiskGatewaysDetails {
     manager: StorageManager,
 }
diff --git a/common/client-core/gateways-storage/src/backend/mem_backend.rs b/common/client-core/gateways-storage/src/backend/mem_backend.rs
index 70560995e9..48235aaf1f 100644
--- a/common/client-core/gateways-storage/src/backend/mem_backend.rs
+++ b/common/client-core/gateways-storage/src/backend/mem_backend.rs
@@ -20,12 +20,12 @@ pub enum InMemStorageError {
     MalformedGateway(#[from] BadGateway),
 }
 
-#[derive(Debug, Default)]
+#[derive(Clone, Debug, Default)]
 pub struct InMemGatewaysDetails {
     inner: Arc<RwLock<InMemStorageInner>>,
 }
 
-#[derive(Debug, Default)]
+#[derive(Clone, Debug, Default)]
 struct InMemStorageInner {
     active_gateway: Option<String>,
     gateways: HashMap<String, GatewayRegistration>,
diff --git a/common/client-core/src/client/base_client/storage/mod.rs b/common/client-core/src/client/base_client/storage/mod.rs
index cccb3fa9d7..5129a5fc41 100644
--- a/common/client-core/src/client/base_client/storage/mod.rs
+++ b/common/client-core/src/client/base_client/storage/mod.rs
@@ -63,7 +63,7 @@ pub trait MixnetClientStorage {
     fn gateway_details_store(&self) -> &Self::GatewaysDetailsStore;
 }
 
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub struct Ephemeral {
     key_store: InMemEphemeralKeys,
     reply_store: reply_storage::Empty,
@@ -114,6 +114,7 @@ impl MixnetClientStorage for Ephemeral {
     }
 }
 
+#[derive(Clone)]
 #[cfg(all(
     not(target_arch = "wasm32"),
     feature = "fs-surb-storage",
diff --git a/common/client-core/src/client/key_manager/persistence.rs b/common/client-core/src/client/key_manager/persistence.rs
index 2bff78ee36..f781cd3da6 100644
--- a/common/client-core/src/client/key_manager/persistence.rs
+++ b/common/client-core/src/client/key_manager/persistence.rs
@@ -4,6 +4,7 @@
 use crate::client::key_manager::ClientKeys;
 use async_trait::async_trait;
 use std::error::Error;
+use std::sync::Arc;
 use tokio::sync::Mutex;
 
 #[cfg(not(target_arch = "wasm32"))]
@@ -64,6 +65,7 @@ pub enum OnDiskKeysError {
     },
 }
 
+#[derive(Clone)]
 #[cfg(not(target_arch = "wasm32"))]
 pub struct OnDiskKeys {
     paths: ClientKeysPaths,
@@ -193,9 +195,9 @@ impl KeyStore for OnDiskKeys {
     }
 }
 
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub struct InMemEphemeralKeys {
-    keys: Mutex<Option<ClientKeys>>,
+    keys: Arc<Mutex<Option<ClientKeys>>>,
 }
 
 #[derive(Debug, thiserror::Error)]
diff --git a/common/client-core/surb-storage/src/backend/fs_backend/mod.rs b/common/client-core/surb-storage/src/backend/fs_backend/mod.rs
index 6f68c59201..4914f6621f 100644
--- a/common/client-core/surb-storage/src/backend/fs_backend/mod.rs
+++ b/common/client-core/surb-storage/src/backend/fs_backend/mod.rs
@@ -22,7 +22,7 @@ mod error;
 mod manager;
 mod models;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct Backend {
     temporary_old_path: Option<PathBuf>,
     database_path: PathBuf,
diff --git a/common/client-core/surb-storage/src/backend/mod.rs b/common/client-core/surb-storage/src/backend/mod.rs
index e195051e4e..8bef5a9aaf 100644
--- a/common/client-core/surb-storage/src/backend/mod.rs
+++ b/common/client-core/surb-storage/src/backend/mod.rs
@@ -19,7 +19,7 @@ pub mod fs_backend;
 #[error("no information provided")]
 pub struct UndefinedError;
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct Empty {
     // we need to keep 'basic' metadata here to "load" the CombinedReplyStorage
     pub min_surb_threshold: usize,
diff --git a/common/credential-storage/src/storage.rs b/common/credential-storage/src/storage.rs
index 4c0602ea85..bc2a6ac7d5 100644
--- a/common/credential-storage/src/storage.rs
+++ b/common/credential-storage/src/storage.rs
@@ -19,7 +19,7 @@ use std::error::Error;
 // `SELECT total_tickets, used_tickets FROM ecash_ticketbook WHERE expiration_date >= ?`, today_date
 // then for each calculate the diff total_tickets - used_tickets and multiply the result by the size of the ticket
 #[async_trait]
-pub trait Storage: Send + Sync {
+pub trait Storage: Clone + Send + Sync {
     type StorageError: Error;
 
     async fn close(&self);
diff --git a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs
index a7fb182743..05ce8ebf01 100644
--- a/sdk/rust/nym-sdk/examples/manually_handle_storage.rs
+++ b/sdk/rust/nym-sdk/examples/manually_handle_storage.rs
@@ -40,6 +40,7 @@ async fn main() {
     client.disconnect().await;
 }
 
+#[derive(Clone)]
 #[allow(unused)]
 struct MockClientStorage {
     pub key_store: MockKeyStore,
@@ -96,6 +97,7 @@ impl MixnetClientStorage for MockClientStorage {
     }
 }
 
+#[derive(Clone)]
 struct MockKeyStore;
 
 #[async_trait]
@@ -115,6 +117,7 @@ impl KeyStore for MockKeyStore {
     }
 }
 
+#[derive(Clone)]
 struct MockGatewayDetailsStore;
 
 #[async_trait]
diff --git a/sdk/rust/nym-sdk/src/bandwidth/client.rs b/sdk/rust/nym-sdk/src/bandwidth/client.rs
index 68a4edb347..e1ca588185 100644
--- a/sdk/rust/nym-sdk/src/bandwidth/client.rs
+++ b/sdk/rust/nym-sdk/src/bandwidth/client.rs
@@ -17,22 +17,22 @@ use zeroize::Zeroizing;
 /// The way to create this client is by calling
 /// [`crate::mixnet::DisconnectedMixnetClient::create_bandwidth_client`] on the associated mixnet
 /// client.
-pub struct BandwidthAcquireClient<'a, St: Storage> {
+pub struct BandwidthAcquireClient<St: Storage + Clone> {
     client: DirectSigningHttpRpcNyxdClient,
-    storage: &'a St,
+    storage: St,
     client_id: Zeroizing<Vec<u8>>,
     ticketbook_type: TicketType,
 }
 
-impl<'a, St> BandwidthAcquireClient<'a, St>
+impl<St> BandwidthAcquireClient<St>
 where
-    St: Storage,
+    St: Storage + Clone,
     <St as Storage>::StorageError: Send + Sync + 'static,
 {
     pub(crate) fn new(
         network_details: NymNetworkDetails,
         mnemonic: String,
-        storage: &'a St,
+        storage: St,
         client_id: Vec<u8>,
         ticketbook_type: TicketType,
     ) -> Result<Self> {
@@ -55,7 +55,7 @@ where
     pub async fn acquire(&self) -> Result<()> {
         issue_credential(
             &self.client,
-            self.storage,
+            &self.storage,
             self.client_id.deref(),
             self.ticketbook_type,
         )
diff --git a/sdk/rust/nym-sdk/src/mixnet/client.rs b/sdk/rust/nym-sdk/src/mixnet/client.rs
index 4c10ec3d76..74f1536ed7 100644
--- a/sdk/rust/nym-sdk/src/mixnet/client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/client.rs
@@ -108,7 +108,7 @@ impl MixnetClientBuilder<OnDiskPersistent> {
 
 impl<S> MixnetClientBuilder<S>
 where
-    S: MixnetClientStorage + 'static,
+    S: MixnetClientStorage + Clone + 'static,
     S::ReplyStore: Send + Sync,
     S::GatewaysDetailsStore: Sync,
     <S::ReplyStore as ReplyStorageBackend>::StorageError: Sync + Send,
@@ -326,7 +326,7 @@ where
 /// client.
 pub struct DisconnectedMixnetClient<S>
 where
-    S: MixnetClientStorage,
+    S: MixnetClientStorage + Clone,
 {
     /// Client configuration
     config: Config,
@@ -371,7 +371,7 @@ where
 
 impl<S> DisconnectedMixnetClient<S>
 where
-    S: MixnetClientStorage + 'static,
+    S: MixnetClientStorage + Clone + 'static,
     S::ReplyStore: Send + Sync,
     S::GatewaysDetailsStore: Sync,
     <S::ReplyStore as ReplyStorageBackend>::StorageError: Sync + Send,
@@ -622,7 +622,7 @@ where
         BandwidthAcquireClient::new(
             self.config.network_details.clone(),
             mnemonic,
-            self.storage.credential_store(),
+            self.storage.credential_store().clone(),
             client_id,
             ticketbook_type,
         )

From 4327e2945aa791e9f0b9126d99a66a611e91fb23 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:02:54 -0700
Subject: [PATCH 15/42] DNS-over-X for internal domain name (i.e. API client)
 lookups

---
 Cargo.toml                        |   1 +
 common/http-api-client/Cargo.toml |   5 +
 common/http-api-client/src/dns.rs | 153 ++++++++++++++++++++++++++++++
 common/http-api-client/src/lib.rs |  14 +--
 4 files changed, 167 insertions(+), 6 deletions(-)
 create mode 100644 common/http-api-client/src/dns.rs

diff --git a/Cargo.toml b/Cargo.toml
index dc20a58404..52c25f0e52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -255,6 +255,7 @@ handlebars = "3.5.5"
 headers = "0.4.0"
 hex = "0.4.3"
 hex-literal = "0.3.3"
+hickory-resolver = "0.24.2"
 hkdf = "0.12.3"
 hmac = "0.12.1"
 http = "1"
diff --git a/common/http-api-client/Cargo.toml b/common/http-api-client/Cargo.toml
index a0dab4b00a..70ab9a7dd1 100644
--- a/common/http-api-client/Cargo.toml
+++ b/common/http-api-client/Cargo.toml
@@ -15,7 +15,9 @@ async-trait = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 http.workspace = true
 url = { workspace = true }
+once_cell = { workspace = true }
 serde = { workspace = true }
+hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "dns-over-h3", "webpki-roots"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
@@ -26,3 +28,6 @@ nym-bin-common = { path = "../bin-common" }
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
 workspace = true
 features = ["tokio"]
+
+[dev-dependencies]
+tokio = { workspace = true, features=["rt", "macros"] }
diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
new file mode 100644
index 0000000000..3f005f2a5c
--- /dev/null
+++ b/common/http-api-client/src/dns.rs
@@ -0,0 +1,153 @@
+//! DNS resolver configuration for internal lookups.
+//!
+//! The resolver itself is the set combination of the google, cloudflare, and quad9 endpoints
+//! supporting DoH, DoT, and for google DoH3 as well.
+//!
+//! This resolver implements a fallback mechanism where, should the DNS-over-TLS resolution fail, a
+//! followup resolution will be done using the hosts configured default (e.g. `/etc/resolve.conf` on
+//! linux).
+//!
+//! Requires the `dns-over-https-rustls`, `dns-over-h3`, `webpki-roots` feature for the
+//! `hickory-resolver` crate
+
+use crate::ClientBuilder;
+
+use std::fmt;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
+use hickory_resolver::{
+    config::{LookupIpStrategy, NameServerConfigGroup, ResolverConfig, ResolverOpts},
+    error::ResolveError,
+    lookup_ip::LookupIpIntoIter,
+    TokioAsyncResolver,
+};
+use once_cell::sync::OnceCell;
+use reqwest::dns::{Addrs, Name, Resolve, Resolving};
+use tracing::warn;
+
+impl ClientBuilder {
+    pub fn dns_resolver<R: Resolve + 'static>(mut self, resolver: Arc<R>) -> Self {
+        self.reqwest_client_builder = self.reqwest_client_builder.dns_resolver(resolver);
+        self
+    }
+}
+
+struct SocketAddrs {
+    iter: LookupIpIntoIter,
+}
+
+#[derive(Debug)]
+struct HickoryDnsSystemConfError(ResolveError);
+
+/// Wrapper around an `AsyncResolver`, which implements the `Resolve` trait.
+#[derive(Debug, Default, Clone)]
+pub struct HickoryDnsResolver {
+    /// Since we might not have been called in the context of a
+    /// Tokio Runtime in initialization, so we must delay the actual
+    /// construction of the resolver.
+    state: Arc<OnceCell<TokioAsyncResolver>>,
+    fallback: Arc<OnceCell<TokioAsyncResolver>>,
+}
+
+impl Resolve for HickoryDnsResolver {
+    fn resolve(&self, name: Name) -> Resolving {
+        let resolver = self.state.clone();
+        let fallback = self.fallback.clone();
+        Box::pin(async move {
+            let resolver = resolver.get_or_try_init(new_resolver)?;
+
+            // try the primary DNS resolver that we set up (DoH or DoT or whatever)
+            let lookup = match resolver.lookup_ip(name.as_str()).await {
+                Ok(res) => res,
+                Err(e) => {
+                    // on failure use the fall back system configured DNS resolver
+                    warn!("primary DNS failed w/ error {e}: using system fallback");
+                    let resolver = fallback.get_or_try_init(new_resolver_system)?;
+                    resolver.lookup_ip(name.as_str()).await?
+                }
+            };
+
+            let addrs: Addrs = Box::new(SocketAddrs {
+                iter: lookup.into_iter(),
+            });
+            Ok(addrs)
+        })
+    }
+}
+
+impl Iterator for SocketAddrs {
+    type Item = SocketAddr;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.iter.next().map(|ip_addr| SocketAddr::new(ip_addr, 0))
+    }
+}
+
+/// Create a new resolver with a custom DoT based configuration. The options are overridden to look
+/// up for both IPv4 and IPv6 addresses to work with "happy eyeballs" algorithm.
+fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
+    let mut name_servers = NameServerConfigGroup::google_tls();
+    name_servers.merge(NameServerConfigGroup::google_https());
+    name_servers.merge(NameServerConfigGroup::google_h3());
+    name_servers.merge(NameServerConfigGroup::quad9_tls());
+    name_servers.merge(NameServerConfigGroup::quad9_https());
+    name_servers.merge(NameServerConfigGroup::cloudflare_tls());
+    name_servers.merge(NameServerConfigGroup::cloudflare_https());
+
+    let config = ResolverConfig::from_parts(None, Vec::new(), name_servers);
+
+    let mut opts = ResolverOpts::default();
+    opts.ip_strategy = LookupIpStrategy::Ipv4thenIpv6;
+    // Would like to enable this when 0.25 stabilizes
+    // opts.server_ordering_strategy = ServerOrderingStrategy::RoundRobin;
+
+    Ok(TokioAsyncResolver::tokio(config, opts))
+}
+
+/// Create a new resolver with the default configuration, which reads from `/etc/resolve.conf`. The
+/// options are overridden to look up for both IPv4 and IPv6 addresses to work with "happy eyeballs"
+/// algorithm.
+fn new_resolver_system() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
+    let (config, mut opts) =
+        hickory_resolver::system_conf::read_system_conf().map_err(HickoryDnsSystemConfError)?;
+    opts.ip_strategy = LookupIpStrategy::Ipv4thenIpv6;
+    Ok(TokioAsyncResolver::tokio(config, opts))
+}
+
+impl fmt::Display for HickoryDnsSystemConfError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("error reading DNS system conf for hickory-dns")
+    }
+}
+
+impl std::error::Error for HickoryDnsSystemConfError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        Some(&self.0)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[tokio::test]
+    async fn reqwest_hickory_doh() {
+        let resolver = HickoryDnsResolver::default();
+        let client = reqwest::ClientBuilder::new()
+            .dns_resolver(resolver.into())
+            .build()
+            .unwrap();
+
+        let resp = client
+            .get("http://ifconfig.me")
+            .send()
+            .await
+            .unwrap()
+            .bytes()
+            .await
+            .unwrap();
+
+        assert!(!resp.is_empty());
+    }
+}
diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
index 1792a85a22..6703f038ff 100644
--- a/common/http-api-client/src/lib.rs
+++ b/common/http-api-client/src/lib.rs
@@ -3,20 +3,21 @@
 
 use async_trait::async_trait;
 use reqwest::header::HeaderValue;
+pub use reqwest::IntoUrl;
 use reqwest::{RequestBuilder, Response, StatusCode};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
-use std::fmt::Display;
-use std::time::Duration;
 use thiserror::Error;
 use tracing::{instrument, warn};
 use url::Url;
 
-pub use reqwest::IntoUrl;
-
-pub use user_agent::UserAgent;
+use std::{fmt::Display, sync::Arc, time::Duration};
 
 mod user_agent;
+pub use user_agent::UserAgent;
+
+mod dns;
+use dns::HickoryDnsResolver;
 
 // The timeout is relatively high as we are often making requests over the mixnet, where latency is
 // high and chatty protocols take a while to complete.
@@ -90,7 +91,8 @@ impl ClientBuilder {
                 url: url.into_url()?,
                 timeout: None,
                 custom_user_agent: false,
-                reqwest_client_builder: reqwest::ClientBuilder::new(),
+                reqwest_client_builder: reqwest::ClientBuilder::new()
+                    .dns_resolver(Arc::new(HickoryDnsResolver::default())),
             })
         }
     }

From f594bfc9abc223c22f517d49937cd6de55a0f069 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:06:25 -0700
Subject: [PATCH 16/42] remove h3 because it causes an error

---
 common/http-api-client/Cargo.toml | 2 +-
 common/http-api-client/src/dns.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/http-api-client/Cargo.toml b/common/http-api-client/Cargo.toml
index 70ab9a7dd1..fd7380bbfa 100644
--- a/common/http-api-client/Cargo.toml
+++ b/common/http-api-client/Cargo.toml
@@ -17,7 +17,7 @@ http.workspace = true
 url = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true }
-hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "dns-over-h3", "webpki-roots"] }
+hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "webpki-roots"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index 3f005f2a5c..3b76fd2502 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -1,13 +1,13 @@
 //! DNS resolver configuration for internal lookups.
 //!
 //! The resolver itself is the set combination of the google, cloudflare, and quad9 endpoints
-//! supporting DoH, DoT, and for google DoH3 as well.
+//! supporting DoH and DoT.
 //!
 //! This resolver implements a fallback mechanism where, should the DNS-over-TLS resolution fail, a
 //! followup resolution will be done using the hosts configured default (e.g. `/etc/resolve.conf` on
 //! linux).
 //!
-//! Requires the `dns-over-https-rustls`, `dns-over-h3`, `webpki-roots` feature for the
+//! Requires the `dns-over-https-rustls`, `webpki-roots` feature for the
 //! `hickory-resolver` crate
 
 use crate::ClientBuilder;
@@ -89,7 +89,7 @@ impl Iterator for SocketAddrs {
 fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
     let mut name_servers = NameServerConfigGroup::google_tls();
     name_servers.merge(NameServerConfigGroup::google_https());
-    name_servers.merge(NameServerConfigGroup::google_h3());
+    // name_servers.merge(NameServerConfigGroup::google_h3());
     name_servers.merge(NameServerConfigGroup::quad9_tls());
     name_servers.merge(NameServerConfigGroup::quad9_https());
     name_servers.merge(NameServerConfigGroup::cloudflare_tls());

From 93140a1aa74cfca488db459ba981419ca86872b9 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 11:40:09 -0700
Subject: [PATCH 17/42] minor fixes for clarity, interface access, and wasm
 exclusion

---
 common/http-api-client/src/dns.rs | 20 +++++++++++++-------
 common/http-api-client/src/lib.rs | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index 3b76fd2502..d3a6c25a25 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -9,7 +9,6 @@
 //!
 //! Requires the `dns-over-https-rustls`, `webpki-roots` feature for the
 //! `hickory-resolver` crate
-
 use crate::ClientBuilder;
 
 use std::fmt;
@@ -52,19 +51,26 @@ pub struct HickoryDnsResolver {
 
 impl Resolve for HickoryDnsResolver {
     fn resolve(&self, name: Name) -> Resolving {
+        self.resolve_str(name.as_str())
+    }
+}
+
+impl HickoryDnsResolver {
+    pub fn resolve_str(&self, name: &str) -> Resolving {
         let resolver = self.state.clone();
         let fallback = self.fallback.clone();
+        let domain = name.to_owned();
         Box::pin(async move {
             let resolver = resolver.get_or_try_init(new_resolver)?;
 
             // try the primary DNS resolver that we set up (DoH or DoT or whatever)
-            let lookup = match resolver.lookup_ip(name.as_str()).await {
+            let lookup = match resolver.lookup_ip(&domain).await {
                 Ok(res) => res,
                 Err(e) => {
                     // on failure use the fall back system configured DNS resolver
                     warn!("primary DNS failed w/ error {e}: using system fallback");
                     let resolver = fallback.get_or_try_init(new_resolver_system)?;
-                    resolver.lookup_ip(name.as_str()).await?
+                    resolver.lookup_ip(&domain).await?
                 }
             };
 
@@ -105,13 +111,13 @@ fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
     Ok(TokioAsyncResolver::tokio(config, opts))
 }
 
-/// Create a new resolver with the default configuration, which reads from `/etc/resolve.conf`. The
-/// options are overridden to look up for both IPv4 and IPv6 addresses to work with "happy eyeballs"
-/// algorithm.
+/// Create a new resolver with the default configuration, which reads from the system DNS config
+/// (i.e. `/etc/resolve.conf` in unix). The options are overridden to look up for both IPv4 and IPv6
+/// addresses to work with "happy eyeballs" algorithm.
 fn new_resolver_system() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
     let (config, mut opts) =
         hickory_resolver::system_conf::read_system_conf().map_err(HickoryDnsSystemConfError)?;
-    opts.ip_strategy = LookupIpStrategy::Ipv4thenIpv6;
+    opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6;
     Ok(TokioAsyncResolver::tokio(config, opts))
 }
 
diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
index 6703f038ff..9805988ab8 100644
--- a/common/http-api-client/src/lib.rs
+++ b/common/http-api-client/src/lib.rs
@@ -3,7 +3,6 @@
 
 use async_trait::async_trait;
 use reqwest::header::HeaderValue;
-pub use reqwest::IntoUrl;
 use reqwest::{RequestBuilder, Response, StatusCode};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
@@ -13,11 +12,15 @@ use url::Url;
 
 use std::{fmt::Display, sync::Arc, time::Duration};
 
+pub use reqwest::IntoUrl;
+
 mod user_agent;
 pub use user_agent::UserAgent;
 
+#[cfg(not(target_arch = "wasm32"))]
 mod dns;
-use dns::HickoryDnsResolver;
+#[cfg(not(target_arch = "wasm32"))]
+pub use dns::HickoryDnsResolver;
 
 // The timeout is relatively high as we are often making requests over the mixnet, where latency is
 // high and chatty protocols take a while to complete.
@@ -87,12 +90,18 @@ impl ClientBuilder {
             // TODO: or should we maybe default to https?
             Self::new(alt)
         } else {
+            #[cfg(target_arch = "wasm32")]
+            let reqwest_client_builder = reqwest::ClientBuilder::new();
+
+            #[cfg(not(target_arch = "wasm32"))]
+            let reqwest_client_builder =
+                reqwest::ClientBuilder::new().dns_resolver(Arc::new(HickoryDnsResolver::default()));
+
             Ok(ClientBuilder {
                 url: url.into_url()?,
                 timeout: None,
                 custom_user_agent: false,
-                reqwest_client_builder: reqwest::ClientBuilder::new()
-                    .dns_resolver(Arc::new(HickoryDnsResolver::default())),
+                reqwest_client_builder,
             })
         }
     }

From bf88b34898a423f5eb835804b940da6a7729052e Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:08:18 -0700
Subject: [PATCH 18/42] fix wasm compile (exclude wasm target from DoH / DoT)

---
 common/http-api-client/Cargo.toml | 4 +++-
 common/http-api-client/src/lib.rs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/http-api-client/Cargo.toml b/common/http-api-client/Cargo.toml
index fd7380bbfa..a70c8d9259 100644
--- a/common/http-api-client/Cargo.toml
+++ b/common/http-api-client/Cargo.toml
@@ -17,13 +17,15 @@ http.workspace = true
 url = { workspace = true }
 once_cell = { workspace = true }
 serde = { workspace = true }
-hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "webpki-roots"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 
 nym-bin-common = { path = "../bin-common" }
 
+[target."cfg(not(target_arch = \"wasm32\"))".dependencies]
+hickory-resolver = { workspace = true, features = ["dns-over-https-rustls", "webpki-roots"] }
+
 # for request timeout until https://github.com/seanmonstar/reqwest/issues/1135 is fixed
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasmtimer]
 workspace = true
diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
index 9805988ab8..d1243f8264 100644
--- a/common/http-api-client/src/lib.rs
+++ b/common/http-api-client/src/lib.rs
@@ -10,7 +10,9 @@ use thiserror::Error;
 use tracing::{instrument, warn};
 use url::Url;
 
-use std::{fmt::Display, sync::Arc, time::Duration};
+#[cfg(not(target_arch = "wasm32"))]
+use std:: sync::Arc;
+use std::{fmt::Display, time::Duration};
 
 pub use reqwest::IntoUrl;
 

From 35b43d5b206870a21db1dd26a003c54c3f611077 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:14:08 -0700
Subject: [PATCH 19/42] missed Lookup strategy

---
 common/http-api-client/src/dns.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index d3a6c25a25..3052f8eb0e 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -104,7 +104,7 @@ fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
     let config = ResolverConfig::from_parts(None, Vec::new(), name_servers);
 
     let mut opts = ResolverOpts::default();
-    opts.ip_strategy = LookupIpStrategy::Ipv4thenIpv6;
+    opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6;
     // Would like to enable this when 0.25 stabilizes
     // opts.server_ordering_strategy = ServerOrderingStrategy::RoundRobin;
 

From c964c137f490465627031ec20956e899079988f6 Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:36:39 -0700
Subject: [PATCH 20/42] fmt

---
 common/http-api-client/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
index d1243f8264..c75e7d64cd 100644
--- a/common/http-api-client/src/lib.rs
+++ b/common/http-api-client/src/lib.rs
@@ -11,7 +11,7 @@ use tracing::{instrument, warn};
 use url::Url;
 
 #[cfg(not(target_arch = "wasm32"))]
-use std:: sync::Arc;
+use std::sync::Arc;
 use std::{fmt::Display, time::Duration};
 
 pub use reqwest::IntoUrl;

From 117eb83a0be075d97d0af38c97e094b5086d6dea Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:14:04 -0700
Subject: [PATCH 21/42] managing returned iterators

---
 common/http-api-client/src/dns.rs | 47 ++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index 3052f8eb0e..f0b6503c73 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -15,6 +15,7 @@ use std::fmt;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
+use hickory_resolver::lookup_ip::LookupIp;
 use hickory_resolver::{
     config::{LookupIpStrategy, NameServerConfigGroup, ResolverConfig, ResolverOpts},
     error::ResolveError,
@@ -51,26 +52,19 @@ pub struct HickoryDnsResolver {
 
 impl Resolve for HickoryDnsResolver {
     fn resolve(&self, name: Name) -> Resolving {
-        self.resolve_str(name.as_str())
-    }
-}
-
-impl HickoryDnsResolver {
-    pub fn resolve_str(&self, name: &str) -> Resolving {
         let resolver = self.state.clone();
         let fallback = self.fallback.clone();
-        let domain = name.to_owned();
         Box::pin(async move {
             let resolver = resolver.get_or_try_init(new_resolver)?;
 
             // try the primary DNS resolver that we set up (DoH or DoT or whatever)
-            let lookup = match resolver.lookup_ip(&domain).await {
+            let lookup = match resolver.lookup_ip(name.as_str()).await {
                 Ok(res) => res,
                 Err(e) => {
                     // on failure use the fall back system configured DNS resolver
                     warn!("primary DNS failed w/ error {e}: using system fallback");
                     let resolver = fallback.get_or_try_init(new_resolver_system)?;
-                    resolver.lookup_ip(&domain).await?
+                    resolver.lookup_ip(name.as_str()).await?
                 }
             };
 
@@ -90,6 +84,27 @@ impl Iterator for SocketAddrs {
     }
 }
 
+type BoxError = Box<dyn std::error::Error + Send + Sync>;
+
+impl HickoryDnsResolver {
+    pub async fn resolve_str(&self, name: &str) -> Result<LookupIp, BoxError> {
+        let resolver = self.state.get_or_try_init(new_resolver)?;
+
+        // try the primary DNS resolver that we set up (DoH or DoT or whatever)
+        let lookup = match resolver.lookup_ip(name).await {
+            Ok(res) => res,
+            Err(e) => {
+                // on failure use the fall back system configured DNS resolver
+                warn!("primary DNS failed w/ error {e}: using system fallback");
+                let resolver = self.fallback.get_or_try_init(new_resolver_system)?;
+                resolver.lookup_ip(name).await?
+            }
+        };
+
+        Ok(lookup)
+    }
+}
+
 /// Create a new resolver with a custom DoT based configuration. The options are overridden to look
 /// up for both IPv4 and IPv6 addresses to work with "happy eyeballs" algorithm.
 fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
@@ -146,7 +161,7 @@ mod test {
             .unwrap();
 
         let resp = client
-            .get("http://ifconfig.me")
+            .get("http://ifconfig.me:80")
             .send()
             .await
             .unwrap()
@@ -156,4 +171,16 @@ mod test {
 
         assert!(!resp.is_empty());
     }
+
+    #[tokio::test]
+    async fn dns_lookup() -> Result<(), BoxError> {
+        let resolver = HickoryDnsResolver::default();
+
+        let domain = "ifconfig.me";
+        let addrs = resolver.resolve_str(domain).await?;
+
+        assert!(addrs.into_iter().next().is_some());
+
+        Ok(())
+    }
 }

From 32e39ebc6b2b3eafa26bc74a27a73eb74f67465c Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:32:04 -0700
Subject: [PATCH 22/42] square cargo.lock with upstream branch

---
 Cargo.lock | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 79f73ce681..e2de42eb3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2302,6 +2302,18 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "env_filter"
 version = "0.1.2"
@@ -3109,6 +3121,61 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "idna 1.0.3",
+ "ipnet",
+ "once_cell",
+ "rand",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.4",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tracing",
+ "url",
+ "webpki-roots 0.25.4",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand",
+ "resolv-conf",
+ "rustls 0.21.12",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tracing",
+ "webpki-roots 0.25.4",
+]
+
 [[package]]
 name = "hidapi"
 version = "1.5.0"
@@ -3148,6 +3215,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
+]
+
 [[package]]
 name = "html5ever"
 version = "0.27.0"
@@ -3756,6 +3834,18 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1"
 
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg 0.50.0",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -4006,6 +4096,12 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@@ -4080,6 +4176,15 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
 [[package]]
 name = "mac"
 version = "0.1.1"
@@ -4154,6 +4259,12 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -5748,12 +5859,15 @@ name = "nym-http-api-client"
 version = "0.1.0"
 dependencies = [
  "async-trait",
+ "hickory-resolver",
  "http 1.1.0",
  "nym-bin-common",
+ "once_cell",
  "reqwest 0.12.4",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
+ "tokio",
  "tracing",
  "url",
  "wasmtimer",
@@ -8242,6 +8356,16 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error 1.2.3",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -11352,6 +11476,12 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

From 4eadaf82922afc4b76cd47c510b51573bc1f314b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 22 Jan 2025 23:46:07 +0100
Subject: [PATCH 23/42] Fix missing path triggers for CI (#5380)

* Fix missing path triggers for CI

* Sort alphabetically to make it easier to maintain
---
 .github/workflows/ci-build.yml    |  7 +++--
 .github/workflows/ci-sdk-wasm.yml |  1 +
 Cargo.toml                        | 51 +++++++++++++++----------------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e994671b5b..fd54e675cf 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -8,17 +8,18 @@ on:
       - 'explorer-api/**'
       - 'gateway/**'
       - 'integrations/**'
-      - 'mixnode/**'
       - 'nym-api/**'
-      - 'nym-data-observatory/**'
+      - 'nym-credential-proxy/**'
       - 'nym-network-monitor/**'
       - 'nym-node/**'
       - 'nym-node-status-api/**'
       - 'nym-outfox/**'
       - 'nym-validator-rewarder/**'
-      - 'sdk/lib/**'
+      - 'nyx-chain-watcher/**'
+      - 'sdk/ffi/**'
       - 'sdk/rust/**'
       - 'service-providers/**'
+      - 'nym-browser-extension/storage/**'
       - 'tools/**'
       - 'wasm/**'
       - 'Cargo.toml'
diff --git a/.github/workflows/ci-sdk-wasm.yml b/.github/workflows/ci-sdk-wasm.yml
index 40bb639501..732367ca4a 100644
--- a/.github/workflows/ci-sdk-wasm.yml
+++ b/.github/workflows/ci-sdk-wasm.yml
@@ -1,6 +1,7 @@
 name: ci-sdk-wasm
 
 on:
+  workflow_dispatch:
   pull_request:
     paths:
       - 'wasm/**'
diff --git a/Cargo.toml b/Cargo.toml
index dc20a58404..c4efce95b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,8 +53,8 @@ members = [
     "common/execute",
     "common/exit-policy",
     "common/gateway-requests",
-    "common/gateway-storage",
     "common/gateway-stats-storage",
+    "common/gateway-storage",
     "common/http-api-client",
     "common/http-api-common",
     "common/inclusion-probability",
@@ -93,6 +93,7 @@ members = [
     "common/topology",
     "common/tun",
     "common/types",
+    "common/verloc",
     "common/wasm/client-core",
     "common/wasm/storage",
     "common/wasm/utils",
@@ -104,6 +105,22 @@ members = [
     "explorer-api/explorer-client",
     "gateway",
     "integrations/bity",
+    "nym-api",
+    "nym-api/nym-api-requests",
+    "nym-browser-extension/storage",
+    "nym-credential-proxy/nym-credential-proxy",
+    "nym-credential-proxy/nym-credential-proxy-requests",
+    "nym-credential-proxy/vpn-api-lib-wasm",
+    "nym-network-monitor",
+    "nym-node",
+    "nym-node-status-api/nym-node-status-agent",
+    "nym-node-status-api/nym-node-status-api",
+    "nym-node-status-api/nym-node-status-client",
+    "nym-node/nym-node-metrics",
+    "nym-node/nym-node-requests",
+    "nym-outfox",
+    "nym-validator-rewarder",
+    "nyx-chain-watcher",
     "sdk/ffi/cpp",
     "sdk/ffi/go",
     "sdk/ffi/shared",
@@ -112,26 +129,16 @@ members = [
     "service-providers/common",
     "service-providers/ip-packet-router",
     "service-providers/network-requester",
-    "nym-api",
-    "nym-api/nym-api-requests",
-    "nym-browser-extension/storage",
-    "nym-credential-proxy/nym-credential-proxy",
-    "nym-credential-proxy/nym-credential-proxy-requests",
-    "nym-credential-proxy/vpn-api-lib-wasm",
-    "nym-network-monitor",
-    "nyx-chain-watcher",
-    "nym-node",
-    "nym-node/nym-node-requests",
-    "nym-node/nym-node-metrics",
-    "nym-node-status-api/nym-node-status-agent",
-    "nym-node-status-api/nym-node-status-api",
-    "nym-node-status-api/nym-node-status-client",
-    "nym-outfox",
-    "nym-validator-rewarder",
     "tools/echo-server",
-    "tools/internal/ssl-inject",
+    "tools/echo-server",
+    "tools/internal/contract-state-importer/importer-cli",
+    "tools/internal/contract-state-importer/importer-contract",
+    "tools/internal/mixnet-connectivity-check",
     # "tools/internal/sdk-version-bump",
+    "tools/internal/ssl-inject",
     "tools/internal/testnet-manager",
+    "tools/internal/testnet-manager",
+    "tools/internal/testnet-manager/dkg-bypass-contract",
     "tools/internal/testnet-manager/dkg-bypass-contract",
     "tools/nym-cli",
     "tools/nym-id-cli",
@@ -143,13 +150,6 @@ members = [
     "wasm/mix-fetch",
     "wasm/node-tester",
     "wasm/zknym-lib",
-    "tools/echo-server",
-    "tools/internal/contract-state-importer/importer-cli",
-    "tools/internal/contract-state-importer/importer-contract",
-    "tools/internal/testnet-manager",
-    "tools/internal/testnet-manager/dkg-bypass-contract",
-    "common/verloc",
-    "tools/internal/mixnet-connectivity-check",
 ]
 
 default-members = [
@@ -173,7 +173,6 @@ exclude = [
     "explorer",
     "contracts",
     "nym-wallet",
-    "nym-vpn/ui/src-tauri",
     "cpu-cycles",
 ]
 

From 04fd197f5a370e50e0e609fd09dd750da7a20246 Mon Sep 17 00:00:00 2001
From: import this <97586125+serinko@users.noreply.github.com>
Date: Thu, 23 Jan 2025 15:14:31 +0000
Subject: [PATCH 24/42] [DOCs]: Add more backup guides, clean up deprecated,
 fix URLs, add sha verf (#5384)

* fix socks5 syntax

* reshape backup and restore and add proxy

* fix URLS

* remove deprecated node-api-check - archived for when there is time to maintain the tool

* add hash verification step
---
 .../nyx-outputs/nyx-total-stake.md            |   2 +-
 .../outputs/api-scraping-outputs/time-now.md  |   2 +-
 documentation/docs/next.config.js             |  14 --
 .../docs/pages/apis/explorer-api.mdx          |   2 +-
 .../pages/developers/clients/socks5/setup.mdx |   2 +-
 .../pages/developers/tools/nym-cli/usage.mdx  |   2 +-
 .../typescript/examples/mix-fetch.mdx         |   2 -
 .../docs/pages/network/architecture.mdx       |   4 +-
 .../docs/pages/network/architecture/nyx.mdx   |   2 +-
 .../operators/binaries/pre-built-binaries.mdx |  54 +++++-
 .../docs/pages/operators/changelog.mdx        |  12 +-
 .../pages/operators/nodes/maintenance.mdx     | 150 ++++++++++++++--
 .../operators/nodes/nym-node/bonding.mdx      |  21 +--
 .../pages/operators/nodes/nym-node/setup.mdx  |   2 +-
 .../nodes/performance-and-testing.mdx         |  28 +++
 .../nodes/performance-and-testing/_meta.json  |   1 -
 .../node-api-check.mdx                        | 165 ------------------
 .../pages/operators/troubleshooting/nodes.mdx |   4 +-
 18 files changed, 239 insertions(+), 230 deletions(-)
 delete mode 100644 documentation/docs/pages/operators/nodes/performance-and-testing/node-api-check.mdx

diff --git a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/nyx-total-stake.md b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/nyx-total-stake.md
index e36dbca0e2..64cb46e4ca 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/nyx-total-stake.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/nyx-total-stake.md
@@ -1 +1 @@
-44.811
+44.332
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/time-now.md b/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
index c568fec333..347e22de35 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
@@ -1 +1 @@
-Thursday, January 16th 2025, 09:57:52 UTC
+Thursday, January 23rd 2025, 10:41:32 UTC
diff --git a/documentation/docs/next.config.js b/documentation/docs/next.config.js
index 10e18d982b..6efaaf2669 100644
--- a/documentation/docs/next.config.js
+++ b/documentation/docs/next.config.js
@@ -497,13 +497,6 @@ const config = {
         permanent: true,
         basePath: false,
       },
-      {
-        source: "/operators/testing/node-api-check.html",
-        destination:
-          "/docs/operators/nodes/performance-and-testing/node-api-check",
-        permanent: true,
-        basePath: false,
-      },
       {
         source: "/operators/testing/prometheus-grafana.html",
         destination:
@@ -663,13 +656,6 @@ const config = {
         permanent: true,
         basePath: false,
       },
-      {
-        source: "/docs/operators/testing/node-api-check",
-        destination:
-          "/docs/operators/nodes/performance-and-testing/node-api-check",
-        permanent: true,
-        basePath: false,
-      },
       {
         source: "/docs/operators/nodes/proxy-configuration",
         destination:
diff --git a/documentation/docs/pages/apis/explorer-api.mdx b/documentation/docs/pages/apis/explorer-api.mdx
index 0ab207360d..2dbb4f30ba 100644
--- a/documentation/docs/pages/apis/explorer-api.mdx
+++ b/documentation/docs/pages/apis/explorer-api.mdx
@@ -3,6 +3,6 @@
 
 The Explorer API is the backend for the [Mixnet Explorer](https://explorer.nymtech.net/).
 
-**This will soon be deprecated in favour of the [Node Status API](../ns-api).**
+**This will soon be deprecated in favour of the [Node Status API](ns-api.mdx).**
 
 The code for this service can be found [in our monorepo](https://github.com/nymtech/nym/tree/develop/explorer).
diff --git a/documentation/docs/pages/developers/clients/socks5/setup.mdx b/documentation/docs/pages/developers/clients/socks5/setup.mdx
index 027fadf35e..43f9c86171 100644
--- a/documentation/docs/pages/developers/clients/socks5/setup.mdx
+++ b/documentation/docs/pages/developers/clients/socks5/setup.mdx
@@ -16,7 +16,7 @@ You can check that your binaries are properly compiled with:
 You can check the necessary parameters for the available commands by running:
 
 ```
-./nym-client <COMMAND> --help
+./nym-socks5-client <COMMAND> --help
 ```
 
 ## Initialising a new client instance
diff --git a/documentation/docs/pages/developers/tools/nym-cli/usage.mdx b/documentation/docs/pages/developers/tools/nym-cli/usage.mdx
index f9fa301cc9..7611149cb7 100644
--- a/documentation/docs/pages/developers/tools/nym-cli/usage.mdx
+++ b/documentation/docs/pages/developers/tools/nym-cli/usage.mdx
@@ -4,7 +4,7 @@
 The `nym-cli` binary can be built by running `cargo build --release` in the `nym/tools/nym-cli` directory.
 
 ## Usage
-See the [commands](./nym-cli/commands.mdx) page for an overview of all command options.
+See the [commands](commands.mdx) page for an overview of all command options.
 
 ## Staking on someone's behalf (for custodians)
 
diff --git a/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx b/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
index ceb9064502..267f8d3788 100644
--- a/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
+++ b/documentation/docs/pages/developers/typescript/examples/mix-fetch.mdx
@@ -17,8 +17,6 @@ Sounds great, are there any catches? Well, there are a few (for now):
 
 - For now, `mixFetch` cannot deal with concurrent requests with the same base URL.
 
-Read [this article](https://blog.nym.com/mixfetch-like-the-fetch-api-but-via-the-mixnet-82acfd435c62) to learn more.
-
 <Callout type="info" emoji="ℹ️">
   Right now Gateways are not required to run a Secure Websocket (WSS) listener, so only a subset of nodes running in Gateway mode have configured their nodes to do so.
 
diff --git a/documentation/docs/pages/network/architecture.mdx b/documentation/docs/pages/network/architecture.mdx
index 9e7210f92c..19560c0bb2 100644
--- a/documentation/docs/pages/network/architecture.mdx
+++ b/documentation/docs/pages/network/architecture.mdx
@@ -1,8 +1,8 @@
 # Network Components
 
 Core components:
-* A **Mixnet**, which mixes Sphinx packet traffic so that it cannot be determined who is communicating with whom. Our mixnet is based on a modified version of the [**Loopix** design](concepts/loopix). This is made up of [Nym nodes](architecture/mixnet/nodes) runnning on servers around the world maintained by a decentralised group of Operators.
-* Various [**Nym clients**](architecture/mixnet/clients) which manage sending and receiving Sphinx packets, encrypting/decrypting traffic, and providing [cover traffic](./concepts/cover-traffic) to hide 'real' traffic timing.
+* A **Mixnet**, which mixes Sphinx packet traffic so that it cannot be determined who is communicating with whom. Our mixnet is based on a modified version of the [**Loopix** design](concepts/loopix). This is made up of [Nym nodes](architecture/mixnet#nodes) runnning on servers around the world maintained by a decentralised group of Operators.
+* Various [**Nym clients**](architecture/mixnet#nym-clients) which manage sending and receiving Sphinx packets, encrypting/decrypting traffic, and providing [cover traffic](./concepts/cover-traffic) to hide 'real' traffic timing.
 * A CosmWasm-enabled blockchain called [**Nyx**](architecture/nyx), the home of the various smart contracts used by the mixnet. A subset of Nyx Validators run [NymAPI](./architecture/nyx#nymapi) instances, taking part in also producing and verifying [zk-nym credentials](cryptography/zk-nym).
 
 ![arch_overview](/images/network/arch/overall-arch.png)
diff --git a/documentation/docs/pages/network/architecture/nyx.mdx b/documentation/docs/pages/network/architecture/nyx.mdx
index 4f2c82e4e1..5795e76f77 100644
--- a/documentation/docs/pages/network/architecture/nyx.mdx
+++ b/documentation/docs/pages/network/architecture/nyx.mdx
@@ -66,7 +66,7 @@ The Vesting contract has multiple functions:
 * Interacting with the Mixnet using vesting (i.e. non-transferable) tokens, allowing users to delegate their unvested tokens.
 
 ### Multisig Contract
-The multisig contract used by the [NymAPI Quroum](../cryptography/zk-nym/zk-nym-overview) - a subset of the Nyx Validator set taking on the additional work of generating and validating zk-nyms - to execute certain actions in the [zk-nym](./ecash.md) contract.
+The multisig contract used by the [NymAPI Quroum](../cryptography/zk-nym/zk-nym-overview) - a subset of the Nyx Validator set taking on the additional work of generating and validating zk-nyms - to execute certain actions in the [zk-nym](../cryptography/zk-nym) contract.
 
 It is essentially an instance of the [canonical](https://github.com/CosmWasm/cw-plus/tree/main/contracts) `cw3-flex-multisig` using the `cw4-group` contract, with one minor change to restrict the addresses allowed to submit proposals.
 
diff --git a/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx b/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
index 89a124b726..1b3dcd27b8 100644
--- a/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
+++ b/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
@@ -1,5 +1,7 @@
-import { Steps } from 'nextra/components'
+import { Steps } from 'nextra/components';
 import { VarInfo } from 'components/variable-info.tsx';
+import { Tabs } from 'nextra/components';
+import { MyTab } from 'components/generic-tabs.tsx';
 
 # Pre-built Binaries
 
@@ -27,11 +29,55 @@ In case you want to download binary to your current working directory, drop `<PA
 
 In case you want to download binary to your current working directory, drop `<PATH>` from the command
 
-###### 2. Make the binary executable
+###### 2. Verify the binary `sha256sum` hash
+
+<div>
+  <Tabs items={[
+    <strong>Manual check</strong>,
+    <strong>One-liner</strong>,
+    ]} defaultIndex="0">
+    <MyTab>
+To see your binary `sha256sum` hash, run: 
+```sh
+sha256sum <BINARY>
+``` 
+```sh
+# for example 
+# sha256sum ./nym-wallet_1.2.15_amd64.AppImage
+# or
+# sha256sum ./nym-node
+```
+- Download [`hashes.json`](https://github.com/nymtech/nym/releases) file from the same same *Assets* drop down like your binary
+- Open it with your text editor or print its content with `cat hashes.json`
+- Check it if your binary `sha256sum` output is in `hashes.json` by using the `sha256sum` and searching for it or using `grep` command:
+```
+grep -i <SHA_HASH> 
+```
+    </MyTab>
+    <MyTab>
+- Download [`hashes.json`](https://github.com/nymtech/nym/releases) file from the same same *Assets* drop down like your binary
+- Run this command, substituting `<BINARY>` with your the one you want to check:
+```sh
+sha256sum <BINARY> | awk '{print $1}' | grep -qF "$(jq -r '.assets | to_entries | .[].value.sha256' hashes.json)" && echo "Hash matches an asset in the JSON file." || echo "Hash does not match any asset in the JSON file."
+```
+```sh
+# for example
+# sha256sum ./nym-node | awk '{print $1}' | grep -qF "$(jq -r '.assets | to_entries | .[].value.sha256' hashes.json)" && echo "Hash matches an asset in the JSON file." || echo "Hash does not match any asset in the JSON file."
+```
+    </MyTab>
+  </Tabs>
+</div>
+
+- If your have to extract the binary (it would look like like `<BINARY>.tar.gz`) do it:
+```sh
+tar -xvzf <BINARY>.tar.gz
+```
+
+###### 3. Make the binary executable
 - Open terminal in the same directory and run:
 ```sh
-chmod +x <BINARY>
-# for example: chmod +x nym-mixnode
+chmod u+x <BINARY>
+# for example: chmod u+x nym-node
 ```
 
 </Steps>
diff --git a/documentation/docs/pages/operators/changelog.mdx b/documentation/docs/pages/operators/changelog.mdx
index 96d73d3183..24c305d63d 100644
--- a/documentation/docs/pages/operators/changelog.mdx
+++ b/documentation/docs/pages/operators/changelog.mdx
@@ -525,7 +525,7 @@ cargo Profile:      release
 
 - `nym-node` has now implemented [IPv6 support for wireguard](https://github.com/nymtech/nym/pull/5059)
 
-- [`network_tunnel_manager.sh` updated](network): run the commands below to make sure
+- [`network_tunnel_manager.sh` updated](https://raw.githubusercontent.com/nymtech/nym/refs/heads/develop/scripts/network_tunnel_manager.sh): run the commands below to make sure
 
 <br />
 
@@ -659,7 +659,7 @@ systemctl daemon-reload && service nym-node restart
 
 - Since `v2024.13-magura`, operators do not update their node version in the wallet. [Manual upgrading steps](nodes/maintenance/manual-upgrade.mdx) has been updated accordingly.
 
-- CLI tool [`node_api_check.py`](nodes/performance-and-testing/node-api-check.mdx), helping operators to collect all API values about their nodes locally, is not up to date with the API changes introduced with `v2024.13-magura` release version. Please treat it as unstable before we fix it.
+- CLI tool `node_api_check.py`, helping operators to collect all API values about their nodes locally, is not up to date with the API changes introduced with `v2024.13-magura` release version. Please treat it as unstable before we fix it.
 
 #### Error Log
 
@@ -967,7 +967,7 @@ Confirm that the deployment workflows work through manual testing
 ### Operators Updates & Tooling
 
 <Callout type="warning" emoji="⚠️">
-**Every operator has to make sure that their nodes [self-described endpoint works](nodes/performance-and-testing/node-api-check#basic-api-usage), otherwise the node will be un-routable and thus won't get any rewards!**
+**Every operator has to make sure that their nodes self-described endpoint works, otherwise the node will be un-routable and thus won't get any rewards!**
 </Callout>
 
 - **New technical documentation:** All Nym documentation starts from a new entry page [nymtech.net/docs](https://nymtech.net/docs/operators/introduction). To run locally or propose collaboration, start in our [repository](https://github.com/nymtech/nym/tree/develop/documentation)
@@ -1165,7 +1165,7 @@ Some endpoints got purposely deprecated without any equivalent reimplemented sin
 ##### Mixnet Contract
 
 <Callout type="warning" emoji="">
-**Every operator has to make sure that their nodes [self-described endpoint works](nodes/performance-and-testing/node-api-check#basic-api-usage), otherwise the node will be un-routable and thus won't get any rewards!**
+**Every operator has to make sure that their nodes self-described endpoint works, otherwise the node will be un-routable and thus won't get any rewards!**
 </Callout>
 
 ###### High Level Changes
@@ -1979,7 +1979,7 @@ done
     - Vesting contract functionalities have been purged, users can only remove tokens from vesting
     - Migrating from `mixnode` or `gateway` smart contracts to a new unifying `nym-node` smart contract will be available soon using Nym desktop wallet, just like you are used to for bonding and node settings. After this migration all `nym-nodes` will be able to receive delegation and rewards. We will share a step by step guide once this migration will be deployed. No action needed now.
 
-- [Nym API Check CLI](testing/node-api-check.md) is upgraded according to the latest API endpoints, output is cleaner and more concise.
+- Nym API Check CLI is upgraded according to the latest API endpoints, output is cleaner and more concise.
 
 
 #### Operators Tasks
@@ -2868,7 +2868,7 @@ warning: /home/alice/src/nym/nym/common/dkg/Cargo.toml: `default-features` is ig
     - Flow [chart](release-cycle.md#release-flow)
 - [Sandbox testnet](sandbox.md) guide: teaching Nym node operators how to run their nodes in Nym Sandbox testnet environment.
 - [Terms & Conditions flag](nodes/setup.md#terms--conditions)
-- [Node API Check CLI](testing/node-api-check.md)
+- Node API Check CLI
 - [Pruning VPS `syslog` scripts](troubleshooting/vps-isp.md#pruning-logs)
 - [Black-xit: Exiting the blacklist](troubleshooting/nodes.md#my-gateway-is-blacklisted)
 
diff --git a/documentation/docs/pages/operators/nodes/maintenance.mdx b/documentation/docs/pages/operators/nodes/maintenance.mdx
index fa686f906c..1d182e3d85 100644
--- a/documentation/docs/pages/operators/nodes/maintenance.mdx
+++ b/documentation/docs/pages/operators/nodes/maintenance.mdx
@@ -101,23 +101,31 @@ For more information about your node's port configuration, check the [port refer
 
 Anything can happen to the server on which your node is running. To back up your `nym-node` keys and configuration protects the operators against the negative impact of unexpected events. To restart your node on another server, two essential pieces are needed:
 
-1. Node keys to initialise the same node on a new VPS
-2. Access to the bonding Nym account (wallet seeds) to edit the IP on smart contract
+1. **Node keys to initialise the same node on a new VPS**
+2. **Access to the bonding Nyx account (wallet seeds) to update host on the Mixnet smart contract**
 
-Assuming that everyone access their wallets from local machine and does *not* store their seeds on VPS, point 2. should be a given.
-To backup your `nym-node` keys and configuration in the easiest way possible, copy the entire config directory `.nym` from your VPS to your local desktop, using a special copy command `scp`:
+Optionally, it can be useful to have a backup your configuration directories to setup [reverse proxy and WSS](nym-node/configuration/proxy-configuration.mdx) quickly as well.
+
+Assuming that everyone access their wallets from local machine and does *not* store their seeds on VPS, point \#2 should be a given.
 
 <Callout type="warning" emoji="⚠️">
 Never store your mnemonic seed anywhere online nor do *not* share it with anyone!
 </Callout>
 
+To backup your `nym-node` keys and configuration in the easiest way possible, copy the entire config directory `.nym` from your VPS to your local machine, using a special copy command `scp`:
+
 <Steps>
 
-###### 1. Create a directory where you want to store your backup
+###### 1. Create a local directory where you want to store your backup
 ```sh
 mkdir -pv <PATH_TO_TARGET_DIRECTORY>
 ```
 
+```sh
+# for example
+# mkdir -pv $HOME/backup/my_nym_node/.nym
+```
+
 ###### 2. Copy configuration folder `.nym` from your VPS to your newly created backup directory
 
 ```sh
@@ -130,37 +138,96 @@ The `scp` command should print logs, an operator can see directly whether it was
 
 </Steps>
 
+Now you have everything needed to restore your `nym-node` on another server. If you are in a need of doing so, follow the steps in [*Restoring a node*](#restoring-a-node) chapter below.
+
+### Backup proxy configuration
+
+If you run your node behind a [reverse proxy and WSS](nym-node/configuration/proxy-configuration.mdx) (suggested for all Exit Gateways), you may find it useful to backup configuration directories for that as well. It's done by following the same logic, using `scp` command for remote copy:
+
+<Callout>
+Given that servers hosting a `nym-node` are expected to be a single purpose machines, we assume in this guide, that there are no other `<HOSTNAME>` sub-directories in `/var/www` and `/etc/nginx/sites-available` then the ones relevant to `nym-node`. In case you prefer to only backup configuration for a particular hostname, just append your `<HOSTNAME>` to the path in the commands below.
+</ Callout>
+
+<Steps>
+
+###### 1. Create local sub-directories where you want to store your backup
+
+```sh
+mkdir -pv <PATH_TO_TARGET_DIRECTORY>
+mkdir -pv <PATH_TO_TARGET_DIRECTORY>
+```
+
+```sh
+# for example
+# mkdir -pv $HOME/backup/my_nym_node/var/www
+# mkdir -pv $HOME/backup/my_nym_node/etc/nginx/sites-available
+```
+
+###### 1. Backup `/var/www` directory
+
+```sh
+scp -r <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:/var/www <PATH_TO_TARGET_DIRECTORY>
+```
+
+###### 2. Backup `/etc/nginx/sites-available` directory
+
+```sh
+scp -r <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:/etc/nginx/sites-available <PATH_TO_TARGET_DIRECTORY>
+```
+
+###### 3. Verify the success of the backup
+
+The `scp` command should print logs, an operator can see directly whether it was successful or if it encountered any error. However, double check that all your needed configuration is in the backup target directory.
+
+</Steps>
+
+<Callout type="info">
+To copy files from the root directory (paths starting with `/`), you need root permissions on the remote machine. If your server is not running as the root user, the `scp` command won't work directly, as using the `sudo` prefix would apply to your local machine instead of the remote server.
+
+To resolve this, you need to SSH into the remote server first, and there use the `sudo cp -r <SOURCE_PATH> <TARGET_PATH>` command to copy the necessary directories to a location outside the root directory. After that, you can run `scp` with the correct source path to transfer the files.
+</Callout>
+
 ## Restoring a node
 
-In case your VPS shut down and you have a [backup](#backup-a-node) of your node keys and access to your bonding wallet, you can easily restore your node on another server without losing your delegation.
+In case your VPS was terminated and you have a [backup](#backup-a-node) of your node keys and access to your [bonding](nym-node/bonding) wallet, you can easily restore your node on another server without losing your delegation.
 
 <Steps>
 
 ###### 1. Prepare new VPS
 
-- On VPS: Do all [preliminary steps](preliminary-steps.mdx) needed to run a `nym-node`.
+SSH into your new VPS and start with:
 
-- On VPS: Create a `.nym/nym-nodes` configuration folder:
+- Do all [preliminary steps](preliminary-steps.mdx) needed to run a `nym-node`.
+
+- Create a `.nym/nym-nodes` configuration folder:
 ```sh
 mkdir -pv ~/.nym/nym-nodes
 ```
 
 ###### 2. Restore your node configuration
 
-From machine where your node is backed up (usually local desktop): Copy the folder with your node keys and configuration to the newly created folder on your VPS using `scp` command. Make sure to grab the entire `nym-node` configuration folder, which is called after your local `nym-node` identifier (`<ID>`), the `-r` (recursive) flag will take care of all sub-directories and their content:
+Copy the folder with your node configuration and keys from your local machine to the newly created folder on your VPS using `scp` command. Make sure to grab the entire `nym-node` configuration folder, which is called after your local `nym-node` identifier (`<ID>`), the `-r` (recursive) flag will take care of all sub-directories and their content:
+
 ```sh
 scp -r <PATH_TO_LOCAL_NODE_CONFIGURATION_FOLDER> <VPS_USER_NAME>@<VPS_HOST_ADDRESS>:~/.nym/nym-nodes/
 ```
+```sh
+# for example:
+scp -r $HOME/backup/my_nym_node/.nym/nym-nodes/default-nym-node root@my-nym-node:~/.nym/nym-nodes/
+```
+
+###### 3. Verify the success of the backup
 
 The `scp` command should print logs, an operator can see directly whether it was successful or if it encountered any error. However, double check that all your needed configuration is in the target directory `.nym/nym-nodes` on your VPS.
 
 
-###### 3. Configure your node on the new VPS
-
-* Edit `~/.nym/nym-nodes/<ID>/config/config.toml` config with the new listening address IP - it's the one under the header `[host]`, called `public_ips = [<PUBLIC_IPS>,]` and add your new location (field `location = <LOCATION>`, formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided). You can see your IP by running a command `echo "$(curl -4 https://ifconfig.me)"`.
+###### 4. Configure your node on the new VPS
 
+* SSH to your VPS
+* Run a command `echo "$(curl -4 https://ifconfig.me)"` to see your public IPv4
+* Edit config file located at `~/.nym/nym-nodes/<ID>/config/config.toml` correct IP - it's the field under the header `[host]`, called `public_ips = [<PUBLIC_IPS>,]`
+* Add your new location field `location = <LOCATION>`, (formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided).
 * Try to run the node and see if everything works.
-
 * Setup the [systemd](nym-node/configuration.mdx#systemd) automation (don't forget to add the [terms and conditions flag](nym-node/setup.mdx#terms--conditions)) to `ExecStart` command, reload the daemon and run the service.
 
 ###### 4. Change the node smart contract info via the wallet interface
@@ -169,6 +236,63 @@ Open Nym Wallet, go to *Bonding*, open *Settings* and change *Host* value to the
 
 </Steps>
 
+Everything should work now. If not, have a look through the `config.toml` file and ensure that there are no details from the past VPS, things like WSS port, landing page asset etc. If you had a configuration with reverse proxy and WSS, continue to set that up as well. If you had it backed up, you can follow the steps to [restore proxy configuration](#restore-proxy-configuration) below, or you can start to [configure proxy from scratch](nym-node/configuration/proxy-configuration.mdx).
+
+### Restoring proxy configuration
+
+If operators moving to a new server had their [proxy configuration backed up](#backup-proxy-configuration), it's possible to simply restore it, following these steps:
+
+<Steps>
+###### 1. Copy your backed up directory `/var/www` for landing page to the server
+- Start setting up reverse proxy and WSS following [this guide](nym-node/configuration/proxy-configuration.mdx) but instead of creating a new `/var/www/<HOSTNAME>` directory, simply copy there the one from the old server, using `scp` command
+
+```sh
+scp -r <PATH_TO_LOCAL_WWW_CONFIGURATION_BACKUP> <VPS_USER_NAME>@<VPS_HOST_ADDRESS>:/var/www/
+```
+```sh
+# for example:
+scp -r $HOME/backup/my_nym_node/var/www root@my-nym-node:/var/www
+```
+###### 2. Make sure that domain is correctly setup
+As you see in the guide you use a domain (same like your `<HOSTNAME>`), make sure you have it registered as and redirected to the new IP by logging into your DNS provider and editing the dashboard of the domain.
+
+###### 3. Proceed with all needed `node` configuration
+- In the guide follow the steps to [configure your node reverse proxy](nym-node/configuration/proxy-configuration#reverse-proxy-configuration), like installing Nginx, opening the needed ports etc
+
+###### 4. Restore Nginx config
+- When you arrive to the point to configure your [`/etc/nginx/sites-available/<HOSTNAME>`](nym-node/configuration/proxy-configuration#2-add-your-endpoint-configuration-to-nginx-by-creating-a-config-file), use again `scp` instead of creating a new one
+
+```sh
+scp -r <PATH_TO_LOCAL_NGINX_CONFIGURATION_BACKUP> <VPS_USER_NAME>@<VPS_HOST_ADDRESS>:/etc/nginx/sites-available
+```
+```sh
+# for example:
+scp -r $HOME/backup/my_nym_node/etc/nginx/sites-available root@my-nym-node:/etc/nginx/sites-available
+```
+###### 5. Edit Nginx configuration file with correct hostname
+- Open the Nginx config file on your server and see if a domain name needs to be changed to new one. To open the file, use for example nano text editor:
+```sh
+nano /etc/nginx/sites-available/<HOSTNAME>
+```
+###### 6. Continue with the Nginx setup
+- Go back to the [proxy setup guide](nym-node/configuration/proxy-configuration#3-activate-and-test-nginx-configuration) and continue from the point [\#3](nym-node/configuration/proxy-configuration#3-activate-and-test-nginx-configuration)
+
+###### 7. Edit WSS configuration with the correct hostname
+- Open the WSS config file on your server and see if a domain name needs to be changed to new one. To open the file, use for example nano text editor:
+```sh
+nano /etc/nginx/sites-available/wss-config-nym
+```
+###### 8. Finish and test the setup
+
+Continue with the [activating and testing](nym-node/configuration/proxy-configuration#2-activate-and-test-nginx-wss-configuration) your reverse proxy and WSS until the end of the guide.
+</ Steps>
+
+<Callout type="info">
+To copy files to the root directory (paths starting with `/`), you need root permissions on the remote machine. If your server is not running as the root user, the `scp` command won't work directly, as using the `sudo` prefix would apply to your local machine instead of the remote server.
+
+To resolve this, you can SSH into the remote server and create the configuration files manually using the prefix `sudo` and then copy their content from your local backup.
+</Callout>
+
 ## Moving a node
 
 In case of a need to move a Nym Node from one machine to another and avoiding to lose the delegation, here are few steps how to do it.
diff --git a/documentation/docs/pages/operators/nodes/nym-node/bonding.mdx b/documentation/docs/pages/operators/nodes/nym-node/bonding.mdx
index 2681b4de9f..ef3ade7403 100644
--- a/documentation/docs/pages/operators/nodes/nym-node/bonding.mdx
+++ b/documentation/docs/pages/operators/nodes/nym-node/bonding.mdx
@@ -28,7 +28,7 @@ Do not bond your node to the API if the previous steps weren't finished. Bad con
 
 Any new bonded node will provide only the bare minimum information: host, identity key and optionally custom port of its HTTP API - we highly recommend to set that one up to `8080`. Everything else will be discovered via the self-described API for maximum flexibility. This also includes the sphinx key, meaning if the API is not exposed, the node will be unable to route any traffic.
 
-**Every operator has to make sure that their nodes [self-described endpoint works](nodes/performance-and-testing/node-api-check#basic-api-usage), otherwise the node will be un-routable and thus won't get any rewards!**
+**Every operator has to make sure that their nodes [self-described endpoint works](../performance-and-testing#functionality--performance-check), otherwise the node will be un-routable and thus won't get any rewards!**
 
 <Callout type="warning" emoji="⚠️">
 **Reveal your menominc phrase only in areas out of surveillance of other people and never share it with others. Nym team will never ask you for your mnemonic phrase - in case you were asked by someone it's a scam, do *not* reply to it!**
@@ -36,7 +36,7 @@ Any new bonded node will provide only the bare minimum information: host, identi
 
 ## Bond via the Desktop wallet (recommended)
 
-You can bond your `nym-node` via the Desktop wallet.
+You can bond your `nym-node` via the Desktop wallet. Nym wallet, just like any Nym binary can be downloaded, verified and made executable following [these simple steps](../../binaries/pre-built-binaries#setup-binaries).
 
 <Steps>
 
@@ -120,18 +120,13 @@ From `nym-wallet` version `1.2.15` onward the application allows and prompts ope
 
 <Steps>
 
-###### 1. Download the latest wallet from [the release page](https://github.com/nymtech/nym/releases)
+###### 1. Download the latest wallet from [the release page](https://github.com/nymtech/nym/releases), verify and make executable
 
-###### 2. Verify the binary and extract it if needed
+Nym wallet, just like any Nym binary can be downloaded, verified and made executable following [these simple steps](../../binaries/pre-built-binaries#setup-binaries).
 
-- Download [`hashes.json`](https://github.com/nymtech/nym/releases/download/nym-wallet-v1.2.15/hashes.json)
-- Open it with your text editor or print it's content with `cat hashes.json`
-- Run `sha256sum <WALLET_BINARY>` for example `sha256sum ./nym-wallet_1.2.15_amd64.AppImage`
-- If your have to extract it (like `.tar.gz`) do it
+###### 2. Open the wallet and sign in
 
-###### 3. Open the wallet and sign in
-
-###### 4. Migrate!
+###### 3. Migrate!
 
 - Go to Bonding and you will be prompted with such message:
 
@@ -161,9 +156,9 @@ If you want to bond your Mix Node via the CLI, then check out the [relevant sect
 This is not relevant for operators running exclusively `mixnode` functionality. For any type of gateway functionality this is a preparation requirement for the upcoming [ticket rewarding](../../tokenomics/mixnet-rewards#roadmap).
 </ Callout>
 
-Every `nym-node` client contains a mnemonic of a Nyx account, generated with node initialisation (first `run` command creating all configuration and data files). This mnemonic is located in `$HOME/.nym/nym-nodes/<ID>/data/cosmos_mnemonic`. **This is *not* the same account as the one used for bondng!**
+Every `nym-node` client contains a mnemonic of a Nyx account, generated with node initialisation (first `run` command creating all configuration and data files). This mnemonic is located in `$HOME/.nym/nym-nodes/<ID>/data/cosmos_mnemonic`. **This is *not* the same account as the one used for bonding!**
 
-This client account will be used for the process of redemption of tickets collected by nodes running as `entry-gateway` and `exit-gateway` as the redemption requires gateway to create a multisig proposal on the chain for which the client (node) needs to pay transaction fee.
+This client account will be used for the process of redemption of [zk-nym tickets](../../../network/cryptography/zk-nym) collected by nodes running as `entry-gateway` and `exit-gateway` as the redemption requires gateway to create a multisig proposal on the chain for which the client (node) needs to pay transaction fee.
 
 Giving the low transaction cost on Cosmos, funding your client Nyx account with 25 NYM tokens should be more than enough. To do so, follow these steps:
 
diff --git a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
index 6b613511d7..c77b18de42 100644
--- a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
+++ b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
@@ -178,7 +178,7 @@ http://<IPv4_ADDRESS>/api/v1/swagger/#/
 https://<HOSTNAME>/api/v1/swagger/#/
 ```
 
-For example to determine which mode your node is running, you can check the `:8080/api/v1/roles` endpoint. For example:
+For example to determine which mode your node is running, you can check the `:8080/api/v1/roles` endpoint:
 ```sh
 # sustitude <IPv4_ADDRESS> or <HOSTNAME> with the one corresponding to your node
 # for http
diff --git a/documentation/docs/pages/operators/nodes/performance-and-testing.mdx b/documentation/docs/pages/operators/nodes/performance-and-testing.mdx
index 2246a76a9d..ba700cf031 100644
--- a/documentation/docs/pages/operators/nodes/performance-and-testing.mdx
+++ b/documentation/docs/pages/operators/nodes/performance-and-testing.mdx
@@ -8,6 +8,34 @@ As developers we need to be constantly improving the software. Operators have as
 
 Therefore [monitoring](#monitoring) and [testing](#testing) are essential pieces of our common work. We call out all Nym operators to join the efforts!
 
+## Functionality & Performance Check
+
+If you want to just quickly check your nodes performance, connectivity and much more, visit [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/).
+
+For more information about available endpoints and their status, you can refer to:
+```sh
+# sustitude <IPv4_ADDRESS> or <HOSTNAME> with the one corresponding to your node
+# for http
+http://<IPv4_ADDRESS>:8080/api/v1/swagger/#/
+# or
+http://<IPv4_ADDRESS>/api/v1/swagger/#/
+
+# for reversed proxy/WSS
+https://<HOSTNAME>/api/v1/swagger/#/
+```
+
+For example to determine which mode your node is running, you can check the `:8080/api/v1/roles` endpoint:
+```sh
+# sustitude <IPv4_ADDRESS> or <HOSTNAME> with the one corresponding to your node
+# for http
+http://<IPv4_ADDRESS>:8080/api/v1/roles
+# or
+http://<IPv4_ADDRESS>/api/v1/roles
+
+# for reversed proxy/WSS
+https://<HOSTNAME>/api/v1/roles
+```
+
 ## Monitoring
 
 There are multiple ways to monitor performance of nodes and the machines on which they run. For the purpose of maximal privacy and decentralisation of the data - preventing Nym Mixnet from any global adversary takeover - we created these pages as a source of mutual empowerment, a place where operators can share and learn new skills to **setup metrics monitors on their own infrastructure**.
diff --git a/documentation/docs/pages/operators/nodes/performance-and-testing/_meta.json b/documentation/docs/pages/operators/nodes/performance-and-testing/_meta.json
index b8b08c3e99..32d200a0dc 100644
--- a/documentation/docs/pages/operators/nodes/performance-and-testing/_meta.json
+++ b/documentation/docs/pages/operators/nodes/performance-and-testing/_meta.json
@@ -1,5 +1,4 @@
 {
   "gateway-probe": "Gateway Probe",
-  "node-api-check": "Node API Check",
   "prometheus-grafana": "Prometheus & Grafana"
 }
diff --git a/documentation/docs/pages/operators/nodes/performance-and-testing/node-api-check.mdx b/documentation/docs/pages/operators/nodes/performance-and-testing/node-api-check.mdx
deleted file mode 100644
index 43867da088..0000000000
--- a/documentation/docs/pages/operators/nodes/performance-and-testing/node-api-check.mdx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { Tabs } from 'nextra/components';
-import { Callout } from 'nextra/components';
-import { VarInfo } from 'components/variable-info.tsx';
-import { Steps } from 'nextra/components';
-import { MyTab } from 'components/generic-tabs.tsx';
-import NodeApiCheckHelp from 'components/outputs/command-outputs/node-api-check-help.md';
-import NodeApiCheckQueryHelp from 'components/outputs/command-outputs/node-api-check-query-help.md'
-
-# Node API Check
-
-<Callout type="warning" emoji="⚠️">
-CLI tool `node_api_check.py`, helping operators to collect all API values about their nodes locally, is not up to date with the API changes introduced with `v2024.13-magura` release version. Please treat it as unstable before we fix it.
-</Callout>
-
-<VarInfo />
-
-Operating a `nym-node` is not a *"set and forget"* endeavor, it takes some work. To diagnose node network performance through querying APIs, is a good knowledge to have. These are the main places to look for API endpoints regarding `nym-node`:
-
-- [`openapi.json`](https://validator.nymtech.net/api/v1/openapi.json): a list of all endpoints
-- [Swagger UI page](https://validator.nymtech.net/api/swagger/index.html)
-
-Besides that, node operators can check out their node performance, connectivity and much more on [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/).
-
-### Basic API usage
-
-For information about available endpoints and their status, you can refer to:
-```sh
-# for http
-http://<PUBLIC_IP>:8080/api/v1/swagger/#/
-# or
-http://<PUBLIC_IP>/api/v1/swagger/#/
-
-# for reversed proxy/WSS
-https://<HOSTNAME>/api/v1/swagger/#/
-```
-
-For example to determine which mode your node is running, you can check `:8080/api/v1/roles` endpoint:
-```sh
-# for http
-http://<PUBLIC_IP>:8080/api/v1/roles
-# or
-http://<PUBLIC_IP>/api/v1/roles
-
-# for reversed proxy/WSS
-https://<HOSTNAME>/api/v1/roles
-```
-
-## `node_api_check.py`
-
-To make this a bit easier, we made a CLI tool querying all available API endpoints based on node `Identity Key` (further denoted as `<ID_KEY>`) called `node_api_check.py`. To diagnose your node performance, whether by yourself or by sharing an output in our [operator channel](https://matrix.to/#/#operators:nymtech.chat), this tool provides you with a quick overview of live data. We recommend to run this checker alongside [`nym_gateway_probe`](gateway-probe.md) to triage both performance and an actual routing.
-
-Besides querying any bonded node APIs, `nym_api_check.py` has a function counting all existing nodes in provided version.
-
-### Setup
-
-#### Pre-requsities
-
-<Steps>
-
-###### 1. Install and configure Python3
-
-
-- Start with installing Python3:
-```sh
-sudo apt install python3
-```
-
-- Make sure Python3 is your default Python version:
-```sh
-update-alternatives --install  /usr/bin/python python /usr/bin/python3 1
-```
-
-- Verify:
-```sh
-python --version
-
-# should return higher than 3
-```
-
-- Install Python modules `tabulate`, `pandas` and `argparse` either using [`pip`](https://python.land/virtual-environments/installing-packages-with-pip) or if you installed Python3 system-wide you can install modules directly:
-
-<div>
-  <Tabs items={[
-    <strong>Using <code>pip</code></strong>,
-    <strong>System-wide Python installation</strong>,
-    ]} defaultIndex="1">
-    <MyTab>
-      ```sh
-      pip install tabulate pandas argparse
-      ```
-    </MyTab>
-    <MyTab>
-      ```sh
-      sudo apt install python3-tabulate python3-pandas python3-argparse -y
-      ```
-    </MyTab>
-  </Tabs>
-</div>
-
-###### 2. Install `node_api_check.py` and make executable
-
-To run the program you neet to have  [`node_api_check.py`](https://github.com/nymtech/nym/tree/develop/scripts/node_api_check.py) and [`api_endpoints.json`](https://github.com/nymtech/nym/tree/develop/scripts/api_endpoints.json).
-
-- If you [compiled from source](../../binaries/building-nym.mdx), you already have both of these files. Note that the latest version of this program may be on `develop` branch.
-
-- If you prefer to download them individually, do it by opening terminal in your desired location and running:
-```sh
-wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/node_api_check.py
-
-wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/api_endpoints.json
-```
-
-- Make executable:
-```sh
-chmod u+x node_api_check.py
-```
-
-</Steps>
-
-Now you are ready to check your node.
-
-### Usage & Commands
-
-- Run the program with `--help` flag to see the available commands:
-```sh
-./node_api_check.py --help
-```
-
-- Command Output:
-
-<NodeApiCheckHelp />
-
-#### `query_stats`
-
-When you want to see all the options connected to any command, add a `--help` flag after the command of your choice. Command `query_stats` is the most useful one of this program.
-
-```sh
-./node_api_check query_stats --help
-```
-
-- Command output:
-
-<NodeApiCheckQueryHelp/ >
-
-The most common usage may be `./node_api_check.py query_stats <ID_KEY>` where `<ID_KEY>` is required, substitute it with node Identity Key.
-
-**Optional arguments**
-
-| Flag                   | Shortcut | Description                                                    |
-| :---                   |   :---   | :---                                                           |
-| `--markdown`           |   `-m`   | returns output in markdown format                              |
-| `--no_routing_history` |   None   | returns output without routing history which can be lengthy    |
-| `--no_verloc_metrics`  |   None   | returns output without verloc measurement which can be lengthy |
-| `--output`             |   `-o`   | exports output to a file, possible to add a target path        |
-
-#### `version_count`
-
-<Callout>
-To see a quick overview of `nym-node` version distribution in numbers and graph, visit [Nym Harbourmaster](https://harbourmaster.nymtech.net).
-</Callout>
-
-Another command is `version_count` where at least one `nym-node` version is required. In case of multiple version count, separate the versions with space. We recommend to run this command with `--markdown` flag for a nicer output. This is an example where we want to look up how many registered nodes are on versions `1.1.0`, `1.1.1`, `1.1.2` and `1.1.3`:
-```sh
-./node_api_check version_count 1.1.0 1.1.1 1.1.2 1.1.3 --markdown
-```
diff --git a/documentation/docs/pages/operators/troubleshooting/nodes.mdx b/documentation/docs/pages/operators/troubleshooting/nodes.mdx
index 2838ef6730..c8e5d06b25 100644
--- a/documentation/docs/pages/operators/troubleshooting/nodes.mdx
+++ b/documentation/docs/pages/operators/troubleshooting/nodes.mdx
@@ -113,8 +113,6 @@ There are a few community explorers as well.
 
 Enter your **identity key** to find your node. Check the contents of the `Mixnode stats` and `Routing score` sections.
 
-You can run [Node API Check CLI](../testing/node-api-check.mdx) to query all API endpoints of your node at once.
-
 [Here](https://github.com/cosmos/chain-registry/blob/master/nyx/chain.json#L158-L187) is a dictionary with Nyx chain registry entry regarding all explorers.
 
 If you want more information, or if your node isn't showing up on the explorer of your choice and you want to double-check, here are some examples on how to check if the node is configured properly.
@@ -345,7 +343,7 @@ In case your Gateway appeared on the [blacklist](https://validator.nymtech.net/a
 
 **What to do**
 
-Begin with a sanity check by opening [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net) and check your node there. To query all API endpoints of your node at once, you can run [Node API Check CLI](../testing/node-api-check.mdx). To see IPv4 and IPv6 routing in real time (harbourmaster can have a cache up to 90 min), run [Gateway Probe CLI](../testing/gateway-probe.mdx).
+Begin with a sanity check by opening [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net) and check your node there. To see IPv4 and IPv6 routing in real time (harbourmaster can have a cache up to 90 min), run [Gateway Probe CLI](../testing/gateway-probe.mdx).
 
 Then follow these steps:
 

From 8d10552d7cd16f3536af02526aa7d7e88456646e Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Thu, 23 Jan 2025 08:29:56 -0700
Subject: [PATCH 25/42] hickory dns error mgmt

---
 common/http-api-client/src/dns.rs | 41 ++++++++++++-------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index f0b6503c73..137809d6a7 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -9,11 +9,11 @@
 //!
 //! Requires the `dns-over-https-rustls`, `webpki-roots` feature for the
 //! `hickory-resolver` crate
+#![deny(missing_docs)]
+
 use crate::ClientBuilder;
 
-use std::fmt;
-use std::net::SocketAddr;
-use std::sync::Arc;
+use std::{net::SocketAddr, sync::Arc};
 
 use hickory_resolver::lookup_ip::LookupIp;
 use hickory_resolver::{
@@ -27,6 +27,7 @@ use reqwest::dns::{Addrs, Name, Resolve, Resolving};
 use tracing::warn;
 
 impl ClientBuilder {
+    /// Override the DNS resolver implementation used by the underlying http client.
     pub fn dns_resolver<R: Resolve + 'static>(mut self, resolver: Arc<R>) -> Self {
         self.reqwest_client_builder = self.reqwest_client_builder.dns_resolver(resolver);
         self
@@ -37,8 +38,12 @@ struct SocketAddrs {
     iter: LookupIpIntoIter,
 }
 
-#[derive(Debug)]
-struct HickoryDnsSystemConfError(ResolveError);
+#[derive(Debug, thiserror::Error)]
+#[error("hickory-dns resolver error: {hickory_error}")]
+pub struct HickoryDnsError {
+    #[from]
+    hickory_error: ResolveError,
+}
 
 /// Wrapper around an `AsyncResolver`, which implements the `Resolve` trait.
 #[derive(Debug, Default, Clone)]
@@ -84,10 +89,9 @@ impl Iterator for SocketAddrs {
     }
 }
 
-type BoxError = Box<dyn std::error::Error + Send + Sync>;
-
 impl HickoryDnsResolver {
-    pub async fn resolve_str(&self, name: &str) -> Result<LookupIp, BoxError> {
+    /// Attempt to resolve a domain name to a set of ['IpAddr']s
+    pub async fn resolve_str(&self, name: &str) -> Result<LookupIp, HickoryDnsError> {
         let resolver = self.state.get_or_try_init(new_resolver)?;
 
         // try the primary DNS resolver that we set up (DoH or DoT or whatever)
@@ -107,7 +111,7 @@ impl HickoryDnsResolver {
 
 /// Create a new resolver with a custom DoT based configuration. The options are overridden to look
 /// up for both IPv4 and IPv6 addresses to work with "happy eyeballs" algorithm.
-fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
+fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsError> {
     let mut name_servers = NameServerConfigGroup::google_tls();
     name_servers.merge(NameServerConfigGroup::google_https());
     // name_servers.merge(NameServerConfigGroup::google_h3());
@@ -129,25 +133,12 @@ fn new_resolver() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
 /// Create a new resolver with the default configuration, which reads from the system DNS config
 /// (i.e. `/etc/resolve.conf` in unix). The options are overridden to look up for both IPv4 and IPv6
 /// addresses to work with "happy eyeballs" algorithm.
-fn new_resolver_system() -> Result<TokioAsyncResolver, HickoryDnsSystemConfError> {
-    let (config, mut opts) =
-        hickory_resolver::system_conf::read_system_conf().map_err(HickoryDnsSystemConfError)?;
+fn new_resolver_system() -> Result<TokioAsyncResolver, HickoryDnsError> {
+    let (config, mut opts) = hickory_resolver::system_conf::read_system_conf()?;
     opts.ip_strategy = LookupIpStrategy::Ipv4AndIpv6;
     Ok(TokioAsyncResolver::tokio(config, opts))
 }
 
-impl fmt::Display for HickoryDnsSystemConfError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("error reading DNS system conf for hickory-dns")
-    }
-}
-
-impl std::error::Error for HickoryDnsSystemConfError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        Some(&self.0)
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
@@ -173,7 +164,7 @@ mod test {
     }
 
     #[tokio::test]
-    async fn dns_lookup() -> Result<(), BoxError> {
+    async fn dns_lookup() -> Result<(), HickoryDnsError> {
         let resolver = HickoryDnsResolver::default();
 
         let domain = "ifconfig.me";

From ff91d4619e00fb4858879230e402917328ee1113 Mon Sep 17 00:00:00 2001
From: import this <97586125+serinko@users.noreply.github.com>
Date: Fri, 24 Jan 2025 10:31:19 +0000
Subject: [PATCH 26/42] [HOTFIX/DOCs]: Update pre-built-binaries.mdx (#5385)

---
 .../docs/pages/operators/binaries/pre-built-binaries.mdx      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx b/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
index 1b3dcd27b8..e8cea401e3 100644
--- a/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
+++ b/documentation/docs/pages/operators/binaries/pre-built-binaries.mdx
@@ -20,15 +20,13 @@ If the pre-built binaries don't work or are unavailable for your system, you wil
 - Download from your terminal using `curl` or `wget` tool:
 ```sh
 # using curl
-curl -L <LINK> -o <PATH>/nym-node
+curl -L <LINK> -o <PATH>
 
 # using wget
 wget <LINK>
 ```
 In case you want to download binary to your current working directory, drop `<PATH>` from the command
 
-In case you want to download binary to your current working directory, drop `<PATH>` from the command
-
 ###### 2. Verify the binary `sha256sum` hash
 
 <div>

From 9550934d1f7597515d3b4863807c6b557908a730 Mon Sep 17 00:00:00 2001
From: Drazen Urch <drazen@urch.eu>
Date: Mon, 27 Jan 2025 20:00:37 +0100
Subject: [PATCH 27/42] Pre shutdown hooks for GatewayClient (#5381)

---
 .../client-core/src/client/base_client/mod.rs | 18 +++---
 .../client-core/src/client/mix_traffic/mod.rs | 60 ++++++++++---------
 .../src/client/mix_traffic/transceiver.rs     | 13 ++--
 .../gateway-client/src/client/mod.rs          | 13 ++++
 .../src/types/text_request.rs                 |  2 +-
 common/task/src/manager.rs                    |  2 +-
 nym-network-monitor/src/main.rs               | 16 +++--
 sdk/rust/nym-sdk/src/mixnet/client.rs         |  2 +
 sdk/rust/nym-sdk/src/mixnet/native_client.rs  | 36 +++++++++++
 9 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/common/client-core/src/client/base_client/mod.rs b/common/client-core/src/client/base_client/mod.rs
index d7f9463dc2..4b31108946 100644
--- a/common/client-core/src/client/base_client/mod.rs
+++ b/common/client-core/src/client/base_client/mod.rs
@@ -1,6 +1,7 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use super::mix_traffic::ClientRequestSender;
 use super::received_buffer::ReceivedBufferMessage;
 use super::statistics_control::StatisticsControl;
 use crate::client::base_client::storage::helpers::store_client_keys;
@@ -645,13 +646,12 @@ where
     fn start_mix_traffic_controller(
         gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
         shutdown: TaskClient,
-        forget_me: ForgetMe,
-    ) -> BatchMixMessageSender {
+    ) -> (BatchMixMessageSender, ClientRequestSender) {
         info!("Starting mix traffic controller...");
-        let (mix_traffic_controller, mix_tx) =
-            MixTrafficController::new(gateway_transceiver, forget_me);
+        let (mix_traffic_controller, mix_tx, client_tx) =
+            MixTrafficController::new(gateway_transceiver);
         mix_traffic_controller.start_with_shutdown(shutdown);
-        mix_tx
+        (mix_tx, client_tx)
     }
 
     // TODO: rename it as it implies the data is persistent whilst one can use InMemBackend
@@ -833,10 +833,9 @@ where
         // traffic stream.
         // The MixTrafficController then sends the actual traffic
 
-        let message_sender = Self::start_mix_traffic_controller(
+        let (message_sender, client_request_sender) = Self::start_mix_traffic_controller(
             gateway_transceiver,
             shutdown.fork("mix_traffic_controller"),
-            self.forget_me,
         );
 
         // Channels that the websocket listener can use to signal downstream to the real traffic
@@ -911,6 +910,8 @@ where
             },
             stats_reporter,
             task_handle: shutdown,
+            client_request_sender,
+            forget_me: self.forget_me,
         })
     }
 }
@@ -922,6 +923,7 @@ pub struct BaseClient {
     pub client_output: ClientOutputStatus,
     pub client_state: ClientState,
     pub stats_reporter: ClientStatsSender,
-
+    pub client_request_sender: ClientRequestSender,
     pub task_handle: TaskHandle,
+    pub forget_me: ForgetMe,
 }
diff --git a/common/client-core/src/client/mix_traffic/mod.rs b/common/client-core/src/client/mix_traffic/mod.rs
index fa73cc82a8..2103491705 100644
--- a/common/client-core/src/client/mix_traffic/mod.rs
+++ b/common/client-core/src/client/mix_traffic/mod.rs
@@ -2,13 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::mix_traffic::transceiver::GatewayTransceiver;
-use crate::{spawn_future, ForgetMe};
+use crate::spawn_future;
 use log::*;
 use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;
 
 pub type BatchMixMessageSender = tokio::sync::mpsc::Sender<Vec<MixPacket>>;
 pub type BatchMixMessageReceiver = tokio::sync::mpsc::Receiver<Vec<MixPacket>>;
+pub type ClientRequestReceiver = tokio::sync::mpsc::Receiver<ClientRequest>;
+pub type ClientRequestSender = tokio::sync::mpsc::Sender<ClientRequest>;
 
 pub mod transceiver;
 
@@ -23,48 +25,60 @@ pub struct MixTrafficController {
     gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
 
     mix_rx: BatchMixMessageReceiver,
+    client_rx: ClientRequestReceiver,
 
     // TODO: this is temporary work-around.
     // in long run `gateway_client` will be moved away from `MixTrafficController` anyway.
     consecutive_gateway_failure_count: usize,
-    forget_me: ForgetMe,
 }
 
 impl MixTrafficController {
     pub fn new<T>(
         gateway_transceiver: T,
-        forget_me: ForgetMe,
-    ) -> (MixTrafficController, BatchMixMessageSender)
+    ) -> (
+        MixTrafficController,
+        BatchMixMessageSender,
+        ClientRequestSender,
+    )
     where
         T: GatewayTransceiver + Send + 'static,
     {
         let (message_sender, message_receiver) =
             tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
+
+        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(1);
+
         (
             MixTrafficController {
                 gateway_transceiver: Box::new(gateway_transceiver),
                 mix_rx: message_receiver,
+                client_rx: client_receiver,
                 consecutive_gateway_failure_count: 0,
-                forget_me,
             },
             message_sender,
+            client_sender,
         )
     }
 
     pub fn new_dynamic(
         gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
-        forget_me: ForgetMe,
-    ) -> (MixTrafficController, BatchMixMessageSender) {
+    ) -> (
+        MixTrafficController,
+        BatchMixMessageSender,
+        ClientRequestSender,
+    ) {
         let (message_sender, message_receiver) =
             tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
+        let (client_sender, client_receiver) = tokio::sync::mpsc::channel(1);
         (
             MixTrafficController {
                 gateway_transceiver,
                 mix_rx: message_receiver,
+                client_rx: client_receiver,
                 consecutive_gateway_failure_count: 0,
-                forget_me,
             },
             message_sender,
+            client_sender,
         )
     }
 
@@ -112,6 +126,17 @@ impl MixTrafficController {
                             break;
                         }
                     },
+                    client_request = self.client_rx.recv() => match client_request {
+                        Some(client_request) => {
+                            match self.gateway_transceiver.send_client_request(client_request).await {
+                                Ok(_) => (),
+                                Err(e) => error!("Failed to send client request: {}", e),
+                            };
+                        },
+                        None => {
+                            log::trace!("MixTrafficController, client request channel closed");
+                        }
+                    },
                     _ = shutdown.recv_with_delay() => {
                         log::trace!("MixTrafficController: Received shutdown");
                         break;
@@ -120,25 +145,6 @@ impl MixTrafficController {
             }
             shutdown.recv_timeout().await;
 
-            if self.forget_me.any() {
-                log::info!("Sending forget me request to the gateway");
-                match self
-                    .gateway_transceiver
-                    .send_client_request(ClientRequest::ForgetMe {
-                        client: self.forget_me.client(),
-                        stats: self.forget_me.stats(),
-                    })
-                    .await
-                {
-                    Ok(_) => {
-                        log::info!("Successfully sent forget me request to the gateway");
-                    }
-                    Err(err) => {
-                        log::error!("Failed to send forget me request to the gateway: {err}");
-                    }
-                }
-            }
-
             log::debug!("MixTrafficController: Exiting");
         });
     }
diff --git a/common/client-core/src/client/mix_traffic/transceiver.rs b/common/client-core/src/client/mix_traffic/transceiver.rs
index 77c226d245..56c0a195d9 100644
--- a/common/client-core/src/client/mix_traffic/transceiver.rs
+++ b/common/client-core/src/client/mix_traffic/transceiver.rs
@@ -86,7 +86,9 @@ impl<G: GatewayTransceiver + ?Sized + Send> GatewayTransceiver for Box<G> {
         &mut self,
         message: ClientRequest,
     ) -> Result<(), GatewayClientError> {
-        (**self).send_client_request(message).await
+        let _ = (**self).send_client_request(message.clone()).await?;
+        log::debug!("Sent client request: {:?}", message);
+        Ok(())
     }
 }
 
@@ -143,14 +145,7 @@ where
         &mut self,
         message: ClientRequest,
     ) -> Result<(), GatewayClientError> {
-        if let Some(shared_key) = self.gateway_client.shared_key() {
-            self.gateway_client
-                .send_websocket_message(message.encrypt(&*shared_key)?)
-                .await?;
-            Ok(())
-        } else {
-            Err(GatewayClientError::ConnectionInInvalidState)
-        }
+        self.gateway_client.send_client_request(message).await
     }
 }
 
diff --git a/common/client-libs/gateway-client/src/client/mod.rs b/common/client-libs/gateway-client/src/client/mod.rs
index 26986e3df8..3c2435121a 100644
--- a/common/client-libs/gateway-client/src/client/mod.rs
+++ b/common/client-libs/gateway-client/src/client/mod.rs
@@ -271,6 +271,19 @@ impl<C, St> GatewayClient<C, St> {
         }
     }
 
+    pub async fn send_client_request(
+        &mut self,
+        message: ClientRequest,
+    ) -> Result<(), GatewayClientError> {
+        if let Some(shared_key) = self.shared_key() {
+            let encrypted = message.encrypt(&*shared_key)?;
+            Box::pin(self.send_websocket_message(encrypted)).await?;
+            Ok(())
+        } else {
+            Err(GatewayClientError::ConnectionInInvalidState)
+        }
+    }
+
     async fn read_control_response(&mut self) -> Result<ServerResponse, GatewayClientError> {
         // we use the fact that all request responses are Message::Text and only pushed
         // sphinx packets are Message::Binary
diff --git a/common/gateway-requests/src/types/text_request.rs b/common/gateway-requests/src/types/text_request.rs
index 72eebc3e17..0fb864a533 100644
--- a/common/gateway-requests/src/types/text_request.rs
+++ b/common/gateway-requests/src/types/text_request.rs
@@ -13,7 +13,7 @@ use std::str::FromStr;
 use tungstenite::Message;
 
 // wrapper for all encrypted requests for ease of use
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[non_exhaustive]
 pub enum ClientRequest {
     UpgradeKey {
diff --git a/common/task/src/manager.rs b/common/task/src/manager.rs
index 5df2012c11..b2134a5e28 100644
--- a/common/task/src/manager.rs
+++ b/common/task/src/manager.rs
@@ -315,7 +315,7 @@ impl TaskClient {
     const MAX_NAME_LENGTH: usize = 128;
     const OVERFLOW_NAME: &'static str = "reached maximum TaskClient children name depth";
 
-    const SHUTDOWN_TIMEOUT_WAITING_FOR_SIGNAL_ON_EXIT: Duration = Duration::from_secs(5);
+    const SHUTDOWN_TIMEOUT_WAITING_FOR_SIGNAL_ON_EXIT: Duration = Duration::from_secs(10);
 
     fn new(
         notify: watch::Receiver<()>,
diff --git a/nym-network-monitor/src/main.rs b/nym-network-monitor/src/main.rs
index 26476813a4..c26f4859b4 100644
--- a/nym-network-monitor/src/main.rs
+++ b/nym-network-monitor/src/main.rs
@@ -59,9 +59,6 @@ async fn make_clients(
                 loop {
                     if Arc::strong_count(&dropped_client) == 1 {
                         if let Some(client) = Arc::into_inner(dropped_client) {
-                            // let forget_me = ClientRequest::ForgetMe {
-                            //     also_from_stats: true,
-                            // };
                             let client_handle = client.into_inner();
                             client_handle.disconnect().await;
                         } else {
@@ -222,10 +219,12 @@ async fn main() -> Result<()> {
         TOPOLOGY.get().expect("Topology not set yet!").clone(),
     ));
 
+    let clients_server = clients.clone();
+
     let server_handle = tokio::spawn(async move {
         let socket = SocketAddr::new(IpAddr::V4(Ipv4Addr::from_str(&args.host)?), args.port);
         let server = HttpServer::new(socket, server_cancel_token);
-        server.run(clients).await
+        server.run(clients_server).await
     });
 
     info!("Waiting for message (ctrl-c to exit)");
@@ -259,6 +258,15 @@ async fn main() -> Result<()> {
         };
     }
 
+    info!("Disconnecting all clients");
+    let mut clients_guard = clients.write().await;
+    while let Some(client) = clients_guard.pop_front() {
+        if let Some(client) = Arc::into_inner(client) {
+            let client_handle = client.into_inner();
+            client_handle.disconnect().await;
+        }
+    }
+
     cancel_token.cancel();
 
     server_handle.await??;
diff --git a/sdk/rust/nym-sdk/src/mixnet/client.rs b/sdk/rust/nym-sdk/src/mixnet/client.rs
index 74f1536ed7..af0f059cfa 100644
--- a/sdk/rust/nym-sdk/src/mixnet/client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/client.rs
@@ -800,6 +800,8 @@ where
             stats_events_reporter,
             started_client.task_handle,
             None,
+            started_client.client_request_sender,
+            started_client.forget_me,
         ))
     }
 }
diff --git a/sdk/rust/nym-sdk/src/mixnet/native_client.rs b/sdk/rust/nym-sdk/src/mixnet/native_client.rs
index 14b537753e..436214819b 100644
--- a/sdk/rust/nym-sdk/src/mixnet/native_client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/native_client.rs
@@ -5,12 +5,15 @@ use async_trait::async_trait;
 use futures::{ready, Stream, StreamExt};
 use log::error;
 use nym_client_core::client::base_client::GatewayConnection;
+use nym_client_core::client::mix_traffic::ClientRequestSender;
 use nym_client_core::client::{
     base_client::{ClientInput, ClientOutput, ClientState},
     inbound_messages::InputMessage,
     received_buffer::ReconstructedMessagesReceiver,
 };
+use nym_client_core::ForgetMe;
 use nym_crypto::asymmetric::identity;
+use nym_gateway_requests::ClientRequest;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::{params::PacketType, receiver::ReconstructedMessage};
 use nym_statistics_common::clients::{ClientStatsEvents, ClientStatsSender};
@@ -56,6 +59,8 @@ pub struct MixnetClient {
 
     // internal state used for the `Stream` implementation
     _buffered: Vec<ReconstructedMessage>,
+    pub(crate) client_request_sender: ClientRequestSender,
+    pub(crate) forget_me: ForgetMe,
 }
 
 impl MixnetClient {
@@ -70,6 +75,8 @@ impl MixnetClient {
         stats_events_reporter: ClientStatsSender,
         task_handle: TaskHandle,
         packet_type: Option<PacketType>,
+        client_request_sender: ClientRequestSender,
+        forget_me: ForgetMe,
     ) -> Self {
         Self {
             nym_address,
@@ -82,6 +89,8 @@ impl MixnetClient {
             task_handle,
             packet_type,
             _buffered: Vec::new(),
+            client_request_sender,
+            forget_me,
         }
     }
 
@@ -112,6 +121,10 @@ impl MixnetClient {
         &self.nym_address
     }
 
+    pub fn client_request_sender(&self) -> ClientRequestSender {
+        self.client_request_sender.clone()
+    }
+
     /// Sign a message with the client's private identity key.
     pub fn sign(&self, data: &[u8]) -> identity::Signature {
         self.identity_keys.private_key().sign(data)
@@ -201,6 +214,15 @@ impl MixnetClient {
     /// Disconnect from the mixnet. Currently it is not supported to reconnect a disconnected
     /// client.
     pub async fn disconnect(mut self) {
+        if self.forget_me.any() {
+            log::debug!("Sending forget me request: {:?}", self.forget_me);
+            match self.send_forget_me().await {
+                Ok(_) => (),
+                Err(e) => error!("Failed to send forget me request: {}", e),
+            };
+            tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
+        }
+
         if let TaskHandle::Internal(task_manager) = &mut self.task_handle {
             task_manager.signal_shutdown().ok();
             task_manager.wait_for_shutdown().await;
@@ -209,6 +231,20 @@ impl MixnetClient {
         // note: it's important to take ownership of the struct as if the shutdown is `TaskHandle::External`,
         // it must be dropped to finalize the shutdown
     }
+
+    pub async fn send_forget_me(&self) -> Result<()> {
+        let client_request = ClientRequest::ForgetMe {
+            client: self.forget_me.client(),
+            stats: self.forget_me.stats(),
+        };
+        match self.client_request_sender.send(client_request).await {
+            Ok(_) => Ok(()),
+            Err(e) => {
+                error!("Failed to send forget me request: {}", e);
+                Err(Error::MessageSendingFailure)
+            }
+        }
+    }
 }
 
 #[derive(Clone)]

From 6d90ffdd2c1ac81f20cab2e09e07032f4a00703b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Stuczy=C5=84ski?=
 <jedrzej.stuczynski@gmail.com>
Date: Tue, 28 Jan 2025 09:29:51 +0000
Subject: [PATCH 28/42] reduce log severity for checking topology validity
 (#5395)

---
 common/topology/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/topology/src/lib.rs b/common/topology/src/lib.rs
index 1077d1ffe5..2150d587cb 100644
--- a/common/topology/src/lib.rs
+++ b/common/topology/src/lib.rs
@@ -11,7 +11,7 @@ use std::borrow::Borrow;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Display;
 use std::net::IpAddr;
-use tracing::{debug, warn};
+use tracing::{debug, trace, warn};
 
 pub use crate::node::{EntryDetails, RoutingNode, SupportedRoles};
 pub use error::NymTopologyError;
@@ -293,7 +293,7 @@ impl NymTopology {
         let has_exit_gateways = !self.rewarded_set.exit_gateways.is_empty();
         let has_entry_gateways = !self.rewarded_set.entry_gateways.is_empty();
 
-        debug!(
+        trace!(
             has_layer1 = %has_layer1,
             has_layer2 = %has_layer2,
             has_layer3 = %has_layer3,

From 8f48ae08c4d99fd7f00ff3b08789b01f586df491 Mon Sep 17 00:00:00 2001
From: Yana Matrosova <42305364+yanok87@users.noreply.github.com>
Date: Tue, 28 Jan 2025 19:30:45 +0200
Subject: [PATCH 29/42] Redirect from mixnode page to nodes page (#5397)

Co-authored-by: Yana <yanok87@users.noreply.github.com>
---
 .../network-components/nodes/[id]/page.tsx    | 356 ++++++++++--------
 explorer-nextjs/next.config.mjs               |  12 +-
 explorer-nextjs/tsconfig.json                 |   3 +-
 3 files changed, 220 insertions(+), 151 deletions(-)

diff --git a/explorer-nextjs/app/network-components/nodes/[id]/page.tsx b/explorer-nextjs/app/network-components/nodes/[id]/page.tsx
index 2f92542b3b..95a172d21e 100644
--- a/explorer-nextjs/app/network-components/nodes/[id]/page.tsx
+++ b/explorer-nextjs/app/network-components/nodes/[id]/page.tsx
@@ -1,62 +1,62 @@
-'use client'
+"use client";
 
-import * as React from 'react'
-import { Alert, AlertTitle, Box, CircularProgress, Grid } from '@mui/material'
-import { useParams } from 'next/navigation'
-import { ColumnsType, DetailTable } from '@/app/components/DetailTable'
-import { ComponentError } from '@/app/components/ComponentError'
-import { ContentCard } from '@/app/components/ContentCard'
-import { UptimeChart } from '@/app/components/UptimeChart'
-import {
-  NymNodeContextProvider,
-  useNymNodeContext,
-} from '@/app/context/node'
-import { useMainContext } from '@/app/context/main'
-import { Title } from '@/app/components/Title'
+import * as React from "react";
+import { Alert, AlertTitle, Box, CircularProgress, Grid } from "@mui/material";
+import { useParams } from "next/navigation";
+import { ColumnsType, DetailTable } from "@/app/components/DetailTable";
+import { ComponentError } from "@/app/components/ComponentError";
+import { ContentCard } from "@/app/components/ContentCard";
+import { UptimeChart } from "@/app/components/UptimeChart";
+import { NymNodeContextProvider, useNymNodeContext } from "@/app/context/node";
+import { useMainContext } from "@/app/context/main";
+import { Title } from "@/app/components/Title";
 import Paper from "@mui/material/Paper";
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableContainer from '@mui/material/TableContainer';
-import TableRow from '@mui/material/TableRow';
-import {humanReadableCurrencyToString} from "@/app/utils/currency";
-import {DeclaredRole} from "@/app/network-components/nodes/DeclaredRole";
-import {NodeDelegationsTable, VestingDelegationWarning} from "@/app/network-components/nodes/[id]/NodeDelegationsTable";
+import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import TableCell from "@mui/material/TableCell";
+import TableContainer from "@mui/material/TableContainer";
+import TableRow from "@mui/material/TableRow";
+import { humanReadableCurrencyToString } from "@/app/utils/currency";
+import { DeclaredRole } from "@/app/network-components/nodes/DeclaredRole";
+import {
+  NodeDelegationsTable,
+  VestingDelegationWarning,
+} from "@/app/network-components/nodes/[id]/NodeDelegationsTable";
 
 const columns: ColumnsType[] = [
   {
-    field: 'identity_key',
-    title: 'Identity Key',
-    headerAlign: 'left',
+    field: "identity_key",
+    title: "Identity Key",
+    headerAlign: "left",
     width: 230,
   },
   {
-    field: 'bond',
-    title: 'Bond',
-    headerAlign: 'left',
+    field: "bond",
+    title: "Bond",
+    headerAlign: "left",
   },
   {
-    field: 'host',
-    title: 'IP',
-    headerAlign: 'left',
+    field: "host",
+    title: "IP",
+    headerAlign: "left",
     width: 99,
   },
   {
-    field: 'location',
-    title: 'Location',
-    headerAlign: 'left',
+    field: "location",
+    title: "Location",
+    headerAlign: "left",
   },
   {
-    field: 'owner',
-    title: 'Owner',
-    headerAlign: 'left',
+    field: "owner",
+    title: "Owner",
+    headerAlign: "left",
   },
   {
-    field: 'version',
-    title: 'Version',
-    headerAlign: 'left',
+    field: "version",
+    title: "Version",
+    headerAlign: "left",
   },
-]
+];
 
 interface NodeEnrichedRowType {
   node_id: number;
@@ -71,28 +71,33 @@ interface NodeEnrichedRowType {
 function nodeEnrichedToGridRow(node: any): NodeEnrichedRowType {
   return {
     node_id: node.node_id,
-    owner: node.bond_information?.owner || '',
-    identity_key: node.bond_information?.node?.identity_key || '',
-    location: node.location?.country_name || '',
+    owner: node.bond_information?.owner || "",
+    identity_key: node.bond_information?.node?.identity_key || "",
+    location: node.location?.country_name || "",
     bond: node.bond_information?.original_pledge.amount || 0, // TODO: format
-    host: node.bond_information?.node?.host || '',
-    version: node.description?.build_information?.build_version || '',
+    host: node.bond_information?.node?.host || "",
+    version: node.description?.build_information?.build_version || "",
   };
 }
 
-
 /**
  * Shows nym node details
  */
 const PageNymNodeDetailsWithState = ({
   selectedNymNode,
 }: {
-  selectedNymNode?: any
+  selectedNymNode?: any;
 }) => {
-  const { uptimeHistory } = useNymNodeContext()
-  const enrichedData = React.useMemo(() => selectedNymNode ? [nodeEnrichedToGridRow(selectedNymNode)] : [], []);
+  const { uptimeHistory } = useNymNodeContext();
+  const enrichedData = React.useMemo(
+    () => (selectedNymNode ? [nodeEnrichedToGridRow(selectedNymNode)] : []),
+    []
+  );
 
-  const hasVestingContractDelegations = React.useMemo(() => selectedNymNode?.delegations?.filter((d: any) => d.proxy)?.length, [selectedNymNode]);
+  const hasVestingContractDelegations = React.useMemo(
+    () => selectedNymNode?.delegations?.filter((d: any) => d.proxy)?.length,
+    [selectedNymNode]
+  );
 
   return (
     <Box component="main">
@@ -109,81 +114,128 @@ const PageNymNodeDetailsWithState = ({
       </Grid>
 
       <Grid container mt={2} spacing={2}>
-        {selectedNymNode.rewarding_details &&
-            <Grid item xs={12} md={4}>
-              <TableContainer component={Paper}>
-                <Table>
-                  <TableBody>
-                    <TableRow>
-                        <TableCell colSpan={2}>
-                            Delegations and Rewards
-                        </TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell component="th" scope="row" sx={{ color: "inherit" }}>
-                        <strong>Operator</strong>
-                      </TableCell>
-                      <TableCell align="right">
-                        {humanReadableCurrencyToString({ amount : selectedNymNode.rewarding_details.operator.split('.')[0], denom: "unym" })}
-                      </TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableCell component="th" scope="row" sx={{ color: "inherit" }}>
-                            <strong>
-                              {hasVestingContractDelegations ?
-                                <VestingDelegationWarning plural={true}>
-                                  Delegates&nbsp;({selectedNymNode.rewarding_details.unique_delegations} delegates)
-                                </VestingDelegationWarning> :
-                                <>Delegates&nbsp;({selectedNymNode.rewarding_details.unique_delegations} delegates)</>
-                              }
-                            </strong>
-                        </TableCell>
-                        <TableCell align="right">
-                          {humanReadableCurrencyToString({ amount : selectedNymNode.rewarding_details.delegates.split('.')[0], denom: "unym" })}
-                        </TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableCell component="th" scope="row" sx={{ color: "inherit" }}>
-                            <strong>Profit margin</strong>
-                        </TableCell>
-                        <TableCell align="right">
-                          {selectedNymNode.rewarding_details.cost_params.profit_margin_percent * 100}%
-                        </TableCell>
-                    </TableRow>
-                    <TableRow>
-                        <TableCell component="th" scope="row" sx={{ color: "inherit" }}>
-                            <strong>Operator costs</strong>
-                        </TableCell>
-                        <TableCell align="right">
-                          {humanReadableCurrencyToString(selectedNymNode.rewarding_details.cost_params.interval_operating_cost)}
-                        </TableCell>
-                    </TableRow>
-                  </TableBody>
-                </Table>
-              </TableContainer>
-            </Grid>}
+        {selectedNymNode.rewarding_details && (
+          <Grid item xs={12} md={4}>
+            <TableContainer component={Paper}>
+              <Table>
+                <TableBody>
+                  <TableRow>
+                    <TableCell colSpan={2}>Delegations and Rewards</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell
+                      component="th"
+                      scope="row"
+                      sx={{ color: "inherit" }}
+                    >
+                      <strong>Operator</strong>
+                    </TableCell>
+                    <TableCell align="right">
+                      {humanReadableCurrencyToString({
+                        amount:
+                          selectedNymNode.rewarding_details.operator.split(
+                            "."
+                          )[0],
+                        denom: "unym",
+                      })}
+                    </TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell
+                      component="th"
+                      scope="row"
+                      sx={{ color: "inherit" }}
+                    >
+                      <strong>
+                        {hasVestingContractDelegations ? (
+                          <VestingDelegationWarning plural={true}>
+                            Delegates&nbsp;(
+                            {
+                              selectedNymNode.rewarding_details
+                                .unique_delegations
+                            }{" "}
+                            delegates)
+                          </VestingDelegationWarning>
+                        ) : (
+                          <>
+                            Delegates&nbsp;(
+                            {
+                              selectedNymNode.rewarding_details
+                                .unique_delegations
+                            }{" "}
+                            delegates)
+                          </>
+                        )}
+                      </strong>
+                    </TableCell>
+                    <TableCell align="right">
+                      {humanReadableCurrencyToString({
+                        amount:
+                          selectedNymNode.rewarding_details.delegates.split(
+                            "."
+                          )[0],
+                        denom: "unym",
+                      })}
+                    </TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell
+                      component="th"
+                      scope="row"
+                      sx={{ color: "inherit" }}
+                    >
+                      <strong>Profit margin</strong>
+                    </TableCell>
+                    <TableCell align="right">
+                      {selectedNymNode.rewarding_details.cost_params
+                        .profit_margin_percent * 100}
+                      %
+                    </TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell
+                      component="th"
+                      scope="row"
+                      sx={{ color: "inherit" }}
+                    >
+                      <strong>Operator costs</strong>
+                    </TableCell>
+                    <TableCell align="right">
+                      {humanReadableCurrencyToString(
+                        selectedNymNode.rewarding_details.cost_params
+                          .interval_operating_cost
+                      )}
+                    </TableCell>
+                  </TableRow>
+                </TableBody>
+              </Table>
+            </TableContainer>
+          </Grid>
+        )}
 
-        {selectedNymNode.description?.declared_role && <Grid item xs={12} md={4}>
-          <TableContainer component={Paper}>
-            <Table>
-              <TableBody>
-                <TableRow>
-                  <TableCell colSpan={2}>
-                    Node roles
-                  </TableCell>
-                </TableRow>
-                <TableRow>
-                  <TableCell>
-                    Self declared roles
-                  </TableCell>
-                  <TableCell>
-                    <DeclaredRole declared_role={selectedNymNode.description?.declared_role}/>
-                  </TableCell>
-                </TableRow>
-              </TableBody>
-            </Table>
-          </TableContainer>
-        </Grid>}
+        {selectedNymNode.description?.declared_role && (
+          <Grid item xs={12} md={4}>
+            <TableContainer component={Paper}>
+              <Table>
+                <TableBody>
+                  <TableRow>
+                    <TableCell colSpan={2}>Node roles</TableCell>
+                  </TableRow>
+                  <TableRow>
+                    <TableCell>Self declared roles</TableCell>
+                    <TableCell>
+                      <DeclaredRole
+                        declared_role={
+                          selectedNymNode.description?.declared_role
+                        }
+                      />
+                    </TableCell>
+                  </TableRow>
+                </TableBody>
+              </Table>
+            </TableContainer>
+          </Grid>
+        )}
       </Grid>
 
       <Grid container spacing={2} mt={2}>
@@ -205,42 +257,41 @@ const PageNymNodeDetailsWithState = ({
       </Grid>
 
       <Box mt={2}>
-        <NodeDelegationsTable node={selectedNymNode}/>
+        <NodeDelegationsTable node={selectedNymNode} />
       </Box>
     </Box>
-  )
-}
+  );
+};
 
 /**
  * Guard component to handle loading and not found states
  */
 const PageNymNodeDetailGuard = () => {
-  const [selectedNode, setSelectedNode] = React.useState<any>()
+  const [selectedNode, setSelectedNode] = React.useState<any>();
   const [isLoading, setLoading] = React.useState<boolean>(true);
   const [error, setError] = React.useState<string>();
-  const { fetchNodeById } = useMainContext()
-  const { id } = useParams()
+  const { fetchNodeById } = useMainContext();
+  const { id } = useParams();
 
   React.useEffect(() => {
     setSelectedNode(undefined);
     setLoading(true);
     (async () => {
-      if(typeof(id) === "string") {
+      if (typeof id === "string") {
         try {
           const res = await fetchNodeById(Number.parseInt(id));
           setSelectedNode(res);
-        } catch(e: any) {
+        } catch (e: any) {
           setError(e.message);
-        }
-        finally {
+        } finally {
           setLoading(false);
         }
       }
     })();
-  }, [id])
+  }, [id, fetchNodeById]);
 
   if (isLoading) {
-    return <CircularProgress />
+    return <CircularProgress />;
   }
 
   // loaded, but not found
@@ -248,31 +299,38 @@ const PageNymNodeDetailGuard = () => {
     return (
       <Alert severity="warning">
         <AlertTitle>Nym node not found</AlertTitle>
-        Sorry, we could not find a node with id <code>{id || ''}</code>
+        Sorry, we could not find a node with id <code>{id || ""}</code>
       </Alert>
-    )
+    );
   }
 
-  return <PageNymNodeDetailsWithState selectedNymNode={selectedNode} />
-}
+  if (!selectedNode) {
+    return (
+      <Alert severity="warning">
+        <AlertTitle>Legacy Node</AlertTitle>
+        Unable to load details for the selected Nym node.
+      </Alert>
+    );
+  }
+
+  return <PageNymNodeDetailsWithState selectedNymNode={selectedNode} />;
+};
 
 /**
  * Wrapper component that adds the node content based on the `id` in the address URL
  */
 const PageNymNodeDetail = () => {
-  const { id } = useParams()
+  const { id } = useParams();
 
-  if (!id || typeof id !== 'string') {
-    return (
-      <Alert severity="error">Oh no! Could not find that node</Alert>
-    )
+  if (!id || typeof id !== "string") {
+    return <Alert severity="error">Oh no! Could not find that node</Alert>;
   }
 
   return (
     <NymNodeContextProvider nymNodeId={id}>
       <PageNymNodeDetailGuard />
     </NymNodeContextProvider>
-  )
-}
+  );
+};
 
-export default PageNymNodeDetail
+export default PageNymNodeDetail;
diff --git a/explorer-nextjs/next.config.mjs b/explorer-nextjs/next.config.mjs
index 4678774e6d..d642290145 100644
--- a/explorer-nextjs/next.config.mjs
+++ b/explorer-nextjs/next.config.mjs
@@ -1,4 +1,14 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+    async redirects() {
+        return [
+          {
+            source: '/network-components/mixnode/:id', // Match the old URL
+            destination: '/network-components/nodes/:id', // Redirect to the new URL
+            permanent: true, 
+          },
+        ];
+      },
+};
 
 export default nextConfig;
diff --git a/explorer-nextjs/tsconfig.json b/explorer-nextjs/tsconfig.json
index 68ef0fdf3b..701d0e6984 100644
--- a/explorer-nextjs/tsconfig.json
+++ b/explorer-nextjs/tsconfig.json
@@ -28,7 +28,8 @@
         "../assets/*"
       ]
     },
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "target": "ES2017"
   },
   "include": [
     "next-env.d.ts",

From b71a4918725072118cbdcff1a3d6e5ec41d330ce Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 29 Jan 2025 14:55:16 -0700
Subject: [PATCH 30/42] relocate a validator api function

---
 Cargo.lock                                       |  1 +
 .../validator-client/src/nym_api/mod.rs          | 16 ++++++++++++++++
 .../validator-client/src/nym_api/routes.rs       |  5 ++++-
 nym-api/nym-api-requests/Cargo.toml              |  1 +
 nym-api/nym-api-requests/src/lib.rs              |  6 ++++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2de42eb3f..dc3e64471f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4832,6 +4832,7 @@ dependencies = [
  "ecdsa",
  "getset",
  "nym-compact-ecash",
+ "nym-config",
  "nym-contracts-common",
  "nym-credentials-interface",
  "nym-crypto",
diff --git a/common/client-libs/validator-client/src/nym_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs
index d790deda70..3103f60870 100644
--- a/common/client-libs/validator-client/src/nym_api/mod.rs
+++ b/common/client-libs/validator-client/src/nym_api/mod.rs
@@ -31,6 +31,7 @@ pub use nym_api_requests::{
         StakeSaturationResponse, UptimeResponse,
     },
     nym_nodes::{CachedNodesResponse, SkimmedNode},
+    NymNetworkDetailsResponse
 };
 pub use nym_coconut_dkg_common::types::EpochId;
 use nym_contracts_common::IdentityKey;
@@ -1027,6 +1028,21 @@ pub trait NymApiClientExt: ApiClient {
         )
         .await
     }
+
+    #[instrument(level = "debug", skip(self))]
+    async fn get_network_details(
+        &self,
+    ) -> Result<NymNetworkDetailsResponse, NymAPIError> {
+        self.get_json(
+            &[
+                routes::API_VERSION,
+                routes::NETWORK,
+                routes::DETAILS,
+            ],
+            NO_PARAMS,
+        )
+        .await
+    }
 }
 
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
diff --git a/common/client-libs/validator-client/src/nym_api/routes.rs b/common/client-libs/validator-client/src/nym_api/routes.rs
index ec14678279..dfb4a64b7b 100644
--- a/common/client-libs/validator-client/src/nym_api/routes.rs
+++ b/common/client-libs/validator-client/src/nym_api/routes.rs
@@ -67,6 +67,9 @@ pub const STAKE_SATURATION: &str = "stake-saturation";
 pub const INCLUSION_CHANCE: &str = "inclusion-probability";
 pub const SUBMIT_GATEWAY: &str = "submit-gateway-monitoring-results";
 pub const SUBMIT_NODE: &str = "submit-node-monitoring-results";
-pub const PERFORMANCE: &str = "performance";
+
 
 pub const SERVICE_PROVIDERS: &str = "services";
+
+pub const DETAILS: &str = "details";
+pub const NETWORK: &str = "network";
\ No newline at end of file
diff --git a/nym-api/nym-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml
index a67960e1e3..3d66ad2bb9 100644
--- a/nym-api/nym-api-requests/Cargo.toml
+++ b/nym-api/nym-api-requests/Cargo.toml
@@ -28,6 +28,7 @@ nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58", "
 nym-credentials-interface = { path = "../../common/credentials-interface" }
 nym-crypto = { path = "../../common/crypto", features = ["serde", "asymmetric"] }
 
+nym-config = { path = "../../common/config" }
 nym-ecash-time = { path = "../../common/ecash-time" }
 nym-compact-ecash = { path = "../../common/nym_offline_compact_ecash" }
 nym-contracts-common = { path = "../../common/cosmwasm-smart-contracts/contracts-common", features = ["naive_float"] }
diff --git a/nym-api/nym-api-requests/src/lib.rs b/nym-api/nym-api-requests/src/lib.rs
index 664eb59fff..681f1c6b0f 100644
--- a/nym-api/nym-api-requests/src/lib.rs
+++ b/nym-api/nym-api-requests/src/lib.rs
@@ -12,6 +12,12 @@ pub mod models;
 pub mod nym_nodes;
 pub mod pagination;
 
+// The response type we fetch from the network details endpoint.
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct NymNetworkDetailsResponse {
+    pub network: nym_config::defaults::NymNetworkDetails,
+}
+
 pub trait Deprecatable {
     fn deprecate(self) -> Deprecated<Self>
     where

From 882003c08c02064d1088e85f3067178755c5e1ee Mon Sep 17 00:00:00 2001
From: jmwample <jmwample@users.noreply.github.com>
Date: Wed, 29 Jan 2025 14:58:04 -0700
Subject: [PATCH 31/42] fmt

---
 .../client-libs/validator-client/src/nym_api/mod.rs  | 12 +++---------
 .../validator-client/src/nym_api/routes.rs           |  3 +--
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/common/client-libs/validator-client/src/nym_api/mod.rs b/common/client-libs/validator-client/src/nym_api/mod.rs
index 3103f60870..efbf613acc 100644
--- a/common/client-libs/validator-client/src/nym_api/mod.rs
+++ b/common/client-libs/validator-client/src/nym_api/mod.rs
@@ -31,7 +31,7 @@ pub use nym_api_requests::{
         StakeSaturationResponse, UptimeResponse,
     },
     nym_nodes::{CachedNodesResponse, SkimmedNode},
-    NymNetworkDetailsResponse
+    NymNetworkDetailsResponse,
 };
 pub use nym_coconut_dkg_common::types::EpochId;
 use nym_contracts_common::IdentityKey;
@@ -1030,15 +1030,9 @@ pub trait NymApiClientExt: ApiClient {
     }
 
     #[instrument(level = "debug", skip(self))]
-    async fn get_network_details(
-        &self,
-    ) -> Result<NymNetworkDetailsResponse, NymAPIError> {
+    async fn get_network_details(&self) -> Result<NymNetworkDetailsResponse, NymAPIError> {
         self.get_json(
-            &[
-                routes::API_VERSION,
-                routes::NETWORK,
-                routes::DETAILS,
-            ],
+            &[routes::API_VERSION, routes::NETWORK, routes::DETAILS],
             NO_PARAMS,
         )
         .await
diff --git a/common/client-libs/validator-client/src/nym_api/routes.rs b/common/client-libs/validator-client/src/nym_api/routes.rs
index dfb4a64b7b..64481a5134 100644
--- a/common/client-libs/validator-client/src/nym_api/routes.rs
+++ b/common/client-libs/validator-client/src/nym_api/routes.rs
@@ -68,8 +68,7 @@ pub const INCLUSION_CHANCE: &str = "inclusion-probability";
 pub const SUBMIT_GATEWAY: &str = "submit-gateway-monitoring-results";
 pub const SUBMIT_NODE: &str = "submit-node-monitoring-results";
 
-
 pub const SERVICE_PROVIDERS: &str = "services";
 
 pub const DETAILS: &str = "details";
-pub const NETWORK: &str = "network";
\ No newline at end of file
+pub const NETWORK: &str = "network";

From d62bc0a10b58458bc55332e73c6d5745e0b95008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Thu, 30 Jan 2025 13:36:06 +0100
Subject: [PATCH 32/42] Downgrade harmless log message from info to debug
 (#5403)

---
 service-providers/ip-packet-router/src/mixnet_listener.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service-providers/ip-packet-router/src/mixnet_listener.rs b/service-providers/ip-packet-router/src/mixnet_listener.rs
index 6e6980ccd4..2bd5fdeaaa 100644
--- a/service-providers/ip-packet-router/src/mixnet_listener.rs
+++ b/service-providers/ip-packet-router/src/mixnet_listener.rs
@@ -632,7 +632,7 @@ impl MixnetListener {
             }
         } else {
             // If the client is not connected, just drop the packet silently
-            log::info!("dropping packet from mixnet: no registered client for packet with source: {src_addr}");
+            log::debug!("dropping packet from mixnet: no registered client for packet with source: {src_addr}");
             Ok(None)
         }
     }

From 6f00023d0920242360548ad963d52f9996c75532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Fri, 31 Jan 2025 10:39:37 +0100
Subject: [PATCH 33/42] Send shutdown instead of panic when reaching max fail
 (#5398)

* Send shutdown instead of panic when reaching max fail

* Stop quicker on failure

* Update comment
---
 .../client-core/src/client/mix_traffic/mod.rs | 41 +++++++++++--------
 .../real_messages_control/message_handler.rs  |  9 +++-
 .../real_traffic_stream.rs                    |  2 +-
 common/client-core/src/error.rs               |  3 ++
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/common/client-core/src/client/mix_traffic/mod.rs b/common/client-core/src/client/mix_traffic/mod.rs
index 2103491705..5a829dd6fe 100644
--- a/common/client-core/src/client/mix_traffic/mod.rs
+++ b/common/client-core/src/client/mix_traffic/mod.rs
@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::client::mix_traffic::transceiver::GatewayTransceiver;
+use crate::error::ClientCoreError;
 use crate::spawn_future;
 use log::*;
 use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;
+use transceiver::ErasedGatewayError;
 
 pub type BatchMixMessageSender = tokio::sync::mpsc::Sender<Vec<MixPacket>>;
 pub type BatchMixMessageReceiver = tokio::sync::mpsc::Receiver<Vec<MixPacket>>;
@@ -82,7 +84,10 @@ impl MixTrafficController {
         )
     }
 
-    async fn on_messages(&mut self, mut mix_packets: Vec<MixPacket>) {
+    async fn on_messages(
+        &mut self,
+        mut mix_packets: Vec<MixPacket>,
+    ) -> Result<(), ErasedGatewayError> {
         debug_assert!(!mix_packets.is_empty());
 
         let result = if mix_packets.len() == 1 {
@@ -94,21 +99,14 @@ impl MixTrafficController {
                 .await
         };
 
-        match result {
-            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
-                    // to reconnect?
-                    panic!("failed to send sphinx packet to the gateway {MAX_FAILURE_COUNT} times in a row - assuming the gateway is dead. Can't do anything about it yet :(")
-                }
-            }
-            Ok(_) => {
-                trace!("We *might* have managed to forward sphinx packet(s) to the gateway!");
-                self.consecutive_gateway_failure_count = 0;
-            }
+        if result.is_err() {
+            self.consecutive_gateway_failure_count += 1;
+        } else {
+            trace!("We *might* have managed to forward sphinx packet(s) to the gateway!");
+            self.consecutive_gateway_failure_count = 0;
         }
+
+        result
     }
 
     pub fn start_with_shutdown(mut self, mut shutdown: nym_task::TaskClient) {
@@ -119,7 +117,18 @@ impl MixTrafficController {
                 tokio::select! {
                     mix_packets = self.mix_rx.recv() => match mix_packets {
                         Some(mix_packets) => {
-                            self.on_messages(mix_packets).await;
+                            if let Err(err) = self.on_messages(mix_packets).await {
+                                error!("Failed to send sphinx packet(s) to the gateway: {err}");
+                                if self.consecutive_gateway_failure_count == MAX_FAILURE_COUNT {
+                                    // Disconnect from the gateway. If we should try to re-connect
+                                    // is handled at a higher layer.
+                                    error!("Failed to send sphinx packet to the gateway {MAX_FAILURE_COUNT} times in a row - assuming the gateway is dead");
+                                    // Do we need to handle the embedded mixnet client case
+                                    // separately?
+                                    shutdown.send_we_stopped(Box::new(ClientCoreError::GatewayFailedToForwardMessages));
+                                    break;
+                                }
+                            }
                         },
                         None => {
                             log::trace!("MixTrafficController: Stopping since channel closed");
diff --git a/common/client-core/src/client/real_messages_control/message_handler.rs b/common/client-core/src/client/real_messages_control/message_handler.rs
index 4dcce65494..6d1e278c24 100644
--- a/common/client-core/src/client/real_messages_control/message_handler.rs
+++ b/common/client-core/src/client/real_messages_control/message_handler.rs
@@ -626,9 +626,14 @@ where
         messages: Vec<RealMessage>,
         transmission_lane: TransmissionLane,
     ) {
-        self.real_message_sender
+        if let Err(err) = self
+            .real_message_sender
             .send((messages, transmission_lane))
             .await
-            .expect("real message receiver task (OutQueueControl) has died");
+        {
+            error!(
+                "Failed to forward messages to the real message sender (OutQueueControl): {err}"
+            );
+        }
     }
 }
diff --git a/common/client-core/src/client/real_messages_control/real_traffic_stream.rs b/common/client-core/src/client/real_messages_control/real_traffic_stream.rs
index 09b55eb633..67703f9cd5 100644
--- a/common/client-core/src/client/real_messages_control/real_traffic_stream.rs
+++ b/common/client-core/src/client/real_messages_control/real_traffic_stream.rs
@@ -545,7 +545,7 @@ where
             loop {
                 tokio::select! {
                     biased;
-                    _ = shutdown.recv_with_delay() => {
+                    _ = shutdown.recv() => {
                         log::trace!("OutQueueControl: Received shutdown");
                         break;
                     }
diff --git a/common/client-core/src/error.rs b/common/client-core/src/error.rs
index 5aaedc84ae..6c434d1aad 100644
--- a/common/client-core/src/error.rs
+++ b/common/client-core/src/error.rs
@@ -96,6 +96,9 @@ pub enum ClientCoreError {
     #[error("timed out while trying to establish gateway connection")]
     GatewayConnectionTimeout,
 
+    #[error("failed to forward mix messages to gateway")]
+    GatewayFailedToForwardMessages,
+
     #[error("no ping measurements for the gateway ({identity}) performed")]
     NoGatewayMeasurements { identity: String },
 

From d6aacae14e1f2305ccc5c25d69f619e3289d44e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:27:52 +0100
Subject: [PATCH 34/42] build(deps): bump the patch-updates group across 1
 directory with 9 updates (#5406)

Bumps the patch-updates group with 9 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [clap](https://github.com/clap-rs/clap) | `4.5.26` | `4.5.27` |
| [clap_complete](https://github.com/clap-rs/clap) | `4.5.40` | `4.5.44` |
| [getset](https://github.com/jbaublitz/getset) | `0.1.3` | `0.1.4` |
| [indicatif](https://github.com/console-rs/indicatif) | `0.17.9` | `0.17.11` |
| [log](https://github.com/rust-lang/log) | `0.4.22` | `0.4.25` |
| [pin-project](https://github.com/taiki-e/pin-project) | `1.1.7` | `1.1.8` |
| [semver](https://github.com/dtolnay/semver) | `1.0.24` | `1.0.25` |
| [serde_json](https://github.com/serde-rs/json) | `1.0.135` | `1.0.138` |
| [bip32](https://github.com/iqlusioninc/crates) | `0.5.2` | `0.5.3` |



Updates `clap` from 4.5.26 to 4.5.27
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.26...clap_complete-v4.5.27)

Updates `clap_complete` from 4.5.40 to 4.5.44
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.40...clap_complete-v4.5.44)

Updates `getset` from 0.1.3 to 0.1.4
- [Release notes](https://github.com/jbaublitz/getset/releases)
- [Commits](https://github.com/jbaublitz/getset/compare/0.1.3...0.1.4)

Updates `indicatif` from 0.17.9 to 0.17.11
- [Release notes](https://github.com/console-rs/indicatif/releases)
- [Commits](https://github.com/console-rs/indicatif/compare/0.17.9...0.17.11)

Updates `log` from 0.4.22 to 0.4.25
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/compare/0.4.22...0.4.25)

Updates `pin-project` from 1.1.7 to 1.1.8
- [Release notes](https://github.com/taiki-e/pin-project/releases)
- [Changelog](https://github.com/taiki-e/pin-project/blob/main/CHANGELOG.md)
- [Commits](https://github.com/taiki-e/pin-project/compare/v1.1.7...v1.1.8)

Updates `semver` from 1.0.24 to 1.0.25
- [Release notes](https://github.com/dtolnay/semver/releases)
- [Commits](https://github.com/dtolnay/semver/compare/1.0.24...1.0.25)

Updates `serde_json` from 1.0.135 to 1.0.138
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.135...v1.0.138)

Updates `bip32` from 0.5.2 to 0.5.3
- [Commits](https://github.com/iqlusioninc/crates/compare/bip32/v0.5.2...bip32/v0.5.3)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: clap_complete
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: getset
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: indicatif
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: log
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: pin-project
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
- dependency-name: bip32
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: patch-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 81 +++++++++++++++++++++++++++++++++---------------------
 Cargo.toml | 12 ++++----
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc3e64471f..3d38e56e83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -692,15 +692,16 @@ dependencies = [
 
 [[package]]
 name = "bip32"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
+checksum = "db40d3dfbeab4e031d78c844642fa0caa0b0db11ce1607ac9d2986dff1405c69"
 dependencies = [
  "bs58",
  "hmac",
  "k256",
  "rand_core 0.6.4",
  "ripemd",
+ "secp256k1",
  "sha2 0.10.8",
  "subtle 2.5.0",
  "zeroize",
@@ -933,7 +934,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -947,7 +948,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -1084,9 +1085,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.26"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1094,9 +1095,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.26"
+version = "4.5.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1106,9 +1107,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.5.40"
+version = "4.5.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
+checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6"
 dependencies = [
  "clap",
 ]
@@ -1790,7 +1791,7 @@ dependencies = [
  "cosmwasm-std",
  "cw2",
  "schemars",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "thiserror 1.0.69",
 ]
@@ -1805,7 +1806,7 @@ dependencies = [
  "cosmwasm-std",
  "cw-storage-plus",
  "schemars",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "thiserror 1.0.69",
 ]
@@ -2843,9 +2844,9 @@ dependencies = [
 
 [[package]]
 name = "getset"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c"
+checksum = "eded738faa0e88d3abc9d1a13cb11adc2073c400969eeb8793cf7132589959fc"
 dependencies = [
  "proc-macro-error2",
  "proc-macro2",
@@ -3744,9 +3745,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.9"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
 dependencies = [
  "console",
  "number_prefix",
@@ -4144,9 +4145,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "loom"
@@ -4801,7 +4802,7 @@ dependencies = [
  "rand_chacha",
  "reqwest 0.12.4",
  "schemars",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde_json",
  "sha2 0.9.9",
@@ -6036,7 +6037,7 @@ dependencies = [
  "nym-contracts-common",
  "rand_chacha",
  "schemars",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde-json-wasm",
  "serde_repr",
@@ -6237,7 +6238,7 @@ dependencies = [
  "nym-wireguard",
  "nym-wireguard-types",
  "rand",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde_json",
  "si-scale",
@@ -7678,18 +7679,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8628,7 +8629,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.24",
+ "semver 1.0.25",
 ]
 
 [[package]]
@@ -8865,6 +8866,24 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+dependencies = [
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.0"
@@ -8899,9 +8918,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
 dependencies = [
  "serde",
 ]
@@ -8996,9 +9015,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -9993,7 +10012,7 @@ dependencies = [
  "pin-project",
  "rand",
  "reqwest 0.11.27",
- "semver 1.0.24",
+ "semver 1.0.25",
  "serde",
  "serde_bytes",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 662cc8348e..ad7e4ef757 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -216,7 +216,7 @@ chacha20 = "0.9.0"
 chacha20poly1305 = "0.10.1"
 chrono = "0.4.39"
 cipher = "0.4.3"
-clap = "4.5.26"
+clap = "4.5.27"
 clap_complete = "4.5"
 clap_complete_fig = "4.5"
 colored = "2.0"
@@ -249,7 +249,7 @@ futures = "0.3.31"
 futures-util = "0.3"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
-getset = "0.1.3"
+getset = "0.1.4"
 handlebars = "3.5.5"
 headers = "0.4.0"
 hex = "0.4.3"
@@ -265,7 +265,7 @@ humantime-serde = "1.1.1"
 human-repr = "1.1.0"
 hyper = "1.4.1"
 hyper-util = "0.1"
-indicatif = "0.17.9"
+indicatif = "0.17.11"
 inquire = "0.6.2"
 ip_network = "0.4.1"
 ipnetwork = "0.20"
@@ -308,11 +308,11 @@ rocket_cors = "0.6.0"
 rocket_okapi = "0.8.0"
 safer-ffi = "0.1.13"
 schemars = "0.8.21"
-semver = "1.0.24"
+semver = "1.0.25"
 serde = "1.0.217"
 serde_bytes = "0.11.15"
 serde_derive = "1.0"
-serde_json = "1.0.135"
+serde_json = "1.0.138"
 serde_json_path = "0.7.1"
 serde_repr = "0.1"
 serde_with = "3.9.0"
@@ -385,7 +385,7 @@ cw4 = { version = "=1.1.2" }
 cw-controllers = { version = "=1.1.0" }
 
 # cosmrs-related
-bip32 = { version = "0.5.2", default-features = false }
+bip32 = { version = "0.5.3", default-features = false }
 
 
 cosmrs = { version = "0.21.0" }

From 68a192daa38eef8884976bc43b0dd91f410ee8f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Mon, 3 Feb 2025 10:50:11 +0100
Subject: [PATCH 35/42] Upgrade to thiserror 2.0 (#5414)

* Upgrade to thiserror 2.0

* Remove line macros in vesting contract error type

* Name positional arguments in GatewayRequestsError

* Named positional argument

* Revert "Remove line macros in vesting contract error type"

This reverts commit 49f937da3f97880b0295f1b10613e860f083e3b8.

* Use positional arguments for line
---
 Cargo.lock                                    | 180 +++++++++---------
 Cargo.toml                                    |   2 +-
 .../vesting-contract/src/error.rs             |  48 ++---
 common/gateway-requests/src/types/error.rs    |  12 +-
 gateway/src/node/client_handling/bandwidth.rs |   2 +-
 sdk/ffi/go/Cargo.toml                         |   2 +-
 6 files changed, 123 insertions(+), 123 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3d38e56e83..f5ab11636d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2454,7 +2454,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -2466,7 +2466,7 @@ dependencies = [
  "console_error_panic_hook",
  "js-sys",
  "serde-wasm-bindgen 0.6.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-storage",
@@ -4407,7 +4407,7 @@ dependencies = [
  "rand",
  "serde",
  "serde-wasm-bindgen 0.6.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tsify",
  "url",
@@ -4808,7 +4808,7 @@ dependencies = [
  "sha2 0.9.9",
  "sqlx",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -4849,7 +4849,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "tendermint 0.40.1",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "ts-rs",
  "utoipa",
@@ -4901,7 +4901,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -4924,7 +4924,7 @@ dependencies = [
  "rand",
  "serde",
  "sha2 0.10.8",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "x25519-dalek",
 ]
 
@@ -4944,7 +4944,7 @@ dependencies = [
  "nym-task",
  "nym-validator-client",
  "rand",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "url",
  "zeroize",
 ]
@@ -4983,7 +4983,7 @@ dependencies = [
  "nym-validator-client",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -5061,7 +5061,7 @@ dependencies = [
  "serde_json",
  "tap",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "toml 0.8.19",
@@ -5098,7 +5098,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-tungstenite",
@@ -5155,7 +5155,7 @@ dependencies = [
  "si-scale",
  "tap",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -5180,7 +5180,7 @@ dependencies = [
  "nym-sphinx-addressing",
  "nym-sphinx-params",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "url",
 ]
 
@@ -5195,7 +5195,7 @@ dependencies = [
  "nym-gateway-requests",
  "serde",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "url",
@@ -5213,7 +5213,7 @@ dependencies = [
  "nym-sphinx",
  "nym-task",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
 ]
@@ -5232,7 +5232,7 @@ dependencies = [
  "serde",
  "serde-wasm-bindgen 0.6.5",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tsify",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -5270,7 +5270,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "sha2 0.9.9",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -5317,7 +5317,7 @@ dependencies = [
  "serde",
  "sha2 0.9.9",
  "subtle 2.5.0",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -5330,7 +5330,7 @@ dependencies = [
  "log",
  "nym-network-defaults",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "toml 0.8.19",
  "url",
 ]
@@ -5346,7 +5346,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "utoipa",
  "vergen",
 ]
@@ -5407,7 +5407,7 @@ dependencies = [
  "strum 0.26.3",
  "strum_macros 0.26.4",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -5455,7 +5455,7 @@ dependencies = [
  "nym-ecash-time",
  "serde",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "zeroize",
 ]
@@ -5473,7 +5473,7 @@ dependencies = [
  "nym-credentials-interface",
  "nym-ecash-time",
  "nym-validator-client",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
 ]
@@ -5497,7 +5497,7 @@ dependencies = [
  "nym-validator-client",
  "rand",
  "si-scale",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -5521,7 +5521,7 @@ dependencies = [
  "nym-validator-client",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "zeroize",
 ]
@@ -5537,7 +5537,7 @@ dependencies = [
  "rand",
  "serde",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "utoipa",
 ]
@@ -5565,7 +5565,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "subtle-encoding",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "x25519-dalek",
  "zeroize",
 ]
@@ -5589,7 +5589,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "sha2 0.9.9",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -5604,7 +5604,7 @@ dependencies = [
  "cw-utils",
  "cw2",
  "nym-multisig-contract-common",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -5639,7 +5639,7 @@ dependencies = [
  "reqwest 0.12.4",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tracing",
  "utoipa",
 ]
@@ -5663,7 +5663,7 @@ dependencies = [
  "nym-explorer-api-requests",
  "reqwest 0.12.4",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
  "url",
@@ -5723,7 +5723,7 @@ dependencies = [
  "rand",
  "sha2 0.10.8",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -5756,7 +5756,7 @@ dependencies = [
  "rand",
  "serde",
  "si-scale",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -5789,7 +5789,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
  "tungstenite 0.20.1",
@@ -5807,7 +5807,7 @@ dependencies = [
  "nym-statistics-common",
  "sqlx",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -5823,7 +5823,7 @@ dependencies = [
  "nym-gateway-requests",
  "nym-sphinx",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -5839,7 +5839,7 @@ dependencies = [
  "nym-ffi-shared",
  "nym-sdk",
  "nym-sphinx-anonymous-replies",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "uniffi",
  "uniffi_build",
@@ -5868,7 +5868,7 @@ dependencies = [
  "reqwest 0.12.4",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tracing",
  "url",
@@ -5900,7 +5900,7 @@ version = "0.1.0"
 dependencies = [
  "nym-credential-storage",
  "nym-credentials",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tracing",
  "zeroize",
@@ -5926,7 +5926,7 @@ version = "0.1.0"
 dependencies = [
  "log",
  "rand",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -5940,7 +5940,7 @@ dependencies = [
  "nym-sphinx",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -5980,7 +5980,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-tun",
@@ -5996,7 +5996,7 @@ dependencies = [
  "k256",
  "ledger-transport",
  "ledger-transport-hid",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6041,7 +6041,7 @@ dependencies = [
  "serde",
  "serde-json-wasm",
  "serde_repr",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "ts-rs",
  "utoipa",
@@ -6067,7 +6067,7 @@ dependencies = [
  "nym-task",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -6086,7 +6086,7 @@ dependencies = [
  "cw4",
  "schemars",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6179,7 +6179,7 @@ dependencies = [
  "sqlx",
  "tap",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-tungstenite",
@@ -6243,7 +6243,7 @@ dependencies = [
  "serde_json",
  "si-scale",
  "sysinfo",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -6289,7 +6289,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum 0.26.3",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "utoipa",
@@ -6343,7 +6343,7 @@ dependencies = [
  "sqlx",
  "strum 0.26.3",
  "strum_macros 0.26.4",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -6386,7 +6386,7 @@ dependencies = [
  "rand_chacha",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "wasm-utils",
 ]
@@ -6401,7 +6401,7 @@ dependencies = [
  "rand",
  "serde",
  "serde-wasm-bindgen 0.6.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tsify",
  "wasm-bindgen",
@@ -6442,7 +6442,7 @@ name = "nym-ordered-buffer"
 version = "0.1.0"
 dependencies = [
  "log",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6460,7 +6460,7 @@ dependencies = [
  "rand",
  "rayon",
  "sphinx-packet",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -6514,7 +6514,7 @@ dependencies = [
  "reqwest 0.12.4",
  "serde",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -6557,7 +6557,7 @@ dependencies = [
  "nym-sphinx-anonymous-replies",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -6587,7 +6587,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "url",
@@ -6621,7 +6621,7 @@ dependencies = [
  "schemars",
  "serde",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "url",
 ]
@@ -6653,7 +6653,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tap",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6678,7 +6678,7 @@ dependencies = [
  "rand",
  "rand_chacha",
  "rand_distr",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
 ]
 
@@ -6696,7 +6696,7 @@ dependencies = [
  "nym-topology",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -6708,7 +6708,7 @@ dependencies = [
  "nym-sphinx-types",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6725,7 +6725,7 @@ dependencies = [
  "rand",
  "rand_chacha",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "wasm-bindgen",
 ]
 
@@ -6742,7 +6742,7 @@ dependencies = [
  "nym-sphinx-types",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "utoipa",
 ]
 
@@ -6760,7 +6760,7 @@ dependencies = [
  "nym-sphinx-types",
  "nym-topology",
  "rand",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6771,7 +6771,7 @@ dependencies = [
  "nym-sphinx-addressing",
  "nym-sphinx-params",
  "nym-sphinx-types",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6786,7 +6786,7 @@ dependencies = [
  "nym-sphinx-forwarding",
  "nym-sphinx-params",
  "nym-sphinx-types",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
 ]
@@ -6798,7 +6798,7 @@ dependencies = [
  "nym-crypto",
  "nym-sphinx-types",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6807,7 +6807,7 @@ version = "0.1.0"
 dependencies = [
  "nym-sphinx-addressing",
  "nym-sphinx-types",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6816,7 +6816,7 @@ version = "0.2.0"
 dependencies = [
  "nym-outfox",
  "sphinx-packet",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
 ]
 
 [[package]]
@@ -6835,7 +6835,7 @@ dependencies = [
  "sha2 0.10.8",
  "si-scale",
  "sysinfo",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "wasmtimer",
@@ -6852,7 +6852,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "zeroize",
 ]
 
@@ -6863,7 +6863,7 @@ dependencies = [
  "cfg-if",
  "futures",
  "log",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
  "tracing",
@@ -6905,7 +6905,7 @@ dependencies = [
  "reqwest 0.12.4",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tracing",
  "tsify",
  "wasm-bindgen",
@@ -6919,7 +6919,7 @@ dependencies = [
  "etherparse",
  "log",
  "nym-wireguard-types",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-tun",
 ]
@@ -6947,7 +6947,7 @@ dependencies = [
  "sha2 0.10.8",
  "strum 0.26.3",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "ts-rs",
  "url",
  "utoipa",
@@ -6994,7 +6994,7 @@ dependencies = [
  "serde_json",
  "sha2 0.9.9",
  "tendermint-rpc",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -7038,7 +7038,7 @@ dependencies = [
  "serde_with",
  "sha2 0.10.8",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -7057,7 +7057,7 @@ dependencies = [
  "nym-task",
  "nym-validator-client",
  "rand",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -7075,7 +7075,7 @@ dependencies = [
  "nym-contracts-common",
  "nym-mixnet-contract-common",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "ts-rs",
 ]
 
@@ -7096,7 +7096,7 @@ dependencies = [
  "serde",
  "serde-wasm-bindgen 0.6.5",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tsify",
  "wasm-bindgen",
@@ -7143,7 +7143,7 @@ dependencies = [
  "nym-node-metrics",
  "nym-task",
  "nym-wireguard-types",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -7162,7 +7162,7 @@ dependencies = [
  "nym-network-defaults",
  "rand",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "x25519-dalek",
 ]
 
@@ -7189,7 +7189,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "tar",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tracing",
@@ -7218,7 +7218,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlx",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-util",
@@ -7245,7 +7245,7 @@ dependencies = [
  "sqlx",
  "tendermint 0.40.1",
  "tendermint-rpc",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "tokio-stream",
@@ -10080,7 +10080,7 @@ dependencies = [
  "serde_json",
  "sqlx",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tokio",
  "toml 0.8.19",
@@ -11362,7 +11362,7 @@ dependencies = [
  "rand",
  "serde",
  "serde-wasm-bindgen 0.6.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "time",
  "tsify",
  "url",
@@ -11384,7 +11384,7 @@ dependencies = [
  "nym-store-cipher",
  "serde",
  "serde-wasm-bindgen 0.6.5",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "wasm-bindgen",
  "wasm-utils",
 ]
@@ -12106,7 +12106,7 @@ dependencies = [
  "rand",
  "reqwest 0.12.4",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.11",
  "tokio",
  "tsify",
  "uuid",
diff --git a/Cargo.toml b/Cargo.toml
index ad7e4ef757..aa462956ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -329,7 +329,7 @@ sysinfo = "0.33.0"
 tap = "1.0.1"
 tar = "0.4.43"
 tempfile = "3.15"
-thiserror = "1.0.64"
+thiserror = "2.0"
 time = "0.3.37"
 tokio = "1.39"
 tokio-stream = "0.1.17"
diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs
index da31bdf30a..a9453b6834 100644
--- a/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs
+++ b/common/cosmwasm-smart-contracts/vesting-contract/src/error.rs
@@ -8,81 +8,81 @@ use thiserror::Error;
 
 #[derive(Error, Debug, PartialEq)]
 pub enum VestingContractError {
-    #[error("VESTING ({}): {0}", line!())]
+    #[error("VESTING ({l}): {0}", l = line!())]
     Std(#[from] StdError),
 
     #[error("VESTING: {0}")]
     OverflowError(#[from] OverflowError),
 
-    #[error("VESTING ({}): Account does not exist - {0}", line!())]
+    #[error("VESTING ({l}): Account does not exist - {0}", l = line!())]
     NoAccountForAddress(String),
 
-    #[error("VESTING ({}): Only admin can perform this action, {0} is not admin", line!())]
+    #[error("VESTING ({l}): Only admin can perform this action, {0} is not admin", l = line!())]
     NotAdmin(String),
 
-    #[error("VESTING ({}): Balance not found for existing account ({0}), this is a bug", line!())]
+    #[error("VESTING ({l}): Balance not found for existing account ({0}), this is a bug", l = line!())]
     NoBalanceForAddress(String),
 
-    #[error("VESTING ({}): Insufficient balance for address {0} -> {1}", line!())]
+    #[error("VESTING ({l}): Insufficient balance for address {0} -> {1}", l = line!())]
     InsufficientBalance(String, u128),
 
-    #[error("VESTING ({}): Insufficient spendable balance for address {0} -> {1}", line!())]
+    #[error("VESTING ({l}): Insufficient spendable balance for address {0} -> {1}", l = line!())]
     InsufficientSpendable(String, u128),
 
     #[error(
-    "VESTING ({}):Only delegation owner can perform delegation actions, {0} is not the delegation owner"
-    , line!())]
+    "VESTING ({l}):Only delegation owner can perform delegation actions, {0} is not the delegation owner"
+    , l = line!())]
     NotDelegate(String),
 
-    #[error("VESTING ({}): Total vesting amount is inprobably low -> {0}, this is likely an error", line!())]
+    #[error("VESTING ({l}): Total vesting amount is inprobably low -> {0}, this is likely an error", l = line!())]
     ImprobableVestingAmount(u128),
 
-    #[error("VESTING ({}): Address {0} has already bonded a node", line!())]
+    #[error("VESTING ({l}): Address {0} has already bonded a node", l = line!())]
     AlreadyBonded(String),
 
-    #[error("VESTING ({}): Received empty funds vector", line!())]
+    #[error("VESTING ({l}): Received empty funds vector", l = line!())]
     EmptyFunds,
 
-    #[error("VESTING ({}): Received wrong denom: {0}, expected {1}", line!())]
+    #[error("VESTING ({l}): Received wrong denom: {0}, expected {1}", l = line!())]
     WrongDenom(String, String),
 
-    #[error("VESTING ({}): Received multiple denoms, expected 1", line!())]
+    #[error("VESTING ({l}): Received multiple denoms, expected 1", l = line!())]
     MultipleDenoms,
 
-    #[error("VESTING ({}): No delegations found for account {0}, mix_identity {1}", line!())]
+    #[error("VESTING ({l}): No delegations found for account {0}, mix_identity {1}", l = line!())]
     NoSuchDelegation(Addr, NodeId),
 
-    #[error("VESTING ({}): Only mixnet contract can perform this operation, got {0}", line!())]
+    #[error("VESTING ({l}): Only mixnet contract can perform this operation, got {0}", l = line!())]
     NotMixnetContract(Addr),
 
-    #[error("VESTING ({}): Calculation underflowed", line!())]
+    #[error("VESTING ({l}): Calculation underflowed", l = line!())]
     Underflow,
 
-    #[error("VESTING ({}): No bond found for account {0}", line!())]
+    #[error("VESTING ({l}): No bond found for account {0}", l = line!())]
     NoBondFound(String),
 
     #[error("VESTING: Attempted to reduce mixnode bond pledge below zero! The current pledge is {current} and we attempted to reduce it by {decrease_by}.")]
     InvalidBondPledgeReduction { current: Coin, decrease_by: Coin },
 
-    #[error("VESTING ({}): Action can only be executed by account owner -> {0}", line!())]
+    #[error("VESTING ({l}): Action can only be executed by account owner -> {0}", l = line!())]
     NotOwner(String),
 
-    #[error("VESTING ({}): Invalid address: {0}", line!())]
+    #[error("VESTING ({l}): Invalid address: {0}", l = line!())]
     InvalidAddress(String),
 
-    #[error("VESTING ({}): Account already exists: {0}", line!())]
+    #[error("VESTING ({l}): Account already exists: {0}", l = line!())]
     AccountAlreadyExists(String),
 
-    #[error("VESTING ({}): Staking account already exists: {0}", line!())]
+    #[error("VESTING ({l}): Staking account already exists: {0}", l = line!())]
     StakingAccountAlreadyExists(String),
 
-    #[error("VESTING ({}): Too few coins sent for vesting account creation, sent {sent}, need at least {need}", line!())]
+    #[error("VESTING ({l}): Too few coins sent for vesting account creation, sent {sent}, need at least {need}", l = line!())]
     MinVestingFunds { sent: u128, need: u128 },
 
-    #[error("VESTING ({}): Maximum amount of locked coins has already been pledged: {current}, cap is {cap}", line!())]
+    #[error("VESTING ({l}): Maximum amount of locked coins has already been pledged: {current}, cap is {cap}", l = line!())]
     LockedPledgeCapReached { current: Uint128, cap: Uint128 },
 
-    #[error("VESTING: ({}: Account owned by {owner} has unpopulated vesting periods!", line!())]
+    #[error("VESTING: ({l}: Account owned by {owner} has unpopulated vesting periods!", l = line!())]
     UnpopulatedVestingPeriods { owner: Addr },
 
     #[error("VESTING: Vesting account associated with {0} already exists, only addresses with not existing vesting accounts can be added as staking addresses")]
diff --git a/common/gateway-requests/src/types/error.rs b/common/gateway-requests/src/types/error.rs
index 2ffb8e665b..31d94b75b7 100644
--- a/common/gateway-requests/src/types/error.rs
+++ b/common/gateway-requests/src/types/error.rs
@@ -59,12 +59,12 @@ pub enum GatewayRequestsError {
         source: NymNodeRoutingAddressError,
     },
 
-    #[error("received request had invalid size. (actual: {0}, but expected one of: {} (ACK), {} (REGULAR), {}, {}, {} (EXTENDED))",
-        PacketSize::AckPacket.size(),
-        PacketSize::RegularPacket.size(),
-        PacketSize::ExtendedPacket8.size(),
-        PacketSize::ExtendedPacket16.size(),
-        PacketSize::ExtendedPacket32.size())
+    #[error("received request had invalid size. (actual: {0}, but expected one of: {a} (ACK), {r} (REGULAR), {e8}, {e16}, {e32} (EXTENDED))",
+        a = PacketSize::AckPacket.size(),
+        r = PacketSize::RegularPacket.size(),
+        e8 = PacketSize::ExtendedPacket8.size(),
+        e16 = PacketSize::ExtendedPacket16.size(),
+        e32 = PacketSize::ExtendedPacket32.size())
     ]
     RequestOfInvalidSize(usize),
 
diff --git a/gateway/src/node/client_handling/bandwidth.rs b/gateway/src/node/client_handling/bandwidth.rs
index 0113be49b3..113240dc11 100644
--- a/gateway/src/node/client_handling/bandwidth.rs
+++ b/gateway/src/node/client_handling/bandwidth.rs
@@ -7,7 +7,7 @@ use tracing::error;
 
 #[derive(Debug, Error)]
 pub enum BandwidthError {
-    #[error("Provided bandwidth credential asks for more bandwidth than it is supported to add at once (credential value: {0}, supported: {}). Try to split it before attempting again", i64::MAX)]
+    #[error("Provided bandwidth credential asks for more bandwidth than it is supported to add at once (credential value: {0}, supported: {s}). Try to split it before attempting again", s = i64::MAX)]
     UnsupportedBandwidthValue(u64),
 
     #[error("failed to parse the bandwidth voucher value: {source}")]
diff --git a/sdk/ffi/go/Cargo.toml b/sdk/ffi/go/Cargo.toml
index 487864d3f8..18e2abd216 100644
--- a/sdk/ffi/go/Cargo.toml
+++ b/sdk/ffi/go/Cargo.toml
@@ -21,7 +21,7 @@ tokio = { version = "1", features = ["full"] }
 lazy_static = "1.5.0"
 # error handling
 anyhow = "1.0.95"
-thiserror = "1.0.64"
+thiserror.workspace = true
 
 [build-dependencies]
 uniffi = { version = "0.25.2", features = ["build"] }

From 1d2e6d916c2d6b6acaa896b5f5ad72fd6bdf7dff Mon Sep 17 00:00:00 2001
From: Jack Wampler <jmwample@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:20:39 -0700
Subject: [PATCH 36/42] Use secure DNS for websocket connection establishment
 (#5386)

implementation of secure dns for websocket connection establishment. depends on #5355
---
 Cargo.lock                                    |  2 +
 common/client-core/Cargo.toml                 |  1 +
 common/client-core/src/error.rs               |  7 +++
 common/client-core/src/init/helpers.rs        |  7 +--
 common/client-core/src/init/mod.rs            |  2 +
 common/client-core/src/init/websockets.rs     | 44 +++++++++++++++
 common/client-libs/gateway-client/Cargo.toml  |  1 +
 .../gateway-client/src/client/mod.rs          | 17 +++---
 .../gateway-client/src/client/websockets.rs   | 53 +++++++++++++++++++
 .../client-libs/gateway-client/src/error.rs   |  6 ++-
 common/http-api-client/src/dns.rs             |  1 +
 common/http-api-client/src/lib.rs             |  2 +-
 12 files changed, 127 insertions(+), 16 deletions(-)
 create mode 100644 common/client-core/src/init/websockets.rs
 create mode 100644 common/client-libs/gateway-client/src/client/websockets.rs

diff --git a/Cargo.lock b/Cargo.lock
index f5ab11636d..ff61dfcff8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5136,6 +5136,7 @@ dependencies = [
  "nym-explorer-client",
  "nym-gateway-client",
  "nym-gateway-requests",
+ "nym-http-api-client",
  "nym-id",
  "nym-metrics",
  "nym-mixnet-client",
@@ -5747,6 +5748,7 @@ dependencies = [
  "nym-credentials-interface",
  "nym-crypto",
  "nym-gateway-requests",
+ "nym-http-api-client",
  "nym-network-defaults",
  "nym-pemstore",
  "nym-sphinx",
diff --git a/common/client-core/Cargo.toml b/common/client-core/Cargo.toml
index f6536b9762..94700eac42 100644
--- a/common/client-core/Cargo.toml
+++ b/common/client-core/Cargo.toml
@@ -40,6 +40,7 @@ nym-crypto = { path = "../crypto" }
 nym-explorer-client = { path = "../../explorer-api/explorer-client" }
 nym-gateway-client = { path = "../client-libs/gateway-client" }
 nym-gateway-requests = { path = "../gateway-requests" }
+nym-http-api-client = { path = "../http-api-client" }
 nym-metrics = { path = "../nym-metrics" }
 nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" }
 nym-sphinx = { path = "../nymsphinx" }
diff --git a/common/client-core/src/error.rs b/common/client-core/src/error.rs
index 6c434d1aad..624cbe6028 100644
--- a/common/client-core/src/error.rs
+++ b/common/client-core/src/error.rs
@@ -36,6 +36,13 @@ pub enum ClientCoreError {
     #[error("no gateway with id: {0}")]
     NoGatewayWithId(String),
 
+    #[error("Invalid URL: {0}")]
+    InvalidUrl(String),
+
+    #[cfg(not(target_arch = "wasm32"))]
+    #[error("resolution failed: {0}")]
+    ResolutionFailed(#[from] nym_http_api_client::HickoryDnsError),
+
     #[error("no gateways on network")]
     NoGatewaysOnNetwork,
 
diff --git a/common/client-core/src/init/helpers.rs b/common/client-core/src/init/helpers.rs
index 0e9dd38eb4..1dabaa9d31 100644
--- a/common/client-core/src/init/helpers.rs
+++ b/common/client-core/src/init/helpers.rs
@@ -15,6 +15,9 @@ use std::{sync::Arc, time::Duration};
 use tungstenite::Message;
 use url::Url;
 
+#[cfg(not(target_arch = "wasm32"))]
+use crate::init::websockets::connect_async;
+
 use nym_topology::NodeId;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::net::TcpStream;
@@ -23,8 +26,6 @@ use tokio::time::sleep;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::Instant;
 #[cfg(not(target_arch = "wasm32"))]
-use tokio_tungstenite::connect_async;
-#[cfg(not(target_arch = "wasm32"))]
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 #[cfg(target_arch = "wasm32")]
 use wasm_utils::websocket::JSWebsocket;
@@ -131,7 +132,7 @@ pub async fn gateways_for_init<R: Rng>(
 async fn connect(endpoint: &str) -> Result<WsConn, ClientCoreError> {
     match tokio::time::timeout(CONN_TIMEOUT, connect_async(endpoint)).await {
         Err(_elapsed) => Err(ClientCoreError::GatewayConnectionTimeout),
-        Ok(Err(conn_failure)) => Err(conn_failure.into()),
+        Ok(Err(conn_failure)) => Err(conn_failure),
         Ok(Ok((stream, _))) => Ok(stream),
     }
 }
diff --git a/common/client-core/src/init/mod.rs b/common/client-core/src/init/mod.rs
index 4954efbb3d..bbe27769ee 100644
--- a/common/client-core/src/init/mod.rs
+++ b/common/client-core/src/init/mod.rs
@@ -26,6 +26,8 @@ use serde::Serialize;
 
 pub mod helpers;
 pub mod types;
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) mod websockets;
 
 // helpers for error wrapping
 
diff --git a/common/client-core/src/init/websockets.rs b/common/client-core/src/init/websockets.rs
new file mode 100644
index 0000000000..6d09a325b0
--- /dev/null
+++ b/common/client-core/src/init/websockets.rs
@@ -0,0 +1,44 @@
+use crate::error::ClientCoreError;
+
+use nym_http_api_client::HickoryDnsResolver;
+use tokio::net::TcpStream;
+use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
+use tungstenite::handshake::client::Response;
+use url::{Host, Url};
+
+use std::net::SocketAddr;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) async fn connect_async(
+    endpoint: &str,
+) -> Result<(WebSocketStream<MaybeTlsStream<TcpStream>>, Response), ClientCoreError> {
+    let resolver = HickoryDnsResolver::default();
+    let uri = Url::parse(endpoint).map_err(|_| ClientCoreError::InvalidUrl(endpoint.to_owned()))?;
+    let port: u16 = uri.port_or_known_default().unwrap_or(443);
+
+    let host = uri
+        .host()
+        .ok_or(ClientCoreError::InvalidUrl(endpoint.to_owned()))?;
+
+    // Get address for tcp connection, if a domain is provided use our preferred resolver rather than
+    // the default std resolve
+    let sock_addrs: Vec<SocketAddr> = match host {
+        Host::Ipv4(addr) => vec![SocketAddr::new(addr.into(), port)],
+        Host::Ipv6(addr) => vec![SocketAddr::new(addr.into(), port)],
+        Host::Domain(domain) => {
+            // Do a DNS lookup for the domain using our custom DNS resolver
+            resolver
+                .resolve_str(domain)
+                .await?
+                .into_iter()
+                .map(|a| SocketAddr::new(a, port))
+                .collect()
+        }
+    };
+
+    let stream = TcpStream::connect(&sock_addrs[..]).await?;
+
+    tokio_tungstenite::client_async_tls(endpoint, stream)
+        .await
+        .map_err(Into::into)
+}
diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml
index 6aa2795d3f..efc699473a 100644
--- a/common/client-libs/gateway-client/Cargo.toml
+++ b/common/client-libs/gateway-client/Cargo.toml
@@ -27,6 +27,7 @@ nym-credential-storage = { path = "../../credential-storage" }
 nym-credentials-interface = { path = "../../credentials-interface" }
 nym-crypto = { path = "../../crypto" }
 nym-gateway-requests = { path = "../../gateway-requests" }
+nym-http-api-client = { path = "../../http-api-client" }
 nym-network-defaults = { path = "../../network-defaults" }
 nym-sphinx = { path = "../../nymsphinx" }
 nym-statistics-common = { path = "../../statistics" }
diff --git a/common/client-libs/gateway-client/src/client/mod.rs b/common/client-libs/gateway-client/src/client/mod.rs
index 3c2435121a..5b42fd7b96 100644
--- a/common/client-libs/gateway-client/src/client/mod.rs
+++ b/common/client-libs/gateway-client/src/client/mod.rs
@@ -40,8 +40,6 @@ use url::Url;
 use std::os::fd::RawFd;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::sleep;
-#[cfg(not(target_arch = "wasm32"))]
-use tokio_tungstenite::connect_async;
 
 #[cfg(not(unix))]
 use std::os::raw::c_int as RawFd;
@@ -53,6 +51,11 @@ use zeroize::Zeroizing;
 
 pub mod config;
 
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) mod websockets;
+#[cfg(not(target_arch = "wasm32"))]
+use websockets::connect_async;
+
 pub struct GatewayConfig {
     pub gateway_identity: identity::PublicKey,
 
@@ -201,15 +204,7 @@ impl<C, St> GatewayClient<C, St> {
             "Attemting to establish connection to gateway at: {}",
             self.gateway_address
         );
-        let ws_stream = match connect_async(&self.gateway_address).await {
-            Ok((ws_stream, _)) => ws_stream,
-            Err(error) => {
-                return Err(GatewayClientError::NetworkConnectionFailed {
-                    address: self.gateway_address.clone(),
-                    source: error,
-                })
-            }
-        };
+        let (ws_stream, _) = connect_async(&self.gateway_address).await?;
 
         self.connection = SocketState::Available(Box::new(ws_stream));
 
diff --git a/common/client-libs/gateway-client/src/client/websockets.rs b/common/client-libs/gateway-client/src/client/websockets.rs
new file mode 100644
index 0000000000..32527571ec
--- /dev/null
+++ b/common/client-libs/gateway-client/src/client/websockets.rs
@@ -0,0 +1,53 @@
+use crate::error::GatewayClientError;
+
+use nym_http_api_client::HickoryDnsResolver;
+use tokio::net::TcpStream;
+use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
+use tungstenite::handshake::client::Response;
+use url::{Host, Url};
+
+use std::net::SocketAddr;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub(crate) async fn connect_async(
+    endpoint: &str,
+) -> Result<(WebSocketStream<MaybeTlsStream<TcpStream>>, Response), GatewayClientError> {
+    let resolver = HickoryDnsResolver::default();
+    let uri =
+        Url::parse(endpoint).map_err(|_| GatewayClientError::InvalidUrl(endpoint.to_owned()))?;
+    let port: u16 = uri.port_or_known_default().unwrap_or(443);
+
+    let host = uri
+        .host()
+        .ok_or(GatewayClientError::InvalidUrl(endpoint.to_owned()))?;
+
+    // Get address for tcp connection, if a domain is provided use our preferred resolver rather than
+    // the default std resolve
+    let sock_addrs: Vec<SocketAddr> = match host {
+        Host::Ipv4(addr) => vec![SocketAddr::new(addr.into(), port)],
+        Host::Ipv6(addr) => vec![SocketAddr::new(addr.into(), port)],
+        Host::Domain(domain) => {
+            // Do a DNS lookup for the domain using our custom DNS resolver
+            resolver
+                .resolve_str(domain)
+                .await?
+                .into_iter()
+                .map(|a| SocketAddr::new(a, port))
+                .collect()
+        }
+    };
+
+    let stream = TcpStream::connect(&sock_addrs[..]).await.map_err(|error| {
+        GatewayClientError::NetworkConnectionFailed {
+            address: endpoint.to_owned(),
+            source: error.into(),
+        }
+    })?;
+
+    tokio_tungstenite::client_async_tls(endpoint, stream)
+        .await
+        .map_err(|error| GatewayClientError::NetworkConnectionFailed {
+            address: endpoint.to_owned(),
+            source: error,
+        })
+}
diff --git a/common/client-libs/gateway-client/src/error.rs b/common/client-libs/gateway-client/src/error.rs
index e1b581d30e..3432f43131 100644
--- a/common/client-libs/gateway-client/src/error.rs
+++ b/common/client-libs/gateway-client/src/error.rs
@@ -44,7 +44,11 @@ pub enum GatewayClientError {
     NetworkConnectionFailed { address: String, source: WsError },
 
     #[error("Invalid URL: {0}")]
-    InvalidURL(String),
+    InvalidUrl(String),
+
+    #[cfg(not(target_arch = "wasm32"))]
+    #[error("resolution failed: {0}")]
+    ResolutionFailed(#[from] nym_http_api_client::HickoryDnsError),
 
     #[error("No shared key was provided or obtained")]
     NoSharedKeyAvailable,
diff --git a/common/http-api-client/src/dns.rs b/common/http-api-client/src/dns.rs
index 137809d6a7..d35d72487b 100644
--- a/common/http-api-client/src/dns.rs
+++ b/common/http-api-client/src/dns.rs
@@ -40,6 +40,7 @@ struct SocketAddrs {
 
 #[derive(Debug, thiserror::Error)]
 #[error("hickory-dns resolver error: {hickory_error}")]
+/// Error occurring while resolving a hostname into an IP address.
 pub struct HickoryDnsError {
     #[from]
     hickory_error: ResolveError,
diff --git a/common/http-api-client/src/lib.rs b/common/http-api-client/src/lib.rs
index c75e7d64cd..bd359b199d 100644
--- a/common/http-api-client/src/lib.rs
+++ b/common/http-api-client/src/lib.rs
@@ -22,7 +22,7 @@ pub use user_agent::UserAgent;
 #[cfg(not(target_arch = "wasm32"))]
 mod dns;
 #[cfg(not(target_arch = "wasm32"))]
-pub use dns::HickoryDnsResolver;
+pub use dns::{HickoryDnsError, HickoryDnsResolver};
 
 // The timeout is relatively high as we are often making requests over the mixnet, where latency is
 // high and chatty protocols take a while to complete.

From 3a21cfa1ab1e965556007eeff7009eb340d78dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Wed, 5 Feb 2025 08:58:25 +0100
Subject: [PATCH 37/42] Make wait_for_graceful_shutdown to be pub (#5424)

---
 common/task/src/manager.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/task/src/manager.rs b/common/task/src/manager.rs
index b2134a5e28..55c55f040b 100644
--- a/common/task/src/manager.rs
+++ b/common/task/src/manager.rs
@@ -221,7 +221,7 @@ impl TaskManager {
         }
     }
 
-    pub(crate) async fn wait_for_graceful_shutdown(&mut self) {
+    pub async fn wait_for_graceful_shutdown(&mut self) {
         if let Some(notify_rx) = self.notify_rx.take() {
             drop(notify_rx);
         }

From 23a7f01c05740d05eeed59158211d6c408fc3ce5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 10:38:28 +0100
Subject: [PATCH 38/42] build(deps): bump tokio from 1.40.0 to 1.43.0 (#5370)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build(deps): bump tokio from 1.40.0 to 1.43.0

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.40.0 to 1.43.0.
- [Release notes](https://github.com/tokio-rs/tokio/releases)
- [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.40.0...tokio-1.43.0)

---
updated-dependencies:
- dependency-name: tokio
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* wip: test if token is set

* Try with an artifical delay between calls

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jon Häggblad <jon.haggblad@gmail.com>
---
 Cargo.lock                                           | 12 ++++++------
 Cargo.toml                                           |  2 +-
 .../nym-node-status-api/src/monitor/geodata.rs       |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff61dfcff8..73fc74c6f1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4054,9 +4054,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.167"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libm"
@@ -10234,9 +10234,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -10263,9 +10263,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index aa462956ac..db440a3d77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -331,7 +331,7 @@ tar = "0.4.43"
 tempfile = "3.15"
 thiserror = "2.0"
 time = "0.3.37"
-tokio = "1.39"
+tokio = "1.43"
 tokio-stream = "0.1.17"
 tokio-test = "0.4.4"
 tokio-tun = "0.11.5"
diff --git a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs
index 9bafc2b4ad..7801c465dc 100644
--- a/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs
+++ b/nym-node-status-api/nym-node-status-api/src/monitor/geodata.rs
@@ -151,8 +151,10 @@ pub(crate) mod ipinfo {
 #[cfg(test)]
 mod api_regression {
 
+    use tokio::time::sleep;
+
     use super::*;
-    use std::{env::var, sync::LazyLock};
+    use std::{env::var, sync::LazyLock, time::Duration};
 
     static IPINFO_TOKEN: LazyLock<Option<String>> = LazyLock::new(|| var("IPINFO_API_TOKEN").ok());
     static CI: LazyLock<Option<String>> = LazyLock::new(|| var("CI").ok());
@@ -174,6 +176,9 @@ mod api_regression {
             let location_result = client.locate_ip(my_ip).await;
             assert!(location_result.is_ok(), "Did ipinfo response change?");
 
+            // Artifical sleep to avoid rate limit
+            sleep(Duration::from_secs(2)).await;
+
             client
                 .check_remaining_bandwidth()
                 .await

From 0fc7cc657d043b958421398928fa44513cb8b761 Mon Sep 17 00:00:00 2001
From: mfahampshire <maxhampshire@pm.me>
Date: Wed, 5 Feb 2025 14:05:44 +0000
Subject: [PATCH 39/42] Max/openapi docs update (#5292)

* spacing + working openapi local for nymapi

* sandbox nyx rest api

* add now working nym-api openapi json url to component
---
 .../pages/apis/cosmos-sdk-nyx/mainnet.mdx     |  2 ++
 .../pages/apis/cosmos-sdk-nyx/sandbox.mdx     |  6 ++++--
 .../docs/pages/apis/explorer-api/mainnet.mdx  |  2 ++
 .../docs/pages/apis/explorer-api/sandbox.mdx  |  2 ++
 .../docs/pages/apis/ns-api/mainnet.mdx        |  2 ++
 .../docs/pages/apis/ns-api/sandbox.mdx        |  2 ++
 .../docs/pages/apis/nym-api/mainnet.mdx       | 19 ++++++++++++++++++-
 7 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/pages/apis/cosmos-sdk-nyx/mainnet.mdx b/documentation/docs/pages/apis/cosmos-sdk-nyx/mainnet.mdx
index 72233bd16a..ed8074d628 100644
--- a/documentation/docs/pages/apis/cosmos-sdk-nyx/mainnet.mdx
+++ b/documentation/docs/pages/apis/cosmos-sdk-nyx/mainnet.mdx
@@ -4,6 +4,8 @@ The information below is generated with [Redoc](https://redocly.com/docs/redoc)
 
 There is also an overview of other Validator endpoints at [https://cosmos.directory/nyx](https://cosmos.directory/nyx).
 
+<br /><br />
+
 <RedocStandalone
   specUrl="https://api.nymtech.net/swagger/swagger.yaml"
   options={{
diff --git a/documentation/docs/pages/apis/cosmos-sdk-nyx/sandbox.mdx b/documentation/docs/pages/apis/cosmos-sdk-nyx/sandbox.mdx
index 726ef0b51e..834d30ecbc 100644
--- a/documentation/docs/pages/apis/cosmos-sdk-nyx/sandbox.mdx
+++ b/documentation/docs/pages/apis/cosmos-sdk-nyx/sandbox.mdx
@@ -1,9 +1,11 @@
 import { RedocStandalone } from 'redoc';
 
-The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at []() which is also used to generate the Swagger docs deployed at []().
+The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://api.sandbox.nymtech.net/swagger/swagger.yaml](https://api.sandbox.nymtech.net/swagger/swagger.yaml).
+
+<br /><br />
 
 <RedocStandalone
-  specUrl=""
+  specUrl="https://api.sandbox.nymtech.net/swagger/swagger.yaml"
   options={{
     nativeScrollbars: true,
     theme: {
diff --git a/documentation/docs/pages/apis/explorer-api/mainnet.mdx b/documentation/docs/pages/apis/explorer-api/mainnet.mdx
index 83853f6684..2e0d960750 100644
--- a/documentation/docs/pages/apis/explorer-api/mainnet.mdx
+++ b/documentation/docs/pages/apis/explorer-api/mainnet.mdx
@@ -3,6 +3,8 @@ import { RedocStandalone } from 'redoc';
 
 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://explorer.nymtech.net/api/v1/openapi.json](https://explorer.nymtech.net/api/v1/openapi.json) which is also used to generate the Swagger docs deployed at [https://explorer.nymtech.net/api/swagger/index.html](https://explorer.nymtech.net/api/swagger/index.html).
 
+<br /><br />
+
 <RedocStandalone
   specUrl="https://sandbox-explorer.nymtech.net/api/v1/openapi.json"
   options={{
diff --git a/documentation/docs/pages/apis/explorer-api/sandbox.mdx b/documentation/docs/pages/apis/explorer-api/sandbox.mdx
index 4053d7cd18..07d03143df 100644
--- a/documentation/docs/pages/apis/explorer-api/sandbox.mdx
+++ b/documentation/docs/pages/apis/explorer-api/sandbox.mdx
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';
 
 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://sandbox-explorer.nymtech.net/api/v1/openapi.json](https://sandbox-explorer.nymtech.net/api/v1/openapi.json) which is also used to generate the Swagger docs deployed at [https://sandbox-explorer.nymtech.net/api/swagger/index.html](https://sandbox-explorer.nymtech.net/api/swagger/index.html).
 
+<br /><br />
+
 <RedocStandalone
   specUrl="https://sandbox-explorer.nymtech.net/api/v1/openapi.json"
   options={{
diff --git a/documentation/docs/pages/apis/ns-api/mainnet.mdx b/documentation/docs/pages/apis/ns-api/mainnet.mdx
index d13f994c5e..a517ba0edd 100644
--- a/documentation/docs/pages/apis/ns-api/mainnet.mdx
+++ b/documentation/docs/pages/apis/ns-api/mainnet.mdx
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';
 
 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json](https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://mainnet-node-status-api.nymtech.cc/swagger/](https://mainnet-node-status-api.nymtech.cc/swagger/).
 
+<br /><br />
+
 <RedocStandalone
   specUrl="https://mainnet-node-status-api.nymtech.cc/api-docs/openapi.json"
   options={{
diff --git a/documentation/docs/pages/apis/ns-api/sandbox.mdx b/documentation/docs/pages/apis/ns-api/sandbox.mdx
index aa553ea145..29c61273a6 100644
--- a/documentation/docs/pages/apis/ns-api/sandbox.mdx
+++ b/documentation/docs/pages/apis/ns-api/sandbox.mdx
@@ -2,6 +2,8 @@ import { RedocStandalone } from 'redoc';
 
 The information below is generated with [Redoc](https://redocly.com/docs/redoc) consuming the OpenAPI spec found at [https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json](https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://sandbox-node-status-api.nymte.ch/swagger/](https://sandbox-node-status-api.nymte.ch/swagger/).
 
+<br /><br />
+
 <RedocStandalone
   specUrl="https://sandbox-node-status-api.nymte.ch/api-docs/openapi.json"
   options={{
diff --git a/documentation/docs/pages/apis/nym-api/mainnet.mdx b/documentation/docs/pages/apis/nym-api/mainnet.mdx
index 426dc780cb..c5b9eec25c 100644
--- a/documentation/docs/pages/apis/nym-api/mainnet.mdx
+++ b/documentation/docs/pages/apis/nym-api/mainnet.mdx
@@ -1,10 +1,27 @@
 import APITable from 'components/api-table.tsx';
+import { RedocStandalone } from 'redoc';
+import { Callout } from 'nextra/components'
 
 You can find the OpenAPI spec found at [https://validator.nymtech.net/api-docs/openapi.json](https://validator.nymtech.net/api-docs/openapi.json) which is also used to generate the Swagger docs deployed at [https://validator.nymtech.net/api/swagger/index.html](https://validator.nymtech.net/api/swagger/index.html).
 
+<Callout type="info" emoji="ℹ️">
 You can find the Swagger endpoints of other NymAPI instances at the following endpoints:
 <APITable endpoint="https://api.nymtech.net/cosmwasm/wasm/v1/contract/n19604yflqggs9mk2z26mqygq43q2kr3n932egxx630svywd5mpxjsztfpvx/smart/eyJnZXRfY3VycmVudF9kZWFsZXJzIjogeyJsaW1pdCI6IDMwfX0=" />
 
 There is also an overview of endpoints at [https://cosmos.directory/nyx](https://cosmos.directory/nyx).
+</Callout>
 
-> Interactive Redoc component coming soon
+<br /><br />
+
+<RedocStandalone
+  specUrl="https://validator.nymtech.net/api-docs/openapi.json"
+  options={{
+    nativeScrollbars: true,
+    theme: {
+      sidebar: {
+        backgroundColor: '#273239',
+        textColor: '#FCFDFE'
+      }
+    }
+  }}
+/>

From 21e3c1538dd1ae4c3e221a269edcb3b0b7cd424c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan-=C8=98tefan=20Neac=C5=9Fu?= <bogdan@nymtech.net>
Date: Wed, 5 Feb 2025 16:06:46 +0200
Subject: [PATCH 40/42] Fix statistics shutdown (#5426)

---
 common/client-core/src/client/statistics_control.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/client-core/src/client/statistics_control.rs b/common/client-core/src/client/statistics_control.rs
index c4e6997cb9..1fbba2307c 100644
--- a/common/client-core/src/client/statistics_control.rs
+++ b/common/client-core/src/client/statistics_control.rs
@@ -123,6 +123,11 @@ impl StatisticsControl {
 
         loop {
             tokio::select! {
+                biased;
+                _ = task_client.recv() => {
+                    log::trace!("StatisticsControl: Received shutdown");
+                    break;
+                },
                 stats_event = self.stats_rx.recv() => match stats_event {
                         Some(stats_event) => self.stats.handle_event(stats_event),
                         None => {
@@ -146,13 +151,8 @@ impl StatisticsControl {
                 _ = local_report_interval.next() => {
                     self.stats.local_report(&mut task_client);
                 }
-                _ = task_client.recv_with_delay() => {
-                    log::trace!("StatisticsControl: Received shutdown");
-                    break;
-                },
             }
         }
-        task_client.recv_timeout().await;
         log::debug!("StatisticsControl: Exiting");
     }
 

From 606e29ebb08c447ff8ffa3c40550ee2d31266b0d Mon Sep 17 00:00:00 2001
From: import this <97586125+serinko@users.noreply.github.com>
Date: Wed, 5 Feb 2025 15:19:56 +0000
Subject: [PATCH 41/42] [DOCs/operators]: Release notes, new specs, legal pages
 (#5419)

* add legal support notes

* write dev release notes

* create new legal page and add templates

* remove node_api_check to backup

* templates page

* update specs

* update backup and restore node

* PR ready for review

* address review comment

* last tweaks - PR finished

* last tweaks - PR finished
---
 documentation/backup-pages/node-api-check.mdx | 166 +++++++
 .../operators/snippets/nym-node-specs.mdx     |  38 +-
 .../operators/templates/dmca_response.md      |  37 ++
 .../templates/provider_introduction.md        |  15 +
 .../nyx-outputs/circulating-supply.md         |   2 +-
 .../nyx-outputs/stake-saturation.md           |   2 +-
 .../nyx-outputs/staking-target.md             |   2 +-
 .../nyx-outputs/token-table.md                |   8 +-
 .../outputs/api-scraping-outputs/time-now.md  |   2 +-
 .../docs/pages/operators/changelog.mdx        | 409 ++++++++++++++++++
 .../operators/community-counsel/_meta.json    |   2 +
 .../operators/community-counsel/legal.mdx     |  84 ++++
 .../operators/community-counsel/templates.mdx |  23 +
 documentation/docs/pages/operators/nodes.mdx  |   4 +-
 .../pages/operators/nodes/maintenance.mdx     | 109 ++++-
 .../pages/operators/nodes/nym-node/setup.mdx  |  38 +-
 .../operators/tokenomics/mixnet-rewards.mdx   |   2 +-
 17 files changed, 901 insertions(+), 42 deletions(-)
 create mode 100644 documentation/backup-pages/node-api-check.mdx
 create mode 100644 documentation/docs/components/operators/templates/dmca_response.md
 create mode 100644 documentation/docs/components/operators/templates/provider_introduction.md
 create mode 100644 documentation/docs/pages/operators/community-counsel/legal.mdx
 create mode 100644 documentation/docs/pages/operators/community-counsel/templates.mdx

diff --git a/documentation/backup-pages/node-api-check.mdx b/documentation/backup-pages/node-api-check.mdx
new file mode 100644
index 0000000000..eee61c71f3
--- /dev/null
+++ b/documentation/backup-pages/node-api-check.mdx
@@ -0,0 +1,166 @@
+import { Tabs } from 'nextra/components';
+import { Callout } from 'nextra/components';
+import { VarInfo } from 'components/variable-info.tsx';
+import { Steps } from 'nextra/components';
+import { MyTab } from 'components/generic-tabs.tsx';
+import NodeApiCheckHelp from 'components/outputs/command-outputs/node-api-check-help.md';
+import NodeApiCheckQueryHelp from 'components/outputs/command-outputs/node-api-check-query-help.md'
+
+# Node API Check
+
+<Callout type="warning" emoji="⚠️">
+CLI tool `node_api_check.py`, helping operators to collect all API values about their nodes locally, is not up to date with the API changes introduced with `v2024.13-magura` release version. Please treat it as unstable before we fix it.
+</Callout>
+
+<VarInfo />
+
+Operating a `nym-node` is not a *"set and forget"* endeavor, it takes some work. To diagnose node network performance through querying APIs, is a good knowledge to have. These are the main places to look for API endpoints regarding `nym-node`:
+
+- [`openapi.json`](https://validator.nymtech.net/api/v1/openapi.json): a list of all endpoints
+- [Swagger UI page](https://validator.nymtech.net/api/swagger/index.html)
+
+Besides that, node operators can check out their node performance, connectivity and much more on [harbourmaster.nymtech.net](https://harbourmaster.nymtech.net/).
+
+### Basic API usage
+
+For information about available endpoints and their status, you can refer to:
+```sh
+# for http
+http://<PUBLIC_IP>:8080/api/v1/swagger/#/
+# or
+http://<PUBLIC_IP>/api/v1/swagger/#/
+
+# for reversed proxy/WSS
+https://<HOSTNAME>/api/v1/swagger/#/
+```
+
+For example to determine which mode your node is running, you can check `:8080/api/v1/roles` endpoint:
+```sh
+# for http
+http://<PUBLIC_IP>:8080/api/v1/roles
+# or
+http://<PUBLIC_IP>/api/v1/roles
+
+# for reversed proxy/WSS
+https://<HOSTNAME>/api/v1/roles
+```
+
+## `node_api_check.py`
+
+To make this a bit easier, we made a CLI tool querying all available API endpoints based on node `Identity Key` (further denoted as `<ID_KEY>`) called `node_api_check.py`. To diagnose your node performance, whether by yourself or by sharing an output in our [operator channel](https://matrix.to/#/#operators:nymtech.chat), this tool provides you with a quick overview of live data. We recommend to run this checker alongside [`nym_gateway_probe`](gateway-probe.md) to triage both performance and an actual routing.
+
+Besides querying any bonded node APIs, `nym_api_check.py` has a function counting all existing nodes in provided version.
+
+### Setup
+
+#### Pre-requsities
+
+<Steps>
+
+###### 1. Install and configure Python3
+
+
+- Start with installing Python3:
+```sh
+sudo apt install python3
+```
+
+- Make sure Python3 is your default Python version:
+```sh
+update-alternatives --install  /usr/bin/python python /usr/bin/python3 1
+```
+
+- Verify:
+```sh
+python --version
+
+# should return higher than 3
+```
+
+- Install Python modules `tabulate`, `pandas` and `argparse` either using [`pip`](https://python.land/virtual-environments/installing-packages-with-pip) or if you installed Python3 system-wide you can install modules directly:
+
+<div>
+  <Tabs items={[
+    <strong>Using <code>pip</code></strong>,
+    <strong>System-wide Python installation</strong>,
+    ]} defaultIndex="1">
+    <MyTab>
+      ```sh
+      pip install tabulate pandas argparse
+      ```
+    </MyTab>
+    <MyTab>
+      ```sh
+      sudo apt install python3-tabulate python3-pandas python3-argparse -y
+      ```
+    </MyTab>
+  </Tabs>
+</div>
+
+###### 2. Install `node_api_check.py` and make executable
+
+To run the program you neet to have  [`node_api_check.py`](https://github.com/nymtech/nym/tree/develop/scripts/node_api_check.py) and [`api_endpoints.json`](https://github.com/nymtech/nym/tree/develop/scripts/api_endpoints.json).
+
+- If you [compiled from source](../../binaries/building-nym.mdx), you already have both of these files. Note that the latest version of this program may be on `develop` branch.
+
+- If you prefer to download them individually, do it by opening terminal in your desired location and running:
+```sh
+wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/node_api_check.py
+
+wget https://raw.githubusercontent.com/nymtech/nym/tree/develop/api_endpoints.json
+```
+
+- Make executable:
+```sh
+chmod u+x node_api_check.py
+```
+
+</Steps>
+
+Now you are ready to check your node.
+
+### Usage & Commands
+
+- Run the program with `--help` flag to see the available commands:
+```sh
+./node_api_check.py --help
+```
+
+- Command Output:
+
+<NodeApiCheckHelp />
+
+#### `query_stats`
+
+When you want to see all the options connected to any command, add a `--help` flag after the command of your choice. Command `query_stats` is the most useful one of this program.
+
+```sh
+./node_api_check query_stats --help
+```
+
+- Command output:
+
+<NodeApiCheckQueryHelp/ >
+
+The most common usage may be `./node_api_check.py query_stats <ID_KEY>` where `<ID_KEY>` is required, substitute it with node Identity Key.
+
+**Optional arguments**
+
+| Flag                   | Shortcut | Description                                                    |
+| :---                   |   :---   | :---                                                           |
+| `--markdown`           |   `-m`   | returns output in markdown format                              |
+| `--no_routing_history` |   None   | returns output without routing history which can be lengthy    |
+| `--no_verloc_metrics`  |   None   | returns output without verloc measurement which can be lengthy |
+| `--output`             |   `-o`   | exports output to a file, possible to add a target path        |
+
+#### `version_count`
+
+<Callout>
+To see a quick overview of `nym-node` version distribution in numbers and graph, visit [Nym Harbourmaster](https://harbourmaster.nymtech.net).
+</Callout>
+
+Another command is `version_count` where at least one `nym-node` version is required. In case of multiple version count, separate the versions with space. We recommend to run this command with `--markdown` flag for a nicer output. This is an example where we want to look up how many registered nodes are on versions `1.1.0`, `1.1.1`, `1.1.2` and `1.1.3`:
+```sh
+./node_api_check version_count 1.1.0 1.1.1 1.1.2 1.1.3 --markdown
+```
+
diff --git a/documentation/docs/components/operators/snippets/nym-node-specs.mdx b/documentation/docs/components/operators/snippets/nym-node-specs.mdx
index cc94aa933d..95bb148ded 100644
--- a/documentation/docs/components/operators/snippets/nym-node-specs.mdx
+++ b/documentation/docs/components/operators/snippets/nym-node-specs.mdx
@@ -11,22 +11,38 @@ Tor community created a very helpful table called [*Good Bad ISPs*](https://comm
 
 <div>
   <Tabs items={[
-    <code>nym-node</code>,
+    <><code>nym-node</code> - dedicated server</>,
+    <><code>nym-node</code> - VPS</>,
     <code>validator</code>,
     ]} defaultIndex="0">
     <MyTab>
-#### `nym-node`
-Before we conclude the testing with exact results, these are the rough specs:
+#### `nym-node` - dedicated server
+If you are about to start a new Nym Node, look for a server with this specification:
 
-| **Hardware** | **Minimum Specification** |
-| :---         | ---:                      |
-| CPU Cores    | 4                         |
-| Memory       | 8 GB RAM                  |
-| Storage      | 80 GB                     |
-| Connectivity | IPv4, IPv6, TCP/IP, UDP   |
-| Bandwidth    | > 1Tb                     |
-| Port speed   | 1Gbps                     |
+| **Hardware**   | **Minimum Specification**          |
+| :---           | ---:                               |
+| Type of server | Dedicated or bare metal            |
+| CPU Cores      | 4                                  |
+| Memory         | 8-16 GB RAM                        |
+| Storage        | 50 GB (preferably 80 GB)           |
+| Connectivity   | IPv4, IPv6, TCP/IP, UDP            |
+| Bandwidth      | Unmetered if possible, or \> 20Tb  |
+| Port speed     | 1Gbps                              |
 
+    </MyTab>
+    <MyTab>
+#### `nym-node` - VPS
+If you are about to start a new Nym Node, look for a server with this specification:
+
+| **Hardware**   | **Minimum Specification**          |
+| :---           | ---:                               |
+| Type of server | VPS           |
+| CPU Cores      | 8                                  |
+| Memory         | 16-32 GB RAM                        |
+| Storage        | 50 GB (preferably 80 GB)           |
+| Connectivity   | IPv4, IPv6, TCP/IP, UDP            |
+| Bandwidth      | Unmetered if possible, or \> 40Tb  |
+| Port speed     | 10Gbps                              |
     </MyTab>
     <MyTab>
 #### Nyx validator
diff --git a/documentation/docs/components/operators/templates/dmca_response.md b/documentation/docs/components/operators/templates/dmca_response.md
new file mode 100644
index 0000000000..9c52527361
--- /dev/null
+++ b/documentation/docs/components/operators/templates/dmca_response.md
@@ -0,0 +1,37 @@
+```
+Thank you for forwarding me the notice you received from <COPYRIGHT_CLAIMANT> regarding <CONTENT>. I would like to assure you that I am not hosting the claimed infringing materials, and furthermore, the Digital Millennium Copyright Act's ("DMCA") safe harbors likely protect you from liability arising from this complaint. The notice is likely based upon misunderstandings about the law and about some of the software I run.
+
+As you know, the DMCA creates four "safe harbors" for service providers to protect them from copyright liability for the acts of their users, when the ISPs fulfill certain requirements. (17 U.S.C. 512)
+
+The DMCA's requirements vary depending on the ISP's role. You may be familiar with the "notice and takedown" provisions of section 512(c) of the DMCA; however, those do not apply when an ISP merely acts as a conduit.
+Instead, the "conduit" safe harbor of section 512(a) of the DMCA has different and less burdensome eligibility requirements, as the D.C. Circuit Court of Appeals held in RIAA v. Verizon (see https://scholar.google.com/scholar_case?case=15815830240179540527) and the Eighth Circuit Court of Appeals confirmed in RIAA v. Charter (see https://scholar.google.com/scholar_case?case=11547531128234336420).
+
+Under DMCA 512(a), service providers like you are typically protected from damages for copyright infringement claims if you also maintain "a policy that provides for termination in appropriate circumstances of subscribers and account holders of the service provider's system or network who are repeat infringers."
+
+If you have and implement such a policy, and you otherwise qualify for the safe harbor, you should be free from fear of copyright damages.
+
+The copyright notice you received was likely triggered by a program I run called Nym. Nym is a network software that helps users to enhance their privacy, security, and safety online. It does not host any content. Rather, it is part of a network of nodes on the Internet that simply pass packets among themselves before sending them to their destinations, just as any Internet intermediary does.
+
+The difference is that Nym tunnels the connections such that no hop can learn both the source and destination of the packets, giving users protection from nefarious snooping on network traffic. The result is that, unlike most other Internet traffic, the final IP address that the recipient receives is not the IP address of the sender. Nym protects users against hazards such as harassment, spam, and identity theft.
+
+Nym was conceived during the EU-funded project 'Panoramix' R&D project (Horizon 2020 programme) with the goal of protecting communication privacy by building a comprehensive mixnet infrastructure. This project has received funding from the European Union’s Horizon 2020 research and innovation programme under the Grant Agreement No 653497, "Privacy and Accountability in Networks via Optimized Randomized Mix-nets (Panoramix)”. (For more on Nym, see https://www.nym.com/, For more on Panoramix, see https://panoramix.me/ ). Nym has continued this work by building a decentralized routing, authentication and payment protocol. Nym will enable developers to build their own sustainable privacy-enhanced services on top of its platform.
+
+I hope, as an organization committed to protecting the privacy of its customers, you'll agree that this is a valuable technology.
+
+While the Nym node that I run may appear to be the source of material that is alleged to be copyright-infringing, I do not host that material.
+
+I do not select the material transmitted through the Nym node that I run, and I have no practical means of either identifying the source of such material or preventing its transmission. I do nothing to encourage or promote the use of the Nym network for copyright infringement.
+
+For these reasons, I am not an infringer of copyright in any materials that are transmitted through the Nym node that I run, either directly or under a theory of contributory or vicarious liability.
+
+Therefore, you should continue to be protected under the DMCA 512(a) safe harbor without taking any further action.
+
+Thank you for working with me on this matter. As a loyal subscriber, I appreciate your notifying me of this issue and hope that the protections of DMCA 512 put any concerns you may have to rest.
+
+If not, please contact me with any further questions.
+
+Very truly yours,
+
+Your customer, <YOUR_NAME/PSEUDONYM>
+```
+
diff --git a/documentation/docs/components/operators/templates/provider_introduction.md b/documentation/docs/components/operators/templates/provider_introduction.md
new file mode 100644
index 0000000000..868d9cb467
--- /dev/null
+++ b/documentation/docs/components/operators/templates/provider_introduction.md
@@ -0,0 +1,15 @@
+```
+I am reaching out to introduce myself. I am about to spin up a machine with you to run what is called a “nym node” - think of it as somewhat similar to a Tor exit node. You can always recognize a nym node by our domain names: nym-exit
+
+Nym node runners are a decentralized community all over the world. We provide secure internet traffic routing services and privacy protection to ordinary people and businesses via the Nym platform and NymVPN app.
+
+The Nym traffic pattern is somewhat unique, as we route traffic using the “sphinx” packet format (similar to Tor 's onion encryption), which makes all traffic look uniform. I wanted to introduce myself and the machines I am running just so that this unique traffic pattern doesn’t raise any flags or issues with you!
+
+We have the highest security standards, which also means I simply relay traffic and do not know the end-destination nor its content. I can not be selective about the material transmitted through the Nym node that I run, and I have no practical means of either identifying the source of such material or preventing its transmission. More information can be found at https://nym.com.
+
+Feel free to ask any questions.
+
+Many thanks,
+
+<YOUR_NAME/PSEUDONYM>
+```
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/circulating-supply.md b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/circulating-supply.md
index da25d07f03..16f5edc4de 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/circulating-supply.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/circulating-supply.md
@@ -1 +1 @@
-805_903_308
+807_251_217
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/stake-saturation.md b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/stake-saturation.md
index c3c2b23ae3..11c0eeb3d3 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/stake-saturation.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/stake-saturation.md
@@ -1 +1 @@
-1_022_821
+1_025_628
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/staking-target.md b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/staking-target.md
index f12437bbae..8bf62f72c2 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/staking-target.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/staking-target.md
@@ -1 +1 @@
-402_951_654
+403_625_608
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/token-table.md b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/token-table.md
index dc74f6501d..dabaa45e3a 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/token-table.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/nyx-outputs/token-table.md
@@ -1,7 +1,7 @@
 | **Item**           | **Description**                                       |   **Amount in NYM** |
 |:-------------------|:------------------------------------------------------|--------------------:|
 | Total Supply       | Maximum amount of NYM token in existence              |       1_000_000_000 |
-| Mixmining Reserve  | Tokens releasing for operators rewards                |         194_096_191 |
-| Vesting Tokens     | Tokens locked outside of cicrulation for future claim |                 500 |
-| Circulating Supply | Amount of unlocked tokens                             |         805_903_308 |
-| Stake Saturation   | Optimal size of node self-bond + delegation           |           1_022_821 |
+| Mixmining Reserve  | Tokens releasing for operators rewards                |         192_748_782 |
+| Vesting Tokens     | Tokens locked outside of cicrulation for future claim |                   0 |
+| Circulating Supply | Amount of unlocked tokens                             |         807_251_217 |
+| Stake Saturation   | Optimal size of node self-bond + delegation           |           1_025_628 |
diff --git a/documentation/docs/components/outputs/api-scraping-outputs/time-now.md b/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
index 347e22de35..6b6e11be89 100644
--- a/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
+++ b/documentation/docs/components/outputs/api-scraping-outputs/time-now.md
@@ -1 +1 @@
-Thursday, January 23rd 2025, 10:41:32 UTC
+Monday, February 3rd 2025, 13:47:19 UTC
diff --git a/documentation/docs/pages/operators/changelog.mdx b/documentation/docs/pages/operators/changelog.mdx
index 24c305d63d..1156e3c89a 100644
--- a/documentation/docs/pages/operators/changelog.mdx
+++ b/documentation/docs/pages/operators/changelog.mdx
@@ -1,9 +1,13 @@
 import { Callout } from 'nextra/components';
 import { Tabs } from 'nextra/components';
+import { MyTab } from 'components/generic-tabs.tsx';
 import { RunTabs } from 'components/operators/nodes/node-run-command-tabs';
 import { VarInfo } from 'components/variable-info.tsx';
 import { AccordionTemplate } from 'components/accordion-template.tsx';
 import { Steps } from 'nextra/components';
+import AbuseResponse from 'components/operators/templates/dmca_response.md';
+import OperatorIntroduction from 'components/operators/templates/provider_introduction.md';
+
 
 export const TestingSteps = () => (
   <div>
@@ -29,6 +33,11 @@ export const TunnelManagerCommands = () => (
   </div>
 );
 
+export const LoadEndpointInfo = () => (
+  <div>
+    Developer notes behind <code>/load</code> endpoint
+  </div>
+);
 
 # Changelog
 
@@ -38,6 +47,406 @@ This page displays a full list of all the changes during our release cycle from
 
 <VarInfo />
 
+## `v2025.2-hu`
+
+- [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.2-hu)
+- [`nym-node`](nodes/nym-node.mdx) version `1.4.0`
+
+```
+nym-node
+Binary Name:        nym-node
+Build Timestamp:    2025-02-04T09:35:42.399220545Z
+Build Version:      1.4.0
+Commit SHA:         4c2bf3642e8eec0d55c7753e14429d73ac2d0e99
+Commit Date:        2025-02-04T10:29:48.000000000+01:00
+Commit Branch:      HEAD
+rustc Version:      1.84.1
+rustc Channel:      stable
+cargo Profile:      release
+```
+
+### Operators Updates & Tools
+
+<Callout type="info">
+From `nym-node v1.3.0` operators can technically choose multiple functionalities for their `nym-node` binary (flagged as `--mode`).
+
+**However, the clients are yet to be developed to be able to make a proper selection for multi-mode nodes!**
+
+**WE ASK OPERATORS TO ASSIGN ONLY ONE FUNCTIONALITY TO `--mode` OPTION PER NODE. PLEASE SELECT ONE MODE ARGUMENT OUT OF: `mixnode` or `entry-gateway` or `exit-gateway`!**
+</Callout>
+
+- Updated maintenance guides to [backup](nodes/maintenance#backup-a-node), [restore](nodes/maintenance#restoring-a-node) and [move](nodes/maintenance#moving-a-node) a node, containing a new and important commands to backup and restore `clients.sqlite` database.
+
+- [New explanation of `nym-node` functionalities](nodes/nym-node/setup#functionality-mode) describing how Gateways get selected in Mixnet mode and Wireguard mode. 
+
+<Callout type="warning">
+Wireguard nodes route data directly to the open internet. Therefore it exposes IP of operators server (VPS) to abuse complains. Before you decide to run a node with active wireguard routing, please read our [Community Counsel pages](community-counsel/exit-gateway) containing more information and some legal content.
+
+**Wireguard mode has no exit policy right now - we are working on the implementation.**
+</Callout>
+
+#### Legal support
+
+We have been notified that a handful of nodes have been taken down by abuse reports. We created new pages with [legal suggestions](community-counsel/legal) and email [templates](community-counsel/templates). Here are some useful points on legal support:
+
+- Here is the first version of a response template tailored for Nym operators.
+<AccordionTemplate name="Email template: responding to DMCA take-down notices">
+<AbuseResponse />
+</AccordionTemplate>
+
+- We are starting Operators Legal Clinic with Alexis Roussel, every Wednesday, 14:30 UTC (60 min) in our [Operator Legal Forum channel on Matrix](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org&via=matrix.su4ka.icu). Come and share your findigs and questions with the rest of the operators.
+
+- Join [Operator Legal Forum channel](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org&via=matrix.su4ka.icu) and share as much as possible (like screen prints, provider, location etc).
+
+- Join [Community legal counsel](https://nym.com/docs/operators/community-counsel) - our collective knowledge hub. Add your findings by opening a [Pull Request](https://nym.com/docs/operators/add-content)
+
+- While we are working on a new list of more friendly providers, consider to move away from these provides as soon as possible:
+    
+    - Servinga / VPS2day (AS39378)
+    - Frantech / Ponynet / BuyVM (AS53667)
+    - OVH SAS / OVHcloud (AS16276)
+    - Online S.A.S. / Scaleway (AS12876)
+    - Hetzner Online GmbH (AS24940)
+    - IONOS SE (AS8560)
+    - Psychz Networks (AS40676)
+    - 1337 Services GmbH / RDP.sh (AS210558)
+
+- Backup your nodes to have access to `.nym` directory locally. Follow [node](nodes/maintenance#backup-a-node) and [proxy configuration](nodes/maintenance#backup-proxy-configuration) backup guides to be able to [restore your node](nodes/maintenance#restoring-a-node) later on on another machine, without losing your delegation.  
+
+- We would like to ask operators who use reverse proxy and a domain (required for Gateways) to start using a common convention starting with `nym-exit` for their nodes URL. The entire address should have this new format:
+```
+nym-exit.<CUSTOM>.<DOMAIN>.<TLD>
+```
+
+For example:
+
+```
+# for squads running multiple nodes a format can look like this:
+nym-exit.ch-node1.mysquad.org
+
+# or like this
+nym-exit.3-jamaica.mysquad.org
+
+# for operators having one node per location, the format can look like this:
+nym-exit.brazil.mysquad.org
+
+# or if operators decide to not have any custom, they can simply have this format:
+nym-exit.mysquad.org
+```
+
+**The `NYM-EXIT` part in the beginning is what's important.**
+
+- When registering a domain, check [Top Level Domain (TLD)](https://www.techopedia.com/definition/1348/top-level-domain-tld) terms and conditions. For example `.icu` is a no go. Having a wrong TLD may lead to your domain being taken away from you when facing a DMCA report.  
+
+- Write a message to your provider and introduce your intention to run a Nym Node on their service
+<AccordionTemplate name="Email template: Introduce yourself to your VPS provider">
+<OperatorIntroduction />
+</AccordionTemplate>
+
+- New page with [templates for VPS provider](community-counsel/templates)
+
+#### Delegation Program
+
+**If you are interested to sign up to delegation program que, message Merve on Element for the time being as we are working on CRM upgrade. We review nodes dynamically and delegate to new ones once a month.** New operators interested to join DP must follow the rules specified [here](https://delegations.explorenym.net/), run one of two latest binary version and have [Terms & Conditions](nodes/nym-node/setup#terms--conditions) accepted.
+
+Note: Due to the token price we allow operators to have Operators cost 1000 NYM, the profit margin maximum remains 20%.
+
+**Delegation and undelegation in January**
+
+Delegated to all these nodes:
+<AccordionTemplate name="New delegated nodes">
+```
+AMnDNd1Xgw7Em9R5vehP7r12ZNWUZ3jmitDHya6gpvGR
+DLkKyYcA5feq43rqZdx6nJBNZvQsdX7kb2f1f6ED4cs2
+26ZmTxTVBKHZg8MTKwypHkXZVJhDC7QHuv3BdsyRyTuk
+5ZWdDN9pQ18vYkYYs5ZERh4P4JLtMiijscZ6FvwSfVxR
+3uBgUJR393acoCRysu6SiLsximiwAMM85QFxq9WD8puC
+5rXcNe2a44vXisK3uqLHCzpzvEwcnsijDMU7hg4fcYk8
+nuMerN7ahqsptK8zDUZhnxMyDqePza8vWDf8k171EEs
+86cNnnRxNpGdEtSX9UP1GpT6xrNvNuxFdHNkZcK7pAJg
+9ngFADaYpT54F9i8iYFZLYR7SB7hrubsPArwpqe1RXQb
+FQBbq1crAkCrjVBnEN85VqgZgGRMLJV65NJk8bPADdw
+FUH3E3dghXjC9hdt3jeAhSsxwozsw1yzBXkoaFqkL4ci
+5wF5wN7T2UuSsiUcQyL77NwdnXwAXxFttpZ1dR1nu4kR
+4pVq4QSCcq4zNCnBNCfyugPjVhVyGDCBDSW5rghg8oZS
+8XW1WWN1PuuAYz2TXQ9iWRekMFEJXjdEq4asMyE2qCCN
+CxgjcTTAnRJzDxMbqtX73vEbWwLQmVoW8zS8RZEicgfT
+7fwyXd4Cmh92d4piEPHmdFm1Wz1QCFQDf6bnDGNT3M6P
+```
+</AccordionTemplate>
+
+Undelegated from 8 nodes for not meeting the rules (being offline):
+<AccordionTemplate name="Undelegated nodes">
+```
+# Gateways
+DLxLKsd3LTnfudSSmHanPaZACsh1x4MGEzfJS4jQibir
+DiciBkjHovXzTDE2EFJKPNj3TGw2oQjr7HPSas2YQPiQ
+ADjpymCgjFsE5m7YvnZFxLMscg85dCUUesR5g8yN3Mzz
+C9dEABjtFRMD1x4ZnbqnsELGJgutT73bPCfYzqBe7sHB
+
+
+# Mixnodes
+2FGgY5zWq6JP1BvpnLPbedWRYYAZELFCT9rMybNhnxpo
+4nKkwPSbkbtkw3yrRKQVAVdviNgFgcNskgcSGdT2Sucy
+DjY3T7n6VoHGcETMnmtZKmUU7NZP6AhCs8CoRsSSbViC
+FAKhiQ8nW5sAWAxks1WB8u1MAWsapToCSE3KmF9LuGRQ
+```
+</AccordionTemplate>
+
+Undelegated due to high saturation:
+```
+5omopSZy59UyNPpx9P97vjBnN6PwPw9x5MVUx5kuNaXt
+```
+
+#### Service Grant Program v2
+
+Aside from delegating on top of nodes, Nym runs a Service Grant Program (SGP) to support Exit Gateway operators before they will be rewarded by collecting [zk-nym tickets](../network/cryptography/zk-nym) from users subscription. Operators included in SGP are long term active community members with the highest requirements on the technical setup and upgrading pace. We are about to start a second iteration of SGP very soon (SGPv2). The final slots and locations are yet to be concluded. Priority to participate in SGPv2 will be given to the current operators in SGP. Based on the number of slots, we will then determine how many more operators can sign up. 
+
+##### Rules of SGPv2
+
+<Callout type="info">
+**We will share more info soon in the channels. The rules are not set in stone and could potentially be altered or updated in the future! Do *not* purchase new servers neither migrate your nodes just yet.**
+</Callout>
+
+As we finalising last details of *"Project Smoosh"*, where one binary - `nym-node` - can run as an `entry-gateway`, `mixnode` or `exit-gateway` in Mixnet mode as well as `entry-gateway` or `exit-gateway` in Wireguard mode, we plan to step up the game. SGPv2 grants will be higher if operators can meet new requirements. 
+
+**Minimum Specs & Requirements**
+
+These are minimum requirements to become a part of SGPv2. We aim to have nodes on dedicated servers, with exceptions for much stronger VPS to meet the needed criteria while sharing server with other users.
+
+<div>
+  <Tabs items={[
+    <><code>nym-node</code> - dedicated server</>,
+    <><code>nym-node</code> - VPS</>,
+    ]} defaultIndex="0">
+    <MyTab>
+#### `nym-node` - dedicated server
+
+| **Hardware**   | **Minimum Specification**          |
+| :---           | ---:                               |
+| Type of server | Dedicated or bare metal            |
+| CPU Cores      | 4                                  |
+| Memory         | 8-16 GB RAM                        |
+| Storage        | 50 GB (preferably 80 GB)           |
+| Connectivity   | IPv4, IPv6, TCP/IP, UDP            |
+| Bandwidth      | Unmetered if possible, or {" >"} 20Tb  |
+| Port speed     | 1Gbps                              |
+
+          - Exit Gateways only
+          - [Terms & Conditions](nodes/nym-node/setup#terms--conditions) accepted
+          - Nodes are [bonded](nodes/nym-node/bonding#migrate-to-nym-node-in-mixnet-smart-contract) as `nym-node` not as a legacy node
+          - Timely upgrades without direct message notifications: Only Latest version, and the two preceding are accepted
+          - Dedicated (or bare metal) machine is to ensure that the numbers above are *dedicated* for `nym-node` operation
+          - Unmetered bandwidth is to ensure smooth user experience without data allowance limitation. 20Tb is a minimum for locations where unlimited bandwidth is not an option. 
+          - 1Gbps is an expected speed of Nym network in order to meet expectations of NymVPN users
+          - Squads operating more than 2 nodes are expected to run larger servers and divide them for multiple nodes. We will share a how-to guide soon.
+          - Operators run [reverse proxy](nodes/nym-node/configuration) with landing page URL starting with `nym-exit` and [Web Secure Socket](nodes/nym-node/configuration)
+          - Operators must write their providers upfront that they will run a Nym Exit Gateway on their servers, using [this template](community-counsel/templates#introduction-to-server-provider)
+          - If a node remains offline for more than 5 days for any reason, including abuse reports, and the operator doesn't resolve it neither doesn't communicate the blockers, they will be removed from the program.
+    </MyTab>
+    <MyTab>
+#### `nym-node` - VPS
+
+| **Hardware**   | **Minimum Specification**          |
+| :---           | ---:                               |
+| Type of server | VPS           |
+| CPU Cores      | 8                                  |
+| Memory         | 16-32 GB RAM                        |
+| Storage        | 50 GB (preferably 80 GB)           |
+| Connectivity   | IPv4, IPv6, TCP/IP, UDP            |
+| Bandwidth      | Unmetered if possible, or {" >"} 40Tb  |
+| Port speed     | 10Gbps                              |
+
+          - Exit Gateways only
+          - [Terms & Conditions](nodes/nym-node/setup#terms--conditions) accepted
+          - Nodes are [bonded](nodes/nym-node/bonding#migrate-to-nym-node-in-mixnet-smart-contract) as `nym-node` not as a legacy node
+          - Timely upgrades without direct message notifications: Only Latest version, and the two preceding are accepted
+          - Stronger specs for VPS are to ensure that the `nym-node` operation will remain solid even when sharing a server with other users
+          - Unmetered bandwidth is to ensure smooth user experience without data allowance limitation. 40Tb is a minimum for locations where unlimited bandwidth is not an option. 
+          - 10Gbps is to ensure that the 1Gbps expected speed of Nym network is met even when sharing a server with other users
+          - Operators run [reverse proxy](nodes/nym-node/configuration) with landing page URL starting with `nym-exit` and [Web Secure Socket](nodes/nym-node/configuration)
+          - Operators must write their providers upfront that they will run a Nym Exit Gateway on their servers, using [this template](community-counsel/templates#introduction-to-server-provider)
+          - If a node remains offline for more than 5 days for any reason, including abuse reports, and the operator doesn't resolve it neither doesn't communicate the blockers, they will be removed from the program.
+    </MyTab>
+  </Tabs>
+</div>
+
+**Operators interested in joining SGPv2 can start by searching for servers that meet the above criteria, where they may eventually migrate their nodes, and then share their findings by submitting  a form which will be shared shortly. We will be first reaching to the current participants of Service Grant Program. Everything will be announced, sending DMs to devrel will not speed up the process!**
+
+
+### Features
+
+- [build(deps): bump criterion from `0.4.0` to `0.5.1`](https://github.com/nymtech/nym/pull/4911): Bumps [criterion](https://github.com/bheisler/criterion.rs) from `0.4.0` to `0.5.1`.
+
+- [NS API: add mixnet scraper](https://github.com/nymtech/nym/pull/5200) 
+
+- [build(deps): bump http from `1.1.0` to `1.2.0`](https://github.com/nymtech/nym/pull/5228): Bumps [http](https://github.com/hyperium/http) from `1.1.0` to `1.2.0`.
+
+- [`http-api-client`: deduplicate code](https://github.com/nymtech/nym/pull/5267): After adding PATCH support in [\#5260](https://github.com/nymtech/nym/pull/5260), it's now time to de-duplicate some of the code
+
+- [Add windows to CI builds](https://github.com/nymtech/nym/pull/5269)
+
+- [nym topology revamp](https://github.com/nymtech/nym/pull/5271): This PR changes the internals of the `NymTopology` to blur the lines between explicit mixnodes and gateways so that what used to be considered a "mixnode" could be a valid egress point of the network. `NymTopology` is no longer divided into `BTreeMap<MixLayer, Vec<mix::Node>>` and `Vec<gateway::Node>`. instead there's information about the current rewarded set (to support future VRF work) and a simple map of `HashMap<NodeId, RoutingNode>`. The new features are mostly controlled via 2 new flags/config values: 
+    - `use_extended_topology` that tells the client to retrieve **all** network nodes rather than the ones that got assigned "active" mixnode role (or support being a gateway)
+    - `ignore_egress_epoch_role` that tells the client it's  fine to construct egress packets to nodes that are **not** assigned entry or exit gateway role
+ 
+- [Nyx Chain Watcher](https://github.com/nymtech/nym/pull/5274)
+
+- [Include `IPINFO_API_TOKEN` in nightly CI](https://github.com/nymtech/nym/pull/5285)
+
+- [Move tun constants to network defaults](https://github.com/nymtech/nym/pull/5286): 
+<AccordionTemplate name={<TestingSteps/>}>
+1. **Regression Testing**:
+- Verified no issues arose when running tests for the affected files.  
+- Tested TUN behaviour with new nym-nodes in the hu branch.  
+ 
+**Results**:  
+
+- **No bugs detected**.  
+- Tunnels are functioning as expected, with traffic routing and IP generation working seamlessly.  
+</AccordionTemplate> 
+
+- [Add dependabot assignes for the root cargo ecosystem](https://github.com/nymtech/nym/pull/5297)
+
+- [build(deps): bump the patch-updates group across 1 directory with 35 updates](https://github.com/nymtech/nym/pull/5310): Bumps the `patch-updates` group with 33 updates
+
+- [Periodically remove stale gateway messages](https://github.com/nymtech/nym/pull/5312): This PR introduces a simple task that removes gateway messages that haven't been retrieved in (by default) 24h.  
+<AccordionTemplate name={<TestingSteps/>}>
+**Automation Script for Data Cleanup Validation**
+
+Test Objective: Validate that the stale message cleanup mechanism in the database correctly removes records older than the configured threshold (24 hours).
+ 
+Test Setup:
+1. Environment:
+    * SQLite database
+    * Bash script: used to insert data.
+ 
+Steps Performed:
+1. Ran the insert_data.sh script to populate the database with test data:
+    * Recent records inserted successfully.
+2. Verified the database content post-insertion: sqlite3 clients.sqlite "SELECT * FROM message_store;"
+3. Confirmed that all 20 records (10 recent + 10 stale) were present.
+4. Allowed the system to run for 24 hours to trigger the cleanup mechanism.
+5. Queried the database again after 24 hours: sqlite3 gateway_storage.db "SELECT * FROM message_store;"
+6. 
+ 
+ Expected Result:
+* All stale records (older than 24 hours) should be removed.
+* Recent records should remain in the database.
+Actual Result:
+* Query after 24 hours showed only the 10 recent records.
+* All 10 stale records were successfully removed.
+</AccordionTemplate>
+
+- [Use expect in geodata test to give error message on failure](https://github.com/nymtech/nym/pull/5314): Keep hitting this error on CI, from what I think is network hickup. But it's hard to tell form the log since the error is swallowed.  Explicitly unwrap the result so we get a more detailed error output.
+<AccordionTemplate name={<TestingSteps/>}>
+**Quick Code Review**  
+ 
+**Summary**  
+1. **CI Workflow**: Adjusted paths to optimise build triggers, avoiding unnecessary CI runs while ensuring coverage for key directories
+2. **Geolocation Test**: Improved error handling by replacing assertions with `.expect` for clearer debugging in API regression tests
+ 
+**Conclusion**  
+
+Regression testing confirms everything works as intended. **Approved**.
+</AccordionTemplate>
+
+- [`CancellationToken`-based shutdowns](https://github.com/nymtech/nym/pull/5325): This PR introduces scaffolding for using `CancellationToken` and `TaskTracker` for our graceful shutdowns rather than the existing `TaskClient` and `TaskManager`. 
+
+- [Introduce `/load` endpoint for self-reported quantised Nym Node load](https://github.com/nymtech/nym/pull/5326): This PR introduces a new `/load` endpoint on a `NymNode` to return its current load. It returns the following data:
+```rust
+pub struct NodeLoad {
+    pub total: Load,
+    pub machine: Load,
+    pub network: Load,
+}
+```
+Where `Load` is quantised into the following buckets / tiers:
+```rust
+pub enum Load {
+    Negligible, // 0 - 0.1
+    Low,        // 0.1 - 0.3
+    Medium,     // 0.3 - 0.6
+    High,       // 0.6 - 0.8
+    VeryHigh,   // 0.8 - 0.95
+    AtCapacity, // >= 0.95
+}
+```
+<AccordionTemplate name={<LoadEndpointInfo/>}>
+The actual values  for`NodeLoad` are determined as follows:
+- For network we approximate current rx/tx rates on all `eth` interfaces and scale them to the range of 0-1Gbps (for this initial iteration we assume the maximum network speed is 1Gbps which would be treated as fully saturated). So for example, if the node is sending at 0.5Gbps, it would get a `Load` of 0.5 and thus value of `Load::Medium`, 0.9Gbps would get `Load` of 0.9 and value of `Load::VeryHigh`, etc. we take the bigger value between rx and tx
+- For machine load there's a bit more logic in there:
+    - Firstly we determine what I call a "base load" of the machine. we do this by taking the average load from the last 5min (via `getloadavg`) and dividing it by the number of CPUs in the machine. For example if the average load of the machine in the last 5min was `1.23` and it has 2 CPUs, then it's `Load` would be `Load::High` (`1.23 / 2 = 0.615`)
+    - However, whilst CPU utilisation is one of the most important factors, it does not tell the whole story. I tried to also take memory/swap utilisation into consideration (whilst not making it the main factor)
+    - Thus we calculate two additional auxiliary `Load` values, for memory usage and swap usage, i.e.: `used_memory / total_memory` and `used_swap / total_swap` respectively.
+    - Then we check whether either of the `MemoryLoad` or `SwapLoad` is bigger than the current base `Load` of the machine we have determined, if so, it's increased by one tier / bucket. For example, say the current machine load is `Load::Low`, but the memory usage is at 90% (`Load::VeryHigh`). that would result in the reported `Load` being bumped up to `Load::Medium` instead. The same logic applies with swap load, **however, only if the total swap > 1GB**. this is to prevent weird edge cases where the machine has hardly any swap.
+    - Finally, the `.total` `Load` uses the same "tier bumping" behaviour using the `.total` and `.network` loads, i.e. `if network > machine`, then `total = machine + 1`. for example if `machine` `Load` is `Load::Low`, but `network` `Load` is `Load::Medium`, then the `total` `Load` is set to `Load::Medium` instead.
+</AccordionTemplate> 
+
+- [Bump the `patch-updates` group with 8 updates](https://github.com/nymtech/nym/pull/5336)
+
+- [Bump `tempfile` from `3.14.0` to `3.15.0`](https://github.com/nymtech/nym/pull/5337)
+
+- [Bump `ts-rs` from `10.0.0` to `10.1.0`](https://github.com/nymtech/nym/pull/5338)
+
+- [Updated `cosmrs` and `tendermint-rpc` to their most recent versions](https://github.com/nymtech/nym/pull/5339)
+
+- [Bump mikefarah/yq from `4.44.6` to `4.45.1`](https://github.com/nymtech/nym/pull/5342)
+
+- [Update `indexed_db_futures`](https://github.com/nymtech/nym/pull/5347): Updates the `indexed_db_futures` dependency to stop relying on the fork. 
+
+- [Refresh wasm sdk](https://github.com/nymtech/nym/pull/5353): This PR refreshes the wasm clients to make them usable in the current network
+
+- [Client gateway selection](https://github.com/nymtech/nym/pull/5358): Changed how gateway is selected.
+    - For init the target gateway can't support mixing
+    - For egress, unless `ignore_epoch_roles` is specified, the gateway can't be currently assigned to a mixing layer. But it can be standby or inactive
+    
+- [Exposed `NymApiClient` method for obtaining node performance history](https://github.com/nymtech/nym/pull/5360)
+
+- [Bind to `[::]` on `nym-node` for both IP versions](https://github.com/nymtech/nym/pull/5361)
+<AccordionTemplate name={<TestingSteps/>}>
+**IPv4 Configuration and Migration Testing**
+ 
+Testing Steps:
+- Initiated and ran a nym-node with version 1.3.1 on an IPv4-only machine, then updated it to the new 'hu', 1.4.0 version.
+- Initiated and ran a new nym-node with 'hu', 1.4.0 always on a machine with only IPv4.
+- Initiated and ran a new nym-node with 'hu', 1.4.0 on a machine with both IPv4 and IPv6 for regression testing.
+ 
+Results:
+- No functional issues during version updates.
+- Logged message on all versions: "no registered client for destination: ff02::2"
+ 
+Status: Pass
+</ AccordionTemplate>
+
+- [Remove empty ephemeral keys](https://github.com/nymtech/nym/pull/5376)
+
+- [Handle ecash network errors differently](https://github.com/nymtech/nym/pull/5378): For errors that could be caused by network problems, we should mark the ticket as still pending, not as bad. This won't fix the underlying problem, but should not assume anymore that the client is the culprit and penalise its bandwidth quota.
+
+- [Make client ignore dual mode nodes by default](https://github.com/nymtech/nym/pull/5388)
+
+<AccordionTemplate name={<TestingSteps/>}>
+**Testing Steps:**
+- Ensured a client is able to select a node which aside from a gateway, can also act as a mixnode
+- Verified 'ignore_epoch_roles' is the default mode
+- _note; this is most likely not going to be a permanent solution_
+ 
+**Results:**
+- Clients and topology are behaving correctly 
+  
+Status: Pass
+</ AccordionTemplate>
+
+- [Update version of chain watcher and validator rewarder](https://github.com/nymtech/nym/pull/5394)
+
+### Bugfix
+
+- [Remove unnecessary arguments for nym-api swagger endpoints](https://github.com/nymtech/nym/pull/5272)
+- [Fixed sql migration for adding default message timestamp](https://github.com/nymtech/nym/pull/5374)
+- [Terminate mixnet socket listener on shutdown](https://github.com/nymtech/nym/pull/5389)
+- [Correctly handle ingore epoch roles flag](https://github.com/nymtech/nym/pull/5390)
+
+
 ## `v2025.1-reeses`
 
 - [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.1-reeses)
diff --git a/documentation/docs/pages/operators/community-counsel/_meta.json b/documentation/docs/pages/operators/community-counsel/_meta.json
index 2308ace555..3e1c9234ce 100644
--- a/documentation/docs/pages/operators/community-counsel/_meta.json
+++ b/documentation/docs/pages/operators/community-counsel/_meta.json
@@ -1,5 +1,7 @@
 {
   "exit-gateway": "Exit Gateway",
+  "legal": "Legal Counsel",
+  "templates": "Templates",
   "jurisdictions": "Jurisdictions",
   "isp-list": "ISP List",
   "landing-pages": "Landing Pages",
diff --git a/documentation/docs/pages/operators/community-counsel/legal.mdx b/documentation/docs/pages/operators/community-counsel/legal.mdx
new file mode 100644
index 0000000000..26672e2f28
--- /dev/null
+++ b/documentation/docs/pages/operators/community-counsel/legal.mdx
@@ -0,0 +1,84 @@
+import { Callout } from 'nextra/components';
+import { Tabs } from 'nextra/components';
+import { RunTabs } from 'components/operators/nodes/node-run-command-tabs';
+import { VarInfo } from 'components/variable-info.tsx';
+import { AccordionTemplate } from 'components/accordion-template.tsx';
+import { Steps } from 'nextra/components';
+import AbuseResponse from 'components/operators/templates/dmca_response.md';
+import OperatorIntroduction from 'components/operators/templates/provider_introduction.md';
+
+# Community Counsel: General Legal Considerations
+
+**This page contains some tips & tricks to support operators running Exit Gateway (`nym-node` in mode `exit-gateway`) gathered by the operators community. Have a look on the points below to strengthen your legal protection.**
+
+<VarInfo />
+
+## Useful Suggestions
+
+#### Introduce Nym Node to your provider
+Write a message to your provider telling them about your intention to run a `nym-node` on their infrastructure. You can use this template for it.
+
+<br/>
+<AccordionTemplate name="Email template: Introduce yourself to your VPS provider">
+<OperatorIntroduction />
+</AccordionTemplate>
+
+#### Join Operators Legal Forum
+This [Matrix channel]((https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org&via=matrix.su4ka.icu)) is the best place to ask questions and share your experience with others. You can share screen prints of abuse reports and ask for support. 
+
+#### Join Operators Legal Clinic
+Do you have any questions directed for lawyers? Come and chat with Nym COO Alexis Roussel, every Wednesday 14:30 UTC for 60min in our [Operator Legal Forum channel on Matrix](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org&via=matrix.su4ka.icu).
+
+#### Use a friendly provider
+Nym operators community shares their experience with different ISPs on [this page](isp). At the same time, consider to move away from these provides:
+   
+- Servinga / VPS2day (AS39378)
+- Frantech / Ponynet / BuyVM (AS53667)
+- OVH SAS / OVHcloud (AS16276)
+- Online S.A.S. / Scaleway (AS12876)
+- Hetzner Online GmbH (AS24940)
+- IONOS SE (AS8560)
+- Psychz Networks (AS40676)
+- 1337 Services GmbH / RDP.sh (AS210558)
+
+#### Backup your nodes
+Your only way to restore your node is when you have an access to `.nym` directory locally. Follow [node](../nodes/maintenance#backup-a-node) and [proxy configuration](../nodes/maintenance#backup-proxy-configuration) backup guides to be able to [restore your node](../nodes/maintenance#restoring-a-node) on another machine later on, without losing your delegation.  
+
+#### Use `nym-exit` prefix on your landing page URL
+We would like to ask operators to use [reverse proxy](../nodes/nym-node/configuration/proxy-configuration) with a [landing page](landing-pages). When assigning a domain please use a common convention with `nym-exit` in the beginning of the the page URL as this will create a reputation and reference. The entire address should have this new format:
+```
+nym-exit.<CUSTOM>.<DOMAIN>.<TLD>
+```
+
+For example:
+
+```
+# for squads running multiple nodes a format can look like this:
+nym-exit.ch-node1.mysquad.org
+
+# or like this
+nym-exit.3-jamaica.mysquad.org
+
+# for operators having one node per location, the format can look like this:
+nym-exit.brazil.mysquad.org
+
+# or if operators decide to not have any custom, they can simply have this format:
+nym-exit.mysquad.org
+```
+
+**The `NYM-EXIT` part in the beginning is what's important.**
+
+#### Chose the right TLD
+When registering a domain, check [Top Level Domain (TLD)](https://www.techopedia.com/definition/1348/top-level-domain-tld) terms and conditions. For example `.icu` is a no go. Having a wrong TLD may lead to your domain being taken away from you when facing a DMCA report.  
+
+#### Respond to abuse reports
+Make sure to read notifications from your account provider and if you receive an abuse report, respond to it in time. Here is a template explaining the essential legal background of Nym Node Exit Gateway. Don't forget to adjust the variables. 
+
+<br/>
+<AccordionTemplate name="Email template: responding to DMCA take-down notices">
+<AbuseResponse />
+</AccordionTemplate>
+
+#### Help us to improve these pages
+Add your findings by opening a [Pull Request](add-content).
+
diff --git a/documentation/docs/pages/operators/community-counsel/templates.mdx b/documentation/docs/pages/operators/community-counsel/templates.mdx
new file mode 100644
index 0000000000..c701f1a003
--- /dev/null
+++ b/documentation/docs/pages/operators/community-counsel/templates.mdx
@@ -0,0 +1,23 @@
+import { Callout } from 'nextra/components';
+import { Tabs } from 'nextra/components';
+import { RunTabs } from 'components/operators/nodes/node-run-command-tabs';
+import { VarInfo } from 'components/variable-info.tsx';
+import { AccordionTemplate } from 'components/accordion-template.tsx';
+import { Steps } from 'nextra/components';
+import AbuseResponse from 'components/operators/templates/dmca_response.md';
+import OperatorIntroduction from 'components/operators/templates/provider_introduction.md';
+
+# Templates for Providers
+
+Communication with your provider is an essential part of legal defense, as more often than not, terminating a server is based on the lack of knowledge about Nym Node and it's legal bases. Use the following templates to introduce your intention to run a Nym Node or as a response to abuse report.
+
+<VarInfo/ >
+
+## Email Templates
+
+### Introduction to server provider
+
+<OperatorIntroduction />
+
+### DMCA abuse report response
+<AbuseResponse />
diff --git a/documentation/docs/pages/operators/nodes.mdx b/documentation/docs/pages/operators/nodes.mdx
index 49cae361f9..3868d6cd22 100644
--- a/documentation/docs/pages/operators/nodes.mdx
+++ b/documentation/docs/pages/operators/nodes.mdx
@@ -35,9 +35,7 @@ Accepting T&Cs is done via a flag `--accept-operator-terms-and-conditions` added
 This is a summary of all needed steps for node operators to setup and configure a `nym-node` and register it to Nym Network:
 
 
-1. **Start with [Preliminary Steps](nodes/preliminary-steps.mdx), preparing:**
-- [VPS](nodes/preliminary-steps/vps-setup.mdx)
-- [Nym wallet](nodes/preliminary-steps/wallet-preparation)
+1. **Start with [Preliminary Steps](nodes/preliminary-steps.mdx), preparing [VPS](nodes/preliminary-steps/vps-setup.mdx) and [Nym wallet](nodes/preliminary-steps/wallet-preparation)**
 
 2. **[Setup](nodes/nym-node/setup.mdx) the node**
 
diff --git a/documentation/docs/pages/operators/nodes/maintenance.mdx b/documentation/docs/pages/operators/nodes/maintenance.mdx
index 1d182e3d85..5819fde852 100644
--- a/documentation/docs/pages/operators/nodes/maintenance.mdx
+++ b/documentation/docs/pages/operators/nodes/maintenance.mdx
@@ -126,13 +126,32 @@ mkdir -pv <PATH_TO_TARGET_DIRECTORY>
 # mkdir -pv $HOME/backup/my_nym_node/.nym
 ```
 
-###### 2. Copy configuration folder `.nym` from your VPS to your newly created backup directory
+###### 2. Backup `clients.sqlite` database
+
+- Install `sqlite3`
+```sh
+apt install sqlite3
+```
+- Open sqlite CLI shell inside `clients.sqlite` database
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite
+```
+- Create backup called `clients_backup.sqlite`
+```sh
+.backup .nym/nym-nodes/default-nym-node/data/clients_backup.sqlite
+```
+- Exit sqlite CLI shell
+```sh
+.exit
+```
+
+###### 3. Copy configuration folder `.nym` from your VPS to your newly created backup directory
 
 ```sh
 scp -r <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:~/.nym/nym-nodes/<ID> <PATH_TO_TARGET_DIRECTORY>
 ```
 
-###### 3. Verify the success of the backup
+###### 4. Verify the success of the backup
 
 The `scp` command should print logs, an operator can see directly whether it was successful or if it encountered any error. However, double check that all your needed configuration is in the backup target directory.
 
@@ -227,7 +246,33 @@ The `scp` command should print logs, an operator can see directly whether it was
 * Run a command `echo "$(curl -4 https://ifconfig.me)"` to see your public IPv4
 * Edit config file located at `~/.nym/nym-nodes/<ID>/config/config.toml` correct IP - it's the field under the header `[host]`, called `public_ips = [<PUBLIC_IPS>,]`
 * Add your new location field `location = <LOCATION>`, (formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided).
-* Try to run the node and see if everything works.
+
+###### 5. Restore `clients.sqlite` database
+
+- Install `sqlite3`
+```sh
+apt install sqlite3
+```
+- Open sqlite CLI shell inside `clients.sqlite` database
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite
+```
+- Restore your backup called `clients_backup.sqlite`
+```sh
+.restore .nym/nym-nodes/default-nym-node/data/clients_backup.sqlite
+```
+- Exit sqlite CLI shell
+```sh
+.exit
+```
+- Check integrity
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite "PRAGMA integrity_check;"
+```
+The result should return `ok` if the database is intact.
+
+###### 6. Test & validate your setup
+* Dry run the node and see if everything works.
 * Setup the [systemd](nym-node/configuration.mdx#systemd) automation (don't forget to add the [terms and conditions flag](nym-node/setup.mdx#terms--conditions)) to `ExecStart` command, reload the daemon and run the service.
 
 ###### 4. Change the node smart contract info via the wallet interface
@@ -313,21 +358,71 @@ mkdir ~/.nym
 #in case no `nym-node` was initialized previously
 mkdir ~/.nym/nym-nodes
 ```
+###### 2. Backup `clients.sqlite` database
 
-###### 2. Move the node data and keys to the new machine
+- Stop your node
+```sh
+service nym-node stop
+```
+- Install `sqlite3`
+```sh
+apt install sqlite3
+```
+- Open sqlite CLI shell inside `clients.sqlite` database
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite
+```
+- Create backup called `clients_backup.sqlite`
+```sh
+.backup .nym/nym-nodes/default-nym-node/data/clients_backup.sqlite
+```
+- Exit sqlite CLI shell
+```sh
+.exit
+```
+
+###### 3. Move the node data and keys to the new machine
 
 * Open your **local terminal** (as that one's ssh key is authorized in both of the VPS) and run:
 ```sh
 scp -r -3 <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:~/.nym/nym-nodes <TARGET_USER_NAME>@<TARGET_HOST_ADDRESS>:~/.nym/nym-nodes/
 ```
 
-###### 3. Open new/target VPS terminal and configure the node
+###### 4. Open new/target VPS terminal and configure the node
 
 * Edit `~/.nym/nym-nodes/<ID>/config/config.toml` config with the new listening address IP - it's the one under the header `[host]`, called `public_ips = [<PUBLIC_IPS>,]` and add your new location (field `location = <LOCATION>`, formats like: 'Jamaica', or two-letter alpha2 (e.g. 'JM'), three-letter alpha3 (e.g. 'JAM') or three-digit numeric-3 (e.g. '388') can be provided). You can see your IP by running a command `echo "$(curl -4 https://ifconfig.me)"`.
 
-* Try to run the node and see if everything works.
 
-* Setup the [systemd](nym-node/configuration.mdx#systemd) automation (don't forget to add the [terms and conditions flag](nym-node/setup.mdx#terms--conditions)) to `ExecStart` command, reload the daemon and run the service. If you want to use the exact same service config file, you can also copy it from one VPS to another following the same logic by opening your **local terminal** (as that one's ssh key is authorized in both of the VPS) and running:
+###### 5. Restore `clients.sqlite` database
+
+- Install `sqlite3`
+```sh
+apt install sqlite3
+```
+- Open sqlite CLI shell inside `clients.sqlite` database
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite
+```
+- Restore your backup called `clients_backup.sqlite`
+```sh
+.restore .nym/nym-nodes/default-nym-node/data/clients_backup.sqlite
+```
+- Exit sqlite CLI shell
+```sh
+.exit
+```
+- Check integrity
+```sh
+sqlite3 ~/.nym/nym-nodes/default-nym-node/data/clients.sqlite "PRAGMA integrity_check;"
+```
+The result should return `ok` if the database is intact.
+
+###### 6. Test & validate your setup
+* Dry run the node and see if everything works.
+* Setup the [systemd](nym-node/configuration.mdx#systemd) automation (don't forget to add the [terms and conditions flag](nym-node/setup.mdx#terms--conditions)) to `ExecStart` command, reload the daemon and run the service.
+
+
+* If you want to use the exact same service config file, you can also copy it from one VPS to another following the same logic by opening your **local terminal** (as that one's ssh key is authorized in both of the VPS) and running:
 ```sh
 scp -r -3 <SOURCE_USER_NAME>@<SOURCE_HOST_ADDRESS>:/etc/systemd/system/nym-node.service <TARGET_USER_NAME>@<TARGET_HOST_ADDRESS>:/etc/systemd/system/nym-node.service
 ```
diff --git a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
index c77b18de42..204a6396d3 100644
--- a/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
+++ b/documentation/docs/pages/operators/nodes/nym-node/setup.mdx
@@ -20,12 +20,12 @@ This documentation page provides a guide on how to set up and run a [NYM NODE](.
 ```sh
 nym-node
 Binary Name:        nym-node
-Build Timestamp:    2025-01-16T11:54:17.079662337Z
-Build Version:      1.3.1
-Commit SHA:         5ab164d229f85bd2dd27ec6e38292c281df2f678
-Commit Date:        2025-01-16T12:51:53.000000000+01:00
+Build Timestamp:    2025-02-04T09:35:42.399220545Z
+Build Version:      1.4.0
+Commit SHA:         4c2bf3642e8eec0d55c7753e14429d73ac2d0e99
+Commit Date:        2025-02-04T10:29:48.000000000+01:00
 Commit Branch:      HEAD
-rustc Version:      1.84.0
+rustc Version:      1.84.1
 rustc Channel:      stable
 cargo Profile:      release
 ```
@@ -39,21 +39,35 @@ cargo Profile:      release
 <Callout type="info">
 From `nym-node v1.3.0` operators can choose multiple functionalities for their `nym-node` binary (flagged as `--mode`).
 
-**However, the clients are yet to be developed to be able to make a proper selection for multi-mode nodes and therefore we ask operators to sign only one functionality to `--mode` option at a time. Please chose out of: `mixnode` or `entry-gateway` or `exit-gateway`.**
-
-We are developing a design where operators can enable multiple modes, and let the Nym API to position the node according the network's needs in the beginning of each epoch.
+**However, the clients are yet to be developed to be able to make a proper selection for multi-mode nodes and therefore we ask operators to assign only one functionality to `--mode` option at a time. Please chose out of: `mixnode` or `entry-gateway` or `exit-gateway`. Chosing multiple at once will make your node non-routable!**
 </Callout>
 
-Nym Node has three functionalities in the network: `entry-gateway`, `mixnode` and `exit-gateway`.
+### Mixnet Routing
 
-- **Entry Gateway (`--mode entry-gateway`)**: A the node to which local client connects. It checks the bandwidth allowance, using [zk-nyms](../../../network/cryptography/zk-nym) and either sends [Sphinx packets](../../../network/cryptography/sphinx) through the mixnet or directly to Exit Gateway in case of dVPN (2-hop) routing. This node also recieves replies and sends them back to users local client.
+***Mixnet mode (5-hop) is the full anonymising option of NymVPN. Read more about the Mixnet architecture [here](http://localhost:3000/docs/network/architecture)***
 
-- **Mixnode (`--mode mixnode`)**: Nodes organized in three layers, randmoly selected every epoch (60 minutes), mixing Sphinx packets, adding a slight latency to defend users agains time correlation attacks and sending them further to the next layer or to the Exit Gateway
+Nym Node has three functionalities in the Mixnet: `entry-gateway`, `mixnode` and `exit-gateway`. These are selected with a flag `--mode <MODE>` alongside `nym-node` command `run` .
+
+- **Entry Gateway (`--mode entry-gateway`)**: A node to which clients connect. It checks the bandwidth allowance, using [zk-nyms](../../../network/cryptography/zk-nym) and either sends [Sphinx packets](../../../network/cryptography/sphinx) through the mixnet or directly to Exit Gateway in case of dVPN (2-hop) routing. This node also receives replies and sends them back to users local client.
+
+- **Mixnode (`--mode mixnode`)**: Nodes organized in three layers, randomly selected every epoch (60 minutes), mixing Sphinx packets, adding a slight latency to defend users agains time correlation attacks and sending them further to the next layer or to the Exit Gateway
 
 - **Exit Gateway (`--mode exit-gateway`)**: The final node in the mixnet. It puts all packets together and using inbuilt Network requester and IP packet router, it sends traffic to the open internet. This node also recieves replies and sends them back to the user client.
 
 <Callout type="warning">
-Exit Gateway is the only node routing data directly to the open internet. Therefore it exposes IP of operators server (VPS) to abuse complains. Before you decide to run an Exit Gateway, please read our [Community Counsel pages](../../community-counsel/exit-gateway) containing more information and some legal content.
+Exit Gateway is the only mode routing data directly to the open internet. Therefore it exposes IP of operators server (VPS) to abuse complains. Before you decide to run an Exit Gateway, please read our [Community Counsel pages](../../community-counsel/exit-gateway) containing more information and some legal content.
+</Callout>
+
+### dVPN Routing
+
+***dVPN routing (2-hop) is the Fast option of NymVPN. It runs a wireguard tunnel inside another wireguard tunnel. dVPN uses 2 Gateway layers (entry and exit) and no Mixnode layers. If an operator announces and [correctly configure](configuration#connectivity-test-and-configuration) their node to route wireguard, the node can be chosen as entry or exit by any client at any time.***
+
+To activate wireguard routing, operators need to add `--wireguard-enabled true` alongside `nym-node` command `run`. 
+
+<Callout type="warning">
+Wireguard nodes route data directly to the open internet. Therefore it exposes IP of operators server (VPS) to abuse complains. Before you decide to run a node with active wireguard routing, please read our [Community Counsel pages](../../community-counsel/exit-gateway) containing more information and some legal content.
+
+**Wireguard mode has no exit policy right now - we are working on the implementation.**
 </Callout>
 
 Everything essential for each mode exists on `nym-node` by default. For instance, if you run a Mixnode, you'll find that a NR (Network Requester) and IPR (IP Packet Router) addresses exist, but they will be ignored in `mixnode` mode.
diff --git a/documentation/docs/pages/operators/tokenomics/mixnet-rewards.mdx b/documentation/docs/pages/operators/tokenomics/mixnet-rewards.mdx
index b329a227c0..ea5cab1beb 100644
--- a/documentation/docs/pages/operators/tokenomics/mixnet-rewards.mdx
+++ b/documentation/docs/pages/operators/tokenomics/mixnet-rewards.mdx
@@ -146,7 +146,7 @@ Besides these values, the API is also looking whether the node is bonded in Mixn
 **The node score is calculated with this formula:**
 
 <Callout type="info" emoji="📌">
-> **active_set_selection_probability = total_stake \* ( config_score \* node_performance ) ^ 20 )**
+> **active_set_selection_probability = total_stake \* (( config_score \* node_performance ) ^ 20 )**
 </Callout>
 
 Note that the score helps prioritize some nodes over others. If all available nodes have the same score, then the selection is done uniformly at random. By raising the config and performance components to 20, values of these parameters that are below one incur a heavy penalization for the node’s selection chances.

From d7b67c1408d91afb5413b54d1a64ec67a93b5ba7 Mon Sep 17 00:00:00 2001
From: import this <97586125+serinko@users.noreply.github.com>
Date: Thu, 6 Feb 2025 10:15:45 +0000
Subject: [PATCH 42/42] [DOCs]: hotfix relative path url (#5427)

---
 documentation/docs/pages/operators/community-counsel/legal.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/docs/pages/operators/community-counsel/legal.mdx b/documentation/docs/pages/operators/community-counsel/legal.mdx
index 26672e2f28..c916a899d6 100644
--- a/documentation/docs/pages/operators/community-counsel/legal.mdx
+++ b/documentation/docs/pages/operators/community-counsel/legal.mdx
@@ -30,7 +30,7 @@ This [Matrix channel]((https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=
 Do you have any questions directed for lawyers? Come and chat with Nym COO Alexis Roussel, every Wednesday 14:30 UTC for 60min in our [Operator Legal Forum channel on Matrix](https://matrix.to/#/!YfoUFsJjsXbWmijbPG:nymtech.chat?via=nymtech.chat&via=matrix.org&via=matrix.su4ka.icu).
 
 #### Use a friendly provider
-Nym operators community shares their experience with different ISPs on [this page](isp). At the same time, consider to move away from these provides:
+Nym operators community shares their experience with different ISPs on [this page](isp-list). At the same time, consider to move away from these provides:
    
 - Servinga / VPS2day (AS39378)
 - Frantech / Ponynet / BuyVM (AS53667)