Add shutdown event handle

* feat: expose obtaining reference to Mnemonic from DirectSecp256k1HdWallet

* updated getters for stringified mnemonic

.github/workflows/ci-contracts.yml

@@ -54,7 +54,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --lib --manifest-path contracts/Cargo.toml --all-features
+          args: --lib --manifest-path contracts/Cargo.toml
 
       - name: Check formatting
         uses: actions-rs/cargo@v1

CHANGELOG.md

@@ -4,50 +4,6 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
-## [2025.18-jarlsberg] (2025-10-14)
-
-- ns-api: add descriptions to dVPN gateway responses ([#6102])
-- NS API: use new probe download filesize and milliseconds field ([#6097])
-- ns-api: use download files size from probes instead of parsing filenames ([#6095])
-- ns-api: add new fields for probe output for query_metadata and download file size and duration in ms ([#6091])
-- Bugfix/bloomfilters purge ([#6089])
-- Hotfix: Update API source in node ping tester script ([#6082])
-- Get wireguard keypair as arg instead of reading it from disk ([#6078])
-- Feature: Ping probe all nodes /described nodes from a server ([#6074])
-- Node Status API: add bridge information to dVPN endpoint ([#6069])
-- frontdoor typo fix ([#6067])
-- Feature: Node rewards tracker ([#6064])
-- [chore] Clippy fix ([#6060])
-- Registration Client ([#6059])
-- Bugfix: Nym node CLI download nym-node exception ([#6058])
-- Feature: Nym node html landing page ([#6053])
-- feat: DKG contract method for updating announce address ([#6050])
-- feat: NS ticket faucet ([#6047])
-- Bridge proto client params in Self-Described ([#6035])
-- Node Status API: remove sqlite support ([#6004])
-- Benny/ci contract fix ([#5962])
-
-[#6102]: https://github.com/nymtech/nym/pull/6102
-[#6097]: https://github.com/nymtech/nym/pull/6097
-[#6095]: https://github.com/nymtech/nym/pull/6095
-[#6091]: https://github.com/nymtech/nym/pull/6091
-[#6089]: https://github.com/nymtech/nym/pull/6089
-[#6082]: https://github.com/nymtech/nym/pull/6082
-[#6078]: https://github.com/nymtech/nym/pull/6078
-[#6074]: https://github.com/nymtech/nym/pull/6074
-[#6069]: https://github.com/nymtech/nym/pull/6069
-[#6067]: https://github.com/nymtech/nym/pull/6067
-[#6064]: https://github.com/nymtech/nym/pull/6064
-[#6060]: https://github.com/nymtech/nym/pull/6060
-[#6059]: https://github.com/nymtech/nym/pull/6059
-[#6058]: https://github.com/nymtech/nym/pull/6058
-[#6053]: https://github.com/nymtech/nym/pull/6053
-[#6050]: https://github.com/nymtech/nym/pull/6050
-[#6047]: https://github.com/nymtech/nym/pull/6047
-[#6035]: https://github.com/nymtech/nym/pull/6035
-[#6004]: https://github.com/nymtech/nym/pull/6004
-[#5962]: https://github.com/nymtech/nym/pull/5962
-
 ## [2025.17-isabirra] (2025-09-29)
 
 - Bugfix | Fix the registration handshake ([#6062])

Cargo.toml

@@ -215,6 +215,7 @@ base64 = "0.22.1"
 base85rs = "0.1.3"
 bincode = "1.3.3"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
+bit-vec = "0.7.0"                                     # can we unify those?
 bitvec = "1.0.0"
 blake3 = "1.7.0"
 bloomfilter = "3.0.1"
@@ -242,11 +243,13 @@ criterion = "0.5"
 csv = "1.3.1"
 ctr = "0.9.1"
 cupid = "0.6.1"
+curve25519-dalek = "4.1"
 dashmap = "5.5.3"
 # We want https://github.com/DefGuard/wireguard-rs/pull/64 , but there's no crates.io release being pushed out anymore
 defguard_wireguard_rs = { git = "https://github.com/DefGuard/wireguard-rs.git", rev = "v0.4.7" }
 digest = "0.10.7"
-dirs = "6.0"
+dirs = "5.0"
+doc-comment = "0.3"
 dotenvy = "0.15.6"
 dyn-clone = "1.0.19"
 ecdsa = "0.16"
@@ -262,8 +265,11 @@ futures = "0.3.31"
 futures-util = "0.3"
 generic-array = "0.14.7"
 getrandom = "0.2.10"
+getset = "0.1.5"
 handlebars = "3.5.5"
+headers = "0.4.0"
 hex = "0.4.3"
+hex-literal = "0.3.3"
 hickory-resolver = "0.25"
 hkdf = "0.12.3"
 hmac = "0.12.1"
@@ -287,10 +293,12 @@ lazy_static = "1.5.0"
 ledger-transport = "0.10.0"
 ledger-transport-hid = "0.10.0"
 log = "0.4"
+maxminddb = "0.23.0"
 mime = "0.3.17"
 moka = { version = "0.12", features = ["future"] }
 nix = "0.27.1"
 notify = "5.1.0"
+okapi = "0.7.0"
 once_cell = "1.21.3"
 opentelemetry = "0.19.0"
 opentelemetry-jaeger = "0.18.0"
@@ -299,6 +307,7 @@ pem = "0.8"
 petgraph = "0.6.5"
 pin-project = "1.1"
 pnet_packet = "0.35.0"
+pin-project-lite = "0.2.16"
 publicsuffix = "2.3.0"
 proc_pidinfo = "0.1.3"
 quote = "1"
@@ -306,10 +315,13 @@ rand = "0.8.5"
 rand_chacha = "0.3"
 rand_core = "0.6.3"
 rand_distr = "0.4"
+rand_pcg = "0.3.1"
+rand_seeder = "0.2.3"
 rayon = "1.5.1"
 regex = "1.10.6"
 reqwest = { version = "0.12.15", default-features = false }
 rs_merkle = "1.5.0"
+safer-ffi = "0.1.13"
 schemars = "0.8.22"
 semver = "1.0.26"
 serde = "1.0.219"
@@ -356,7 +368,6 @@ tracing-indicatif = "0.3.9"
 tracing-test = "0.2.5"
 ts-rs = "10.1.0"
 tungstenite = { version = "0.20.1", default-features = false }
-typed-builder = "0.23.0"
 uniffi = "0.29.2"
 uniffi_build = "0.29.0"
 url = "2.5"

clients/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-client"
-version = "1.1.64"
+version = "1.1.63"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jędrzej Stuczyński <andrew@nymtech.net>"]
 description = "Implementation of the Nym Client"
 edition = "2021"

clients/native/src/client/mod.rs

@@ -60,7 +60,6 @@ impl SocketClient {
         let ClientInput {
             connection_command_sender,
             input_sender,
-            ..
         } = client_input;
 
         let ClientOutput {

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.64"
+version = "1.1.63"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 description = "A SOCKS5 localhost proxy that converts incoming messages to Sphinx and sends them to a Nym address"
 edition = "2021"

common/client-core/Cargo.toml

@@ -36,7 +36,7 @@ nym-bandwidth-controller = { path = "../bandwidth-controller" }
 nym-crypto = { path = "../crypto" }
 nym-gateway-client = { path = "../client-libs/gateway-client" }
 nym-gateway-requests = { path = "../gateway-requests" }
-nym-http-api-client = { path = "../http-api-client", features = ["network-defaults"] }
+nym-http-api-client = { path = "../http-api-client" }
 nym-nonexhaustive-delayqueue = { path = "../nonexhaustive-delayqueue" }
 nym-sphinx = { path = "../nymsphinx" }
 nym-statistics-common = { path = "../statistics" }

common/client-core/src/cli_helpers/client_add_gateway.rs

@@ -114,12 +114,13 @@ where
         })?;
         hardcoded_topology.entry_capable_nodes().cloned().collect()
     } else {
+        let mut rng = rand::thread_rng();
         crate::init::helpers::gateways_for_init(
+            &mut rng,
             &core.client.nym_api_urls,
             user_agent,
             core.debug.topology.minimum_gateway_performance,
             core.debug.topology.ignore_ingress_epoch_role,
-            None,
         )
         .await?
     };

common/client-core/src/cli_helpers/client_init.rs

@@ -173,12 +173,13 @@ where
         })?;
         hardcoded_topology.entry_capable_nodes().cloned().collect()
     } else {
+        let mut rng = rand::thread_rng();
         crate::init::helpers::gateways_for_init(
+            &mut rng,
             &core.client.nym_api_urls,
             user_agent,
             core.debug.topology.minimum_gateway_performance,
             core.debug.topology.ignore_ingress_epoch_role,
-            None,
         )
         .await?
     };

common/client-core/src/client/base_client/mod.rs

@@ -7,12 +7,11 @@ use super::statistics_control::StatisticsControl;
 use crate::client::base_client::storage::helpers::store_client_keys;
 use crate::client::base_client::storage::MixnetClientStorage;
 use crate::client::cover_traffic_stream::LoopCoverTrafficStream;
-use crate::client::event_control::EventControl;
 use crate::client::inbound_messages::{InputMessage, InputMessageReceiver, InputMessageSender};
 use crate::client::key_manager::persistence::KeyStore;
 use crate::client::key_manager::ClientKeys;
 use crate::client::mix_traffic::transceiver::{GatewayReceiver, GatewayTransceiver, RemoteGateway};
-use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController, MixTrafficEvent};
+use crate::client::mix_traffic::{BatchMixMessageSender, MixTrafficController};
 use crate::client::real_messages_control;
 use crate::client::real_messages_control::RealMessagesController;
 use crate::client::received_buffer::{
@@ -67,16 +66,13 @@ use std::path::Path;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use tokio::sync::mpsc::Sender;
+use tracing::*;
 use url::Url;
 
 #[cfg(target_arch = "wasm32")]
 #[cfg(debug_assertions)]
 use wasm_utils::console_log;
 
-/// Default number of retries for Nym API requests when using network details with domain fronting.
-/// This allows the client to try alternative URLs if the primary endpoint is unavailable.
-const DEFAULT_NYM_API_RETRIES: usize = 3;
-
 #[cfg(all(
     not(target_arch = "wasm32"),
     feature = "fs-surb-storage",
@@ -87,28 +83,10 @@ pub mod non_wasm_helpers;
 pub mod helpers;
 pub mod storage;
 
-#[derive(Clone, Copy, Debug)]
-pub enum MixnetClientEvent {
-    Traffic(MixTrafficEvent),
-}
-
-pub type EventReceiver = mpsc::UnboundedReceiver<MixnetClientEvent>;
-#[derive(Clone)]
-pub struct EventSender(pub mpsc::UnboundedSender<MixnetClientEvent>);
-
-impl EventSender {
-    pub fn send(&self, event: MixnetClientEvent) {
-        if let Err(err) = self.0.unbounded_send(event) {
-            tracing::warn!("Failed to send error event. The caller event reader was closed: {err}");
-        }
-    }
-}
-
 #[derive(Clone)]
 pub struct ClientInput {
     pub connection_command_sender: ConnectionCommandSender,
     pub input_sender: InputMessageSender,
-    pub client_request_sender: ClientRequestSender,
 }
 
 impl ClientInput {
@@ -216,14 +194,10 @@ pub struct BaseClientBuilder<C, S: MixnetClientStorage> {
     client_store: S,
     dkg_query_client: Option<C>,
 
-    // Optional API URLs for domain fronting support
-    nym_api_urls: Option<Vec<nym_network_defaults::ApiUrl>>,
-
     wait_for_gateway: bool,
     custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
     custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send>>,
     shutdown: Option<ShutdownTracker>,
-    event_tx: Option<EventSender>,
     user_agent: Option<UserAgent>,
 
     setup_method: GatewaySetup,
@@ -248,12 +222,10 @@ where
             config: base_config,
             client_store,
             dkg_query_client,
-            nym_api_urls: None,
             wait_for_gateway: false,
             custom_topology_provider: None,
             custom_gateway_transceiver: None,
             shutdown: None,
-            event_tx: None,
             user_agent: None,
             setup_method: GatewaySetup::MustLoad { gateway_id: None },
             #[cfg(unix)]
@@ -271,16 +243,6 @@ where
         self
     }
 
-    /// Set Nym API URLs for domain fronting support.
-    ///
-    /// When provided, the client will use these API URLs (which include front_hosts)
-    /// to construct HTTP clients with domain fronting enabled.
-    #[must_use]
-    pub fn with_nym_api_urls(mut self, nym_api_urls: Vec<nym_network_defaults::ApiUrl>) -> Self {
-        self.nym_api_urls = Some(nym_api_urls);
-        self
-    }
-
     #[must_use]
     pub fn with_forget_me(mut self, forget_me: &ForgetMe) -> Self {
         self.config.debug.forget_me = *forget_me;
@@ -326,12 +288,6 @@ where
         self
     }
 
-    #[must_use]
-    pub fn with_event_tx(mut self, event_tx: EventSender) -> Self {
-        self.event_tx = Some(event_tx);
-        self
-    }
-
     #[must_use]
     pub fn with_user_agent(mut self, user_agent: UserAgent) -> Self {
         self.user_agent = Some(user_agent);
@@ -362,18 +318,6 @@ where
         details.client_address()
     }
 
-    fn start_event_control(
-        parent_event_tx: Option<EventSender>,
-        children_event_rx: EventReceiver,
-        shutdown_tracker: &ShutdownTracker,
-    ) {
-        let event_control = EventControl::new(parent_event_tx, children_event_rx);
-        shutdown_tracker.try_spawn_named_with_shutdown(
-            async move { event_control.run().await },
-            "EventControl",
-        );
-    }
-
     // future constantly pumping loop cover traffic at some specified average rate
     // the pumped traffic goes to the MixTrafficController
     fn start_cover_traffic_stream(
@@ -385,7 +329,7 @@ where
         stats_tx: ClientStatsSender,
         shutdown_tracker: &ShutdownTracker,
     ) {
-        tracing::info!("Starting loop cover traffic stream...");
+        info!("Starting loop cover traffic stream...");
 
         let mut stream = LoopCoverTrafficStream::new(
             ack_key,
@@ -417,7 +361,7 @@ where
         stats_tx: ClientStatsSender,
         shutdown_tracker: &ShutdownTracker,
     ) {
-        tracing::info!("Starting real traffic stream...");
+        info!("Starting real traffic stream...");
 
         let real_messages_controller = RealMessagesController::new(
             controller_config,
@@ -502,7 +446,7 @@ where
         metrics_reporter: ClientStatsSender,
         shutdown_tracker: &ShutdownTracker,
     ) {
-        tracing::info!("Starting received messages buffer controller...");
+        info!("Starting received messages buffer controller...");
         let controller = ReceivedMessagesBufferController::<SphinxMessageReceiver>::new(
             local_encryption_keypair,
             query_receiver,
@@ -613,7 +557,7 @@ where
             details_store
                 .upgrade_stored_remote_gateway_key(gateway_client.gateway_identity(), &updated_key)
                 .await.map_err(|err| {
-                tracing::error!("failed to store upgraded gateway key! this connection might be forever broken now: {err}");
+                error!("failed to store upgraded gateway key! this connection might be forever broken now: {err}");
                 ClientCoreError::GatewaysDetailsStoreError { source: Box::new(err) }
             })?
         }
@@ -710,7 +654,7 @@ where
 
         if topology_config.disable_refreshing {
             // if we're not spawning the refresher, don't cause shutdown immediately
-            tracing::info!("The background topology refresher is not going to be started");
+            info!("The background topology refresher is not going to be started");
         }
 
         let mut topology_refresher = TopologyRefresher::new(
@@ -720,7 +664,7 @@ where
         );
         // before returning, block entire runtime to refresh the current network view so that any
         // components depending on topology would see a non-empty view
-        tracing::info!("Obtaining initial network topology");
+        info!("Obtaining initial network topology");
         topology_refresher.try_refresh().await;
 
         if let Err(err) = topology_refresher.ensure_topology_is_routable().await {
@@ -746,13 +690,13 @@ where
                     .wait_for_gateway(local_gateway, waiting_timeout)
                     .await
                 {
-                    tracing::error!(
+                    error!(
                         "the gateway did not come back online within the specified timeout: {err}"
                     );
                     return Err(err.into());
                 }
             } else {
-                tracing::error!("the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}");
+                error!("the gateway we're supposedly connected to does not exist. We'll not be able to send any packets to ourselves: {err}");
                 return Err(err.into());
             }
         }
@@ -760,7 +704,7 @@ where
         if !topology_config.disable_refreshing {
             // don't spawn the refresher if we don't want to be refreshing the topology.
             // only use the initial values obtained
-            tracing::info!("Starting topology refresher...");
+            info!("Starting topology refresher...");
             shutdown_tracker.try_spawn_named_with_shutdown(
                 async move { topology_refresher.run().await },
                 "TopologyRefresher",
@@ -777,7 +721,7 @@ where
         input_sender: Sender<InputMessage>,
         shutdown_tracker: &ShutdownTracker,
     ) -> ClientStatsSender {
-        tracing::info!("Starting statistics control...");
+        info!("Starting statistics control...");
         StatisticsControl::create_and_start(
             config.debug.stats_reporting,
             user_agent
@@ -792,17 +736,10 @@ where
     fn start_mix_traffic_controller(
         gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
         shutdown_tracker: &ShutdownTracker,
-        event_tx: EventSender,
     ) -> (BatchMixMessageSender, ClientRequestSender) {
-        tracing::info!("Starting mix traffic controller...");
-        let mut mix_traffic_controller = MixTrafficController::new(
-            gateway_transceiver,
-            shutdown_tracker.clone_shutdown_token(),
-            event_tx,
-        );
-
-        let mix_tx = mix_traffic_controller.mix_tx();
-        let client_tx = mix_traffic_controller.client_tx();
+        info!("Starting mix traffic controller...");
+        let (mut mix_traffic_controller, mix_tx, client_tx) =
+            MixTrafficController::new(gateway_transceiver, shutdown_tracker.clone_shutdown_token());
 
         shutdown_tracker.try_spawn_named(
             async move { mix_traffic_controller.run().await },
@@ -866,7 +803,7 @@ where
     {
         // if client keys do not exist already, create and persist them
         if key_store.load_keys().await.is_err() {
-            tracing::info!("could not find valid client keys - a new set will be generated");
+            info!("could not find valid client keys - a new set will be generated");
             let mut rng = OsRng;
             let keys = if let Some(derivation_material) = derivation_material {
                 ClientKeys::from_master_key(&mut rng, &derivation_material)
@@ -881,67 +818,21 @@ where
     }
 
     fn construct_nym_api_client(
-        nym_api_urls: Option<&Vec<nym_network_defaults::ApiUrl>>,
         config: &Config,
         user_agent: Option<UserAgent>,
     ) -> Result<nym_http_api_client::Client, ClientCoreError> {
-        tracing::debug!(
-            "construct_nym_api_client called with nym_api_urls: {}",
-            nym_api_urls.is_some()
-        );
-
-        // If API URLs are provided, use new_with_fronted_urls() which handles domain fronting
-        if let Some(nym_api_urls) = nym_api_urls {
-            if nym_api_urls.is_empty() {
-                tracing::warn!("Provided nym_api_urls is empty, falling back to config endpoints");
-            } else {
-                tracing::info!(
-                    "Building nym-api client from provided URLs (with domain fronting support): {} URLs",
-                    nym_api_urls.len()
-                );
-
-                let mut builder =
-                    nym_http_api_client::ClientBuilder::new_with_fronted_urls(nym_api_urls.clone())
-                        .map_err(ClientCoreError::from)?
-                        .with_retries(DEFAULT_NYM_API_RETRIES);
-
-                if let Some(user_agent) = user_agent {
-                    builder = builder.with_user_agent(user_agent);
-                }
-
-                return builder.build().map_err(ClientCoreError::from);
-            }
-        }
-
-        // Fallback to basic client for backwards compatibility
-        tracing::debug!("Building basic nym-api HTTP client from config endpoints");
-
         let mut nym_api_urls = config.get_nym_api_endpoints();
-        if nym_api_urls.is_empty() {
-            tracing::warn!("No API endpoints configured in config, this may cause issues");
-        }
         nym_api_urls.shuffle(&mut thread_rng());
 
-        // Convert config URLs to ApiUrl format for consistency
-        let api_urls: Vec<nym_network_defaults::ApiUrl> = nym_api_urls
-            .into_iter()
-            .map(|url| nym_network_defaults::ApiUrl {
-                url: url.to_string(),
-                front_hosts: None,
-            })
-            .collect();
-
-        tracing::debug!("Using {} config API endpoints", api_urls.len());
-
-        let mut builder = nym_http_api_client::ClientBuilder::new_with_fronted_urls(api_urls)
-            .map_err(ClientCoreError::from)?
-            .with_retries(DEFAULT_NYM_API_RETRIES)
-            .with_bincode();
+        let mut builder = nym_http_api_client::Client::builder(nym_api_urls[0].clone())
+            .map_err(ClientCoreError::from)?;
 
         if let Some(user_agent) = user_agent {
             builder = builder.with_user_agent(user_agent);
         }
 
+        builder = builder.with_bincode();
+
         builder.build().map_err(ClientCoreError::from)
     }
 
@@ -959,7 +850,7 @@ where
         <S::CredentialStore as CredentialStorage>::StorageError: Send + Sync + 'static,
         <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
     {
-        tracing::info!("Starting nym client");
+        info!("Starting nym client");
         #[cfg(debug_assertions)]
         #[cfg(target_arch = "wasm32")]
         {
@@ -993,9 +884,6 @@ where
         // channels responsible for controlling real messages
         let (input_sender, input_receiver) = tokio::sync::mpsc::channel::<InputMessage>(1);
 
-        // channels responsible for event management
-        let (event_sender, event_receiver) = mpsc::unbounded();
-
         // channels responsible for controlling ack messages
         let (ack_sender, ack_receiver) = mpsc::unbounded();
         let shared_topology_accessor =
@@ -1005,11 +893,9 @@ where
         // or get one from the registry
         let shutdown_tracker = match self.shutdown {
             Some(parent_tracker) => parent_tracker.clone(),
-            None => nym_task::create_sdk_shutdown_tracker()?,
+            None => nym_task::get_sdk_shutdown_tracker()?,
         };
 
-        Self::start_event_control(self.event_tx, event_receiver, &shutdown_tracker);
-
         // channels responsible for dealing with reply-related fun
         let (reply_controller_sender, reply_controller_receiver) =
             reply_controller::requests::new_control_channels();
@@ -1025,11 +911,7 @@ where
             .dkg_query_client
             .map(|client| BandwidthController::new(credential_store, client));
 
-        let nym_api_client = Self::construct_nym_api_client(
-            self.nym_api_urls.as_ref(),
-            &self.config,
-            self.user_agent.clone(),
-        )?;
+        let nym_api_client = Self::construct_nym_api_client(&self.config, self.user_agent.clone())?;
         let key_rotation_config = Self::determine_key_rotation_state(&nym_api_client).await?;
 
         let topology_provider = Self::setup_topology_provider(
@@ -1101,11 +983,8 @@ where
         // traffic stream.
         // The MixTrafficController then sends the actual traffic
 
-        let (message_sender, client_request_sender) = Self::start_mix_traffic_controller(
-            gateway_transceiver,
-            &shutdown_tracker.clone(),
-            EventSender(event_sender),
-        );
+        let (message_sender, client_request_sender) =
+            Self::start_mix_traffic_controller(gateway_transceiver, &shutdown_tracker.clone());
 
         // Channels that the websocket listener can use to signal downstream to the real traffic
         // controller that connections are closed.
@@ -1154,8 +1033,8 @@ where
             );
         }
 
-        tracing::debug!("Core client startup finished!");
-        tracing::debug!("The address of this client is: {self_address}");
+        debug!("Core client startup finished!");
+        debug!("The address of this client is: {self_address}");
 
         #[cfg(debug_assertions)]
         #[cfg(target_arch = "wasm32")]
@@ -1171,7 +1050,6 @@ where
                 client_input: ClientInput {
                     connection_command_sender: client_connection_tx,
                     input_sender,
-                    client_request_sender,
                 },
             },
             client_output: ClientOutputStatus::AwaitingConsumer {
@@ -1187,6 +1065,7 @@ where
             },
             stats_reporter,
             shutdown_handle: shutdown_tracker, // The primary tracker for this client
+            client_request_sender,
             forget_me: self.config.debug.forget_me,
             remember_me: self.config.debug.remember_me,
         })
@@ -1200,57 +1079,8 @@ pub struct BaseClient {
     pub client_output: ClientOutputStatus,
     pub client_state: ClientState,
     pub stats_reporter: ClientStatsSender,
+    pub client_request_sender: ClientRequestSender,
     pub shutdown_handle: ShutdownTracker,
     pub forget_me: ForgetMe,
     pub remember_me: RememberMe,
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use nym_network_defaults::{ApiUrl, NymNetworkDetails};
-
-    #[test]
-    fn test_network_details_with_multiple_urls() {
-        // Verify that network details can be configured with multiple API URLs
-        let mut network_details = NymNetworkDetails::new_empty();
-        network_details.nym_api_urls = Some(vec![
-            ApiUrl {
-                url: "https://validator.nymtech.net/api/".to_string(),
-                front_hosts: None,
-            },
-            ApiUrl {
-                url: "https://nym-frontdoor.vercel.app/api/".to_string(),
-                front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
-            },
-        ]);
-
-        assert_eq!(network_details.nym_api_urls.as_ref().unwrap().len(), 2);
-        assert!(network_details.nym_api_urls.as_ref().unwrap()[1]
-            .front_hosts
-            .is_some());
-    }
-
-    #[test]
-    fn test_network_details_with_front_hosts() {
-        // Verify that ApiUrl can store domain fronting configuration
-        let api_url = ApiUrl {
-            url: "https://nym-frontdoor.vercel.app/api/".to_string(),
-            front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
-        };
-
-        assert_eq!(api_url.url, "https://nym-frontdoor.vercel.app/api/");
-        assert_eq!(api_url.front_hosts.as_ref().unwrap().len(), 2);
-        assert!(api_url
-            .front_hosts
-            .as_ref()
-            .unwrap()
-            .contains(&"vercel.app".to_string()));
-    }
-
-    #[test]
-    fn test_default_nym_api_retries_constant() {
-        // Verify the retry constant is set correctly
-        assert_eq!(DEFAULT_NYM_API_RETRIES, 3);
-    }
-}

common/client-core/src/client/cover_traffic_stream.rs

@@ -205,7 +205,7 @@ impl LoopCoverTrafficStream<OsRng> {
                 TrySendError::Full(_) => {
                     // This isn't a problem, if the channel is full means we're already sending the
                     // max amount of messages downstream can handle.
-                    tracing::trace!("Failed to send cover message - channel full");
+                    tracing::debug!("Failed to send cover message - channel full");
                 }
                 TrySendError::Closed(_) => {
                     tracing::warn!("Failed to send cover message - channel closed");

common/client-core/src/client/event_control.rs

@@ -1,40 +0,0 @@
-// Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
-// SPDX-License-Identifier: Apache-2.0
-
-use futures::StreamExt;
-
-use crate::client::base_client::{EventReceiver, EventSender, MixnetClientEvent};
-
-/// Launches and manages task events, propagating upwards what is not strictly internal.
-pub(crate) struct EventControl {
-    parent_event_tx: Option<EventSender>,
-    children_event_rx: EventReceiver,
-}
-
-impl EventControl {
-    pub(crate) fn new(
-        parent_event_tx: Option<EventSender>,
-        children_event_rx: EventReceiver,
-    ) -> Self {
-        EventControl {
-            parent_event_tx,
-            children_event_rx,
-        }
-    }
-
-    fn is_internal(event: MixnetClientEvent) -> bool {
-        match event {
-            MixnetClientEvent::Traffic(_) => false,
-        }
-    }
-
-    pub(crate) async fn run(mut self) {
-        while let Some(event) = self.children_event_rx.next().await {
-            if let Some(parent_event_tx) = &self.parent_event_tx {
-                if !Self::is_internal(event) {
-                    parent_event_tx.send(event);
-                }
-            }
-        }
-    }
-}

common/client-core/src/client/mix_traffic/mod.rs

@@ -1,10 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::client::{
-    base_client::{EventSender, MixnetClientEvent},
-    mix_traffic::transceiver::GatewayTransceiver,
-};
+use crate::client::mix_traffic::transceiver::GatewayTransceiver;
 use nym_gateway_requests::ClientRequest;
 use nym_sphinx::forwarding::packet::MixPacket;
 use nym_task::ShutdownToken;
@@ -20,41 +17,33 @@ pub mod transceiver;
 
 // We remind ourselves that 32 x 32kb = 1024kb, a reasonable size for a network buffer.
 pub const MIX_MESSAGE_RECEIVER_BUFFER_SIZE: usize = 32;
-
-/// Reduced from 100 to 20 to fail fast (~1-2 seconds instead of ~6 seconds).
-/// If we can't send 20 packets in a row, the gateway is unreachable.
-const MAX_FAILURE_COUNT: usize = 20;
+const MAX_FAILURE_COUNT: usize = 100;
 
 // that's also disgusting.
 pub struct Empty;
 
-#[derive(Clone, Copy, Debug)]
-pub enum MixTrafficEvent {
-    FailedSendingSphinx,
-}
-
 pub struct MixTrafficController {
     gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
 
-    mix_tx: BatchMixMessageSender,
     mix_rx: BatchMixMessageReceiver,
     client_rx: ClientRequestReceiver,
-    client_tx: ClientRequestSender,
 
     // TODO: this is temporary work-around.
     // in long run `gateway_client` will be moved away from `MixTrafficController` anyway.
     consecutive_gateway_failure_count: usize,
 
     shutdown_token: ShutdownToken,
-    event_tx: EventSender,
 }
 
 impl MixTrafficController {
     pub fn new<T>(
         gateway_transceiver: T,
         shutdown_token: ShutdownToken,
-        event_tx: EventSender,
-    ) -> MixTrafficController
+    ) -> (
+        MixTrafficController,
+        BatchMixMessageSender,
+        ClientRequestSender,
+    )
     where
         T: GatewayTransceiver + Send + 'static,
     {
@@ -63,32 +52,41 @@ impl MixTrafficController {
 
         let (client_sender, client_receiver) = tokio::sync::mpsc::channel(8);
 
-        MixTrafficController {
-            gateway_transceiver: Box::new(gateway_transceiver),
-            mix_tx: message_sender,
-            mix_rx: message_receiver,
-            client_rx: client_receiver,
-            client_tx: client_sender,
-            consecutive_gateway_failure_count: 0,
-            shutdown_token,
-            event_tx,
-        }
+        (
+            MixTrafficController {
+                gateway_transceiver: Box::new(gateway_transceiver),
+                mix_rx: message_receiver,
+                client_rx: client_receiver,
+                consecutive_gateway_failure_count: 0,
+                shutdown_token,
+            },
+            message_sender,
+            client_sender,
+        )
     }
 
     pub fn new_dynamic(
         gateway_transceiver: Box<dyn GatewayTransceiver + Send>,
         shutdown_token: ShutdownToken,
-        event_tx: EventSender,
-    ) -> MixTrafficController {
-        Self::new(gateway_transceiver, shutdown_token, event_tx)
-    }
-
-    pub fn client_tx(&self) -> ClientRequestSender {
-        self.client_tx.clone()
-    }
-
-    pub fn mix_tx(&self) -> BatchMixMessageSender {
-        self.mix_tx.clone()
+    ) -> (
+        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(8);
+        (
+            MixTrafficController {
+                gateway_transceiver,
+                mix_rx: message_receiver,
+                client_rx: client_receiver,
+                consecutive_gateway_failure_count: 0,
+                shutdown_token,
+            },
+            message_sender,
+            client_sender,
+        )
     }
 
     async fn on_messages(
@@ -147,31 +145,35 @@ impl MixTrafficController {
                     trace!("MixTrafficController: Received shutdown");
                     break;
                 }
-                // mix_rx should never error out as we're holding one instance of the sender
-
-                Some(mix_packets) = self.mix_rx.recv() =>  {
-                    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?
-                            self.event_tx.send(MixnetClientEvent::Traffic(MixTrafficEvent::FailedSendingSphinx));
-                            // IMO it shouldn't be signalled from there but it is how it is
-                            // TODO : report the failure upwards and shutdown from upwards
-                            // Gateway is dead, we have to shut down currently
-                            error!("Signalling shutdown from the MixTrafficController");
-                            self.shutdown_token.cancel();
-                            break;
+                mix_packets = self.mix_rx.recv() => match mix_packets {
+                    Some(mix_packets) => {
+                        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?
+                                self.shutdown_token.cancel();
+                                break;
+                            }
                         }
+                    },
+                    None => {
+                        trace!("MixTrafficController: Stopping since channel closed");
+                        break;
+                    }
+                },
+                client_request = self.client_rx.recv() => match client_request {
+                    Some(client_request) => {
+                        self.on_client_request(client_request).await;
+                    },
+                    None => {
+                        trace!("MixTrafficController, client request channel closed");
+                        break
                     }
                 },
-                // client_rx should never error out as we're holding one instance of the sender
-                Some(client_request) = self.client_rx.recv() => {
-                    self.on_client_request(client_request).await;
-                }
             }
         }
         debug!("MixTrafficController: Exiting");

common/client-core/src/client/mod.rs

@@ -3,7 +3,6 @@
 
 pub mod base_client;
 pub mod cover_traffic_stream;
-pub(crate) mod event_control;
 pub(crate) mod helpers;
 pub mod inbound_messages;
 pub mod key_manager;

common/client-core/src/client/real_messages_control/real_traffic_stream.rs

@@ -298,8 +298,6 @@ where
                         "failed to send mixnet packet due to closed channel (outside of shutdown!)"
                     );
                 }
-                // Early return to avoid further processing when channel is closed
-                return;
             }
             Ok(_) => {
                 let event = if fragment_id.is_some() {

common/client-core/src/init/helpers.rs

@@ -45,7 +45,6 @@ type WsConn = JSWebsocket;
 
 const CONCURRENT_GATEWAYS_MEASURED: usize = 20;
 const MEASUREMENTS: usize = 3;
-const DEFAULT_NYM_API_RETRIES: usize = 3;
 
 #[cfg(not(target_arch = "wasm32"))]
 const CONN_TIMEOUT: Duration = Duration::from_millis(1500);
@@ -133,27 +132,25 @@ impl<'a, G: ConnectableGateway> GatewayWithLatency<'a, G> {
     }
 }
 
-pub async fn gateways_for_init(
+pub async fn gateways_for_init<R: Rng>(
+    rng: &mut R,
     nym_apis: &[Url],
     user_agent: Option<UserAgent>,
     minimum_performance: u8,
     ignore_epoch_roles: bool,
-    retry_count: Option<usize>,
 ) -> Result<Vec<RoutingNode>, ClientCoreError> {
-    // Build client with ALL URLs for fallback support
-    let nym_api_urls: Vec<nym_http_api_client::Url> = nym_apis
-        .iter()
-        .map(|url| nym_http_api_client::Url::from(url.clone()))
-        .collect();
+    let nym_api = nym_apis
+        .choose(rng)
+        .ok_or(ClientCoreError::ListOfNymApisIsEmpty)?;
 
-    if nym_api_urls.is_empty() {
-        return Err(ClientCoreError::ListOfNymApisIsEmpty);
-    }
-
-    let retry_count = retry_count.unwrap_or(DEFAULT_NYM_API_RETRIES);
-    let mut builder = nym_http_api_client::ClientBuilder::new_with_urls(nym_api_urls.clone())?
-        .with_retries(retry_count)
-        .with_bincode();
+    // Use the unified HTTP client directly with optional user agent
+    let mut builder = nym_http_api_client::Client::builder(nym_api.clone())
+        .map_err(|e| {
+            ClientCoreError::ValidatorClientError(nym_validator_client::ValidatorClientError::from(
+                e,
+            ))
+        })?
+        .with_bincode(); // Use bincode for better performance
 
     if let Some(user_agent) = user_agent {
         builder = builder.with_user_agent(user_agent);
@@ -163,7 +160,7 @@ pub async fn gateways_for_init(
         ClientCoreError::ValidatorClientError(nym_validator_client::ValidatorClientError::from(e))
     })?;
 
-    tracing::debug!("Fetching list of gateways from: {:?}", nym_api_urls);
+    tracing::debug!("Fetching list of gateways from: {nym_api}");
 
     // Use our helper to handle pagination
     let gateways = get_all_basic_entry_nodes_with_metadata(&client, true)
@@ -175,15 +172,17 @@ pub async fn gateways_for_init(
 
     // filter out gateways below minimum performance and ones that could operate as a mixnode
     // (we don't want instability)
-    let valid_gateways: Vec<RoutingNode> = gateways
+    let valid_gateways = gateways
         .iter()
         .filter(|g| ignore_epoch_roles || !g.supported_roles.mixnode)
         .filter(|g| g.performance.round_to_integer() >= minimum_performance)
         .filter_map(|gateway| gateway.try_into().ok())
-        .collect();
+        .collect::<Vec<_>>();
+    tracing::debug!("After checking validity: {}", valid_gateways.len());
+    tracing::trace!("Valid gateways: {valid_gateways:#?}");
 
     tracing::info!(
-        "Found {} valid gateways after filtering",
+        "and {} after validity and performance filtering",
         valid_gateways.len()
     );
 
@@ -346,20 +345,13 @@ pub(super) fn get_specified_gateway(
     must_use_tls: bool,
 ) -> Result<RoutingNode, ClientCoreError> {
     tracing::debug!("Requesting specified gateway: {gateway_identity}");
-
     let user_gateway = ed25519::PublicKey::from_base58_string(gateway_identity)
         .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;
 
     let gateway = gateways
         .iter()
         .find(|gateway| gateway.identity_key == user_gateway)
-        .ok_or_else(|| {
-            tracing::debug!(
-                "Gateway {gateway_identity} not found in {} available gateways",
-                gateways.len()
-            );
-            ClientCoreError::NoGatewayWithId(gateway_identity.to_string())
-        })?;
+        .ok_or_else(|| ClientCoreError::NoGatewayWithId(gateway_identity.to_string()))?;
 
     let Some(entry_details) = gateway.entry.as_ref() else {
         return Err(ClientCoreError::UnsupportedEntry {
@@ -422,52 +414,3 @@ pub(super) async fn register_with_gateway(
         authenticated_ephemeral_client: gateway_client,
     })
 }
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    #[test]
-    fn test_single_url_builds_without_retries() {
-        let urls = [Url::parse("https://api.nym.com").unwrap()];
-
-        let nym_api_urls: Vec<nym_http_api_client::Url> = urls
-            .iter()
-            .map(|url| nym_http_api_client::Url::from(url.clone()))
-            .collect();
-
-        assert_eq!(nym_api_urls.len(), 1, "Should have exactly one URL");
-    }
-
-    #[test]
-    fn test_multiple_urls_prepared_for_retries() {
-        let urls = vec![
-            Url::parse("https://api1.nym.com").unwrap(),
-            Url::parse("https://api2.nym.com").unwrap(),
-            Url::parse("https://api3.nym.com").unwrap(),
-        ];
-
-        let nym_api_urls: Vec<nym_http_api_client::Url> = urls
-            .iter()
-            .map(|url| nym_http_api_client::Url::from(url.clone()))
-            .collect();
-
-        assert_eq!(nym_api_urls.len(), 3, "Should have all three URLs");
-        assert!(
-            nym_api_urls.len() > 1,
-            "Multiple URLs trigger retry behavior"
-        );
-    }
-
-    #[test]
-    fn test_empty_url_list_is_detected() {
-        let urls: Vec<Url> = vec![];
-
-        let nym_api_urls: Vec<nym_http_api_client::Url> = urls
-            .iter()
-            .map(|url| nym_http_api_client::Url::from(url.clone()))
-            .collect();
-
-        assert!(nym_api_urls.is_empty(), "Empty list should remain empty");
-    }
-}

common/http-api-client/src/lib.rs

@@ -296,9 +296,6 @@ impl std::error::Error for ReqwestErrorWrapper {}
 #[derive(Debug, Error)]
 #[allow(missing_docs)]
 pub enum HttpClientError {
-    #[error("did not provide any valid client URLs")]
-    NoUrlsProvided,
-
     #[error("failed to construct inner reqwest client: {source}")]
     ReqwestBuildError {
         #[source]
@@ -585,29 +582,24 @@ impl ClientBuilder {
             Self::new(alt)
         } else {
             let url = url.to_url()?;
-            Self::new_with_urls(vec![url])
+            Ok(Self::new_with_urls(vec![url]))
         }
     }
 
     /// Create a client builder from network details with sensible defaults
     #[cfg(feature = "network-defaults")]
-    // deprecating function since it's not clear from its signature whether the client
-    // would be constructed using `nym_api_urls` or `nym_vpn_api_urls`
-    #[deprecated(note = "use explicit Self::new_with_fronted_urls instead")]
     pub fn from_network(
         network: &nym_network_defaults::NymNetworkDetails,
     ) -> Result<Self, HttpClientError> {
-        let urls = network.nym_api_urls.as_ref().cloned().unwrap_or_default();
-        Self::new_with_fronted_urls(urls.clone())
-    }
-
-    /// Create a client builder using the provided set of domain-fronted URLs
-    #[cfg(feature = "network-defaults")]
-    pub fn new_with_fronted_urls(
-        urls: Vec<nym_network_defaults::ApiUrl>,
-    ) -> Result<Self, HttpClientError> {
-        let urls = urls
-            .into_iter()
+        let urls = network
+            .nym_api_urls
+            .as_ref()
+            .ok_or_else(|| {
+                HttpClientError::GenericRequestFailure(
+                    "No API URLs configured in network details".to_string(),
+                )
+            })?
+            .iter()
             .map(|api_url| {
                 // Convert ApiUrl to our Url type with fronting support
                 let mut url = Url::parse(&api_url.url)?;
@@ -619,19 +611,15 @@ impl ClientBuilder {
                         .iter()
                         .map(|host| format!("https://{}", host))
                         .collect();
-                    url = Url::new(api_url.url.clone(), Some(fronts)).map_err(|source| {
-                        HttpClientError::MalformedUrl {
-                            raw: api_url.url.clone(),
-                            source,
-                        }
-                    })?;
+                    url = Url::new(api_url.url.clone(), Some(fronts))
+                        .map_err(|e| HttpClientError::GenericRequestFailure(e.to_string()))?;
                 }
 
                 Ok(url)
             })
             .collect::<Result<Vec<_>, HttpClientError>>()?;
 
-        let mut builder = Self::new_with_urls(urls)?;
+        let mut builder = Self::new_with_urls(urls);
 
         // Enable domain fronting by default (on retry)
         #[cfg(feature = "tunneling")]
@@ -643,11 +631,7 @@ impl ClientBuilder {
     }
 
     /// Constructs a new http `ClientBuilder` from a valid url.
-    pub fn new_with_urls(urls: Vec<Url>) -> Result<Self, HttpClientError> {
-        if urls.is_empty() {
-            return Err(HttpClientError::NoUrlsProvided);
-        }
-
+    pub fn new_with_urls(urls: Vec<Url>) -> Self {
         let urls = Self::check_urls(urls);
 
         #[cfg(target_arch = "wasm32")]
@@ -656,7 +640,7 @@ impl ClientBuilder {
         #[cfg(not(target_arch = "wasm32"))]
         let reqwest_client_builder = default_builder();
 
-        Ok(ClientBuilder {
+        ClientBuilder {
             urls,
             timeout: None,
             custom_user_agent: false,
@@ -667,7 +651,7 @@ impl ClientBuilder {
 
             retry_limit: 0,
             serialization: SerializationFormat::Json,
-        })
+        }
     }
 
     /// Add an additional URL to the set usable by this constructed `Client`
@@ -964,13 +948,13 @@ impl Client {
 
                     return (url.as_str(), url.front_str());
                 } else {
-                    tracing::debug!(
-                        "Domain fronting is enabled, but no host_url is defined for current URL"
+                    warn!(
+                        "Domain fronting is enabled, but no host_url is defined! Domain fronting WILL NOT WORK"
                     )
                 }
             } else {
-                tracing::debug!(
-                    "Domain fronting is enabled, but current URL has no front_hosts configured"
+                warn!(
+                    "Domain fronting is enabled, but no front_url is defined! Domain fronting WILL NOT WORK"
                 )
             }
         }

common/http-api-client/src/registry.rs

@@ -21,10 +21,6 @@ inventory::collect!(ConfigRecord);
 /// Returns the default builder with all registered configurations applied.
 pub fn default_builder() -> ReqwestClientBuilder {
     let mut b = ReqwestClientBuilder::new();
-
-    #[cfg(feature = "debug-inventory")]
-    let mut test_client = ReqwestClientBuilder::new();
-
     let mut records: Vec<&'static ConfigRecord> =
         inventory::iter::<ConfigRecord>.into_iter().collect();
     records.sort_by_key(|r| r.priority); // lower runs first
@@ -39,10 +35,6 @@ pub fn default_builder() -> ReqwestClientBuilder {
 
     for r in records {
         b = (r.apply)(b);
-        #[cfg(feature = "debug-inventory")]
-        {
-            test_client = (r.apply)(test_client);
-        }
     }
 
     #[cfg(feature = "debug-inventory")]
@@ -55,7 +47,7 @@ pub fn default_builder() -> ReqwestClientBuilder {
         eprintln!("[HTTP-INVENTORY] Building test client to verify configuration...");
 
         // Try to build a client to see if it works
-        match test_client.build() {
+        match b.try_clone().unwrap().build() {
             Ok(client) => {
                 eprintln!("[HTTP-INVENTORY] ✓ Client built successfully");
                 eprintln!("[HTTP-INVENTORY] Client debug info: {:#?}", client);

common/http-api-client/src/tests.rs

@@ -2,77 +2,77 @@ use super::*;
 
 #[test]
 fn sanitizing_urls() {
-    let base_url: Url = "http://api.test".parse().unwrap();
+    let base_url: Url = "http://foomp.com".parse().unwrap();
 
     // works with a full string
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, "/foo//bar/", NO_PARAMS).as_str()
     );
 
     // (and leading slash doesn't matter)
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, "foo//bar/", NO_PARAMS).as_str()
     );
 
     // works with 1 segment
     assert_eq!(
-        "http://api.test/foo",
+        "http://foomp.com/foo",
         sanitize_url(&base_url, &["foo"], NO_PARAMS).as_str()
     );
 
     // works with 2 segments
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["foo", "bar"], NO_PARAMS).as_str()
     );
 
     // works with leading slash
     assert_eq!(
-        "http://api.test/foo",
+        "http://foomp.com/foo",
         sanitize_url(&base_url, &["/foo"], NO_PARAMS).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["/foo", "bar"], NO_PARAMS).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["foo", "/bar"], NO_PARAMS).as_str()
     );
 
     // works with trailing slash
     assert_eq!(
-        "http://api.test/foo",
+        "http://foomp.com/foo",
         sanitize_url(&base_url, &["foo/"], NO_PARAMS).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["foo/", "bar"], NO_PARAMS).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["foo", "bar/"], NO_PARAMS).as_str()
     );
 
     // works with both leading and trailing slash
     assert_eq!(
-        "http://api.test/foo",
+        "http://foomp.com/foo",
         sanitize_url(&base_url, &["/foo/"], NO_PARAMS).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar",
+        "http://foomp.com/foo/bar",
         sanitize_url(&base_url, &["/foo/", "/bar/"], NO_PARAMS).as_str()
     );
 
     // adds params
     assert_eq!(
-        "http://api.test/foo/bar?foomp=baz",
+        "http://foomp.com/foo/bar?foomp=baz",
         sanitize_url(&base_url, &["foo", "bar"], &[("foomp", "baz")]).as_str()
     );
     assert_eq!(
-        "http://api.test/foo/bar?arg1=val1&arg2=val2",
+        "http://foomp.com/foo/bar?arg1=val1&arg2=val2",
         sanitize_url(
             &base_url,
             &["/foo/", "/bar/"],
@@ -91,87 +91,83 @@ fn sanitizing_urls() {
 #[tokio::test]
 async fn api_client_retry() -> Result<(), Box<dyn std::error::Error>> {
     let client = ClientBuilder::new_with_urls(vec![
-        "http://broken.nym.test".parse()?,         // This will fail
-        "https://httpbin.org/status/200".parse()?, // This will succeed
-    ])?
+        "http://broken.nym.badurl".parse()?,
+        "http://example.com/".parse()?,
+    ])
     .with_retries(3)
     .build()?;
 
-    let req = client.create_get_request(&[], NO_PARAMS).unwrap();
+    let req = client.create_get_request(&["/"], NO_PARAMS).unwrap();
     let resp = client.send(req).await?;
 
-    // The main test is that we successfully retried and switched to the working URL
-    // We accept any response from the working endpoint since external services can be unreliable
-    assert_eq!(
-        client.current_url().as_str(),
-        "https://httpbin.org/status/200"
-    );
+    assert_eq!(resp.status(), 200);
 
-    println!("Response status: {}", resp.status());
+    // check that the url was updated
+    assert_eq!(client.current_url().as_str(), "http://example.com/");
 
     Ok(())
 }
 
 #[test]
 fn host_updating() {
-    let url = Url::new("http://nym-api1.test", None).unwrap();
+    let url = Url::new("http://example.com", None).unwrap();
     let mut client = ClientBuilder::new(url).unwrap().build().unwrap();
 
     // check that the url is set correctly
     let current_url = client.current_url();
-    assert_eq!(current_url.as_str(), "http://nym-api1.test/");
+    assert_eq!(current_url.as_str(), "http://example.com/");
     assert_eq!(current_url.front_str(), None);
 
     // update the url
     client.update_host();
 
     // check that the url is still the same since there is one URL
-    assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.com/");
 
     // =======================================
     // we rotate through urls when available
 
     let new_urls = vec![
-        Url::new("http://nym-api1.test", None).unwrap(),
-        Url::new("http://nym-api2.test", None).unwrap(),
+        Url::new("http://example.com", None).unwrap(),
+        Url::new("http://example.org", None).unwrap(),
     ];
     client.change_base_urls(new_urls);
-    assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.com/");
 
     client.update_host();
 
     // check that the url got updated now that there are multiple URLs
-    assert_eq!(client.current_url().as_str(), "http://nym-api2.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.org/");
     assert_eq!(client.current_url().front_str(), None);
 
     client.update_host();
-    assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.com/");
 
     // =======================================
     // we rotate through urls when available if fronting is disabled
 
     let new_urls = vec![
         Url::new(
-            "http://nym-api1.test",
-            Some(vec!["http://cdn1.test", "http://cdn2.test"]),
+            "http://example.com",
+            Some(vec!["http://front1.com", "http://front2.com"]),
         )
         .unwrap(),
-        Url::new("http://nym-api2.test", None).unwrap(),
+        Url::new("http://example.org", None).unwrap(),
     ];
     client.change_base_urls(new_urls);
 
-    assert_eq!(client.current_url().as_str(), "http://nym-api1.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.com/");
 
     client.update_host();
 
     // check that the url got updated now that there are multiple URLs
-    assert_eq!(client.current_url().as_str(), "http://nym-api2.test/");
+    assert_eq!(client.current_url().as_str(), "http://example.org/");
 }
 
 #[test]
 #[cfg(feature = "tunneling")]
 fn fronted_host_updating() {
-    let url = Url::new("http://nym-api.test", Some(vec!["http://cdn1.test"])).unwrap();
+    let url = Url::new("http://example.com", Some(vec!["http://front1.com"])).unwrap();
     let mut client = ClientBuilder::new(url)
         .unwrap()
         .with_fronting(crate::fronted::FrontPolicy::Always)
@@ -180,103 +176,46 @@ fn fronted_host_updating() {
 
     // check that the url is set correctly
     let current_url = client.current_url();
-    assert_eq!(current_url.as_str(), "http://nym-api.test/");
-    assert_eq!(current_url.front_str(), Some("cdn1.test"));
+    assert_eq!(current_url.as_str(), "http://example.com/");
+    assert_eq!(current_url.front_str(), Some("front1.com"));
 
     // update the url
     client.update_host();
 
     // check that the url is still the same since there is one URL and one front
     let current_url = client.current_url();
-    assert_eq!(current_url.as_str(), "http://nym-api.test/");
-    assert_eq!(current_url.front_str(), Some("cdn1.test"));
+    assert_eq!(current_url.as_str(), "http://example.com/");
+    assert_eq!(current_url.front_str(), Some("front1.com"));
 
     // =======================================
     // we rotate through front urls when available if fronting is enabled
 
     let new_urls = vec![
         Url::new(
-            "http://nym-api.test",
-            Some(vec!["http://cdn1.test", "http://cdn2.test"]),
+            "http://example.com",
+            Some(vec!["http://front1.com", "http://front2.com"]),
         )
         .unwrap(),
-        Url::new("http://nym-api2.test", None).unwrap(),
+        Url::new("http://example.org", None).unwrap(),
     ];
     client.change_base_urls(new_urls);
 
     let current_url = client.current_url();
-    assert_eq!(current_url.as_str(), "http://nym-api.test/");
-    assert_eq!(current_url.front_str(), Some("cdn1.test"));
+    assert_eq!(current_url.as_str(), "http://example.com/");
+    assert_eq!(current_url.front_str(), Some("front1.com"));
 
     // update the url - this should keep the same host but change the front
     client.update_host();
 
     let current_url = client.current_url();
     // check that the url is still the same since there is one URL
-    assert_eq!(current_url.as_str(), "http://nym-api.test/");
-    assert_eq!(current_url.front_str(), Some("cdn2.test"));
+    assert_eq!(current_url.as_str(), "http://example.com/");
+    assert_eq!(current_url.front_str(), Some("front2.com"));
 
     // update the url - this should wrap around to the first front as the second url is not fronted
     client.update_host();
 
     let current_url = client.current_url();
-    assert_eq!(current_url.as_str(), "http://nym-api.test/");
-    assert_eq!(current_url.front_str(), Some("cdn1.test"));
-}
-
-#[test]
-#[cfg(feature = "network-defaults")]
-fn from_network_configures_multiple_urls_and_retries() {
-    use nym_network_defaults::{ApiUrl, NymNetworkDetails};
-
-    // Create network details with multiple URLs and fronting
-    let mut network_details = NymNetworkDetails::new_empty();
-    network_details.nym_api_urls = Some(vec![
-        ApiUrl {
-            url: "https://validator.nymtech.net/api/".to_string(),
-            front_hosts: None,
-        },
-        ApiUrl {
-            url: "https://nym-frontdoor.vercel.app/api/".to_string(),
-            front_hosts: Some(vec!["vercel.app".to_string(), "vercel.com".to_string()]),
-        },
-        ApiUrl {
-            url: "https://nym-frontdoor.global.ssl.fastly.net/api/".to_string(),
-            front_hosts: Some(vec!["yelp.global.ssl.fastly.net".to_string()]),
-        },
-    ]);
-
-    // Build client from network details
-    let client = ClientBuilder::new_with_fronted_urls(
-        network_details.nym_api_urls.clone().unwrap_or_default(),
-    )
-    .expect("Failed to create client from network")
-    .build()
-    .expect("Failed to build client");
-
-    // Verify all URLs were configured
-    assert_eq!(
-        client.base_urls().len(),
-        3,
-        "Expected 3 URLs to be configured from network details"
-    );
-
-    // Verify the URLs have fronting configured where appropriate
-    assert_eq!(
-        client.base_urls()[0].as_str(),
-        "https://validator.nymtech.net/api/"
-    );
-    assert!(client.base_urls()[0].front_str().is_none());
-
-    assert_eq!(
-        client.base_urls()[1].as_str(),
-        "https://nym-frontdoor.vercel.app/api/"
-    );
-    assert!(client.base_urls()[1].front_str().is_some());
-
-    assert_eq!(
-        client.base_urls()[2].as_str(),
-        "https://nym-frontdoor.global.ssl.fastly.net/api/"
-    );
-    assert!(client.base_urls()[2].front_str().is_some());
+    assert_eq!(current_url.as_str(), "http://example.com/");
+    assert_eq!(current_url.front_str(), Some("front1.com"));
 }

common/http-api-client/src/url.rs

@@ -183,11 +183,6 @@ impl Url {
         })
     }
 
-    /// Returns the underlying URL
-    pub fn inner_url(&self) -> &url::Url {
-        &self.url
-    }
-
     /// Returns true if the URL has a front domain set
     pub fn has_front(&self) -> bool {
         if let Some(fronts) = &self.fronts {
@@ -206,11 +201,6 @@ impl Url {
             .and_then(|url| url.host_str())
     }
 
-    /// Returns the fronts
-    pub fn fronts(&self) -> Option<&[url::Url]> {
-        self.fronts.as_deref()
-    }
-
     /// Return the string representation of the host (domain or IP address) for this URL, if any.
     pub fn host_str(&self) -> Option<&str> {
         self.url.host_str()

common/network-defaults/src/network.rs

@@ -124,8 +124,6 @@ impl NymNetworkDetails {
             }
         }
 
-        let nym_api = var(var_names::NYM_API).expect("nym api not set");
-
         NymNetworkDetails::new_empty()
             .with_network_name(var(var_names::NETWORK_NAME).expect("network name not set"))
             .with_bech32_account_prefix(
@@ -151,7 +149,7 @@ impl NymNetworkDetails {
             })
             .with_additional_validator_endpoint(ValidatorDetails::new(
                 var(var_names::NYXD).expect("nyxd validator not set"),
-                Some(nym_api.clone()),
+                Some(var(var_names::NYM_API).expect("nym api not set")),
                 get_optional_env(var_names::NYXD_WEBSOCKET),
             ))
             .with_mixnet_contract(get_optional_env(var_names::MIXNET_CONTRACT_ADDRESS))
@@ -161,10 +159,6 @@ impl NymNetworkDetails {
             .with_multisig_contract(get_optional_env(var_names::MULTISIG_CONTRACT_ADDRESS))
             .with_coconut_dkg_contract(get_optional_env(var_names::COCONUT_DKG_CONTRACT_ADDRESS))
             .with_nym_vpn_api_url(get_optional_env(var_names::NYM_VPN_API))
-            .with_nym_api_urls(Some(vec![ApiUrl {
-                url: nym_api,
-                front_hosts: None,
-            }]))
     }
 
     pub fn new_mainnet() -> Self {
@@ -354,12 +348,6 @@ impl NymNetworkDetails {
         self
     }
 
-    #[must_use]
-    pub fn with_nym_api_urls(mut self, urls: Option<Vec<ApiUrl>>) -> Self {
-        self.nym_api_urls = urls;
-        self
-    }
-
     pub fn nym_vpn_api_url(&self) -> Option<Url> {
         self.nym_vpn_api_url.as_ref().map(|url| {
             url.parse()

common/socks5-client-core/src/lib.rs

@@ -119,7 +119,6 @@ where
         let ClientInput {
             connection_command_sender,
             input_sender,
-            ..
         } = client_input;
 
         let ClientOutput {

common/task/src/lib.rs

@@ -24,6 +24,6 @@ pub use crate::runtime_registry::RegistryAccessError;
 
 /// Get or create a ShutdownTracker for SDK use.
 /// This provides automatic task management without requiring manual setup.
-pub fn create_sdk_shutdown_tracker() -> Result<ShutdownTracker, RegistryAccessError> {
-    Ok(runtime_registry::RuntimeRegistry::create_sdk()?.shutdown_tracker_owned())
+pub fn get_sdk_shutdown_tracker() -> Result<ShutdownTracker, RegistryAccessError> {
+    Ok(runtime_registry::RuntimeRegistry::get_or_create_sdk()?.shutdown_tracker_owned())
 }

common/task/src/runtime_registry.rs

@@ -19,45 +19,30 @@ pub(crate) struct RuntimeRegistry {
 pub enum RegistryAccessError {
     #[error("the runtime registry is poisoned")]
     Poisoned,
-
-    #[error("The SDK ShutdownManager already exists")]
-    ExistingShutdownManager,
-
-    #[error("No existing SDK ShutdownManager")]
-    MissingShutdownManager,
 }
 
 impl RuntimeRegistry {
-    /// Create a ShutdownManager for SDK use.
+    /// Get or create a ShutdownManager for SDK use.
     /// This manager doesn't listen to OS signals, making it suitable for library use.
-    /// This function overwrite any existing manager!
-    pub(crate) fn create_sdk() -> Result<Arc<ShutdownManager>, RegistryAccessError> {
-        let mut guard = REGISTRY
-            .sdk_manager
-            .write()
-            .map_err(|_| RegistryAccessError::Poisoned)?;
-
-        Ok(guard
-            .insert(Arc::new(
-                ShutdownManager::new_without_signals().with_cancel_on_panic(),
-            ))
-            .clone())
-    }
-
-    /// Get the  ShutdownManager for SDK use.
-    /// This manager doesn't listen to OS signals, making it suitable for library use.
-    /// Not yet used, but maybe in the future
-    #[allow(dead_code)]
-    pub(crate) fn get_sdk() -> Result<Arc<ShutdownManager>, RegistryAccessError> {
+    pub(crate) fn get_or_create_sdk() -> Result<Arc<ShutdownManager>, RegistryAccessError> {
         let guard = REGISTRY
             .sdk_manager
             .read()
             .map_err(|_| RegistryAccessError::Poisoned)?;
         if let Some(manager) = guard.as_ref() {
-            Ok(manager.clone())
-        } else {
-            Err(RegistryAccessError::MissingShutdownManager)
+            return Ok(manager.clone());
         }
+        drop(guard);
+
+        let mut guard = REGISTRY
+            .sdk_manager
+            .write()
+            .map_err(|_| RegistryAccessError::Poisoned)?;
+        Ok(guard
+            .get_or_insert_with(|| {
+                Arc::new(ShutdownManager::new_without_signals().with_cancel_on_panic())
+            })
+            .clone())
     }
 
     /// Check if an SDK manager has been created.
@@ -100,13 +85,10 @@ mod tests {
 
         assert!(!RuntimeRegistry::has_sdk_manager().unwrap());
 
-        // Error if nothing was created
-        assert!(RuntimeRegistry::get_sdk().is_err());
-
-        let manager1 = RuntimeRegistry::create_sdk().unwrap();
+        let manager1 = RuntimeRegistry::get_or_create_sdk().unwrap();
         assert!(RuntimeRegistry::has_sdk_manager().unwrap());
 
-        let manager2 = RuntimeRegistry::get_sdk().unwrap();
+        let manager2 = RuntimeRegistry::get_or_create_sdk().unwrap();
         // Should return the same instance
         assert!(Arc::ptr_eq(&manager1, &manager2));
 

common/wasm/client-core/src/helpers.rs

@@ -160,12 +160,13 @@ pub async fn setup_gateway_from_api(
     minimum_performance: u8,
     ignore_epoch_roles: bool,
 ) -> Result<InitialisationResult, WasmCoreError> {
+    let mut rng = thread_rng();
     let gateways = gateways_for_init(
+        &mut rng,
         nym_apis,
         None,
         minimum_performance,
         ignore_epoch_roles,
-        None,
     )
     .await?;
     setup_gateway_wasm(client_store, force_tls, chosen_gateway, gateways).await
@@ -177,12 +178,13 @@ pub async fn current_gateways_wasm(
     minimum_performance: u8,
     ignore_epoch_roles: bool,
 ) -> Result<Vec<RoutingNode>, ClientCoreError> {
+    let mut rng = thread_rng();
     gateways_for_init(
+        &mut rng,
         nym_apis,
         user_agent,
         minimum_performance,
         ignore_epoch_roles,
-        None,
     )
     .await
 }

contracts/coconut-dkg/src/contract.rs

@@ -255,12 +255,10 @@ pub fn query(deps: Deps<'_>, env: Env, msg: QueryMsg) -> Result<QueryResponse, C
 }
 
 #[entry_point]
-pub fn migrate(deps: DepsMut<'_>, env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
+pub fn migrate(deps: DepsMut<'_>, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     set_build_information!(deps.storage)?;
     cw2::ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
-    crate::queued_migrations::introduce_historical_epochs(deps, env)?;
-
     Ok(Response::new())
 }
 

contracts/coconut-dkg/src/dealers/transactions.rs

@@ -9,7 +9,6 @@ use crate::epoch_state::storage::{load_current_epoch, save_epoch};
 use crate::epoch_state::utils::check_epoch_state;
 use crate::error::ContractError;
 use crate::state::storage::STATE;
-use crate::verification_key_shares::storage::vk_shares;
 use crate::Dealer;
 use cosmwasm_std::{Deps, DepsMut, Env, Event, MessageInfo, Response};
 use nym_coconut_dkg_common::dealer::{DealerRegistrationDetails, OwnershipTransfer};
@@ -110,7 +109,7 @@ pub fn try_transfer_ownership(
     DEALERS_INDICES.save(deps.storage, &transfer_to, &current_index)?;
     DEALERS_INDICES.remove(deps.storage, &info.sender);
 
-    // update registration detail and share information for every epoch the current dealer has participated in the protocol
+    // update registration detail for every epoch the current dealer has participated in the protocol
     // ideally, we'd have only updated the current epoch, but the way the contract is constructed
     // forbids that otherwise we'd have introduced inconsistency
     for epoch_id in 0..=epoch.epoch_id {
@@ -118,11 +117,6 @@ pub fn try_transfer_ownership(
             EPOCH_DEALERS_MAP.remove(deps.storage, (epoch_id, &info.sender));
             EPOCH_DEALERS_MAP.save(deps.storage, (epoch_id, &transfer_to), &details)?;
         }
-        if let Some(mut vk_share) = vk_shares().may_load(deps.storage, (&info.sender, epoch_id))? {
-            vk_shares().remove(deps.storage, (&info.sender, epoch_id))?;
-            vk_share.owner = transfer_to.clone();
-            vk_shares().save(deps.storage, (&transfer_to, epoch_id), &vk_share)?;
-        }
     }
 
     let Some(transaction_info) = env.transaction else {
@@ -167,14 +161,6 @@ pub fn try_update_announce_address(
     details.announce_address = new_address.clone();
     EPOCH_DEALERS_MAP.save(deps.storage, (epoch.epoch_id, &info.sender), &details)?;
 
-    let mut contract_share = vk_shares().load(deps.storage, (&info.sender, epoch.epoch_id))?;
-    contract_share.announce_address = new_address.clone();
-    vk_shares().save(
-        deps.storage,
-        (&info.sender, epoch.epoch_id),
-        &contract_share,
-    )?;
-
     Ok(Response::new().add_event(
         Event::new("dkg-announce-address-update")
             .add_attribute("dealer", info.sender)
@@ -242,14 +228,9 @@ pub(crate) mod tests {
 #[cfg(feature = "testable-dkg-contract")]
 mod tests_with_mock {
     use super::*;
-    use crate::testable_dkg_contract::{
-        init_contract_tester, init_contract_tester_with_group_members, DkgContractTesterExt,
-    };
-    use anyhow::Context;
+    use crate::testable_dkg_contract::{init_contract_tester, DkgContractTesterExt};
     use cosmwasm_std::testing::message_info;
-    use nym_coconut_dkg_common::msg::QueryMsg;
-    use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse;
-    use nym_contracts_common_testing::{ChainOpts, ContractOpts};
+    use nym_contracts_common_testing::ContractOpts;
 
     #[test]
     fn transferring_ownership() -> anyhow::Result<()> {
@@ -267,7 +248,6 @@ mod tests_with_mock {
         contract.run_initial_dummy_dkg();
         let old_index = DEALERS_INDICES.load(&contract, &group_member)?;
         let old_details = EPOCH_DEALERS_MAP.load(&contract, (0, &group_member))?;
-        let old_share = vk_shares().load(&contract, (&group_member, 0))?;
 
         let not_group_member = contract.addr_make("not_group_member");
         let (deps, env) = contract.deps_mut_env();
@@ -297,20 +277,13 @@ mod tests_with_mock {
         assert!(EPOCH_DEALERS_MAP
             .may_load(&contract, (0, &group_member))?
             .is_none());
-        assert!(vk_shares()
-            .may_load(&contract, (&group_member, 0))?
-            .is_none());
 
         let new_index = DEALERS_INDICES.load(&contract, &new_group_member)?;
         let new_details = EPOCH_DEALERS_MAP.load(&contract, (0, &new_group_member))?;
-        let new_share = vk_shares().load(&contract, (&new_group_member, 0))?;
 
         // the underlying info hasn't changed
         assert_eq!(old_index, new_index);
         assert_eq!(old_details, new_details);
-        assert_ne!(old_share, new_share);
-        assert_eq!(old_share.owner, group_member);
-        assert_eq!(new_share.owner, new_group_member);
 
         assert_eq!(
             OWNERSHIP_TRANSFER_LOG.load(
@@ -463,91 +436,9 @@ mod tests_with_mock {
         assert_eq!(old_details1, new_details1);
         assert_eq!(old_details2, new_details2);
 
-        // most recent entry is updated
+        // most  recent entry is updated
         assert_eq!(new_details3.announce_address, new_address);
 
         Ok(())
     }
-
-    #[test]
-    fn updating_announce_address_updates_vk_shares() -> anyhow::Result<()> {
-        let mut contract = init_contract_tester_with_group_members(3);
-        let group_member = contract.random_group_member();
-
-        contract.run_initial_dummy_dkg(); // => epoch 0
-        contract.run_reset_dkg(); // => epoch 1
-
-        // LEAVE DKG MEMBERSHIP
-        contract.remove_group_member(group_member.clone());
-        contract.run_reset_dkg(); // => epoch 2
-
-        // COME BACK
-        contract.add_group_member(group_member.clone());
-        contract.run_reset_dkg(); // => epoch 3
-
-        let old_address = EPOCH_DEALERS_MAP
-            .load(&contract, (3, &group_member))?
-            .announce_address;
-
-        let old_share0 = vk_shares().load(&contract, (&group_member, 0))?;
-        let old_share1 = vk_shares().load(&contract, (&group_member, 1))?;
-        let old_share2 = vk_shares().may_load(&contract, (&group_member, 2))?;
-        assert!(old_share2.is_none());
-        let old_share3 = vk_shares().may_load(&contract, (&group_member, 3))?;
-        assert!(old_share3.is_some());
-
-        let new_address = "https://new-address.com".to_string();
-        try_update_announce_address(
-            contract.deps_mut(),
-            message_info(&group_member, &[]),
-            new_address.clone(),
-        )?;
-
-        let new_share0 = vk_shares().load(&contract, (&group_member, 0))?;
-        let new_share1 = vk_shares().load(&contract, (&group_member, 1))?;
-        let new_share2 = vk_shares().may_load(&contract, (&group_member, 2))?;
-        assert!(new_share2.is_none());
-        let new_share3 = vk_shares().load(&contract, (&group_member, 3))?;
-
-        // old epoch data is unchanged
-        assert_eq!(old_share0, new_share0);
-        assert_eq!(old_share1, new_share1);
-        assert_eq!(old_share2, new_share2);
-
-        // most recent entry is updated
-        assert_eq!(new_share3.announce_address, new_address);
-
-        // finally an integration check against query endpoint
-        let epoch0_shares: PagedVKSharesResponse =
-            contract.query(&QueryMsg::GetVerificationKeys {
-                epoch_id: 0,
-                limit: None,
-                start_after: None,
-            })?;
-        assert_eq!(epoch0_shares.shares.len(), 3);
-
-        let member_share = epoch0_shares
-            .shares
-            .iter()
-            .find(|s| s.owner == group_member)
-            .context("failed to find member's share")?;
-        assert_eq!(member_share.announce_address, old_address);
-
-        let epoch0_shares: PagedVKSharesResponse =
-            contract.query(&QueryMsg::GetVerificationKeys {
-                epoch_id: 3,
-                limit: None,
-                start_after: None,
-            })?;
-        assert_eq!(epoch0_shares.shares.len(), 3);
-
-        let member_share = epoch0_shares
-            .shares
-            .iter()
-            .find(|s| s.owner == group_member)
-            .context("failed to find member's share")?;
-        assert_eq!(member_share.announce_address, new_address);
-
-        Ok(())
-    }
 }

contracts/coconut-dkg/src/queued_migrations.rs

@@ -1,21 +1,2 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
-
-use crate::epoch_state::storage::HISTORICAL_EPOCH;
-use crate::error::ContractError;
-use cosmwasm_std::{DepsMut, Env};
-
-pub fn introduce_historical_epochs(deps: DepsMut, env: Env) -> Result<(), ContractError> {
-    if HISTORICAL_EPOCH.may_load(deps.storage)?.is_some() {
-        return Err(ContractError::FailedMigration {
-            comment: "this migration has already been run before".to_string(),
-        });
-    }
-
-    #[allow(deprecated)]
-    let current = crate::epoch_state::storage::CURRENT_EPOCH.load(deps.storage)?;
-    // we won't have information on intermediate states prior to now, but that's not the end of the world
-    HISTORICAL_EPOCH.save(deps.storage, &current, env.block.height)?;
-
-    Ok(())
-}

contracts/coconut-dkg/src/testable_dkg_contract/mod.rs

@@ -62,18 +62,12 @@ impl TestableNymContract for DkgContract {
     where
         Self: Sized,
     {
-        init_contract_tester()
+        init_contract_tester_with_group_members(DEFAULT_GROUP_MEMBERS)
     }
 }
 
 pub fn init_contract_tester() -> ContractTester<DkgContract> {
-    init_contract_tester_with_group_members(DEFAULT_GROUP_MEMBERS)
-}
-
-pub fn init_contract_tester_with_group_members(members: usize) -> ContractTester<DkgContract> {
-    prepare_contract_tester_builder_with_group_members(members)
-        .build()
-        .with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
+    DkgContract::init().with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
 }
 
 pub fn prepare_contract_tester_builder_with_group_members<C>(
@@ -143,6 +137,12 @@ where
     builder
 }
 
+pub fn init_contract_tester_with_group_members(members: usize) -> ContractTester<DkgContract> {
+    prepare_contract_tester_builder_with_group_members(members)
+        .build()
+        .with_common_storage_key(CommonStorageKeys::Admin, "dkg-admin")
+}
+
 pub trait DkgContractTesterExt:
     ContractOpts<ExecuteMsg = ExecuteMsg, QueryMsg = QueryMsg, ContractError = ContractError>
     + ChainOpts

contracts/mixnet/src/testing/legacy.rs

@@ -0,0 +1,12 @@
+// Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn legacy_mixnode_bonding() {
+        todo!()
+    }
+}

contracts/mixnet/src/testing/mod.rs

@@ -2,3 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub(crate) mod transactions;
+
+// the purpose of that module is to keep track of tests of legacy features that will eventually be phased out
+// such as standalone mixnode/gateway bonding
+pub(crate) mod legacy;

documentation/docs/components/operators/snippets/quic-bridge-deployment-script-setup.mdx

@@ -15,7 +15,6 @@ Operators can use [Nym Bridge Configuration Tool](https://github.com/nymtech/nym
 <Steps>
 ###### 1. Download [`quic_bridge_deployment.sh`](https://github.com/nymtech/nym/blob/develop/scripts/nym-node-setup/quic_bridge_deployment.sh) script
 - SSH to your server
-- **Run as root**
 - Download the script and make executable
 ```sh
 wget https://raw.githubusercontent.com/nymtech/nym/refs/heads/develop/scripts/nym-node-setup/quic_bridge_deployment.sh && \
@@ -27,7 +26,7 @@ chmod +x quic_bridge_deployment.sh
 - Optional: open `tmux` in case you will need to run another commands on the VPS
 - Run the script with a command `full_bridge_setup`
 ```sh
-./quic_bridge_deployment.sh full_bridge_setup
+./nym-node-setup/quic_bridge_deployment.sh full_bridge_setup
 ```
 
 ###### 3. Follow the interactive prompts

documentation/docs/components/outputs/api-scraping-outputs/time-now.md

@@ -1 +1 @@
-Thursday, October 30th 2025, 13:00:59 UTC
+Monday, October 13th 2025, 13:24:56 UTC

documentation/docs/components/outputs/command-outputs/node-api-check-query-help.md

@@ -11,7 +11,7 @@ options:
   --no_routing_history  Display node stats without routing history
   --no_verloc_metrics   Display node stats without verloc metrics
   -m, --markdown        Display results in markdown format
-  -o [OUTPUT], --output [OUTPUT]
+  -o, --output [OUTPUT]
                         Save results to file (in current dir or supply with
                         path without filename)
 ```

documentation/docs/components/outputs/csv2md-outputs/isp-sheet.md

@@ -18,23 +18,23 @@
 | [Hostslick](https://hostslick.com)                                                                                   | Netherlands, Germany                                                                                                                                | Yes, on by default                   | Yes                                                | Good amount of bandwidth for the price. Make sure you open the ticket if you want to run Exit node                                                                                                                  | 07/2024            |
 | [Incognet](https://incognet.io)                                                                                      | Netherlands and USA                                                                                                                                 | Yes, on by default                   | Yes                                                | They allow Tor exit nodes but you must adhere to their rules https://incognet.io/tor-exits                                                                                                                          | 07/2024            |
 | [Incognet](https://incognet.io/kansas-city-dedicated-servers)                                                        | USA, Netherlands                                                                                                                                    | Yes                                  | nan                                                | nan                                                                                                                                                                                                                 | 07/2025            |
-| [Ionos](https://www.ionos.com/servers/amd-servers)                                                                   | USA, DE, UK, ESP, FR                                                                                                                                | nan                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
+| [Ionos](https://www.ionos.com/servers/amd-servers)                                                                   | US, DE, UK, ESP, FR                                                                                                                                 | nan                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
 | [IsHosting](https://ishosting.com/en)                                                                                | Brazil, Netherlands                                                                                                                                 | Yes, based on ticket                 | Yes                                                | Expensive                                                                                                                                                                                                           | 05/2024            |
-| [Leaseweb](https://www.leaseweb.com/en/configure/vc/product/entityKey/DEDSER02_NEW_ORDER_BUSINESS_R740XD-24SFF-6134) | USA, NL, DE, UK, CA, SG, JP, AUS, HK                                                                                                                | nan                                  | No                                                 | KYC mandatory                                                                                                                                                                                                       | 07/2025            |
+| [Leaseweb](https://www.leaseweb.com/en/configure/vc/product/entityKey/DEDSER02_NEW_ORDER_BUSINESS_R740XD-24SFF-6134) | US, NL, DE, UK, CA, SG, JP, AUS, HK                                                                                                                 | nan                                  | No                                                 | KYC mandatory                                                                                                                                                                                                       | 07/2025            |
 | [Linode](https://linode.com)                                                                                         | USA, Canada, Japan, India, Indonesia, Sweden, Netherlands, Germany, Brazil, France, UK, Australia, Italy                                            | Yes out of the box                   | No, only through [BitLAunch](https://bitlaunch.io) | IPv6 sometimes need to be re-added in Networking tab, no reboot needed                                                                                                                                              | 05/2024            |
 | [LiteServer](https://liteserver.nl)                                                                                  | Netherlands                                                                                                                                         | Yes, on by default                   | Yes                                                | Very reliable Dutch provider. They do allow Relay nodes but for Exit nodes you need to contact them. Always check T&C https://liteserver.nl/legal                                                                   | 07/2024            |
 | [Lowendbox](https://lowendbox.com/category/dedicated-servers)                                                        |                                                                                                                                                     |                                      |                                                    | Just an aggregator with good offers                                                                                                                                                                                 | 07/2025            |
 | [M247](https://m247.com/eu/services/host/dedicated-servers/)                                                         | UK, Austria, Br, Sw, Jp, Poland, Fr, USA, Netherlands                                                                                               | Yes                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
-| [Mebilcom](https://www.melbicom.net/dedicatedserver/)                                                                | NL, USA, DE, UAE, NG, ESP, IN, IT, FR, LT, SG, BG, LV, PL                                                                                           | nan                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
+| [Mebilcom](https://www.melbicom.net/dedicatedserver/)                                                                | NL, US, DE, UAE, NG, ESP, IN, IT, FR, LT, SG, BG, LV, PL                                                                                            | nan                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
 | [Mevspace](https://mevspace.com)                                                                                     | Poland                                                                                                                                              | Yes, on by default                   | Yes                                                | Flexible Polish providers with 3 DCs in Poland. They do allow Tor Exit nodes but you may need a dedicated server for this. Make sure you open a ticket to check. As of today's date, they have 48h for 1 EUR tariff | 07/2024            |
 | [Misaka](https://www.misaka.io/)                                                                                     | South Africa                                                                                                                                        | Yes, native support                  | No                                                 | Very Expensive                                                                                                                                                                                                      | 05/2024            |
 | [NiceVPS](https://nicevps.net/)                                                                                      | Netherlands                                                                                                                                         | Yes                                  | nan                                                | nan                                                                                                                                                                                                                 | 07/2025            |
 | [Njalla](https://nja.la)                                                                                             | Sweden                                                                                                                                              | Yes                                  | Yes                                                | Privacy vandguards! The biggest VPS 45 is 3 cores only, but it works better than many “larger” servers on the market.                                                                                               | 05/2024            |
 | [OVH](https://us.ovhcloud.com/bare-metal/rise/rise-3/)                                                               | USA, DE, FR, UK, PL, CA                                                                                                                             |                                      | No                                                 | Not all locations always available                                                                                                                                                                                  | 07/2025            |
-| [Oneprovider](https://oneprovider.com/en/dedicated-servers/ipv6)                                                     | PL, FR, NL, UA, USA, BG, RO, DK, ESP, NO, CZ, RS, IE, IT, UK, HU, CH, SK, AT, BE, BA, HK, JP, SG, LU, AU, SWE, UAE, BR, CR, MX, GR, CL, MA, AR      | Yes                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
+| [Oneprovider](https://oneprovider.com/en/dedicated-servers/ipv6)                                                     | PL, FR, NL, UA, US, BG, RO, DK, ESP, NO, CZ, RS, IE, IT, UK, HU, CH, SK, AT, BE, BA, HK, JP, SG, LU, AU, SWE, UAE, BR, CR, MX, GR, CL, MA, AR       | Yes                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
 | [PrivateLayer](https://privatelayer.com)                                                                             | Swiss                                                                                                                                               | Yes                                  | Yes                                                | Slow customer response                                                                                                                                                                                              | 07/2025            |
 | [Privex](https://www.privex.io/tor-exit-policy/)                                                                     | USA, Germany, Sweden                                                                                                                                | Yes                                  | Yes                                                | nan                                                                                                                                                                                                                 | 07/2025            |
-| [Psychz](https://www.psychz.net)                                                                                     | USA, UK, Brazil, Japan, Russia, South Africa and many more                                                                                          | Yes                                  | nan                                                | nan                                                                                                                                                                                                                 | 07/2025            |
+| [Psychz](https://www.psychz.net)                                                                                     | US, UK, Brazil, Japan, Russia, South Africa and many more                                                                                           | Yes                                  | nan                                                | nan                                                                                                                                                                                                                 | 07/2025            |
 | [RDP](https://rdp.sh)                                                                                                | Netherlands, USA, Poland                                                                                                                            | Yes, on by default                   | Yes                                                | German provider. Exit nodes are allowed, policy is here https://rdp.sh/docs/faq/tor ports 25,465,587 must be closed. Make sure you open a ticket before running an exit node.                                       | 07/2024            |
 | [Servermania](https://www.servermania.com/dedicated-servers-hosting.htm)                                             | USA, Canada                                                                                                                                         | nan                                  | No                                                 | nan                                                                                                                                                                                                                 | 07/2025            |
 | [Svea](https://svea.net/vps)                                                                                         | Sweden                                                                                                                                              | Yes                                  | nan                                                | nan                                                                                                                                                                                                                 | 07/2025            |

documentation/docs/data/csv/isp-sheet.csv

@@ -21,11 +21,11 @@
 [Lowendbox](https://lowendbox.com/category/dedicated-servers), , , ,Just an aggregator with good offers,07/2025
 [Thundervm](https://thundervm.com/en/hosting/dedicated-server),"USA, UK, France, Italy, Switzerland, Netherlands",,Yes, ,07/2025
 [OVH](https://us.ovhcloud.com/bare-metal/rise/rise-3/),"USA, DE, FR, UK, PL, CA", ,No,Not all locations always available,07/2025
-[Mebilcom](https://www.melbicom.net/dedicatedserver/),"NL, USA, DE, UAE, NG, ESP, IN, IT, FR, LT, SG, BG, LV, PL",,No,,07/2025
+[Mebilcom](https://www.melbicom.net/dedicatedserver/),"NL, US, DE, UAE, NG, ESP, IN, IT, FR, LT, SG, BG, LV, PL",,No,,07/2025
 [Servermania](https://www.servermania.com/dedicated-servers-hosting.htm),"USA, Canada",,No,,07/2025
-[Oneprovider](https://oneprovider.com/en/dedicated-servers/ipv6),"PL, FR, NL, UA, USA, BG, RO, DK, ESP, NO, CZ, RS, IE, IT, UK, HU, CH, SK, AT, BE, BA, HK, JP, SG, LU, AU, SWE, UAE, BR, CR, MX, GR, CL, MA, AR",Yes,No,,07/2025
-[Ionos](https://www.ionos.com/servers/amd-servers),"USA, DE, UK, ESP, FR",,No,,07/2025
-[Leaseweb](https://www.leaseweb.com/en/configure/vc/product/entityKey/DEDSER02_NEW_ORDER_BUSINESS_R740XD-24SFF-6134),"USA, NL, DE, UK, CA, SG, JP, AUS, HK",,No,KYC mandatory,07/2025
+[Oneprovider](https://oneprovider.com/en/dedicated-servers/ipv6),"PL, FR, NL, UA, US, BG, RO, DK, ESP, NO, CZ, RS, IE, IT, UK, HU, CH, SK, AT, BE, BA, HK, JP, SG, LU, AU, SWE, UAE, BR, CR, MX, GR, CL, MA, AR",Yes,No,,07/2025
+[Ionos](https://www.ionos.com/servers/amd-servers),"US, DE, UK, ESP, FR",,No,,07/2025
+[Leaseweb](https://www.leaseweb.com/en/configure/vc/product/entityKey/DEDSER02_NEW_ORDER_BUSINESS_R740XD-24SFF-6134),"US, NL, DE, UK, CA, SG, JP, AUS, HK",,No,KYC mandatory,07/2025
 [M247](https://m247.com/eu/services/host/dedicated-servers/),"UK, Austria, Br, Sw, Jp, Poland, Fr, USA, Netherlands",Yes,No,,07/2025
 [Hostroyale](https://hostroyale.com/hosting/dedicated-server/),Various countries with different pricing,, Yes,,07/2025
 [DataPacket](https://www.datapacket.com/pricing),"NL, GR, SK, BE, RO, HU, DK, IE, DE, UA, PT, GB, ES, FR, IT, NO, CZ, BG, SE, AT, PL, HR, CH, USA, CO, AR, PE, MX, CL, TR, ZA, NG, IL, HK, AU, SG, JP",Yes,,,07/2025
@@ -35,7 +35,7 @@
 [Colocall](https://www.colocall.net/),Ukraine,Yes,,,07/2025
 [Incognet](https://incognet.io/kansas-city-dedicated-servers),"USA, Netherlands",Yes,,,07/2025
 [FranTech](https://my.frantech.ca),USA,Yes,,,07/2025
-[Psychz](https://www.psychz.net),"USA, UK, Brazil, Japan, Russia, South Africa and many more",Yes,,,07/2025
+[Psychz](https://www.psychz.net),"US, UK, Brazil, Japan, Russia, South Africa and many more",Yes,,,07/2025
 [Fsit](https://www.fsit.com/server/vps-vserver-kvm),Swiss,Yes,Yes,,07/2025
 [NiceVPS](https://nicevps.net/),Netherlands,Yes,,,07/2025
 [Dataclub](https://www.dataclub.eu/),"Latvia, Sweden, Netherlands",Yes,,,07/2027

documentation/docs/pages/operators/changelog.mdx

@@ -49,403 +49,6 @@ This page displays a full list of all the changes during our release cycle from
 
 <VarInfo />
 
-## `v2025.19-kase`
-
-- [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.19-kase)
-- [`nym-node`](nodes/nym-node.mdx) version `1.20.0`
-
-```sh
-nym-node
-Binary Name:        nym-node
-Build Timestamp:    2025-10-30T12:43:37.933354749Z
-Build Version:      1.20.0
-Commit SHA:         75a6d3426bd18dca600ad1cfa39b0a3c4f319c69
-Commit Date:        2025-10-30T11:59:32.000000000+01:00
-Commit Branch:      HEAD
-rustc Version:      1.88.0
-rustc Channel:      stable
-cargo Profile:      release
-```
-
-### Operators Updates & Tools
-
-<Callout type="info" emoji="ℹ️">
-**When this platform release becomes latest, we would like to ask operators ruuning any Gateway mode of `nym-node`, to use new version of [QUIC brige deployment tool](https://github.com/nymtech/nym/blob/develop/scripts/nym-node-setup/quic_bridge_deployment.sh)and install QUIC `nym-bridge` on their server, following [these steps](#quic-transport-bridge-deployment).**
-</Callout>
-
-Alongside this platform release we are happy to introduce several improvements and new tools for node operators.
-
-- [Updated version of QUIC brige deployment tool](https://github.com/nymtech/nym/blob/develop/scripts/nym-node-setup/quic_bridge_deployment.sh), **if you run a `nym-node` in any Gateway mode, please install QUIC on your server, following [these steps](#quic-transport-bridge-deployment)**
-
-- [New **Nym Node Status Dashboard**](https://node-status.nym.com)
-
-- [New **Harbourmaster** aka ***Nym Node Status Observatory***](https://harbourmaster.nymtech.net)
-
-
-
-### Features
-
-- [Propagate cancel token to mixnet client](https://github.com/nymtech/nym/pull/6105): Ensures cancellation token propagation to mixnet client
-
-- [[DOCs/operators] QUIC deployment script & docs](https://github.com/nymtech/nym/pull/6098): Script and documentation for QUIC deployment, referencing `nym-bridges` repository  
-
-- [Move gateway probe to monorepo (Rust edition 2024)](https://github.com/nymtech/nym/pull/6094): Moves `nym-gateway-probe` and related packages into monorepo, updates to Rust 2024 edition
-
-- [Expose reference to Mnemonic from `DirectSecp256k1HdWallet`](https://github.com/nymtech/nym/pull/6083): Adds safer accessors for mnemonic references and deprecates unsafe cloning
-
-### Bugfix
-
-- [Cherry pick - request #6143 from nymtech/bugfix/mix-tx-closed-v2](https://github.com/nymtech/nym/pull/6153): Add circuit breaker  
-<AccordionTemplate name={<TestingSteps/>}>
- **Summary:**
-- Network-requester started successfully  
-- SOCKS5 client started successfully  
-- Traffic was proxied through the mixnet  
-- Shutdown was clean  
-- No 'channel closed (outside of shutdown!)' errors  
-</AccordionTemplate>
-
-- [`nym-credential-proxy` query params parsing regression](https://github.com/nymtech/nym/pull/6121): Fix query deserialization issue with `serde_urlencoded` breaking compatibility with VPN API
-
-- [Revert some dep updates introduced in #6043](https://github.com/nymtech/nym/pull/6120): Revert dependency updates that broke ANSI escape characters within tracing output
-
-- [Skip IPv6 metadata endpoint request](https://github.com/nymtech/nym/pull/6118): Skip querying IPv4-only metadata endpoints during IPv6 probing tests
-
-- [Revert "Propagate cancel token to mixnet client"](https://github.com/nymtech/nym/pull/6115): Reverts earlier change due to premature mixnet exit issues
-
-- [Retrieve and update ticketbook in the same query](https://github.com/nymtech/nym/pull/6101): Fix concurrency issue with multiple agents retrieving ticketbooks simultaneously
-
-- [Include network name in default gateway probe config path](https://github.com/nymtech/nym/pull/6100): Prevents reuse of credentials across different networks
-
-- [Incompatibility fixes](https://github.com/nymtech/nym/pull/6099): Fixes several incompatibilities, including initialization and build mismatches
-
-- [Testnet manager `02sql` migration](https://github.com/nymtech/nym/pull/6096): Fix invalid FK constraint blocking SQL migration
-
-- [Use custom topology provider for list of init gateways](https://github.com/nymtech/nym/pull/6092): Fixes SDK bug where clients ignored custom topology provider on registration
-
-- [Fix `WASM` client + build commands](https://github.com/nymtech/nym/pull/6043): Fixes WASM client hang and runtime time-related issues; improves internal dev testing stability
-
-### Refactors & Maintenance
-
-- [Update to no longer use 1mb files](https://github.com/nymtech/nym/pull/6117)
-
-- [Restore pending DKG contract state migration](https://github.com/nymtech/nym/pull/6116)
-
-- [Update `dirs` to `6.0`](https://github.com/nymtech/nym/pull/6109): Minor dependency update, safe for compatibility
-
-## `v2025.18-jarlsberg`
-
-- [Release Binaries](https://github.com/nymtech/nym/releases/tag/nym-binaries-v2025.18-jarlsberg)
-- [`nym-node`](nodes/nym-node.mdx) version `1.19.0`
-
-```sh
-nym-node
-Binary Name:        nym-node
-Build Timestamp:    2025-10-15T09:04:32.043934599Z
-Build Version:      1.19.0
-Commit SHA:         2235a6e1477bea7368ee5443a298f544deb63504
-Commit Date:        2025-10-15T10:22:16.000000000+02:00
-Commit Branch:      master
-rustc Version:      1.92.0-nightly
-rustc Channel:      nightly
-cargo Profile:      release
-```
-
-### API Changes
-There have been a few updates to the Node Status API (used by the NymVPN API) to do with Nodes' metadata endpoints, which are used to determine if they are running a QUIC bridge.
-
-- [Node Status API: add bridge information to dVPN endpoint](https://github.com/nymtech/nym/pull/6069)
-Scrape the `/api/v1/bridges/client-params` endpoint from nodes to get bridge information and add to the dVPN output:
-
- ```
- {
- 	"identity_key": "3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ",
- 	"name": "middle winner wing",
- 	"authenticator": {
- 		"address": "6CQMtm9DqUj7mPVkSD9YarjUuPh7mJaZQnnHWxNpgByh.AGXiTivVieBULeDhL9tuyMKgRydoT67sFCjeoERDN84k@3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ"
- 	},
- 	"ip_packet_router": {
- 		"address": "GA47h8294m7f6ciyFuDkjk3mmqrvALqboL2o22jkqFhi.22SdTGBWKFrrBM31hMgzjmgduSH1nosnbE9dgNcY2CXz@3wqfp9ebaajgV8HRKYHeZuZCNXgitnW8BbytxyBH65xZ"
- 	},
- 	"location": {
- 		"two_letter_iso_country_code": "GB",
- 		"latitude": 51.5085,
- 		"longitude": -0.1257
- 	},
- 	"last_probe": {
- 		"last_updated_utc": "2025-09-02T18:19:10Z",
- 		"outcome": {
- 		"as_entry": {
- 			"can_connect": true,
- 			"can_route": true
- 		},
- 		"as_exit": {
- 			"can_connect": true,
- 			"can_route_ip_external_v4": true,
- 			"can_route_ip_external_v6": true,
- 			"can_route_ip_v4": true,
- 			"can_route_ip_v6": true
- 		},
- 		"wg": {
- 			"can_handshake_v4": true,
- 			"can_handshake_v6": true,
- 			"can_register": true,
- 			"can_resolve_dns_v4": true,
- 			"can_resolve_dns_v6": true,
- 			"download_duration_sec_v4": 0,
- 			"download_duration_sec_v6": 5,
- 			"download_error_v4": "",
- 			"download_error_v6": "",
- 			"downloaded_file_v4": "https://proof.ovh.net/files/1Mb.dat",
- 			"downloaded_file_v6": "https://proof.ovh.net/files/10Mb.dat",
- 			"ping_hosts_performance_v4": 1,
- 			"ping_hosts_performance_v6": 1,
- 			"ping_ips_performance_v4": 1,
- 			"ping_ips_performance_v6": 0.6666667,
- 			"can_handshake": true,
- 			"can_resolve_dns": true,
- 			"ping_hosts_performance": 1,
- 			"ping_ips_performance": 1
- 		}
- 		}
- 	},
- 	"ip_addresses": [
- 		"178.79.168.250",
- 		"2a01:7e00::f03c:95ff:fef8:77f"
- 	],
- 	"mix_port": 1789,
- 	"role": "EntryGateway",
- 	"entry": {
- 		"hostname": "nym-circ.anonym.tech",
- 		"ws_port": 9000,
- 		"wss_port": 9443
- 	},
- + 	"bridges":{
- + 		"version": 0,
- + 		"transports": [
- + 			{
- + 				"transport_type": "quic_plain",
- + 				"args": {
- + 					"addresses":  ["[2a01:7e00::f03c:95ff:fef8:77f]:4443", "178.79.168.250:4443"],
- + 					"id_pubkey": "gyKl6DN9hgdPGhEzdf9gY4Ha2GzrOwSzLCguxeTVTJU=",
- + 					"host": "netdna.bootstrapcdn.com"
- + 				}
- + 			}
- + 		]
- + 	}
- 	"performance": "1",
- 	"build_information": {
- 		"build_version": "1.16.0",
- 		"commit_branch": "build",
- 		"commit_sha": "7f97f13799342f864e1b106e8cafc9f6d6c24c0f"
- 	}
- }
- ```
-
-- [ns-api: add new fields for probe output for query_metadata and download file size and duration in ms](https://github.com/nymtech/nym/pull/6091)
-
-This PR adds new fields to the Node Status API:
-
- ```json
- {
-   "node": "ByxGq9hpDQu6Wc8augEh22w7CRWJHPNfDshB1b8nfWkh",
-   "used_entry": "ByxGq9hpDQu6Wc8augEh22w7CRWJHPNfDshB1b8nfWkh",
-   "outcome": {
-     "as_entry": {
-       "can_connect": true,
-       "can_route": true
-     },
-     "as_exit": {
-       "can_connect": true,
-       "can_route_ip_v4": true,
-       "can_route_ip_external_v4": true,
-       "can_route_ip_v6": true,
-       "can_route_ip_external_v6": true
-     },
-     "wg": {
-       "can_register": true,
-       "can_query_metadata_v4": true, // <--------------------------------
-       "can_handshake_v4": true,
-       "can_resolve_dns_v4": true,
-       "ping_hosts_performance_v4": 1.0,
-       "ping_ips_performance_v4": 1.0,
-       "can_handshake_v6": true,
-       "can_resolve_dns_v6": true,
-       "ping_hosts_performance_v6": 1.0,
-       "ping_ips_performance_v6": 0.93333334,
-       "download_duration_sec_v4": 2,
-       "download_duration_milliseconds_v4": 2034, // <--------------------------------
-       "downloaded_file_size_bytes_v4": 1048576, // <--------------------------------
-       "downloaded_file_v4": "https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
-       "download_error_v4": "",
-       "download_duration_sec_v6": 5,
-       "downloaded_file_size_bytes_v6": 1048576,
-       "download_duration_milliseconds_v6": 5501,
-       "downloaded_file_v6": "https://proof.ovh.net/files/1Mb.dat",
-       "download_error_v6": ""
-     }
-   }
- }
- ```
-
-- [ns-api: add descriptions to dVPN gateway responses](https://github.com/nymtech/nym/pull/6102)
-This PR adds the `description` field to dVPN gateways in `/dvpn/v1/directory/gateways`.
-
-- [NS API: use new probe download filesize and milliseconds field](https://github.com/nymtech/nym/pull/6097)
-This PR uses the new fields in mainnet to calculate the probe download score.
-
-- [ns-api: use download files size from probes instead of parsing filenames](https://github.com/nymtech/nym/pull/6095) This PR uses the new field in the probe results that says how many bytes were downloaded to calculate the speed of download. It only uses downloads on ipv4 and ignores ipv6 for now. This might change in the future.
-
-- [Node Status API: remove sqlite support](https://github.com/nymtech/nym/pull/6004)
-This PR removes sqlite support, requiring pgsql to run the NS API.
-
- It also fixes the following issues:
-
- - deserialisation of `NodeDescription`
- - defaults for `WireguardDetails` for deserialisation
-
- It also bumps the version to v4.0.0.
-
-### Operators Updates & Tools
-
-- [Node rewards tracker](https://github.com/nymtech/nym/pull/6064)
-This PR introduces a script fetching operators rewards based on provided Nyx account addresses provided in `data/wallet-addresses.csv`.
-
-<AccordionTemplate name="Info">
- **Output is:**
-     1. Printed table in terminal
-     3. Sheet with complete info stored in `data/node-balances.csv`
-     4. Historical data yaml file stored in `data/data.yaml` - this file should not be changed manually, as
-     all values older than 30 days get auto-removed
-
- **RUN**
-
- Before you start fill first column of `data/wallet-addresses.csv` called `addresses` with your Nyx account addresses and (optionally) second column called `tag` with an entity, for example *"mysquad"* and *"personal"* to get sorted output per entity.
-
- - Csv example with `tag`s:
- ```
- n1foofoofoo, personal
- n1barbarbar, personal
- n1bazbazbaz, mysquad
- n1lollollol, mysquad
- ```
- - For operators having all nodes under one entity, the tag field will be left empty. Example:
- ```csv
- n1foofoofoo
- n1barbarbar
- n1bazbazbaz
- ```
-
-Documentation coming soon.
-</AccordionTemplate>
-
-- [Bugfix/bloomfilters purge](https://github.com/nymtech/nym/pull/6089)
-This PR fixes bug where old replay protection bloomfilters were never getting removed.
-
-
-### Features
-- [Get wireguard keypair as arg instead of reading it from disk](https://github.com/nymtech/nym/pull/6078)
-
-- [Registration Client](https://github.com/nymtech/nym/pull/6059)
- This PR introduces the `RegistrationClient` whose eventual job will be to handle registration with gateway and bandwidth control. This is step 1, where it only handles registration and then hands back the control channel to the vpn-client.
-
-<AccordionTemplate name="Info">
-
- **nym-wg-gateway-client**
- This crate has been smooshed with the nym-authenticator-client as they were doing the same thing : talking with the Authenticator.
-
- **nym-authenticator-client**
- The job of the `AuthenticatorClient` is to talk to the `Authenticator`s via the mixnet. They both make use of a `AuthClientMixnetListener` that handles interaction with the mixnet client. No more `SharedMixnetClient`, only clear owners. That component could be turned into an actual multiplexer, but that's out of scope.
-
- It is designed to be able to shut down, since it won't be necessary for bandwidth top up in the future.
-
- Lots of types and traits were copied in both repos, some of them are sadly still there. Further work could be done to improve messaging ( `ClientMessage` and `AuthenticatorRequests` for example)
-
- **nym-ip-packet-client**
- This crate has minor changes, focused on getting rid of the `SharedMixnetClient`. It still talks to the `IpPacketRouter` but it owns the `MixnetClient`
-
- **Nym-registration-client**
- Brand new crates, whose current job is to run a `MixnetClient` with the given options,  register with the component related to the tunnel type, and hand back the necessary component for running the tunnel.
-
- **authenticator-requests**
- Mostly refactoring, lots of code was duplicated in the vpn-client repo
-
- **misc**
- The rest are qol changes that might not be needed right away but that is preparing the future improvements coming soon™
- </AccordionTemplate>
-
-- [Feature: Ping probe all nodes /described nodes from a server](https://github.com/nymtech/nym/pull/6074)
-This script should be ran from a node hosting server. It pings all IPs listed in /described endpoint and returns a file with unreachable IPs. Such list gives operator an idea on IPs potentially blocking their IP.
-
-- [Feature: Nym node html landing page](https://github.com/nymtech/nym/pull/6053)
-This PR introduces a new landing page which contains:
-  - no more deprecated tornul
-  - new nym theme
-  - bold text about DMCA
-  - hook for nym-node-cli to use it and add $EMAIL prompted to the operator
-
-- [feat: DKG contract method for updating announce address](https://github.com/nymtech/nym/pull/6050)
-
-- [feat: NS ticket faucet](https://github.com/nymtech/nym/pull/6047)
-Overview: modifies the Node Status API so that it keeps a buffer of tickets inside its storage that it gives out when new test runs get requested. it also slightly adjusts the ticketbook API in a bit hacky way to allow importing ticketbooks with specific index ranges. However, those changes also involve modifying cli arguments passed to both NS API and gateway probes. The associated vpn-client repo branch is `feature/ticket-faucet-probe` which for the same reason is not yet ready
-
-<AccordionTemplate name="Info">
-**Node Status API**
-**Added**
- - `--config-env-file` / `-c` (optional) - helper allowing testing locally on non-mainnet networks without passing everything through env variables
- - `--mnemonic` (env: `NYM_NODE_STATUS_API_MNEMONIC`) - account used for obtaining ticketbooks
- - `--max-concurrent-deposits` (env: `NYM_NODE_STATUS_API_MAX_CONCURRENT_DEPOSITS`) (optional; default: 5) - Specifies the maximum number of deposits the node status api can make in a single transaction. Note that each deposit batch is followed by the same number of sequential signing requests
- - `--tickets-buffer-size` (env: `NYM_NODE_STATUS_API_TICKETS_BUFFER`) (optional; default: 50) - Specifies the size of the tickets buffer the node status api should have available at any time for each ticket type.
- - `--tickets-buffer-check-interval` (env: `NYM_NODE_STATUS_API_TICKETS_CHECK_INTERVAL`) (optional; default: 1min) - Specifies interval at which the node status api should check if it has sufficient number of tickets buffered
- - `--quorum-check-interval` (env: `NYM_NODE_STATUS_API_QUORUM_CHECK_INTERVAL`) (optional; default: 5min) - Specifies interval at which the node status api should check if signing quorum is available
- - `--buffered-ticket-types` (env: `NYM_NODE_STATUS_BUFFERED_TICKET_TYPES`) (optional; default: `[V1MixnetEntry, V1WireguardEntry, V1WireguardExit]`) - Specifies types of tickets to buffer
- - `--ecash-client-identifier-bs58` (env: `NYM_NODE_STATUS_API_ECASH_CLIENT_IDENTIFIER_BS58`) - Identifier used for deriving keys embedded in the issued ticketbooks (i.e. seed for the client identity). It can be a random string, but make sure it has sufficient entropy. it has to be base58 encoded.
-
-**Node Status Agent**
-**Removed**
- - `--mnemonic` - no longer needed as tickets are obtained throught the faucet
-
-**Gateway Probe (vpn-client repo)**
-**Added**
- - `--ticket-materials` - all the encoded generated tickets (and global data) needed by the probe
- - `--ticket-materials-revision` - revision of the serialisation to help with decoding (not strictly needed, but it was already available)
-**Removed**
- - `--mnemonic` - no longer needed as tickets are obtained throught the faucet
-</AccordionTemplate>
-
-- [Bridge proto client params in Self-Described](https://github.com/nymtech/nym/pull/6035)
-This PR gives the nym-node a way to expose information about the bridge protocols that the node supports, and the parameters that are necessary to connect using those protocols.
-
-<AccordionTemplate name="Info">
- This is meant to be usable by the node status API to be be included into node descriptors that are compiled for the vpn client.
-
- - Adds a new field to the nym-node config `gateway_tasks.storage_paths.bridge_client_params`
-   - IF the new config field is present a new self-described endpoint is available at `/v1/bridges/client-params`
-   - IF the new config field is NOT present the endpoint is not exposed.
-
- I arbitrarily chose config v8 as the oldest nym-node configuration version that supports the option. This can probably be propogated further backwards if necessary.
-
- NOTE: The new `/bridges/client-params` endpoint does not have swagger / utopia docs associated. This interface will likely change in several upcoming iterations and serving from file (for now) means that the types are not defined internally.
-
- tested as working on node `3wqfp9eb` both when file is provided in config (sucessful response) and when file is not specified in config (path gives 404).
-
- </AccordionTemplate>
-
-### Refactors & Maintenance
-- [[chore] Clippy fix](https://github.com/nymtech/nym/pull/6060)
-
-- [Bugfix: Nym node CLI download nym-node exception](https://github.com/nymtech/nym/pull/6058)
-This PR fixes a case when the "Latest" platform release doesn't include `nym-node` by prompting user to insert binary URL instead of failing. Additionally it fixes fetching new landing page script in the CLI.
-
-- [Benny/ci contract fix](https://github.com/nymtech/nym/pull/5962)
-
-- [frontdoor typo fix](https://github.com/nymtech/nym/pull/6067)
-
-- [Hotfix: Update API source in node ping tester script](https://github.com/nymtech/nym/pull/6082)
-This PR fixes initial development bug where a wrong API endpoint was used.
- `https://validator.nymtech.net/api/v1/nym-nodes/described` gets all nym nodes, not just gateways.
- Code is simplified accordingly.
-
 ## QUIC Transport Bridge Deployment
 
 <QuicDeploymentSteps />
@@ -505,7 +108,7 @@ All of the routes removed had already been deprecated over a year ago. This is m
 <AccordionTemplate name="Removed API routes">
 
 ### Legacy mixnodes related:
-
+ 
 - `/v1/mixnodes`
 - `/v1/mixnodes/active`
 - `/v1/mixnodes/active/detailed`
@@ -527,9 +130,9 @@ All of the routes removed had already been deprecated over a year ago. This is m
 - `/v1/status/mixnodes/detailed-unfiltered`
 - `/v1/status/mixnode/{mix_id}/report`
 - `/v1/status/mixnode/{mix_id}/avg_uptime`
-
+ 
 ### Legacy gateways related:
-
+ 
 - `/v1/gateways`
 - `/v1/gateways/described`
 - `/v1/gateways/blacklisted`
@@ -541,21 +144,21 @@ All of the routes removed had already been deprecated over a year ago. This is m
 </AccordionTemplate>
 
 #### Structs changes:
-
+ 
 - `MixnodeUptimeHistoryResponse` no longer has `owner` field
 - `GatewayUptimeHistoryResponse` no longer has `owner` field
-
-
+ 
+ 
 #### New Routes Added
 
 - `/v1/nym-nodes/stake-saturation/{node_id}` - as a better replacement for `/v1/status/mixnode/{mix_id}/stake-saturation` as this information might be potentially useful and can be applied to any nym-node, not just a legacy mixnode.
 - `/v1/legacy/mixnodes` - returns a list of bonded legacy mixnodes that haven't migrated to nym-nodes
 - `/v1/legacy/gateways` - returns a list of bonded legacy gateways that haven't migrated to nym-nodes
-
+ 
 #### Node Status API
-
+ 
 Furthermore the changes remove all scraping of legacy mixnodes from NS and the following routes are removed:
-
+ 
 - `/v2/mixnodes/{mix_id}`
 - `/v2/mixnodes`
 
@@ -626,7 +229,7 @@ Furthermore the changes remove all scraping of legacy mixnodes from NS and the f
 ### Operators Updates & Tools
 
 <Callout type="info" emoji="ℹ️">
-Nodes receiving stake as a part of [**Nym Delegation Program**](https://nym.com/network/DP) are updated weekly based on the [rules](https://forms.nym.com/form/#/2/form/view/BRh8QroXFinjOF4D3FHgYiX76zbiRvUV2Sy+czaoKFQ) without prior notification given to the operators.
+Nodes receiving stake as a part of [**Nym Delegation Program**](https://nym.com/network/DP) are updated weekly based on the [rules](https://forms.nym.com/form/#/2/form/view/BRh8QroXFinjOF4D3FHgYiX76zbiRvUV2Sy+czaoKFQ) without prior notification given to the operators. 
 
 [**Nym Delegation account**](https://explorer.nym.spectredao.net/account/n1rnxpdpx3kldygsklfft0gech7fhfcux4zst5lw) `n1rnxpdpx3kldygsklfft0gech7fhfcux4zst5lw` is a single source of truth. If you expect your node to have Nym team stake and it doesn't, please reach out in in the [**Node Operators Matrix channel**](https://matrix.to/#/#operators:nymtech.chat).
 </Callout>
@@ -649,32 +252,32 @@ nym-vpnc connect --enable-two-hop  --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
 
 - [Feature/testing utils](https://github.com/nymtech/nym/pull/5963): This PR introduces a couple of general helpers, in particular some mocks for sending across values using Stream/Sink and AsyncRead/AsyncWrite without actual underlying networking. Example implementation are with NymNoise (which was the original inspiration) and gateway handshake.
 
-- [Backport metadata endpoint](https://github.com/nymtech/nym/pull/6010)
+- [Backport metadata endpoint](https://github.com/nymtech/nym/pull/6010) 
 
 ### Bugfix
 
 - [Fix rust `1.89` `clippy` issues](https://github.com/nymtech/nym/pull/5944)
 
-- [`http api` client adjustment](https://github.com/nymtech/nym/pull/5953): It fixes missing `feature-lock` when cloning the client and adds helper macro for user agent creation
+- [`http api` client adjustment](https://github.com/nymtech/nym/pull/5953): It fixes missing `feature-lock` when cloning the client and adds helper macro for user agent creation  
 
 - [Fix `ci-build` for linux (and use updated runner)](https://github.com/nymtech/nym/pull/5958): This PR fixes our build pipeline by using correct (updated) linux runner and updates all the conditional steps that were behind `ubuntu` runners (which no longer exist)
 
-- [Fixing the ci for ns agent](https://github.com/nymtech/nym/pull/5965)
+- [Fixing the ci for ns agent](https://github.com/nymtech/nym/pull/5965) 
 
 - [Manually calculate per node work on rewarded set changes](https://github.com/nymtech/nym/pull/5972): This PR fixes:
-    1. Nym rewarded set was set to X, for argument sake say 200
+    1. Nym rewarded set was set to X, for argument sake say 200 
     2. We sent transaction to update it to Y, say 100
     3. This internally updated the interval rewarding parameters inside the mixnet contract including the default active and standby node work factors. Note that the rewarded set itself stayed the same, as it only changes after epoch rolls over and new one is assigned (by the `nym-api`)
    4. Epoch has finished and `nym-api` wanted to do the rewarding. It grabbed the **current** rewarded set (of X, 200) and started calculating the total work in the system. But since the contract already had new parameters (adjusted for size of Y, 100), the result was greater than 1 thus `nym-api` was preventably blowing up.
     To fix it we introduce additional checks, so that if the current rewarded set does not match the specification defined in the contract rewarding parameters, `nym-api` will attempt to do its best to manually calculate work factors for this epoch.
 
-- [Fix the ns api ci workflow](https://github.com/nymtech/nym/pull/5981)
+- [Fix the ns api ci workflow](https://github.com/nymtech/nym/pull/5981) 
 
-- [Make sure tables are removed in correct order to not trigger FK constraint issue](https://github.com/nymtech/nym/pull/5987)
+- [Make sure tables are removed in correct order to not trigger FK constraint issue](https://github.com/nymtech/nym/pull/5987) 
 
 ### Refactors & Maintenance
 
-- [Move credential verifier in peer controller](https://github.com/nymtech/nym/pull/5938): This PR is to not duplicate the verifier code (minus the actual verification operation, which is harder to unit test because of expiration checks)
+- [Move credential verifier in peer controller](https://github.com/nymtech/nym/pull/5938): This PR is to not duplicate the verifier code (minus the actual verification operation, which is harder to unit test because of expiration checks) 
 
 - [Remove unused import](https://github.com/nymtech/nym/pull/5942)
 
@@ -685,7 +288,7 @@ nym-vpnc connect --enable-two-hop  --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
 - [Remove freshness check on testrun submit](https://github.com/nymtech/nym/pull/5977):
     - Freshness is enforced by a background task that marks test runs as stale after a configured amount of time
     - Make existing freshness period configurable to avoid code changes in the future
-    - Added `humantime` for parsing
+    - Added `humantime` for parsing  
 
 - [Move authenticator into gateway crate](https://github.com/nymtech/nym/pull/5982)
 
@@ -708,7 +311,7 @@ nym-vpnc connect --enable-two-hop  --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
 
 - [Ecash liveness check](https://github.com/nymtech/nym/pull/5890)
 
-- [Basic zulip client for sending messages](https://github.com/nymtech/nym/pull/5913): In order to be able to send zulip notifications about *emergency* upgrade mode being activated, we need some sort of client. Unfortunately there isn't any rust library that's maintained (the only one had last commit 4 years ago). This simple thing now currently only supports message sending
+- [Basic zulip client for sending messages](https://github.com/nymtech/nym/pull/5913): In order to be able to send zulip notifications about *emergency* upgrade mode being activated, we need some sort of client. Unfortunately there isn't any rust library that's maintained (the only one had last commit 4 years ago). This simple thing now currently only supports message sending 
 
 - [`nym-node` debug command to reset providers db](https://github.com/nymtech/nym/pull/5914)
 
@@ -718,7 +321,7 @@ nym-vpnc connect --enable-two-hop  --entry-gateway-id 7CWjY3QFoA9dgE535u9bQiXCfz
 
 ### Refactors & Maintenance
 
-- [Allow compatibility with 'CDLA-Permissive-2.0'](https://github.com/nymtech/nym/pull/5910): This license is present in the included `webpki-roots`
+- [Allow compatibility with 'CDLA-Permissive-2.0'](https://github.com/nymtech/nym/pull/5910): This license is present in the included `webpki-roots` 
 
 - [Migrate strum to `0.27.2`](https://github.com/nymtech/nym/pull/5960): This PR migrates strum to the latest. Notably all macros' were moved into `strum_macros`. The rest stays the same.
 
@@ -743,9 +346,9 @@ cargo Profile:      release
 
 ### Operators Updates & Tools
 
--  Stark Industries is on a sanction list by EU. IP addresses managed by Stark Ind. and their subsidies (ASN 44477 / ASN 33993) had been put on [spamhaus.org](http://spamhaus.org/) [list](https://www.spamhaus.org/drop/asndrop.json). The effect on NymVPN user experience is that Exit Gateways IPs hosted on Stark Ind. are seen as a spam proxies by many online services.
+-  Stark Industries is on a sanction list by EU. IP addresses managed by Stark Ind. and their subsidies (ASN 44477 / ASN 33993) had been put on [spamhaus.org](http://spamhaus.org/) [list](https://www.spamhaus.org/drop/asndrop.json). The effect on NymVPN user experience is that Exit Gateways IPs hosted on Stark Ind. are seen as a spam proxies by many online services.  
 
-- We ask operators - especially Exit Gateways - to consider moving to another ISP. Visit an updated [ISP list](community-counsel/isp-list) and feel free to add more providers, following [these steps](community-counsel/add-content).
+- We ask operators - especially Exit Gateways - to consider moving to another ISP. Visit an updated [ISP list](community-counsel/isp-list) and feel free to add more providers, following [these steps](community-counsel/add-content). 
 
 ### Features
 
@@ -759,13 +362,13 @@ cargo Profile:      release
 - [`sqlx-pool-guard`: allocate more memory on windows](https://github.com/nymtech/nym/pull/5896):
     - Allocate 1.5x more memory than reported by the system to provide a safety margin
     - Increase number of retry attempts to 5
-
+    
 
 - [dkg epoch dealers query](https://github.com/nymtech/nym/pull/5899)
 
 - [dkg snapshot epoch](https://github.com/nymtech/nym/pull/5900): In order to determine if signer quorum has been down at particular height, we need to know with certainty the dkg epoch id corresponding to given block height. This PR makes it possible. Every time epoch state is changed (due to DKG progress), snapshot is saved and can be queried. This doesn't work for past data, but given mainnet has only had a single DKG instance, that's not an issue.
 
-- [`sqlx-pool-guard`: obtain filename from connect options](https://github.com/nymtech/nym/pull/5905):
+- [`sqlx-pool-guard`: obtain filename from connect options](https://github.com/nymtech/nym/pull/5905): 
 
 ### Refactors & Maintenance
 
@@ -821,7 +424,7 @@ cargo Profile:      release
 
 - [Remove old explorer references](https://github.com/nymtech/nym/pull/5846)
 
-- [Listen for shutdown signals during nym-node startup](https://github.com/nymtech/nym/pull/5879): This is to avoid situation where the process can't be killed without 'kill -9' because the logic to listen to shutdown signals hasn't been hit yet
+- [Listen for shutdown signals during nym-node startup](https://github.com/nymtech/nym/pull/5879): This is to avoid situation where the process can't be killed without 'kill -9' because the logic to listen to shutdown signals hasn't been hit yet 
 
 ### Bugfixes
 

documentation/docs/pages/operators/nodes/nym-node/setup.mdx

@@ -21,10 +21,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-10-30T12:43:37.933354749Z
-Build Version:      1.20.0
-Commit SHA:         75a6d3426bd18dca600ad1cfa39b0a3c4f319c69
-Commit Date:        2025-10-30T11:59:32.000000000+01:00
+Build Timestamp:    2025-10-01T10:42:58.647419869Z
+Build Version:      1.18.0
+Commit SHA:         bbea2ff9e913f49cb7bf6c7bafa9d9b158c80de5
+Commit Date:        2025-10-01T12:06:07.000000000+02:00
 Commit Branch:      HEAD
 rustc Version:      1.88.0
 rustc Channel:      stable

nym-api/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-api"
 license = "GPL-3.0"
-version = "1.1.67"
+version = "1.1.66"
 authors.workspace = true
 edition = "2021"
 rust-version.workspace = true

nym-api/src/support/config/mod.rs

@@ -124,7 +124,6 @@ pub struct Config {
     pub node_status_api: NodeStatusAPI,
 
     #[serde(alias = "topology_cacher")]
-    #[serde(default)]
     pub describe_cache: DescribeCache,
 
     #[serde(default)]

nym-api/src/support/config/template.rs

@@ -70,6 +70,30 @@ per_node_test_packets = {{ network_monitor.debug.per_node_test_packets }}
 # Path to the database file containing uptime statuses for all mixnodes and gateways.
 database_path = '{{ node_status_api.storage_paths.database_path }}'
 
+[node_status_api.debug]
+
+caching_interval = '{{ node_status_api.debug.caching_interval }}'
+
+
+##### topology cacher config options #####
+
+[topology_cacher.debug]
+
+caching_interval = '{{ topology_cacher.debug.caching_interval }}'
+
+
+##### circulating supply cacher config options #####
+
+[circulating_supply_cacher]
+
+# Specifies whether circulating supply caching service is enabled in this process.
+enabled = {{ circulating_supply_cacher.enabled }}
+
+[circulating_supply_cacher.debug]
+
+caching_interval = '{{ circulating_supply_cacher.debug.caching_interval }}'
+
+
 ##### rewarding config options #####
 
 [rewarding]

nym-authenticator-client/src/mixnet_listener.rs

@@ -51,12 +51,12 @@ impl AuthClientMixnetListener {
     }
 
     async fn run(mut self) -> Self {
-        let mixnet_cancel_token = self.mixnet_client.cancellation_token();
         self.shutdown_token.run_until_cancelled(async {
+            let shutdown_event = self.mixnet_client.shutdown_event();
             loop {
                 tokio::select! {
                     biased;
-                    _ = mixnet_cancel_token.cancelled() => {
+                    _ = shutdown_event.wait() => {
                         tracing::debug!("AuthClientMixnetListener: mixnet client was shutdown");
                         break;
                     }
@@ -100,9 +100,7 @@ impl AuthClientMixnetListener {
 
     // Disconnects the mixnet client and effectively drop itself, since it doesn't work without one, and reconnecting isn't supported
     pub async fn disconnect_mixnet_client(self) {
-        if !self.mixnet_client.cancellation_token().is_cancelled() {
-            self.mixnet_client.disconnect().await;
-        }
+        self.mixnet_client.disconnect().await;
     }
 
     pub fn start(self) -> AuthClientMixnetListenerHandle {
@@ -110,14 +108,14 @@ impl AuthClientMixnetListener {
         let message_sender = self.input_message_tx.clone();
         // Allows stopping only this, e.g. if we don't need it in the new bandwidth controller
         let cancellation_token = self.shutdown_token.clone();
-        let mixnet_cancellation_token = self.mixnet_client.cancellation_token();
+        // let mixnet_cancellation_token = self.mixnet_client.cancellation_token();
         let handle = tokio::spawn(self.run());
 
         AuthClientMixnetListenerHandle {
             message_broadcast,
             message_sender,
             cancellation_token,
-            mixnet_cancellation_token,
+            // mixnet_cancellation_token,
             handle,
         }
     }
@@ -127,7 +125,7 @@ pub struct AuthClientMixnetListenerHandle {
     message_broadcast: MixnetMessageBroadcastSender,
     message_sender: MixnetMessageInputSender,
     cancellation_token: CancellationToken,
-    mixnet_cancellation_token: CancellationToken,
+    // mixnet_cancellation_token: CancellationToken,
     handle: JoinHandle<AuthClientMixnetListener>,
 }
 
@@ -140,9 +138,9 @@ impl AuthClientMixnetListenerHandle {
         self.message_broadcast.subscribe()
     }
 
-    pub fn mixnet_cancel_token(&self) -> CancellationToken {
-        self.mixnet_cancellation_token.clone()
-    }
+    // pub fn mixnet_cancel_token(&self) -> CancellationToken {
+    //     self.mixnet_cancellation_token.clone()
+    // }
 
     pub async fn stop(self) {
         // If shutdown was externally called, that call is a no-op

nym-credential-proxy/nym-credential-proxy-requests/Cargo.toml

@@ -16,7 +16,6 @@ schemars = { workspace = true, features = ["preserve_order", "uuid1"] }
 uuid = { workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
-serde_with = { workspace = true }
 time = { workspace = true, features = ["serde", "formatting", "parsing"] }
 tsify = { workspace = true, optional = true }
 reqwest = { workspace = true, features = ["json", "rustls-tls"] }

nym-credential-proxy/nym-credential-proxy-requests/src/api/v1/ticketbook/models.rs

@@ -9,7 +9,6 @@ use schemars::JsonSchema;
 use schemars::r#gen::SchemaGenerator;
 use schemars::schema::Schema;
 use serde::{Deserialize, Serialize};
-use serde_with::{DisplayFromStr, serde_as};
 use std::ops::{Deref, DerefMut};
 use time::{Date, OffsetDateTime};
 
@@ -265,14 +264,12 @@ pub struct WebhookTicketbookWalletSharesRequest {
     pub secret: String,
 }
 
-#[serde_as]
 #[derive(Default, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema, utoipa::IntoParams))]
 #[cfg(feature = "query-types")]
 #[serde(default, rename_all = "kebab-case")]
 pub struct TicketbookObtainParams {
     #[serde(default)]
-    #[serde_as(as = "DisplayFromStr")]
     pub skip_webhook: bool,
 
     #[serde(default)]
@@ -280,19 +277,15 @@ pub struct TicketbookObtainParams {
     pub global: GlobalDataParams,
 }
 
-#[serde_as]
 #[derive(Default, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "openapi", derive(utoipa::ToSchema, utoipa::IntoParams))]
 #[cfg(feature = "query-types")]
 #[serde(default, rename_all = "kebab-case")]
 pub struct GlobalDataParams {
-    #[serde_as(as = "DisplayFromStr")]
     pub include_master_verification_key: bool,
 
-    #[serde_as(as = "DisplayFromStr")]
     pub include_coin_index_signatures: bool,
 
-    #[serde_as(as = "DisplayFromStr")]
     pub include_expiration_date_signatures: bool,
 }
 

nym-gateway-probe/netstack_ping/lib.go

@@ -35,13 +35,15 @@ import (
 )
 
 var fileUrls = []string{
-	"https://proof.ovh.net/files/10Mb.dat",
+	"https://proof.ovh.net/files/1Mb.dat",
+	"https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
 	"https://nym-bandwidth-monitoring.ops-d86.workers.dev/10mb.dat",
 	// "https://nym-bandwidth-monitoring.ops-d86.workers.dev/100mb.dat", to be introduced later
 }
 
 var fileUrlsV6 = []string{
-	"https://proof.ovh.net/files/10Mb.dat",
+	"https://proof.ovh.net/files/1Mb.dat",
+	"https://nym-bandwidth-monitoring.ops-d86.workers.dev/1mb.dat",
 	"https://nym-bandwidth-monitoring.ops-d86.workers.dev/10mb.dat",
 	// "https://nym-bandwidth-monitoring.ops-d86.workers.dev/100mb.dat", to be introduced later
 }
@@ -192,20 +194,14 @@ func ping(req NetstackRequestGo) (NetstackResponse, error) {
 
 	response.CanHandshake = true
 
-	// Skip metadata query if endpoint is empty (e.g., for IPv6 where the IPv4 metadata endpoint is not reachable)
-	if req.MetadataEndpoint != "" {
-		version, duration, err := queryMetadata(req.MetadataEndpoint, req.MetadataTimeoutSec, tnet)
-		if err != nil {
-			log.Printf("Failed to query metadata URLs: %v\n", err)
-			response.CanQueryMetadata = false
-		} else {
-			log.Printf("Queried metadata endpoint with version: %v\n", version)
-			log.Printf("Query duration: %v\n", duration)
-			response.CanQueryMetadata = true
-		}
-	} else {
-		log.Printf("Skipping metadata query (no endpoint provided)")
+	version, duration, err := queryMetadata(req.MetadataEndpoint, req.MetadataTimeoutSec, tnet)
+	if err != nil {
+		log.Printf("Failed to query metadata URLs: %v\n", err)
 		response.CanQueryMetadata = false
+	} else {
+		log.Printf("Queried metadata endpoint with version: %v\n", version)
+		log.Printf("Query duration: %v\n", duration)
+		response.CanQueryMetadata = true
 	}
 
 	for _, host := range req.PingHosts {
@@ -546,25 +542,25 @@ func queryMetadata(url string, timeoutSecs uint64, tnet *netstack.Net) (int, tim
 func main() {
 	// uncomment the lines below to run locally and see README.md for how to get the Wireguard config
 	/*	var _, err = ping(NetstackRequestGo{
-			 WgIp:             "10.1.155.153",
-			 PrivateKey:       "...",
-			 PublicKey:        "...",
-			 Endpoint:         "13.245.9.123:51822",
-			 MetadataEndpoint: "http://10.1.0.1:51830",
-			 Dns:              "1.1.1.1",
-			 IpVersion:        4,
-			 //PingHosts:          nil,
-			 //PingIps:            nil,
-			 //NumPing:            0,
-			 //SendTimeoutSec:     0,
-			 //RecvTimeoutSec:     0,
-			 //DownloadTimeoutSec: 0,
-			 MetadataTimeoutSec: 5,
-			 //AwgArgs:            "",
-		 })
+			WgIp:             "10.1.155.153",
+			PrivateKey:       "...",
+			PublicKey:        "...",
+			Endpoint:         "13.245.9.123:51822",
+			MetadataEndpoint: "http://10.1.0.1:51830",
+			Dns:              "1.1.1.1",
+			IpVersion:        4,
+			//PingHosts:          nil,
+			//PingIps:            nil,
+			//NumPing:            0,
+			//SendTimeoutSec:     0,
+			//RecvTimeoutSec:     0,
+			//DownloadTimeoutSec: 0,
+			MetadataTimeoutSec: 5,
+			//AwgArgs:            "",
+		})
 
-		 if err != nil {
-			 log.Fatal(err)
-		 }
+		if err != nil {
+			log.Fatal(err)
+		}
 	*/
 }

nym-gateway-probe/netstack_ping/lib_test.go

@@ -215,8 +215,8 @@ func TestPingFunction(t *testing.T) {
 	// Create a request with valid IP but will fail due to network setup
 	req := NetstackRequestGo{
 		WgIp:               "10.0.0.1",
-		PrivateKey:         "0000000000000000000000000000000000000000000000000000000000000000",
-		PublicKey:          "0000000000000000000000000000000000000000000000000000000000000000",
+		PrivateKey:         "test-key",
+		PublicKey:          "test-pub-key",
 		Endpoint:           "1.1.1.1:51820",
 		Dns:                "1.1.1.1",
 		IpVersion:          4,
@@ -275,11 +275,10 @@ func TestResultStructs(t *testing.T) {
 // TestConsecutiveFailureExit validates that the ping loop exits cleanly after consecutive failures
 func TestConsecutiveFailureExit(t *testing.T) {
 	// Create a test request that will trigger consecutive failures
-	// Using valid hex-encoded keys (32 bytes = 64 hex chars)
 	req := NetstackRequestGo{
 		WgIp:               "10.0.0.1",
-		PrivateKey:         "0000000000000000000000000000000000000000000000000000000000000000",
-		PublicKey:          "0000000000000000000000000000000000000000000000000000000000000000",
+		PrivateKey:         "test-key",
+		PublicKey:          "test-pub-key",
 		Endpoint:           "1.1.1.1:51820",
 		Dns:                "1.1.1.1",
 		IpVersion:          4,

nym-gateway-probe/src/netstack.rs

@@ -145,8 +145,7 @@ impl NetstackRequestGo {
             private_key: req.private_key.clone(),
             public_key: req.public_key.clone(),
             endpoint: req.endpoint.clone(),
-            // Skip metadata endpoint for IPv6 as it's an IPv4-only address (10.1.0.1)
-            metadata_endpoint: String::new(),
+            metadata_endpoint: req.metadata_endpoint.clone(),
             dns: req.v6_ping_config.dns.clone(),
             ip_version: 6,
             ping_hosts: req.v6_ping_config.ping_hosts.clone(),

nym-ip-packet-client/src/connect.rs

@@ -133,8 +133,7 @@ impl IprClientConnect {
 
         let timeout = sleep(IPR_CONNECT_TIMEOUT);
         tokio::pin!(timeout);
-
-        let mixnet_cancel_token = self.mixnet_client.cancellation_token();
+        let shutdown_event = self.mixnet_client.shutdown_event();
 
         loop {
             tokio::select! {
@@ -142,15 +141,14 @@ impl IprClientConnect {
                     error!("Cancelled while waiting for reply to connect request");
                     return Err(Error::Cancelled);
                 },
-
-                _ = mixnet_cancel_token.cancelled() => {
-                    error!("Mixnet client stopped while waiting for reply to connect request");
-                    return Err(Error::Cancelled);
-                },
                 _ = &mut timeout => {
                     error!("Timed out waiting for reply to connect request");
                     return Err(Error::TimeoutWaitingForConnectResponse);
                 },
+                _ = shutdown_event.wait() => {
+                    error!("Mixnet client stopped while waiting for reply to connect request");
+                    return Err(Error::Cancelled);
+                },
                 msgs = self.mixnet_client.wait_for_messages() => match msgs {
                     None => {
                         return Err(Error::NoMixnetMessagesReceived);

nym-node-status-api/nym-node-status-api/.sqlx/query-283f49a65c7d70bf271702ff6a5c7ad6e68c81932d295ff18ed198c54706a57c.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n            node_id,\n            ed25519_identity_pubkey,\n            total_stake,\n            ip_addresses as \"ip_addresses!: serde_json::Value\",\n            mix_port,\n            x25519_sphinx_pubkey,\n            node_role as \"node_role: serde_json::Value\",\n            supported_roles as \"supported_roles: serde_json::Value\",\n            entry as \"entry: serde_json::Value\",\n            performance,\n            self_described as \"self_described: serde_json::Value\",\n            bond_info as \"bond_info: serde_json::Value\",\n            http_api_port\n        FROM\n            nym_nodes\n        ORDER BY\n            node_id\n        ",
+  "query": "SELECT\n            node_id,\n            ed25519_identity_pubkey,\n            total_stake,\n            ip_addresses as \"ip_addresses!: serde_json::Value\",\n            mix_port,\n            x25519_sphinx_pubkey,\n            node_role as \"node_role: serde_json::Value\",\n            supported_roles as \"supported_roles: serde_json::Value\",\n            entry as \"entry: serde_json::Value\",\n            performance,\n            self_described as \"self_described: serde_json::Value\",\n            bond_info as \"bond_info: serde_json::Value\"\n        FROM\n            nym_nodes\n        WHERE\n            self_described IS NOT NULL\n        AND\n            bond_info IS NOT NULL\n        ",
   "describe": {
     "columns": [
       {
@@ -62,11 +62,6 @@
         "ordinal": 11,
         "name": "bond_info: serde_json::Value",
         "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 12,
-        "name": "http_api_port",
-        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -84,9 +79,8 @@
       true,
       false,
       true,
-      true,
       true
     ]
   },
-  "hash": "3ddc12cc4e1796b787a50c40560d2bd71d1cfe5f5265e6f161b3122d1317a421"
+  "hash": "283f49a65c7d70bf271702ff6a5c7ad6e68c81932d295ff18ed198c54706a57c"
 }

nym-node-status-api/nym-node-status-api/.sqlx/query-8c92a413a2853a2508c0e8a17ae8723c400930663c4c76e96dfdc7e8c98501ca.json

@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE ecash_ticketbook SET used_tickets = used_tickets + 1 WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8c92a413a2853a2508c0e8a17ae8723c400930663c4c76e96dfdc7e8c98501ca"
+}

nym-node-status-api/nym-node-status-api/.sqlx/query-af5c78ef980e38d81f58f72f21c9cd410f83b8750196e0cf5fa5af23883e76df.json

@@ -1,65 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                UPDATE ecash_ticketbook\n                SET used_tickets = used_tickets + 1\n                WHERE id = (\n                    SELECT id\n                    FROM ecash_ticketbook\n                    WHERE used_tickets < total_tickets\n                        AND expiration_date >= $1\n                        AND ticketbook_type = $2\n                    ORDER BY expiration_date ASC\n                    LIMIT 1\n                    FOR UPDATE\n                )\n                RETURNING *\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "serialization_revision",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "ticketbook_type",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "ticketbook_data",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 4,
-        "name": "expiration_date",
-        "type_info": "Date"
-      },
-      {
-        "ordinal": 5,
-        "name": "epoch_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 6,
-        "name": "total_tickets",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 7,
-        "name": "used_tickets",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Date",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "af5c78ef980e38d81f58f72f21c9cd410f83b8750196e0cf5fa5af23883e76df"
-}

nym-node-status-api/nym-node-status-api/.sqlx/query-b010fb91828f7e4f0b72bdfe3b58b2abb437cccdb6ebd2e1087cc822ed737b0e.json

@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO nym_nodes\n                (node_id, ed25519_identity_pubkey,\n                    total_stake,\n                    ip_addresses, mix_port,\n                    x25519_sphinx_pubkey, node_role,\n                    supported_roles, entry,\n                    self_described,\n                    bond_info,\n                    performance, last_updated_utc\n                )\n                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)\n                ON CONFLICT(node_id) DO UPDATE SET\n                ed25519_identity_pubkey=excluded.ed25519_identity_pubkey,\n                ip_addresses=excluded.ip_addresses,\n                mix_port=excluded.mix_port,\n                x25519_sphinx_pubkey=excluded.x25519_sphinx_pubkey,\n                node_role=excluded.node_role,\n                supported_roles=excluded.supported_roles,\n                entry=excluded.entry,\n                self_described=excluded.self_described,\n                bond_info=excluded.bond_info,\n                performance=excluded.performance,\n                last_updated_utc=excluded.last_updated_utc\n                ;",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Varchar",
+        "Int8",
+        "Jsonb",
+        "Int4",
+        "Varchar",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb",
+        "Jsonb",
+        "Varchar",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b010fb91828f7e4f0b72bdfe3b58b2abb437cccdb6ebd2e1087cc822ed737b0e"
+}

nym-node-status-api/nym-node-status-api/.sqlx/query-c48d04fc3de59dd484f0a63d40336ced54e08785f77e9ef85f3157d004ec85dc.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n            node_id,\n            ed25519_identity_pubkey,\n            total_stake,\n            ip_addresses as \"ip_addresses!: serde_json::Value\",\n            mix_port,\n            x25519_sphinx_pubkey,\n            node_role as \"node_role: serde_json::Value\",\n            supported_roles as \"supported_roles: serde_json::Value\",\n            entry as \"entry: serde_json::Value\",\n            performance,\n            self_described as \"self_described: serde_json::Value\",\n            bond_info as \"bond_info: serde_json::Value\",\n            http_api_port\n        FROM\n            nym_nodes\n        WHERE\n            self_described IS NOT NULL\n        AND\n            bond_info IS NOT NULL\n        ",
+  "query": "SELECT\n            node_id,\n            ed25519_identity_pubkey,\n            total_stake,\n            ip_addresses as \"ip_addresses!: serde_json::Value\",\n            mix_port,\n            x25519_sphinx_pubkey,\n            node_role as \"node_role: serde_json::Value\",\n            supported_roles as \"supported_roles: serde_json::Value\",\n            entry as \"entry: serde_json::Value\",\n            performance,\n            self_described as \"self_described: serde_json::Value\",\n            bond_info as \"bond_info: serde_json::Value\"\n        FROM\n            nym_nodes\n        ORDER BY\n            node_id\n        ",
   "describe": {
     "columns": [
       {
@@ -62,11 +62,6 @@
         "ordinal": 11,
         "name": "bond_info: serde_json::Value",
         "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 12,
-        "name": "http_api_port",
-        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -84,9 +79,8 @@
       true,
       false,
       true,
-      true,
       true
     ]
   },
-  "hash": "0b51df277ed66c6553f66af9b135342dee177abc1c92e4a89147de3c22d3d1a5"
+  "hash": "c48d04fc3de59dd484f0a63d40336ced54e08785f77e9ef85f3157d004ec85dc"
 }

nym-node-status-api/nym-node-status-api/.sqlx/query-dde9aff827c34086077927bbe33fa3d5c939e7122ba7c88b78a353f00b271ec2.json

@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO nym_nodes\n                (node_id, ed25519_identity_pubkey,\n                    total_stake,\n                    ip_addresses, mix_port,\n                    x25519_sphinx_pubkey, node_role,\n                    supported_roles, entry,\n                    self_described,\n                    bond_info,\n                    performance, last_updated_utc, http_api_port\n                )\n                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)\n                ON CONFLICT(node_id) DO UPDATE SET\n                ed25519_identity_pubkey=excluded.ed25519_identity_pubkey,\n                ip_addresses=excluded.ip_addresses,\n                mix_port=excluded.mix_port,\n                x25519_sphinx_pubkey=excluded.x25519_sphinx_pubkey,\n                node_role=excluded.node_role,\n                supported_roles=excluded.supported_roles,\n                entry=excluded.entry,\n                self_described=excluded.self_described,\n                bond_info=excluded.bond_info,\n                performance=excluded.performance,\n                last_updated_utc=excluded.last_updated_utc,\n                http_api_port=excluded.http_api_port\n                ;",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Varchar",
-        "Int8",
-        "Jsonb",
-        "Int4",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb",
-        "Jsonb",
-        "Varchar",
-        "Int4",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "dde9aff827c34086077927bbe33fa3d5c939e7122ba7c88b78a353f00b271ec2"
-}

nym-node-status-api/nym-node-status-api/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node-status-api"
-version = "4.0.11-rc1"
+version = "4.0.9"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

nym-node-status-api/nym-node-status-api/migrations_pg/20251008000000_nym_nodes_add_http_api_port.sql

@@ -1,2 +0,0 @@
-ALTER TABLE nym_nodes
-    ADD COLUMN IF NOT EXISTS http_api_port INTEGER;

nym-node-status-api/nym-node-status-api/src/cli/mod.rs

@@ -1,5 +1,5 @@
 use crate::ticketbook_manager::TicketbookManagerConfig;
-use clap::{Parser, Subcommand};
+use clap::Parser;
 use nym_bin_common::bin_info;
 use nym_credential_proxy_lib::shared_state::ecash_state::TicketType;
 use reqwest::Url;
@@ -105,19 +105,6 @@ pub(crate) struct Cli {
 
     #[clap(flatten)]
     pub(crate) ticketbook: TicketbookArgs,
-
-    #[command(subcommand)]
-    pub(crate) command: Option<Commands>,
-}
-
-#[derive(Subcommand, Debug)]
-pub(crate) enum Commands {
-    /// Scrape a single node and output detailed debug logs
-    ScrapeNode {
-        /// The id of the node to scrape
-        #[arg(long)]
-        node_id: i64,
-    },
 }
 
 #[derive(Debug, Parser)]

nym-node-status-api/nym-node-status-api/src/db/mod.rs

@@ -1,4 +1,5 @@
 use anyhow::{Result, anyhow};
+use std::ops::{Deref, DerefMut};
 use std::{str::FromStr, time::Duration};
 
 pub(crate) mod models;
@@ -7,7 +8,9 @@ pub(crate) mod queries;
 #[cfg(test)]
 mod tests;
 
-use sqlx::{ConnectOptions, PgPool, Postgres, migrate::Migrator, postgres::PgConnectOptions};
+use sqlx::{
+    ConnectOptions, PgPool, Postgres, Transaction, migrate::Migrator, postgres::PgConnectOptions,
+};
 
 static MIGRATOR: Migrator = sqlx::migrate!("./migrations_pg");
 
@@ -15,6 +18,35 @@ pub(crate) type DbPool = PgPool;
 
 pub(crate) type DbConnection = sqlx::pool::PoolConnection<Postgres>;
 
+pub(crate) struct StorageTransaction<'a> {
+    inner: Transaction<'a, Postgres>,
+}
+
+impl<'a> StorageTransaction<'a> {
+    pub(crate) async fn commit(self) -> Result<(), sqlx::Error> {
+        self.inner.commit().await
+    }
+}
+
+impl<'a> From<Transaction<'a, Postgres>> for StorageTransaction<'a> {
+    fn from(inner: Transaction<'a, Postgres>) -> Self {
+        Self { inner }
+    }
+}
+
+impl<'a> Deref for StorageTransaction<'a> {
+    type Target = Transaction<'a, Postgres>;
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<'a> DerefMut for StorageTransaction<'a> {
+    fn deref_mut(&mut self) -> &mut Transaction<'a, Postgres> {
+        &mut self.inner
+    }
+}
+
 #[derive(Clone)]
 pub(crate) struct Storage {
     pool: DbPool,

nym-node-status-api/nym-node-status-api/src/db/models.rs

@@ -381,7 +381,7 @@ impl ScrapeNodeKind {
 pub(crate) struct ScraperNodeInfo {
     pub node_kind: ScrapeNodeKind,
     pub hosts: Vec<String>,
-    pub http_api_port: Option<u16>,
+    pub http_api_port: i64,
 }
 
 impl ScraperNodeInfo {
@@ -395,21 +395,8 @@ impl ScraperNodeInfo {
                 format!("http://{}", host),
             ]);
 
-            if let Some(custom_http_api_port) = self.http_api_port {
-                urls = Vec::new();
-                for host in &self.hosts {
-                    urls.append(&mut vec![format!(
-                        "http://{}:{}",
-                        host, custom_http_api_port
-                    )]);
-                }
-
-                // do not fall back to default ports, if the operator sets a custom http api port
-                // in their bond, use it and error out if it's not available
-                // this will correctly handle cases where some operators run multiple nodes
-                // on a single IP address and assign different custom http port apis at bond time
-
-                // urls.insert(0, format!("http://{}:{}", host, custom_http_api_port));
+            if self.http_api_port != DEFAULT_NYM_NODE_HTTP_PORT as i64 {
+                urls.insert(0, format!("http://{}:{}", host, self.http_api_port));
             }
         }
 
@@ -436,7 +423,6 @@ pub(crate) struct NymNodeDto {
     pub performance: String,
     pub self_described: Option<serde_json::Value>,
     pub bond_info: Option<serde_json::Value>,
-    pub http_api_port: Option<i32>,
 }
 
 #[allow(dead_code)] // it's not dead code but clippy doesn't detect usage in sqlx macros
@@ -454,7 +440,6 @@ pub(crate) struct NymNodeInsertRecord {
     pub entry: Option<serde_json::Value>,
     pub self_described: Option<serde_json::Value>,
     pub bond_info: Option<serde_json::Value>,
-    pub http_api_port: Option<i32>,
     pub last_updated_utc: i64,
 }
 
@@ -471,12 +456,6 @@ impl NymNodeInsertRecord {
             .map(|info| decimal_to_i64(info.total_stake()))
             .unwrap_or(0);
         let entry = serialize_opt_to_value!(skimmed_node.entry)?;
-        let http_api_port = bond_info.and_then(|bond| {
-            bond.bond_information
-                .node
-                .custom_http_port
-                .map(|port| port as i32)
-        });
         let bond_info = serialize_opt_to_value!(bond_info)?;
         let self_described = serialize_opt_to_value!(self_described)?;
 
@@ -493,7 +472,6 @@ impl NymNodeInsertRecord {
             entry,
             self_described,
             bond_info,
-            http_api_port,
             last_updated_utc: now,
         };
 

nym-node-status-api/nym-node-status-api/src/db/queries/ecash_data.rs

@@ -1,7 +1,7 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use crate::db::Storage;
+use crate::db::{Storage, StorageTransaction};
 use crate::ticketbook_manager::storage::auxiliary_models::StoredIssuedTicketbook;
 use nym_credential_proxy_lib::storage::models::{
     RawCoinIndexSignatures, RawExpirationDateSignatures, RawVerificationKey,
@@ -10,6 +10,10 @@ use time::Date;
 use tracing::error;
 
 impl Storage {
+    pub(crate) async fn begin_storage_tx(&self) -> Result<StorageTransaction<'_>, sqlx::Error> {
+        self.pool.begin().await.map(Into::into)
+    }
+
     pub(crate) async fn available_tickets_of_type(&self, typ: &str) -> Result<i64, sqlx::Error> {
         let count = sqlx::query!(
             r#"
@@ -213,38 +217,46 @@ impl Storage {
             .await?;
         Ok(())
     }
+}
 
+impl<'a> StorageTransaction<'a> {
     pub(crate) async fn get_next_unspent_ticketbook(
-        &self,
+        &mut self,
         ticket_type: String,
         deadline: Date,
     ) -> Result<Option<StoredIssuedTicketbook>, sqlx::Error> {
-        sqlx::query_as!(
-            StoredIssuedTicketbook,
+        sqlx::query_as(
             r#"
-                UPDATE ecash_ticketbook
-                SET used_tickets = used_tickets + 1
-                WHERE id = (
-                    SELECT id
-                    FROM ecash_ticketbook
-                    WHERE used_tickets < total_tickets
-                        AND expiration_date >= $1
-                        AND ticketbook_type = $2
-                    ORDER BY expiration_date ASC
-                    LIMIT 1
-                    FOR UPDATE
-                )
-                RETURNING *
+                SELECT *
+                FROM ecash_ticketbook
+                WHERE used_tickets + 1 <= total_tickets
+                AND expiration_date >= $1
+                AND ticketbook_type = $2
+                ORDER BY expiration_date ASC
+                LIMIT 1
             "#,
-            deadline,
-            ticket_type
         )
-        .fetch_optional(&self.pool)
+        .bind(deadline)
+        .bind(ticket_type)
+        .fetch_optional(&mut ***self)
         .await
     }
 
+    pub(crate) async fn increase_used_ticketbook_tickets(
+        &mut self,
+        ticketbook_id: i32,
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            "UPDATE ecash_ticketbook SET used_tickets = used_tickets + 1 WHERE id = $1",
+            ticketbook_id
+        )
+        .execute(&mut ***self)
+        .await?;
+        Ok(())
+    }
+
     pub(crate) async fn set_distributed_ticketbook(
-        &self,
+        &mut self,
         testrun_id: i32,
         ticketbook_id: i32,
         assigned_index: i32,
@@ -259,7 +271,7 @@ impl Storage {
             ticketbook_id,
             assigned_index
         )
-        .execute(&self.pool)
+        .execute(&mut ***self)
         .await?;
         Ok(())
     }

nym-node-status-api/nym-node-status-api/src/db/queries/nym_nodes.rs

@@ -35,8 +35,7 @@ pub(crate) async fn get_all_nym_nodes(pool: &DbPool) -> anyhow::Result<Vec<NymNo
             entry as "entry: serde_json::Value",
             performance,
             self_described as "self_described: serde_json::Value",
-            bond_info as "bond_info: serde_json::Value",
-            http_api_port
+            bond_info as "bond_info: serde_json::Value"
         FROM
             nym_nodes
         ORDER BY
@@ -73,8 +72,7 @@ pub(crate) async fn get_described_bonded_nym_nodes(
             entry as "entry: serde_json::Value",
             performance,
             self_described as "self_described: serde_json::Value",
-            bond_info as "bond_info: serde_json::Value",
-            http_api_port
+            bond_info as "bond_info: serde_json::Value"
         FROM
             nym_nodes
         WHERE
@@ -117,9 +115,9 @@ pub(crate) async fn update_nym_nodes(
                     supported_roles, entry,
                     self_described,
                     bond_info,
-                    performance, last_updated_utc, http_api_port
+                    performance, last_updated_utc
                 )
-                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)
                 ON CONFLICT(node_id) DO UPDATE SET
                 ed25519_identity_pubkey=excluded.ed25519_identity_pubkey,
                 ip_addresses=excluded.ip_addresses,
@@ -131,8 +129,7 @@ pub(crate) async fn update_nym_nodes(
                 self_described=excluded.self_described,
                 bond_info=excluded.bond_info,
                 performance=excluded.performance,
-                last_updated_utc=excluded.last_updated_utc,
-                http_api_port=excluded.http_api_port
+                last_updated_utc=excluded.last_updated_utc
                 ;",
             record.node_id,
             record.ed25519_identity_pubkey,
@@ -147,7 +144,6 @@ pub(crate) async fn update_nym_nodes(
             record.bond_info,
             record.performance,
             record.last_updated_utc as i32,
-            record.http_api_port,
         )
         .execute(&mut *tx)
         .await

nym-node-status-api/nym-node-status-api/src/db/queries/scraper.rs

@@ -21,11 +21,10 @@ pub(crate) async fn get_nodes_for_scraping(pool: &DbPool) -> Result<Vec<ScraperN
     let skimmed_nodes = queries::get_described_bonded_nym_nodes(pool)
         .await
         .map(|nodes_dto| {
-            nodes_dto.into_iter().filter_map(|node_dto| {
-                let node_id = node_dto.node_id;
-                let http_api_port = node_dto.http_api_port;
-                match SkimmedNode::try_from(node_dto) {
-                    Ok(node) => Some((node, http_api_port)),
+            nodes_dto.into_iter().filter_map(|node| {
+                let node_id = node.node_id;
+                match SkimmedNode::try_from(node) {
+                    Ok(node) => Some(node),
                     Err(e) => {
                         tracing::error!("Failed to decode node_id={}: {}", node_id, e);
                         None
@@ -34,7 +33,7 @@ pub(crate) async fn get_nodes_for_scraping(pool: &DbPool) -> Result<Vec<ScraperN
             })
         })?;
 
-    skimmed_nodes.for_each(|(node, http_api_port)| {
+    skimmed_nodes.for_each(|node| {
         // TODO: relies on polyfilling: Nym nodes table might contain legacy mixnodes
         // as well. Categorize them here.
         let node_kind = if gateway_keys.contains(&node.ed25519_identity_pubkey.to_base58_string()) {
@@ -55,7 +54,7 @@ pub(crate) async fn get_nodes_for_scraping(pool: &DbPool) -> Result<Vec<ScraperN
                 .into_iter()
                 .map(|ip| ip.to_string())
                 .collect::<Vec<_>>(),
-            http_api_port: http_api_port.map(|port| port as u16),
+            http_api_port: node.mix_port.into(),
         })
     });
 

nym-node-status-api/nym-node-status-api/src/db/tests.rs

@@ -138,7 +138,6 @@ mod db_tests {
             performance: "1.0".to_string(),
             self_described: None,
             bond_info: None,
-            http_api_port: None,
         };
 
         let skimmed_node: nym_validator_client::nym_api::SkimmedNode =
@@ -363,42 +362,22 @@ fn test_scraper_node_info_contact_addresses() {
     let node_info = ScraperNodeInfo {
         node_kind: ScrapeNodeKind::MixingNymNode { node_id: 123 },
         hosts: vec!["1.1.1.1".to_string(), "example.com".to_string()],
-        http_api_port: None,
+        http_api_port: 8080,
     };
 
     let addresses = node_info.contact_addresses();
 
     // Should generate multiple URLs for each host
-    // When no custom port is specified only default ports should be used
+    // Custom port (8080) should be inserted at the beginning
     assert!(addresses.contains(&"http://1.1.1.1:8080".to_string()));
+    assert!(addresses.contains(&"http://example.com:8080".to_string()));
     assert!(addresses.contains(&"http://1.1.1.1:8000".to_string()));
     assert!(addresses.contains(&"https://1.1.1.1".to_string()));
-    assert!(addresses.contains(&"http://1.1.1.1".to_string()));
     assert!(addresses.contains(&"http://example.com:8000".to_string()));
     // Check that URLs follow the expected pattern
     assert!(addresses.len() >= 8); // At least 4 URLs per host
 }
 
-#[test]
-fn test_scraper_node_info_contact_addresses_with_custom_http_api_port() {
-    use crate::db::models::{ScrapeNodeKind, ScraperNodeInfo};
-
-    let node_info = ScraperNodeInfo {
-        node_kind: ScrapeNodeKind::MixingNymNode { node_id: 123 },
-        hosts: vec!["1.1.1.1".to_string(), "example.com".to_string()],
-        http_api_port: Some(4444),
-    };
-
-    let addresses = node_info.contact_addresses();
-
-    // Should generate multiple URLs for each host
-    // Custom port (4444) should be the only port in the list
-    assert!(addresses.contains(&"http://1.1.1.1:4444".to_string()));
-    assert!(addresses.contains(&"http://example.com:4444".to_string()));
-    // Check that URLs follow the expected pattern
-    assert!(addresses.len() >= 2); // At least 4 URLs per host
-}
-
 #[test]
 fn test_scrape_node_kind_node_id() {
     use crate::db::models::ScrapeNodeKind;
@@ -435,7 +414,6 @@ fn test_nym_node_dto_with_invalid_keys() {
         performance: "1.0".to_string(),
         self_described: None,
         bond_info: None,
-        http_api_port: None,
     };
 
     let result: Result<nym_validator_client::nym_api::SkimmedNode, _> = nym_node_dto.try_into();
@@ -473,7 +451,6 @@ fn test_nym_node_dto_with_invalid_performance() {
         performance: "invalid_percent".to_string(),
         self_described: None,
         bond_info: None,
-        http_api_port: None,
     };
 
     let result: Result<nym_validator_client::nym_api::SkimmedNode, _> = nym_node_dto.try_into();

nym-node-status-api/nym-node-status-api/src/main.rs

@@ -1,6 +1,4 @@
-use crate::cli::Commands;
 use crate::monitor::DelegationsCache;
-use crate::node_scraper::helpers::scrape_and_store_description_by_node_id;
 use crate::ticketbook_manager::TicketbookManager;
 use crate::ticketbook_manager::state::TicketbookManagerState;
 use clap::Parser;
@@ -42,49 +40,11 @@ async fn main() -> anyhow::Result<()> {
     tracing::info!("Registered {} agent keys", agent_key_list.len());
 
     let connection_url = args.database_url.clone();
-    if std::env::var("SHOW_CONFIG").ok().is_some() {
-        tracing::debug!("Using config:\n{:#?}", args);
-    }
+    tracing::debug!("Using config:\n{:#?}", args);
 
     let storage = db::Storage::init(connection_url, args.sqlx_busy_timeout_s).await?;
     let db_pool = storage.pool_owned();
 
-    // node geocache is shared between node monitor and HTTP server
-    let geocache = moka::future::Cache::builder()
-        .time_to_live(args.geodata_ttl)
-        .build();
-    let delegations_cache = DelegationsCache::new();
-
-    let client_config = nym_validator_client::nyxd::Config::try_from_nym_network_details(
-        &nym_network_defaults::NymNetworkDetails::new_from_env(),
-    )?;
-    let nyxd_client = NyxdClient::connect(client_config.clone(), args.nyxd_addr.as_str())
-        .map_err(|err| anyhow::anyhow!("Couldn't connect: {}", err))?;
-
-    match args.command {
-        Some(Commands::ScrapeNode { node_id }) => {
-            if std::env::var("RUN_ONCE_INIT_NODES").ok().is_some() {
-                let geocache_clone = geocache.clone();
-                let delegations_cache_clone = Arc::clone(&delegations_cache);
-                monitor::run_once(
-                    db_pool.clone(),
-                    args.nym_api_client_timeout,
-                    nyxd_client,
-                    args.ipinfo_api_token,
-                    geocache_clone,
-                    delegations_cache_clone,
-                )
-                .await?;
-            }
-            tracing::info!("Scraping node with id {node_id}...");
-            scrape_and_store_description_by_node_id(&db_pool, node_id).await?;
-            return Ok(());
-        }
-        None => {
-            // default behaviour
-        }
-    }
-
     // Start the node scraper
     let scraper = node_scraper::DescriptionScraper::new(storage.pool_owned());
     shutdown_manager.spawn_with_shutdown(async move {
@@ -98,9 +58,20 @@ async fn main() -> anyhow::Result<()> {
         scraper.start().await;
     });
 
+    // node geocache is shared between node monitor and HTTP server
+    let geocache = moka::future::Cache::builder()
+        .time_to_live(args.geodata_ttl)
+        .build();
+    let delegations_cache = DelegationsCache::new();
+
     // Start the monitor
     let geocache_clone = geocache.clone();
     let delegations_cache_clone = Arc::clone(&delegations_cache);
+    let client_config = nym_validator_client::nyxd::Config::try_from_nym_network_details(
+        &nym_network_defaults::NymNetworkDetails::new_from_env(),
+    )?;
+    let nyxd_client = NyxdClient::connect(client_config.clone(), args.nyxd_addr.as_str())
+        .map_err(|err| anyhow::anyhow!("Couldn't connect: {}", err))?;
 
     shutdown_manager.spawn_with_shutdown(async move {
         monitor::run_in_background(

nym-node-status-api/nym-node-status-api/src/metrics_scraper/mod.rs

@@ -57,7 +57,7 @@ async fn run(
         .clone()
         .expect("rust sdk mainnet default missing api_url");
 
-    let nym_api = nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])?
+    let nym_api = nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
         .no_hickory_dns()
         .with_timeout(nym_api_client_timeout)
         .build()?;

nym-node-status-api/nym-node-status-api/src/monitor/mod.rs

@@ -68,7 +68,7 @@ pub(crate) async fn run_in_background(
     loop {
         tracing::info!("Refreshing node info...");
 
-        if let Err(e) = monitor.run(false).await {
+        if let Err(e) = monitor.run().await {
             tracing::error!(
                 "Monitor run failed: {e}, retrying in {}s...",
                 MONITOR_FAILURE_RETRY_DELAY.as_secs()
@@ -84,33 +84,8 @@ pub(crate) async fn run_in_background(
     }
 }
 
-#[instrument(level = "debug", name = "data_monitor", skip_all)]
-pub(crate) async fn run_once(
-    db_pool: DbPool,
-    nym_api_client_timeout: Duration,
-    nyxd_client: nym_validator_client::QueryHttpRpcNyxdClient,
-    ipinfo_api_token: String,
-    geocache: NodeGeoCache,
-    node_delegations: Arc<RwLock<DelegationsCache>>,
-) -> anyhow::Result<()> {
-    let ipinfo = IpInfoClient::new(ipinfo_api_token.clone());
-
-    let mut monitor = Monitor {
-        db_pool,
-        network_details: nym_network_defaults::NymNetworkDetails::new_from_env(),
-        nym_api_client_timeout,
-        nyxd_client,
-        ipinfo,
-        geocache,
-        node_delegations,
-    };
-
-    tracing::info!("Refreshing node info...");
-    monitor.run(true).await
-}
-
 impl Monitor {
-    async fn run(&mut self, exit_early: bool) -> anyhow::Result<()> {
+    async fn run(&mut self) -> anyhow::Result<()> {
         self.check_ipinfo_bandwidth().await;
 
         let default_api_url = self
@@ -123,7 +98,7 @@ impl Monitor {
             .expect("rust sdk mainnet default missing api_url");
 
         let nym_api =
-            nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])?
+            nym_http_api_client::ClientBuilder::new_with_urls(vec![default_api_url.into()])
                 .no_hickory_dns()
                 .with_timeout(self.nym_api_client_timeout)
                 .build()?;
@@ -178,11 +153,6 @@ impl Monitor {
                 tracing::debug!("{} nym nodes written to DB!", inserted);
             })?;
 
-        // stop here if running once
-        if exit_early {
-            return Ok(());
-        }
-
         // refresh geodata for all nodes
         for node_description in described_nodes.values() {
             self.location_cached(node_description).await;

nym-node-status-api/nym-node-status-api/src/node_scraper/helpers.rs

@@ -118,17 +118,6 @@ pub fn sanitize_description(
     }
 }
 
-pub async fn scrape_and_store_description_by_node_id(pool: &DbPool, node_id: i64) -> Result<()> {
-    let nodes = crate::db::queries::get_nodes_for_scraping(pool).await?;
-    match nodes.iter().find(|n| *n.node_kind.node_id() == node_id) {
-        Some(node) => Ok(scrape_and_store_description(pool, node.clone()).await?),
-        None => {
-            error!("Could not find node with id {node_id}");
-            Err(anyhow!("Could not find node with id {node_id}"))
-        }
-    }
-}
-
 pub async fn scrape_and_store_description(pool: &DbPool, node: ScraperNodeInfo) -> Result<()> {
     let client = build_client()?;
     let urls = node.contact_addresses();
@@ -163,13 +152,7 @@ pub async fn scrape_and_store_description(pool: &DbPool, node: ScraperNodeInfo)
         anyhow::anyhow!("Failed to fetch description from any URL: {}", err_msg)
     })?;
 
-    let sanitized_description = sanitize_description(description.clone(), *node.node_id());
-
-    trace!("tried_url_list = {tried_url_list:?}");
-    trace!("ndoe_id = {}", node.node_id());
-    trace!("description = {:?}", description);
-    trace!("sanitized_description = {:?}", sanitized_description);
-
+    let sanitized_description = sanitize_description(description, *node.node_id());
     insert_scraped_node_description(pool, &node.node_kind, &sanitized_description).await?;
 
     Ok(())

nym-node-status-api/nym-node-status-api/src/ticketbook_manager/storage/mod.rs

@@ -91,14 +91,15 @@ impl TicketbookManagerStorage {
         testrun_id: i32,
     ) -> anyhow::Result<Option<RetrievedTicketbook>> {
         let deadline = ecash_today().ecash_date();
+        let mut tx = self.storage.begin_storage_tx().await?;
 
         // we don't want ticketbooks with expiration in the past
-        // note: this query updates the spent tickets atomically
-        let Some(raw) = self
-            .storage
+        let Some(raw) = tx
             .get_next_unspent_ticketbook(ticket_type.to_string(), deadline)
             .await?
         else {
+            // make sure to finish our tx
+            tx.commit().await?;
             return Ok(None);
         };
 
@@ -109,9 +110,10 @@ impl TicketbookManagerStorage {
         )
         .map_err(|err| anyhow!("failed to deserialise stored ticketbook: {err}"))?;
 
-        self.storage
-            .set_distributed_ticketbook(testrun_id, raw.id, raw.used_tickets)
+        tx.set_distributed_ticketbook(testrun_id, raw.id, raw.used_tickets)
             .await?;
+        tx.increase_used_ticketbook_tickets(raw.id).await?;
+        tx.commit().await?;
 
         deserialised.update_spent_tickets(raw.used_tickets as u64);
         Ok(Some(RetrievedTicketbook {

nym-node/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nym-node"
-version = "1.19.0"
+version = "1.16.0"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

nym-node/src/node/replay_protection/background_task.rs

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::config::Config;
-use crate::config::persistence::DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT;
+use crate::config::persistence::{
+    DEFAULT_RD_BLOOMFILTER_FILE_EXT, DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT,
+};
 use crate::error::NymNodeError;
 use crate::node::replay_protection::bloomfilter::RotationFilter;
 use crate::node::replay_protection::helpers::parse_rotation_id_from_filename;
@@ -22,6 +24,7 @@ use tracing::{debug, error, info, trace, warn};
 
 // background task responsible for periodically flushing the bloomfilters to disk
 pub struct ReplayProtectionDiskFlush {
+    bloomfilters_directory: PathBuf,
     disk_flushing_rate: Duration,
 
     filters_manager: ReplayProtectionBloomfiltersManager,
@@ -121,25 +124,8 @@ impl ReplayProtectionDiskFlush {
                 None
             };
 
-        // if we have any other stored bloomfilters that are neither primary nor secondary,
-        // remove them - they are an artifact from an old version that had a bug in purging code
-        for (rotation_id, path) in filter_files {
-            if rotation_id == primary_key_rotation_id {
-                continue;
-            }
-            if let Some(secondary_key_rotation_id) = secondary_key_rotation_id
-                && secondary_key_rotation_id == rotation_id
-            {
-                continue;
-            }
-            info!(
-                "stale bloomfilter for rotation {rotation_id} found at: {path:?}. it is going to get removed"
-            );
-            fs::remove_file(&path)
-                .map_err(|source| NymNodeError::BloomfilterIoFailure { source, path })?;
-        }
-
         Ok(ReplayProtectionDiskFlush {
+            bloomfilters_directory,
             disk_flushing_rate: config
                 .mixnet
                 .replay_protection
@@ -156,12 +142,15 @@ impl ReplayProtectionDiskFlush {
     }
 
     fn bloomfilter_filepath(&self, rotation_id: u32) -> PathBuf {
-        self.filters_manager.bloomfilter_filepath(rotation_id)
+        self.bloomfilters_directory
+            .join(format!("rot-{rotation_id}"))
+            .with_extension(DEFAULT_RD_BLOOMFILTER_FILE_EXT)
     }
 
     fn current_bloomfilter_being_flushed_filepath(&self, rotation_id: u32) -> PathBuf {
-        self.filters_manager
-            .current_bloomfilter_being_flushed_filepath(rotation_id)
+        self.bloomfilters_directory
+            .join(format!("rot-{rotation_id}"))
+            .with_extension(DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT)
     }
 
     pub(crate) fn bloomfilters_manager(&self) -> ReplayProtectionBloomfiltersManager {
@@ -224,7 +213,7 @@ impl ReplayProtectionDiskFlush {
     }
 
     async fn flush_filters_to_disk(&self) -> Result<(), NymNodeError> {
-        if let Some(parent) = self.filters_manager.bloomfilters_directory().parent() {
+        if let Some(parent) = self.bloomfilters_directory.parent() {
             fs::create_dir_all(parent).map_err(|source| NymNodeError::BloomfilterIoFailure {
                 source,
                 path: parent.to_path_buf(),

nym-node/src/node/replay_protection/bloomfilter.rs

@@ -4,7 +4,6 @@
 use crate::error::NymNodeError;
 use bloomfilter::Bloom;
 use nym_sphinx_types::REPLAY_TAG_SIZE;
-use nym_validator_client::models::KeyRotationId;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
@@ -13,6 +12,7 @@ use std::path::Path;
 use std::sync::{Arc, Mutex, PoisonError, TryLockError};
 use time::OffsetDateTime;
 use tracing::{error, info, warn};
+
 // auxiliary data associated with the bloomfilter to get some statistics from the time of its creation
 // this is needed in order to more accurately resize it upon reset
 
@@ -180,16 +180,15 @@ impl ReplayProtectionBloomfilters {
         Ok(())
     }
 
-    pub(crate) fn purge_secondary(&self) -> Result<Option<KeyRotationId>, NymNodeError> {
+    pub(crate) fn purge_secondary(&self) -> Result<(), NymNodeError> {
         let mut guard = self
             .inner
             .lock()
             .map_err(|_| NymNodeError::BloomfilterFailure {
                 message: "mutex got poisoned",
             })?;
-
-        let id = guard.overlap.take().map(|f| f.metadata.rotation_id);
-        Ok(id)
+        guard.overlap = None;
+        Ok(())
     }
 
     pub(crate) fn primary_metadata(

nym-node/src/node/replay_protection/manager.rs

@@ -2,25 +2,18 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::config::Config;
-use crate::config::persistence::{
-    DEFAULT_RD_BLOOMFILTER_FILE_EXT, DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT,
-};
 use crate::error::NymNodeError;
 use crate::node::replay_protection::bloomfilter::{ReplayProtectionBloomfilters, RotationFilter};
 use crate::node::replay_protection::items_in_bloomfilter;
 use human_repr::HumanCount;
 use nym_node_metrics::NymNodeMetrics;
 use std::cmp::max;
-use std::fs;
-use std::path::PathBuf;
 use std::time::Duration;
 use time::OffsetDateTime;
 use tracing::info;
 
 #[derive(Clone)]
 pub(crate) struct ReplayProtectionBloomfiltersManager {
-    bloomfilters_directory: PathBuf,
-
     target_fp_p: f64,
     minimum_bloomfilter_packets_per_second: usize,
     bloomfilter_size_multiplier: f64,
@@ -33,7 +26,6 @@ impl ReplayProtectionBloomfiltersManager {
     pub(crate) fn new_disabled(metrics: NymNodeMetrics) -> Self {
         // the exact config values are irrelevant as the filters will never be recreated
         ReplayProtectionBloomfiltersManager {
-            bloomfilters_directory: Default::default(),
             target_fp_p: 0.001,
             minimum_bloomfilter_packets_per_second: 1,
             bloomfilter_size_multiplier: 1.0,
@@ -49,12 +41,6 @@ impl ReplayProtectionBloomfiltersManager {
         metrics: NymNodeMetrics,
     ) -> Self {
         ReplayProtectionBloomfiltersManager {
-            bloomfilters_directory: config
-                .mixnet
-                .replay_protection
-                .storage_paths
-                .current_bloomfilters_directory
-                .clone(),
             target_fp_p: config.mixnet.replay_protection.debug.false_positive_rate,
             minimum_bloomfilter_packets_per_second: config
                 .mixnet
@@ -71,22 +57,6 @@ impl ReplayProtectionBloomfiltersManager {
         }
     }
 
-    pub(crate) fn bloomfilters_directory(&self) -> &PathBuf {
-        &self.bloomfilters_directory
-    }
-
-    pub(crate) fn bloomfilter_filepath(&self, rotation_id: u32) -> PathBuf {
-        self.bloomfilters_directory
-            .join(format!("rot-{rotation_id}"))
-            .with_extension(DEFAULT_RD_BLOOMFILTER_FILE_EXT)
-    }
-
-    pub(crate) fn current_bloomfilter_being_flushed_filepath(&self, rotation_id: u32) -> PathBuf {
-        self.bloomfilters_directory
-            .join(format!("rot-{rotation_id}"))
-            .with_extension(DEFAULT_RD_BLOOMFILTER_FLUSH_FILE_EXT)
-    }
-
     pub(crate) fn bloomfilters(&self) -> ReplayProtectionBloomfilters {
         self.filters.clone()
     }
@@ -100,14 +70,7 @@ impl ReplayProtectionBloomfiltersManager {
     }
 
     pub(crate) fn purge_secondary(&self) -> Result<(), NymNodeError> {
-        // remove data in memory
-        if let Some(secondary_id) = self.filters.purge_secondary()? {
-            // remove data on disk (if applicable)
-            let path = self.bloomfilter_filepath(secondary_id);
-            fs::remove_file(&path)
-                .map_err(|source| NymNodeError::BloomfilterIoFailure { source, path })?;
-        }
-        Ok(())
+        self.filters.purge_secondary()
     }
 
     pub(crate) fn promote_pre_announced(&self) -> Result<(), NymNodeError> {

nym-registration-client/Cargo.toml

@@ -12,12 +12,10 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-futures.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
 tracing.workspace = true
-typed-builder.workspace = true
 url.workspace = true
 
 nym-authenticator-client = { path = "../nym-authenticator-client" }

nym-registration-client/src/builder/config.rs

@@ -15,12 +15,10 @@ use nym_sdk::{
 use std::os::fd::RawFd;
 use std::{path::PathBuf, sync::Arc, time::Duration};
 use tokio_util::sync::CancellationToken;
-use typed_builder::TypedBuilder;
 
 use crate::error::RegistrationClientError;
 
 const VPN_AVERAGE_PACKET_DELAY: Duration = Duration::from_millis(15);
-const MIXNET_CLIENT_STARTUP_TIMEOUT: Duration = Duration::from_secs(30);
 
 #[derive(Clone)]
 pub struct NymNodeWithKeys {
@@ -28,14 +26,11 @@ pub struct NymNodeWithKeys {
     pub keys: Arc<KeyPair>,
 }
 
-#[derive(TypedBuilder)]
 pub struct BuilderConfig {
     pub entry_node: NymNodeWithKeys,
     pub exit_node: NymNodeWithKeys,
     pub data_path: Option<PathBuf>,
     pub mixnet_client_config: MixnetClientConfig,
-    #[builder(default = MIXNET_CLIENT_STARTUP_TIMEOUT)]
-    pub mixnet_client_startup_timeout: Duration,
     pub two_hops: bool,
     pub user_agent: UserAgent,
     pub custom_topology_provider: Box<dyn TopologyProvider + Send + Sync>,
@@ -211,17 +206,3 @@ fn log_mixnet_client_config(debug_config: &DebugConfig) {
 fn true_to_disabled(val: bool) -> &'static str {
     if val { "disabled" } else { "enabled" }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_mixnet_client_config_default_values() {
-        let config = MixnetClientConfig::default();
-        assert!(!config.disable_poisson_rate);
-        assert!(!config.disable_background_cover_traffic);
-        assert_eq!(config.min_mixnode_performance, None);
-        assert_eq!(config.min_gateway_performance, None);
-    }
-}

nym-registration-client/src/builder/mod.rs

@@ -1,23 +1,25 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use futures::channel::mpsc;
 use nym_bandwidth_controller::{BandwidthController, BandwidthTicketProvider};
 use nym_credential_storage::ephemeral_storage::EphemeralCredentialStorage;
 use nym_sdk::{
     NymNetworkDetails,
-    mixnet::{EventSender, MixnetClient, MixnetClientBuilder},
+    mixnet::{MixnetClient, MixnetClientBuilder},
 };
 use nym_validator_client::{
     QueryHttpRpcNyxdClient,
     nyxd::{Config as NyxdClientConfig, NyxdClient},
 };
+use std::time::Duration;
 
 use crate::{RegistrationClient, config::RegistrationClientConfig, error::RegistrationClientError};
 use config::BuilderConfig;
 
 pub(crate) mod config;
 
+pub(crate) const MIXNET_CLIENT_STARTUP_TIMEOUT: Duration = Duration::from_secs(30);
+
 pub struct RegistrationClientBuilder {
     pub config: BuilderConfig,
 }
@@ -35,7 +37,6 @@ impl RegistrationClientBuilder {
             two_hops: self.config.two_hops,
         };
         let cancel_token = self.config.cancel_token.clone();
-        let (event_tx, event_rx) = mpsc::unbounded();
 
         let nyxd_client = get_nyxd_client(&self.config.network_env)?;
 
@@ -43,10 +44,9 @@ impl RegistrationClientBuilder {
             MixnetClient,
             Box<dyn BandwidthTicketProvider>,
         ) = if let Some((mixnet_client_storage, credential_storage)) = storage {
-            let builder = MixnetClientBuilder::new_with_storage(mixnet_client_storage)
-                .event_tx(EventSender(event_tx));
+            let builder = MixnetClientBuilder::new_with_storage(mixnet_client_storage);
             let mixnet_client = tokio::time::timeout(
-                self.config.mixnet_client_startup_timeout,
+                MIXNET_CLIENT_STARTUP_TIMEOUT,
                 self.config.build_and_connect_mixnet_client(builder),
             )
             .await??;
@@ -54,9 +54,9 @@ impl RegistrationClientBuilder {
                 Box::new(BandwidthController::new(credential_storage, nyxd_client));
             (mixnet_client, bandwidth_controller)
         } else {
-            let builder = MixnetClientBuilder::new_ephemeral().event_tx(EventSender(event_tx));
+            let builder = MixnetClientBuilder::new_ephemeral();
             let mixnet_client = tokio::time::timeout(
-                self.config.mixnet_client_startup_timeout,
+                MIXNET_CLIENT_STARTUP_TIMEOUT,
                 self.config.build_and_connect_mixnet_client(builder),
             )
             .await??;
@@ -74,7 +74,6 @@ impl RegistrationClientBuilder {
             cancel_token,
             mixnet_client_address,
             bandwidth_controller,
-            event_rx,
         })
     }
 }

nym-registration-client/src/lib.rs

@@ -8,7 +8,7 @@ use nym_bandwidth_controller::BandwidthTicketProvider;
 use nym_credentials_interface::TicketType;
 use nym_ip_packet_client::IprClientConnect;
 use nym_registration_common::AssignedAddresses;
-use nym_sdk::mixnet::{EventReceiver, MixnetClient, Recipient};
+use nym_sdk::mixnet::{MixnetClient, Recipient};
 
 use crate::config::RegistrationClientConfig;
 
@@ -31,7 +31,6 @@ pub struct RegistrationClient {
     mixnet_client_address: Recipient,
     bandwidth_controller: Box<dyn BandwidthTicketProvider>,
     cancel_token: CancellationToken,
-    event_rx: EventReceiver,
 }
 
 impl RegistrationClient {
@@ -62,7 +61,6 @@ impl RegistrationClient {
                     entry_mixnet_gateway_ip,
                     exit_mixnet_gateway_ip,
                 },
-                event_rx: self.event_rx,
             },
         )))
     }

nym-registration-client/src/types.rs

@@ -4,7 +4,7 @@
 use nym_authenticator_client::{AuthClientMixnetListenerHandle, AuthenticatorClient};
 use nym_bandwidth_controller::BandwidthTicketProvider;
 use nym_registration_common::{AssignedAddresses, GatewayData};
-use nym_sdk::mixnet::{EventReceiver, MixnetClient};
+use nym_sdk::mixnet::MixnetClient;
 
 pub enum RegistrationResult {
     Mixnet(Box<MixnetRegistrationResult>),
@@ -14,7 +14,6 @@ pub enum RegistrationResult {
 pub struct MixnetRegistrationResult {
     pub assigned_addresses: AssignedAddresses,
     pub mixnet_client: MixnetClient,
-    pub event_rx: EventReceiver,
 }
 
 pub struct WireguardRegistrationResult {

nym-wallet/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "NymWallet"
@@ -773,7 +773,7 @@ dependencies = [
 [[package]]
 name = "bls12_381"
 version = "0.8.0"
-source = "git+https://github.com/jstuczyn/bls12_381?branch=temp%2Fexperimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
+source = "git+https://github.com/jstuczyn/bls12_381?branch=temp/experimental-serdect-updated#9bf520059cb28323fc51469cae86868ef4fa6fbd"
 dependencies = [
  "digest 0.10.7",
  "ff",
@@ -1723,6 +1723,15 @@ dependencies = [
  "dirs-sys 0.3.7",
 ]
 
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys 0.4.1",
+]
+
 [[package]]
 name = "dirs"
 version = "6.0.0"
@@ -1743,6 +1752,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.4.6",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.5.0"
@@ -4079,7 +4100,7 @@ dependencies = [
 name = "nym-config"
 version = "0.1.0"
 dependencies = [
- "dirs 6.0.0",
+ "dirs 5.0.1",
  "handlebars",
  "log",
  "nym-network-defaults",

sdk/rust/nym-sdk/src/mixnet.rs

@@ -45,21 +45,15 @@ pub use native_client::MixnetClient;
 pub use native_client::MixnetClientSender;
 #[allow(deprecated)]
 pub use nym_client_core::client::{
-    base_client::{
-        storage::{
-            gateways_storage::{
-                ActiveGateway, BadGateway, GatewayRegistration, GatewaysDetailsStore,
-            },
-            Ephemeral, MixnetClientStorage, OnDiskPersistent,
-        },
-        EventReceiver, EventSender, MixnetClientEvent,
+    base_client::storage::{
+        gateways_storage::{ActiveGateway, BadGateway, GatewayRegistration, GatewaysDetailsStore},
+        Ephemeral, MixnetClientStorage, OnDiskPersistent,
     },
     inbound_messages::InputMessage,
     key_manager::{
         persistence::{InMemEphemeralKeys, KeyStore, OnDiskKeys},
         ClientKeys,
     },
-    mix_traffic::MixTrafficEvent,
     replies::reply_storage::{
         fs_backend::Backend as ReplyStorage, CombinedReplyStorage, Empty as EmptyReplyStorage,
         ReplyStorageBackend,

sdk/rust/nym-sdk/src/mixnet/client.rs

@@ -16,7 +16,7 @@ use nym_client_core::client::base_client::storage::helpers::{
 use nym_client_core::client::base_client::storage::{
     Ephemeral, GatewaysDetailsStore, MixnetClientStorage, OnDiskPersistent,
 };
-use nym_client_core::client::base_client::{BaseClient, EventSender};
+use nym_client_core::client::base_client::BaseClient;
 use nym_client_core::client::key_manager::persistence::KeyStore;
 use nym_client_core::client::{
     base_client::BaseClientBuilder, replies::reply_storage::ReplyStorageBackend,
@@ -54,7 +54,6 @@ pub struct MixnetClientBuilder<S: MixnetClientStorage = Ephemeral> {
     custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
     custom_gateway_transceiver: Option<Box<dyn GatewayTransceiver + Send + Sync>>,
     custom_shutdown: Option<ShutdownTracker>,
-    event_tx: Option<EventSender>,
     force_tls: bool,
     user_agent: Option<UserAgent>,
     #[cfg(unix)]
@@ -98,7 +97,6 @@ impl MixnetClientBuilder<OnDiskPersistent> {
                 .await?,
             gateway_endpoint_config_path: None,
             custom_shutdown: None,
-            event_tx: None,
             custom_gateway_transceiver: None,
             force_tls: false,
             user_agent: None,
@@ -132,7 +130,6 @@ where
             custom_topology_provider: None,
             custom_gateway_transceiver: None,
             custom_shutdown: None,
-            event_tx: None,
             force_tls: false,
             user_agent: None,
             #[cfg(unix)]
@@ -156,7 +153,6 @@ where
             custom_topology_provider: self.custom_topology_provider,
             custom_gateway_transceiver: self.custom_gateway_transceiver,
             custom_shutdown: self.custom_shutdown,
-            event_tx: self.event_tx,
             force_tls: self.force_tls,
             user_agent: self.user_agent,
             #[cfg(unix)]
@@ -274,13 +270,6 @@ where
         self
     }
 
-    /// Use an externally managed shutdown mechanism.
-    #[must_use]
-    pub fn event_tx(mut self, event_tx: EventSender) -> Self {
-        self.event_tx = Some(event_tx);
-        self
-    }
-
     /// Attempt to wait for the selected gateway (if applicable) to come online if its currently not bonded.
     #[must_use]
     pub fn with_wait_for_gateway(mut self, wait_for_gateway: bool) -> Self {
@@ -329,12 +318,8 @@ where
 
     /// Construct a [`DisconnectedMixnetClient`] from the setup specified.
     pub fn build(self) -> Result<DisconnectedMixnetClient<S>> {
-        let mut client = DisconnectedMixnetClient::new(
-            self.config,
-            self.socks5_config,
-            self.storage,
-            self.event_tx,
-        )?;
+        let mut client =
+            DisconnectedMixnetClient::new(self.config, self.socks5_config, self.storage)?;
 
         client.custom_gateway_transceiver = self.custom_gateway_transceiver;
         client.custom_topology_provider = self.custom_topology_provider;
@@ -396,9 +381,6 @@ where
     /// Allows passing an externally controlled shutdown handle.
     custom_shutdown: Option<ShutdownTracker>,
 
-    /// Sender of mixnet client events to the SDK caller
-    event_tx: Option<EventSender>,
-
     user_agent: Option<UserAgent>,
 
     /// Callback on the websocket fd as soon as the connection has been established
@@ -433,7 +415,6 @@ where
         config: Config,
         socks5_config: Option<Socks5>,
         storage: S,
-        event_tx: Option<EventSender>,
     ) -> Result<DisconnectedMixnetClient<S>> {
         // don't create dkg client for the bandwidth controller if credentials are disabled
         let dkg_query_client = if config.enabled_credentials_mode {
@@ -462,7 +443,6 @@ where
             wait_for_gateway: false,
             force_tls: false,
             custom_shutdown: None,
-            event_tx,
             user_agent: None,
             #[cfg(unix)]
             connection_fd_callback: None,
@@ -555,22 +535,21 @@ where
     async fn available_gateways(&mut self) -> Result<Vec<RoutingNode>, ClientCoreError> {
         if let Some(ref mut custom_provider) = self.custom_topology_provider {
             if let Some(topology) = custom_provider.get_new_topology().await {
-                // Use entry_capable_nodes() instead of entry_gateways() to include
-                // all entry-capable nodes, not just actively assigned ones
-                return Ok(topology.entry_capable_nodes().cloned().collect());
+                return Ok(topology.entry_gateways().cloned().collect());
             }
         }
 
         let nym_api_endpoints = self.get_api_endpoints();
         let topology_cfg = &self.config.debug_config.topology;
         let user_agent = self.user_agent.clone();
+        let mut rng = OsRng;
 
         gateways_for_init(
+            &mut rng,
             &nym_api_endpoints,
             user_agent,
             topology_cfg.minimum_gateway_performance,
             topology_cfg.ignore_ingress_epoch_role,
-            None,
         )
         .await
     }
@@ -706,16 +685,6 @@ where
             .config
             .as_base_client_config(nyxd_endpoints, nym_api_endpoints.clone());
 
-        tracing::debug!(
-            "SDK: Passing nym_api_urls to BaseClientBuilder (has {} nym_api_urls)",
-            self.config
-                .network_details
-                .nym_api_urls
-                .as_ref()
-                .map(|urls| urls.len())
-                .unwrap_or(0)
-        );
-
         let mut base_builder: BaseClientBuilder<_, _> =
             BaseClientBuilder::new(base_config, self.storage, self.dkg_query_client)
                 .with_wait_for_gateway(self.wait_for_gateway)
@@ -723,11 +692,6 @@ where
                 .with_remember_me(&self.remember_me)
                 .with_derivation_material(self.derivation_material);
 
-        // Add nym_api_urls if available in network_details
-        if let Some(nym_api_urls) = self.config.network_details.nym_api_urls.clone() {
-            base_builder = base_builder.with_nym_api_urls(nym_api_urls);
-        }
-
         if let Some(user_agent) = self.user_agent {
             base_builder = base_builder.with_user_agent(user_agent);
         }
@@ -736,14 +700,15 @@ where
             base_builder = base_builder.with_topology_provider(topology_provider);
         }
 
-        // Use custom shutdown if provided, otherwise the sdk one will be used later down the line
-        if let Some(shutdown_tracker) = self.custom_shutdown {
-            base_builder = base_builder.with_shutdown(shutdown_tracker);
-        }
-
-        if let Some(event_tx) = self.event_tx {
-            base_builder = base_builder.with_event_tx(event_tx);
-        }
+        // Use custom shutdown if provided, otherwise get from registry
+        let shutdown_tracker = match self.custom_shutdown {
+            Some(custom) => custom,
+            None => {
+                // Auto-create from registry for SDK use
+                nym_task::get_sdk_shutdown_tracker()?
+            }
+        };
+        base_builder = base_builder.with_shutdown(shutdown_tracker);
 
         if let Some(gateway_transceiver) = self.custom_gateway_transceiver {
             base_builder = base_builder.with_gateway_transceiver(gateway_transceiver);
@@ -861,6 +826,7 @@ where
             stats_events_reporter,
             started_client.shutdown_handle,
             None,
+            started_client.client_request_sender,
             started_client.forget_me,
             started_client.remember_me,
         ))
@@ -892,17 +858,3 @@ impl IncludedSurbs {
         Self::ExposeSelfAddress
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_mixnet_builder_default_no_custom_client() {
-        let builder = MixnetClientBuilder::new_ephemeral();
-        assert!(
-            builder.build().is_ok(),
-            "Builder should succeed without custom client"
-        );
-    }
-}

sdk/rust/nym-sdk/src/mixnet/native_client.rs

@@ -24,7 +24,6 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 use tokio::sync::RwLockReadGuard;
-use tokio_util::sync::CancellationToken;
 
 /// Client connected to the Nym mixnet.
 pub struct MixnetClient {
@@ -58,6 +57,7 @@ pub struct MixnetClient {
 
     // internal state used for the `Stream` implementation
     _buffered: Vec<ReconstructedMessage>,
+    pub(crate) client_request_sender: ClientRequestSender,
     pub(crate) forget_me: ForgetMe,
     pub(crate) remember_me: RememberMe,
 }
@@ -74,6 +74,7 @@ impl MixnetClient {
         stats_events_reporter: ClientStatsSender,
         task_handle: ShutdownTracker,
         packet_type: Option<PacketType>,
+        client_request_sender: ClientRequestSender,
         forget_me: ForgetMe,
         remember_me: RememberMe,
     ) -> Self {
@@ -88,6 +89,7 @@ impl MixnetClient {
             shutdown_handle: task_handle,
             packet_type,
             _buffered: Vec::new(),
+            client_request_sender,
             forget_me,
             remember_me,
         }
@@ -121,12 +123,12 @@ impl MixnetClient {
     }
 
     /// Get a child token of the root, to monitor unexpected shutdown, without causing one
-    pub fn cancellation_token(&self) -> CancellationToken {
-        self.shutdown_handle.child_shutdown_token().inner().clone()
-    }
+    // pub fn cancellation_token(&self) -> CancellationToken {
+    //     self.shutdown_handle.child_shutdown_token().inner().clone()
+    // }
 
     pub fn client_request_sender(&self) -> ClientRequestSender {
-        self.client_input.client_request_sender.clone()
+        self.client_request_sender.clone()
     }
 
     /// Get the client's identity keys.
@@ -196,6 +198,13 @@ impl MixnetClient {
         self.client_state.topology_accessor.release_manual_control()
     }
 
+    /// Returns a shutdown event handle that can be used for waiting for the client to shutdown.
+    pub fn shutdown_event(&self) -> ShutdownEventHandle {
+        ShutdownEventHandle {
+            shutdown_handle: self.shutdown_handle.clone(),
+        }
+    }
+
     /// Wait for messages from the mixnet
     pub async fn wait_for_messages(&mut self) -> Option<Vec<ReconstructedMessage>> {
         self.reconstructed_receiver.next().await
@@ -249,12 +258,7 @@ impl MixnetClient {
             client: self.forget_me.client(),
             stats: self.forget_me.stats(),
         };
-        match self
-            .client_input
-            .client_request_sender
-            .send(client_request)
-            .await
-        {
+        match self.client_request_sender.send(client_request).await {
             Ok(_) => Ok(()),
             Err(e) => {
                 error!("Failed to send forget me request: {e}");
@@ -267,12 +271,7 @@ impl MixnetClient {
         let client_request = ClientRequest::RememberMe {
             session_type: self.remember_me.session_type(),
         };
-        match self
-            .client_input
-            .client_request_sender
-            .send(client_request)
-            .await
-        {
+        match self.client_request_sender.send(client_request).await {
             Ok(_) => Ok(()),
             Err(e) => {
                 error!("Failed to send forget me request: {e}");
@@ -347,3 +346,16 @@ impl MixnetMessageSender for MixnetClientSender {
             .map_err(|_| Error::MessageSendingFailure)
     }
 }
+
+/// Handle for waiting on the shutdown event of the mixnet client.
+pub struct ShutdownEventHandle {
+    shutdown_handle: ShutdownTracker,
+}
+
+impl ShutdownEventHandle {
+    /// Returns once mixnet client has been shut down.
+    /// If mixnet client is already shut down, returns immediately.
+    pub async fn wait(&self) {
+        self.shutdown_handle.wait_for_tracker().await
+    }
+}

service-providers/network-requester/Cargo.toml

@@ -4,7 +4,7 @@
 [package]
 name = "nym-network-requester"
 license = "GPL-3.0"
-version = "1.1.65"
+version = "1.1.64"
 authors.workspace = true
 edition.workspace = true
 rust-version = "1.85"

tools/echo-server/src/lib.rs

@@ -226,8 +226,7 @@ mod tests {
                 error!("{err}");
                 // this is not an ideal way of checking it, but if test fails due to networking failures
                 // it should be fine to progress
-                let err_str = err.to_string();
-                if err_str.contains("nym api") || err_str.contains("failed to connect") {
+                if err.to_string().contains("nym api request failed") {
                     return Ok(());
                 }
                 return Err(err);
@@ -292,8 +291,7 @@ mod tests {
                 error!("{err}");
                 // this is not an ideal way of checking it, but if test fails due to networking failures
                 // it should be fine to progress
-                let err_str = err.to_string();
-                if err_str.contains("nym api") || err_str.contains("failed to connect") {
+                if err.to_string().contains("nym api request failed") {
                     return Ok(());
                 }
                 return Err(err);

tools/internal/testnet-manager/Makefile

@@ -1,18 +1,2 @@
 build-bypass-contract:
-	$(MAKE) -C dkg-bypass-contract build
-
-
-COSMWASM_OPTIMIZER_IMAGE ?= cosmwasm/optimizer:0.17.0
-COSMWASM_OPTIMIZER_PLATFORM ?= linux/amd64
-
-build-bypass-contract-docker:
-	docker volume rm nym_contracts_cache 2>/dev/null || true
-	docker volume rm registry_cache 2>/dev/null || true
-	docker run --rm --platform $(COSMWASM_OPTIMIZER_PLATFORM) \
-		-v $(CURDIR)/../../..:/code \
-		--mount type=volume,source=nym_contracts_cache,target=/target \
-		--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-		-e CARGO_BUILD_INCREMENTAL=false \
-		-e RUSTFLAGS="-C target-cpu=generic -C debuginfo=0" \
-		-e SOURCE_DATE_EPOCH=1 \
-		$(COSMWASM_OPTIMIZER_IMAGE) "tools/internal/testnet-manager/dkg-bypass-contract"; \
+	$(MAKE) -C dkg-bypass-contract build

tools/internal/testnet-manager/dkg-bypass-contract/src/contract.rs

@@ -5,7 +5,6 @@ use crate::msg::MigrateMsg;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{
     Addr, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, StdError, StdResult, Storage,
-    entry_point,
 };
 use cw_storage_plus::{Index, IndexList, IndexedMap, Item, Map, MultiIndex};
 use nym_coconut_dkg_common::dealer::DealerRegistrationDetails;
@@ -58,9 +57,7 @@ pub(crate) fn next_node_index(store: &mut dyn Storage) -> StdResult<NodeIndex> {
 #[cw_serde]
 pub enum EmptyMessage {}
 
-// #[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
-
-#[entry_point]
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
 pub fn instantiate(
     _: DepsMut<'_>,
     _: Env,
@@ -71,8 +68,7 @@ pub fn instantiate(
 }
 
 /// Handle an incoming message
-// #[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
-#[entry_point]
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
 pub fn execute(
     _: DepsMut<'_>,
     _: Env,
@@ -82,15 +78,13 @@ pub fn execute(
     Ok(Response::new())
 }
 
-// #[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
-#[entry_point]
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
 pub fn query(_: Deps<'_>, _: Env, _: EmptyMessage) -> Result<QueryResponse, StdError> {
     Ok(Default::default())
 }
 
 // LIMITATION: we're not storing dealings themselves
-// #[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
-#[entry_point]
+#[cfg_attr(not(feature = "library"), cosmwasm_std::entry_point)]
 pub fn migrate(deps: DepsMut<'_>, env: Env, msg: MigrateMsg) -> Result<Response, StdError> {
     // on migration immediately attempt to rewrite the storage
     let threshold = (2 * msg.dealers.len() as u64).div_ceil(3);

tools/internal/testnet-manager/src/manager/network_init.rs

@@ -21,7 +21,6 @@ use std::path::Path;
 use std::time::Duration;
 use time::OffsetDateTime;
 use time::format_description::well_known::Rfc3339;
-use tracing::error;
 use url::Url;
 
 struct InitCtx {
@@ -683,14 +682,9 @@ impl NetworkManager {
                 })?;
 
             let now = OffsetDateTime::now_utc();
+            // SAFETY: all the information saved in our contracts should be well-formed
             let commit_timestamp = OffsetDateTime::parse(&build_info.commit_timestamp, &Rfc3339)
-                .inspect_err(|err| {
-                    error!(
-                        "failed to parse contract build information: {err}. set timestamp was: {}",
-                        build_info.commit_timestamp
-                    )
-                })
-                .unwrap_or(OffsetDateTime::UNIX_EPOCH);
+                .expect("malformed commit timestamp");
 
             let age = now - commit_timestamp;
 

tools/nym-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-cli"
-version = "1.1.64"
+version = "1.1.63"
 authors.workspace = true
 edition = "2021"
 license.workspace = true

tools/nymvisor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nymvisor"
-version = "0.1.29"
+version = "0.1.28"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

wasm/client/src/client.rs

@@ -66,6 +66,11 @@ pub struct NymClient {
     _task_manager: ShutdownTracker,
 
     packet_type: PacketType,
+
+    // We need this to keep the client_request channel alive and avoid jamming up the
+    // JS runtime when the MixTrafficController then tries to reconnect it if it dies
+    #[allow(dead_code)]
+    pub(crate) client_request_sender: ClientRequestSender,
 }
 
 // TODO: we don't really need a builder anymore,
@@ -258,6 +263,7 @@ impl NymClientBuilder {
             _full_topology: None,
             _task_manager: started_client.shutdown_handle,
             packet_type,
+            client_request_sender: started_client.client_request_sender,
         })
     }