Add shutdown event handle

* feat: expose obtaining reference to Mnemonic from DirectSecp256k1HdWallet

* updated getters for stringified mnemonic

.github/workflows/ci-build.yml

@@ -81,12 +81,21 @@ jobs:
           command: fmt
           args: --all -- --check
 
-      - name: Clippy
+      - name: Clippy (macos)
+        if: contains(matrix.os, 'mac')
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --workspace --all-targets --exclude nym-gateway-probe -- -D warnings
+
+      - name: Clippy (non-macos)
+        if: contains(matrix.os, 'linux') || contains(matrix.os, 'windows')
         uses: actions-rs/cargo@v1
         with:
           command: clippy
           args: --workspace --all-targets -- -D warnings
 
+
       - name: Build all binaries
         uses: actions-rs/cargo@v1
         with:

.github/workflows/ci-docs.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: arc-ubuntu-22.04
+    runs-on: arc-linux-latest
     env:
       RUSTUP_PERMIT_COPY_RENAME: 1
     defaults:

.github/workflows/ci-sdk-wasm.yml

@@ -4,10 +4,10 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'wasm/**'
+      - "wasm/**"
-      - 'clients/client-core/**'
+      - "clients/client-core/**"
-      - 'common/**'
+      - "common/**"
-      - '.github/workflows/ci-sdk-wasm.yml'
+      - ".github/workflows/ci-sdk-wasm.yml"
 
 jobs:
   wasm:
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23.7"
+          go-version: "1.24.6"
 
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
@@ -41,7 +41,7 @@ jobs:
       - name: Install wasm-opt
         uses: ./.github/actions/install-wasm-opt
         with:
-          version: '116'
+          version: "116"
 
       - name: Install wasm-bindgen-cli
         run: cargo install wasm-bindgen-cli

Cargo.toml

@@ -31,6 +31,7 @@ members = [
     "common/client-libs/mixnet-client",
     "common/client-libs/validator-client",
     "common/commands",
+    "common/nym-common",
     "common/config",
     "common/cosmwasm-smart-contracts/coconut-dkg",
     "common/cosmwasm-smart-contracts/contracts-common",
@@ -58,7 +59,8 @@ members = [
     "common/gateway-requests",
     "common/gateway-stats-storage",
     "common/gateway-storage",
-    "common/http-api-client", "common/http-api-client-macro",
+    "common/http-api-client",
+    "common/http-api-client-macro",
     "common/http-api-common",
     "common/inclusion-probability",
     "common/ip-packet-requests",
@@ -66,7 +68,9 @@ members = [
     "common/mixnode-common",
     "common/network-defaults",
     "common/node-tester-utils",
-    "common/nonexhaustive-delayqueue", "common/nym-cache",
+    "common/nonexhaustive-delayqueue",
+    "common/nym-cache",
+    "common/nym-connection-monitor",
     "common/nym-id",
     "common/nym-metrics",
     "common/nym_offline_compact_ecash",
@@ -98,7 +102,8 @@ members = [
     "common/ticketbooks-merkle",
     "common/topology",
     "common/tun",
-    "common/types", "common/upgrade-mode-check",
+    "common/types",
+    "common/upgrade-mode-check",
     "common/verloc",
     "common/wasm/client-core",
     "common/wasm/storage",
@@ -127,7 +132,7 @@ members = [
     "nym-node-status-api/nym-node-status-client",
     "nym-node/nym-node-metrics",
     "nym-node/nym-node-requests",
-    "nym-outfox", 
+    "nym-outfox",
     "nym-registration-client",
     "nym-signers-monitor",
     "nym-statistics-api",
@@ -160,6 +165,7 @@ members = [
     "wasm/mix-fetch",
     "wasm/node-tester",
     "wasm/zknym-lib",
+    "nym-gateway-probe"
 ]
 
 default-members = [
@@ -178,16 +184,16 @@ default-members = [
     "tools/nymvisor",
 ]
 
-exclude = ["explorer", "contracts", "nym-wallet", "cpu-cycles"]
+exclude = ["contracts", "nym-wallet", "cpu-cycles"]
 
 [workspace.package]
 authors = ["Nym Technologies SA"]
 repository = "https://github.com/nymtech/nym"
 homepage = "https://nymtech.net"
 documentation = "https://nymtech.net"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
-rust-version = "1.81"
+rust-version = "1.85"
 readme = "README.md"
 
 [workspace.dependencies]
@@ -300,6 +306,7 @@ parking_lot = "0.12.3"
 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"
@@ -358,6 +365,7 @@ tracing-opentelemetry = "0.19.0"
 tracing-subscriber = "0.3.19"
 tracing-tree = "0.2.2"
 tracing-indicatif = "0.3.9"
+tracing-test = "0.2.5"
 ts-rs = "10.1.0"
 tungstenite = { version = "0.20.1", default-features = false }
 uniffi = "0.29.2"
@@ -368,6 +376,7 @@ utoipa-swagger-ui = "8.1"
 utoipauto = "0.2"
 uuid = "*"
 vergen = { version = "=8.3.1", default-features = false }
+vergen-gitcl = { version = "1.0.8", default-features = false }
 walkdir = "2"
 x25519-dalek = "2.0.0"
 zeroize = "1.7.0"
@@ -407,18 +416,19 @@ prost = { version = "0.13", default-features = false }
 # wasm-related dependencies
 gloo-utils = "0.2.0"
 gloo-net = "0.6.0"
+gloo-timers = "0.3.0"
 
 indexed_db_futures = "0.6.4"
 js-sys = "0.3.76"
 serde-wasm-bindgen = "0.6.5"
 tsify = "0.4.5"
+tokio_with_wasm = { version = "0.8.7" }
 wasm-bindgen = "0.2.99"
 wasm-bindgen-futures = "0.4.49"
 wasm-bindgen-test = "0.3.49"
 wasmtimer = "0.4.1"
 web-sys = "0.3.76"
 
-
 # for local development:
 #[patch.crates-io]
 #sphinx-packet = { path = "../sphinx" }

Makefile

@@ -107,16 +107,16 @@ sdk-wasm-build:
 	$(MAKE) -C nym-browser-extension/storage wasm-pack
 	$(MAKE) -C wasm/client
 	$(MAKE) -C wasm/node-tester
-	$(MAKE) -C wasm/mix-fetch
+	# $(MAKE) -C wasm/mix-fetch
 	$(MAKE) -C wasm/zknym-lib
-	#$(MAKE) -C wasm/full-nym-wasm
+	# $(MAKE) -C wasm/full-nym-wasm
 
 # run this from npm/yarn to ensure tools are in the path, e.g. yarn build:sdk from root of repo
 sdk-typescript-build:
 	npx lerna run --scope @nymproject/sdk build --stream
-	npx lerna run --scope @nymproject/mix-fetch build --stream
+	# npx lerna run --scope @nymproject/mix-fetch build --stream
-	npx lerna run --scope @nymproject/node-tester build --stream
+	# npx lerna run --scope @nymproject/node-tester build --stream
-	yarn --cwd sdk/typescript/codegen/contract-clients build
+	# yarn --cwd sdk/typescript/codegen/contract-clients build
 
 # NOTE: These targets are part of the main workspace (but not as wasm32-unknown-unknown)
 WASM_CRATES = extension-storage nym-client-wasm nym-node-tester-wasm zknym-lib

clients/native/Cargo.toml

@@ -4,7 +4,7 @@ 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"
-rust-version = "1.70"
+rust-version = "1.85"
 license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

clients/socks5/Cargo.toml

@@ -4,7 +4,7 @@ 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"
-rust-version = "1.70"
+rust-version = "1.85"
 license.workspace = true
 
 [dependencies]

common/async-file-watcher/src/lib.rs

@@ -1,8 +1,8 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use futures::channel::mpsc;
 use futures::StreamExt;
+use futures::channel::mpsc;
 use notify::event::{DataChange, MetadataKind, ModifyKind};
 use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
 use std::collections::HashMap;
@@ -96,10 +96,10 @@ impl AsyncFileWatcher {
         // when testing I was consistently getting two `Modify(Data(Any))` events in quick succession
         // (probably to modify content and metadata).
         // we really only want to propagate one of them
-        if let Some(previous) = self.last_received.get(&event.kind) {
+        if let Some(previous) = self.last_received.get(&event.kind)
-            if now.duration_since(*previous) < self.tick_duration {
+            && now.duration_since(*previous) < self.tick_duration
-                return false;
+        {
-            }
+            return false;
         }
 
         let Some(filters) = &self.filters else {

common/authenticator-requests/src/client_message.rs

@@ -5,9 +5,10 @@ use nym_sphinx::addressing::Recipient;
 use nym_wireguard_types::PeerPublicKey;
 
 use crate::{
+    AuthenticatorVersion, Error,
     latest::registration::IpPair,
     traits::{FinalMessage, InitMessage, QueryBandwidthMessage, TopUpMessage, Versionable},
-    v2, v3, v4, v5, AuthenticatorVersion, Error,
+    v2, v3, v4, v5,
 };
 
 // This is very redundant with AuthenticatorRequest and I reckon they could be smooshed.

common/authenticator-requests/src/traits.rs

@@ -9,7 +9,7 @@ use nym_crypto::asymmetric::x25519::PrivateKey;
 use nym_wireguard_types::PeerPublicKey;
 
 use crate::latest::registration::IpPair;
-use crate::{v1, v2, v3, v4, v5, AuthenticatorVersion, Error};
+use crate::{AuthenticatorVersion, Error, v1, v2, v3, v4, v5};
 
 pub trait Versionable {
     fn version(&self) -> AuthenticatorVersion;

common/authenticator-requests/src/v1/registration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use nym_wireguard_types::PeerPublicKey;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;

common/authenticator-requests/src/v2/registration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use nym_credentials_interface::CredentialSpendingData;
 use nym_wireguard_types::PeerPublicKey;
 use serde::{Deserialize, Serialize};

common/authenticator-requests/src/v3/registration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use nym_credentials_interface::CredentialSpendingData;
 use nym_wireguard_types::PeerPublicKey;
 use serde::{Deserialize, Serialize};

common/authenticator-requests/src/v4/registration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use nym_credentials_interface::CredentialSpendingData;
 use nym_network_defaults::constants::{WG_TUN_DEVICE_IP_ADDRESS_V4, WG_TUN_DEVICE_IP_ADDRESS_V6};
 use nym_wireguard_types::PeerPublicKey;

common/authenticator-requests/src/v5/registration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::Error;
-use base64::{engine::general_purpose, Engine};
+use base64::{Engine, engine::general_purpose};
 use nym_credentials_interface::CredentialSpendingData;
 use nym_network_defaults::constants::{WG_TUN_DEVICE_IP_ADDRESS_V4, WG_TUN_DEVICE_IP_ADDRESS_V6};
 use nym_wireguard_types::PeerPublicKey;

common/authenticator-requests/src/version.rs

@@ -129,7 +129,11 @@ impl From<semver::Version> for AuthenticatorVersion {
         // if provided version is higher (or equal) to release version of V5,
         // we return the latest (i.e. v5)
 
-        debug_assert_eq!(Self::V5, Self::LATEST, "a new AuthenticatorVersion variant has been introduced without adjusting the `From<semver::Version>` trait");
+        debug_assert_eq!(
+            Self::V5,
+            Self::LATEST,
+            "a new AuthenticatorVersion variant has been introduced without adjusting the `From<semver::Version>` trait"
+        );
         Self::LATEST
     }
 }

common/bin-common/src/completions/mod.rs

@@ -1,8 +1,8 @@
+use clap::Args;
 use clap::builder::Command;
 use clap::clap_derive::ValueEnum;
-use clap::Args;
-use clap_complete::generator::generate;
 use clap_complete::Shell as ClapShell;
+use clap_complete::generator::generate;
 use std::io;
 
 pub fn fig_generate(command: &mut Command, name: &str) {

common/client-core/Cargo.toml

@@ -3,7 +3,7 @@ name = "nym-client-core"
 version = "1.1.15"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>"]
 edition = "2021"
-rust-version = "1.76"
+rust-version = "1.85"
 license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -69,7 +69,6 @@ workspace = true
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.hyper-util]
 workspace = true
 features = ["tokio"]
-###
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-stream]
 workspace = true
@@ -103,7 +102,7 @@ workspace = true
 features = ["tokio"]
 
 [target."cfg(target_arch = \"wasm32\")".dependencies.gloo-timers]
-version = "0.3.0"
+workspace = true
 features = ["futures"]
 
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-utils]
@@ -114,6 +113,10 @@ features = ["websocket"]
 workspace = true
 features = ["wasm-bindgen"]
 
+[target."cfg(target_arch = \"wasm32\")".dependencies.tokio_with_wasm]
+workspace = true
+features = ["full"]
+
 [dev-dependencies]
 tempfile = { workspace = true }
 

common/client-core/config-types/src/lib.rs

@@ -707,13 +707,10 @@ pub struct DebugConfig {
 
     /// Defines all configuration options related to reply SURBs.
     pub reply_surbs: ReplySurbs,
-
     /// Defines all configuration options related to stats reporting.
     pub stats_reporting: StatsReporting,
-
     /// Defines all configuration options related to the forget me flag.
     pub forget_me: ForgetMe,
-
     /// Defines all configuration options related to the remember me flag.
     pub remember_me: RememberMe,
 }

common/client-core/config-types/src/old/v6.rs

@@ -543,10 +543,8 @@ pub struct DebugConfigV6 {
 
     /// Defines all configuration options related to reply SURBs.
     pub reply_surbs: ReplySurbsV6,
-
     /// Defines all configuration options related to stats reporting.
     pub stats_reporting: StatsReportingV6,
-
     /// Defines all configuration options related to the forget me flag.
     pub forget_me: ForgetMeV6,
 

common/client-core/gateways-storage/src/backend/fs_backend/manager.rs

@@ -31,7 +31,6 @@ impl StorageManager {
                 }
             })?;
         }
-
         let opts = sqlx::sqlite::SqliteConnectOptions::new()
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
             .synchronous(SqliteSynchronous::Normal)

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

@@ -69,6 +69,10 @@ use tokio::sync::mpsc::Sender;
 use tracing::*;
 use url::Url;
 
+#[cfg(target_arch = "wasm32")]
+#[cfg(debug_assertions)]
+use wasm_utils::console_log;
+
 #[cfg(all(
     not(target_arch = "wasm32"),
     feature = "fs-surb-storage",
@@ -847,6 +851,11 @@ where
         <S::GatewaysDetailsStore as GatewaysDetailsStore>::StorageError: Sync + Send,
     {
         info!("Starting nym client");
+        #[cfg(debug_assertions)]
+        #[cfg(target_arch = "wasm32")]
+        {
+            console_log!("Starting base Nym Client");
+        }
 
         // derive (or load) client keys and gateway configuration
         let init_res = Self::initialise_keys_and_gateway(
@@ -883,7 +892,7 @@ where
         // Create a shutdown tracker for this client - either as a child of provided tracker
         // or get one from the registry
         let shutdown_tracker = match self.shutdown {
-            Some(parent_tracker) => parent_tracker.child_tracker(),
+            Some(parent_tracker) => parent_tracker.clone(),
             None => nym_task::get_sdk_shutdown_tracker()?,
         };
 
@@ -917,7 +926,7 @@ where
             self.user_agent.clone(),
             generate_client_stats_id(*self_address.identity()),
             input_sender.clone(),
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         );
 
         // needs to be started as the first thing to block if required waiting for the gateway
@@ -927,7 +936,7 @@ where
             shared_topology_accessor.clone(),
             self_address.gateway(),
             self.wait_for_gateway,
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         )
         .await?;
 
@@ -947,7 +956,7 @@ where
             stats_reporter.clone(),
             #[cfg(unix)]
             self.connection_fd_callback,
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         )
         .await?;
         let gateway_ws_fd = gateway_transceiver.ws_fd();
@@ -955,7 +964,7 @@ where
         let reply_storage = Self::setup_persistent_reply_storage(
             reply_storage_backend,
             key_rotation_config,
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         )
         .await?;
 
@@ -966,7 +975,7 @@ where
             reply_storage.key_storage(),
             reply_controller_sender.clone(),
             stats_reporter.clone(),
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         );
 
         // The message_sender is the transmitter for any component generating sphinx packets
@@ -974,10 +983,8 @@ where
         // traffic stream.
         // The MixTrafficController then sends the actual traffic
 
-        let (message_sender, client_request_sender) = Self::start_mix_traffic_controller(
+        let (message_sender, client_request_sender) =
-            gateway_transceiver,
+            Self::start_mix_traffic_controller(gateway_transceiver, &shutdown_tracker.clone());
-            &shutdown_tracker.child_tracker(),
-        );
 
         // Channels that the websocket listener can use to signal downstream to the real traffic
         // controller that connections are closed.
@@ -1006,7 +1013,7 @@ where
             shared_lane_queue_lengths.clone(),
             client_connection_rx,
             stats_reporter.clone(),
-            &shutdown_tracker.child_tracker(),
+            &shutdown_tracker.clone(),
         );
 
         if !self
@@ -1022,13 +1029,20 @@ where
                 shared_topology_accessor.clone(),
                 message_sender,
                 stats_reporter.clone(),
-                &shutdown_tracker.child_tracker(),
+                &shutdown_tracker.clone(),
             );
         }
 
         debug!("Core client startup finished!");
         debug!("The address of this client is: {self_address}");
 
+        #[cfg(debug_assertions)]
+        #[cfg(target_arch = "wasm32")]
+        {
+            console_log!("Core client startup finished!");
+            console_log!("Rust::start_base: the address of this client is: {self_address}");
+        }
+
         Ok(BaseClient {
             address: self_address,
             identity_keys,

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

@@ -225,9 +225,15 @@ impl LoopCoverTrafficStream<OsRng> {
         // JS: due to identical logical structure to OutQueueControl::on_message(), this is also
         // presumably required to prevent bugs in the future. Exact reason is still unknown to me.
 
-        // TODO: temporary and BAD workaround for wasm (we should find a way to yield here in wasm)
         #[cfg(not(target_arch = "wasm32"))]
-        tokio::task::yield_now().await;
+        {
+            tokio::task::yield_now().await;
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            tokio_with_wasm::task::yield_now().await;
+        }
     }
 
     // it's fine if cover traffic stream task gets killed whilst processing next message

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![allow(unused_imports)]
-
 use std::time::Duration;
 
+#[cfg(target_arch = "wasm32")]
 pub use wasmtimer::{std::Instant, tokio::*};
 pub type IntervalStream = gloo_timers::future::IntervalStream;
 

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

@@ -155,6 +155,7 @@ impl MixTrafficController {
                                 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;
                             }
                         }

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

@@ -31,9 +31,9 @@ use tracing::*;
 #[cfg(not(target_arch = "wasm32"))]
 use tokio::time::{sleep, Sleep};
 
+// use wasm_utils::console_log;
 #[cfg(target_arch = "wasm32")]
 use wasmtimer::tokio::{sleep, Sleep};
-
 mod sending_delay_controller;
 
 /// Configurable parameters of the `OutQueueControl`
@@ -325,9 +325,15 @@ where
         // ready and hence was immediately re-scheduled causing other tasks to be starved;
         // yield makes it go back the scheduling queue regardless of its value availability
 
-        // TODO: temporary and BAD workaround for wasm (we should find a way to yield here in wasm)
         #[cfg(not(target_arch = "wasm32"))]
-        tokio::task::yield_now().await;
+        {
+            tokio::task::yield_now().await;
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            tokio_with_wasm::task::yield_now().await;
+        }
     }
 
     fn on_close_connection(&mut self, connection_id: ConnectionId) {

common/client-core/src/lib.rs

@@ -24,7 +24,9 @@ pub fn spawn_future<F>(future: F)
 where
     F: Future<Output = ()> + 'static,
 {
-    wasm_bindgen_futures::spawn_local(future);
+    wasm_bindgen_futures::spawn_local(async move {
+        future.await;
+    });
 }
 
 #[deprecated(note = "use spawn_future from nym_task crate instead")]

common/client-libs/validator-client/Cargo.toml

@@ -3,7 +3,7 @@ name = "nym-validator-client"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.85"
 license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

common/client-libs/validator-client/src/signing/direct_wallet.rs

@@ -10,7 +10,7 @@ use cosmrs::tx;
 use cosmrs::tx::SignDoc;
 use nym_config::defaults;
 use thiserror::Error;
-use zeroize::{Zeroize, ZeroizeOnDrop};
+use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
 
 type Secp256k1Keypair = (SigningKey, PublicKey);
 
@@ -128,9 +128,20 @@ impl DirectSecp256k1HdWallet {
         Ok(accounts)
     }
 
+    pub fn secret(&self) -> &bip39::Mnemonic {
+        &self.secret
+    }
+
+    #[deprecated(
+        note = "use either .secret() for obtaining &bip39::Mnemonic or .mnemonic_string() for Zeroizing wrapper around the String"
+    )]
     pub fn mnemonic(&self) -> String {
         self.secret.to_string()
     }
+
+    pub fn mnemonic_string(&self) -> Zeroizing<String> {
+        Zeroizing::new(self.secret.to_string())
+    }
 }
 
 #[must_use]

common/commands/src/validator/account/create.rs

@@ -18,6 +18,6 @@ pub fn create_account(args: Args, prefix: &str) {
     let wallet = DirectSecp256k1HdWallet::from_mnemonic(prefix, mnemonic);
 
     // Output address and mnemonics into separate lines for easier parsing
-    println!("{}", wallet.mnemonic());
+    println!("{}", wallet.mnemonic_string().as_str());
     println!("{}", wallet.try_derive_accounts().unwrap()[0].address());
 }

common/cosmwasm-smart-contracts/contracts-common-testing/src/helpers.rs

@@ -1,17 +1,17 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::testing::{message_info, MockApi, MockQuerier, MockStorage};
+use cosmwasm_std::testing::{MockApi, MockQuerier, MockStorage, message_info};
 use cosmwasm_std::{
-    coins, Addr, BankMsg, CosmosMsg, Decimal, Empty, Env, MemoryStorage, MessageInfo, Order,
+    Addr, BankMsg, CosmosMsg, Decimal, Empty, Env, MemoryStorage, MessageInfo, Order, OwnedDeps,
-    OwnedDeps, Response, StdResult, Storage,
+    Response, StdResult, Storage, coins,
 };
 use cw_storage_plus::{KeyDeserialize, Map, Prefix, PrimaryKey};
 use nym_contracts_common::events::may_find_attribute;
 use rand::{RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use std::fmt::Debug;
 use std::str::FromStr;
 

common/cosmwasm-smart-contracts/contracts-common-testing/src/tester/basic_traits.rs

@@ -4,12 +4,12 @@
 use crate::{ContractTester, TestableNymContract};
 use cosmwasm_std::testing::{message_info, mock_env};
 use cosmwasm_std::{
-    from_json, Addr, BlockInfo, Coin, ContractInfo, Deps, DepsMut, Env, MessageInfo, Response,
+    Addr, BlockInfo, Coin, ContractInfo, Deps, DepsMut, Env, MessageInfo, Response, StdResult,
-    StdResult, Storage, Timestamp,
+    Storage, Timestamp, from_json,
 };
-use cw_multi_test::{next_block, AppResponse, Executor};
+use cw_multi_test::{AppResponse, Executor, next_block};
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use std::any::type_name;
 use std::fmt::Debug;
 

common/cosmwasm-smart-contracts/contracts-common-testing/src/tester/extensions.rs

@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{
-    CommonStorageKeys, ContractOpts, ContractTester, StorageWrapper, TestableNymContract,
+    CommonStorageKeys, ContractOpts, ContractTester, StorageWrapper, TEST_DENOM,
-    TEST_DENOM,
+    TestableNymContract,
 };
 use cosmwasm_std::testing::message_info;
 use cosmwasm_std::{
-    coin, coins, from_json, to_json_vec, Addr, Coin, MessageInfo, StdError, StdResult, Storage,
+    Addr, Coin, MessageInfo, StdError, StdResult, Storage, coin, coins, from_json, to_json_vec,
 };
 use cw_multi_test::Executor;
 use cw_storage_plus::{Key, Path, PrimaryKey};
 use rand_chacha::ChaCha20Rng;
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use std::any::type_name;
 use std::ops::Deref;
 

common/cosmwasm-smart-contracts/contracts-common-testing/src/tester/mod.rs

@@ -1,16 +1,16 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{mock_api, test_rng, TEST_DENOM};
+use crate::{TEST_DENOM, mock_api, test_rng};
 use cosmwasm_std::testing::MockApi;
 use cosmwasm_std::{
-    coin, coins, Addr, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Order, QuerierWrapper,
+    Addr, Binary, Deps, DepsMut, Empty, Env, MessageInfo, Order, QuerierWrapper, Record, Response,
-    Record, Response, Storage,
+    Storage, coin, coins,
 };
 use cw_multi_test::{App, AppBuilder, BankKeeper, Contract, ContractWrapper, Executor};
 use rand_chacha::ChaCha20Rng;
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use std::collections::HashMap;
 use std::fmt::{Debug, Display};
 use std::marker::PhantomData;

common/cosmwasm-smart-contracts/contracts-common/src/contract_querier.rs

@@ -1,9 +1,9 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::{from_json, Binary, CustomQuery, QuerierWrapper, StdResult};
+use cosmwasm_std::{Binary, CustomQuery, QuerierWrapper, StdResult, from_json};
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 
 // re-expose methods from QuerierWrapper as traits so that we could more easily define extension traits
 pub trait ContractQuerier {

common/cosmwasm-smart-contracts/contracts-common/src/signing/mod.rs

@@ -1,10 +1,10 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_std::{from_json, to_json_vec, Addr, Coin, MessageInfo, StdResult};
+use cosmwasm_std::{Addr, Coin, MessageInfo, StdResult, from_json, to_json_vec};
 use schemars::JsonSchema;
 use serde::de::DeserializeOwned;
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 pub use verifier::Verifier;

common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml

@@ -2,7 +2,7 @@
 name = "nym-mixnet-contract-common"
 version = "0.6.0"
 description = "Common library for the Nym mixnet contract"
-rust-version = "1.62"
+rust-version = "1.85"
 edition = { workspace = true }
 authors = { workspace = true }
 license = { workspace = true }

common/cosmwasm-smart-contracts/mixnet-contract/src/error.rs

@@ -5,8 +5,8 @@ use crate::nym_node::Role;
 use crate::{
     EpochEventId, EpochState, IntervalEventId, NodeId, OperatingCostRange, ProfitMarginRange,
 };
-use contracts_common::signing::verifier::ApiVerifierError;
 use contracts_common::Percent;
+use contracts_common::signing::verifier::ApiVerifierError;
 use cosmwasm_std::{Addr, Coin, Decimal, Uint128};
 use cw_controllers::AdminError;
 use thiserror::Error;
@@ -47,7 +47,9 @@ pub enum MixnetContractError {
     )]
     InvalidPubKey,
 
-    #[error("Attempted to reduce node pledge ({current}{denom} - {decrease_by}{denom}) below the minimum amount: {minimum}{denom}")]
+    #[error(
+        "Attempted to reduce node pledge ({current}{denom} - {decrease_by}{denom}) below the minimum amount: {minimum}{denom}"
+    )]
     InvalidPledgeReduction {
         current: Uint128,
         decrease_by: Uint128,
@@ -123,7 +125,9 @@ pub enum MixnetContractError {
     #[error("Provided ed25519 signature did not verify correctly")]
     InvalidEd25519Signature,
 
-    #[error("Can't perform the specified action as the current epoch is still progress. It started at {epoch_start} and finishes at {epoch_end}, while the current block time is {current_block_time}")]
+    #[error(
+        "Can't perform the specified action as the current epoch is still progress. It started at {epoch_start} and finishes at {epoch_end}, while the current block time is {current_block_time}"
+    )]
     EpochInProgress {
         current_block_time: u64,
         epoch_start: i64,
@@ -133,7 +137,9 @@ pub enum MixnetContractError {
     #[error("attempted to reward a gateway node - this has not been fully integrated yet")]
     GatewayRewarding,
 
-    #[error("node {node_id} has already been rewarded during the current rewarding epoch ({absolute_epoch_id})")]
+    #[error(
+        "node {node_id} has already been rewarded during the current rewarding epoch ({absolute_epoch_id})"
+    )]
     NodeAlreadyRewarded {
         node_id: NodeId,
         absolute_epoch_id: u32,
@@ -172,7 +178,9 @@ pub enum MixnetContractError {
     #[error("one of the roles in the new active set is empty")]
     EmptyRoleAssignment,
 
-    #[error("the number of mixnodes in the rewarded set is not divisible by the number of mix-layers (3)")]
+    #[error(
+        "the number of mixnodes in the rewarded set is not divisible by the number of mix-layers (3)"
+    )]
     UnevenLayerAssignment,
 
     #[error("provided active set is bigger than the rewarded set")]
@@ -196,25 +204,35 @@ pub enum MixnetContractError {
     #[error("key rotation validity below minimum value")]
     TooShortRotationInterval,
 
-    #[error("this validator ({current_validator}) is not the one responsible for advancing this epoch. It's responsibility of {chosen_validator}.")]
+    #[error(
+        "this validator ({current_validator}) is not the one responsible for advancing this epoch. It's responsibility of {chosen_validator}."
+    )]
     RewardingValidatorMismatch {
         current_validator: Addr,
         chosen_validator: Addr,
     },
 
-    #[error("the epoch is currently in the process of being advanced. (the state is {current_state}) Please try sending your transaction again once this has finished")]
+    #[error(
+        "the epoch is currently in the process of being advanced. (the state is {current_state}) Please try sending your transaction again once this has finished"
+    )]
     EpochAdvancementInProgress { current_state: EpochState },
 
-    #[error("the epoch is in an unexpected state. expected 'mix rewarding' state, but we're in {current_state} instead.")]
+    #[error(
+        "the epoch is in an unexpected state. expected 'mix rewarding' state, but we're in {current_state} instead."
+    )]
     UnexpectedNonRewardingEpochState { current_state: EpochState },
 
-    #[error("attempted to reward mixnode out of order. Attempted to reward {attempted_to_reward} while last rewarded was {last_rewarded}.")]
+    #[error(
+        "attempted to reward mixnode out of order. Attempted to reward {attempted_to_reward} while last rewarded was {last_rewarded}."
+    )]
     RewardingOutOfOrder {
         last_rewarded: NodeId,
         attempted_to_reward: NodeId,
     },
 
-    #[error("the epoch is currently not in the 'event reconciliation' state. (the state is {current_state})")]
+    #[error(
+        "the epoch is currently not in the 'event reconciliation' state. (the state is {current_state})"
+    )]
     EpochNotInEventReconciliationState { current_state: EpochState },
 
     #[error(
@@ -225,14 +243,18 @@ pub enum MixnetContractError {
     #[error("unexpected role assignment. got: {got} while expected: {expected}")]
     UnexpectedRoleAssignment { expected: Role, got: Role },
 
-    #[error("attempted to assign an invalid number of nodes for a role of {role}. got {assigned}, but the maximum allowed is {allowed}")]
+    #[error(
+        "attempted to assign an invalid number of nodes for a role of {role}. got {assigned}, but the maximum allowed is {allowed}"
+    )]
     IllegalRoleCount {
         role: Role,
         assigned: u32,
         allowed: u32,
     },
 
-    #[error("the epoch is currently not in the 'epoch advancement' state. (the state is {current_state})")]
+    #[error(
+        "the epoch is currently not in the 'epoch advancement' state. (the state is {current_state})"
+    )]
     EpochNotInAdvancementState { current_state: EpochState },
 
     #[error("failed to verify message signature: {source}")]
@@ -241,7 +263,9 @@ pub enum MixnetContractError {
         source: ApiVerifierError,
     },
 
-    #[error("this operation is no longer allowed to be performed with vesting tokens. please move them to your liquid balance and try again")]
+    #[error(
+        "this operation is no longer allowed to be performed with vesting tokens. please move them to your liquid balance and try again"
+    )]
     DisabledVestingOperation,
 
     #[error(
@@ -249,7 +273,9 @@ pub enum MixnetContractError {
     )]
     NotAVestingMixnode,
 
-    #[error("this delegation has not been performed with the vesting tokens or has already been migrated")]
+    #[error(
+        "this delegation has not been performed with the vesting tokens or has already been migrated"
+    )]
     NotAVestingDelegation,
 
     #[error("the provided profit margin ({provided}) is outside the allowed range: {range}")]
@@ -258,7 +284,9 @@ pub enum MixnetContractError {
         range: ProfitMarginRange,
     },
 
-    #[error("the provided interval operating cost ({provided}{denom}) is outside the allowed range: {range}")]
+    #[error(
+        "the provided interval operating cost ({provided}{denom}) is outside the allowed range: {range}"
+    )]
     OperatingCostOutsideRange {
         denom: String,
         provided: Uint128,
@@ -279,7 +307,9 @@ pub enum MixnetContractError {
     #[error("the provided nym-node version is not a valid semver. got: {provided}")]
     InvalidNymNodeSemver { provided: String },
 
-    #[error("the provided nym-node version is not greater than the current one. got: {provided}. current: {current}")]
+    #[error(
+        "the provided nym-node version is not greater than the current one. got: {provided}. current: {current}"
+    )]
     NonIncreasingSemver { provided: String, current: String },
 }
 

common/cosmwasm-smart-contracts/mixnet-contract/src/events.rs

@@ -9,7 +9,7 @@ use crate::reward_params::{ActiveSetUpdate, IntervalRewardParams, IntervalReward
 use crate::rewarding::RewardDistribution;
 use crate::{BlockHeight, ContractStateParamsUpdate, EpochId, IdentityKeyRef, Interval, NodeId};
 pub use contracts_common::events::*;
-use cosmwasm_std::{attr, Addr, Coin, Decimal, Event};
+use cosmwasm_std::{Addr, Coin, Decimal, Event, attr};
 use std::fmt::Display;
 
 pub const EVENT_VERSION_PREFIX: &str = "v2_";

common/cosmwasm-smart-contracts/mixnet-contract/src/gateway.rs

@@ -3,7 +3,7 @@
 
 use crate::{IdentityKey, NodeId, SphinxKey};
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{to_json_string, Addr, Coin};
+use cosmwasm_std::{Addr, Coin, to_json_string};
 use std::cmp::Ordering;
 use std::fmt::Display;
 

common/cosmwasm-smart-contracts/mixnet-contract/src/interval.rs

@@ -1,13 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::NodeId;
 use crate::error::MixnetContractError;
 use crate::nym_node::Role;
-use crate::NodeId;
 use cosmwasm_schema::cw_serde;
-use cosmwasm_schema::schemars::gen::SchemaGenerator;
-use cosmwasm_schema::schemars::schema::{InstanceType, Schema, SchemaObject};
 use cosmwasm_schema::schemars::JsonSchema;
+use cosmwasm_schema::schemars::r#gen::SchemaGenerator;
+use cosmwasm_schema::schemars::schema::{InstanceType, Schema, SchemaObject};
 use cosmwasm_std::{Addr, Env};
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
@@ -27,8 +27,8 @@ pub(crate) mod string_rfc3339_offset_date_time {
     use serde::ser::Error;
     use serde::{Deserializer, Serialize, Serializer};
     use std::fmt::Formatter;
-    use time::format_description::well_known::Rfc3339;
     use time::OffsetDateTime;
+    use time::format_description::well_known::Rfc3339;
 
     struct Rfc3339OffsetDateTimeVisitor;
 
@@ -91,7 +91,7 @@ impl EpochStatus {
     ) -> Result<bool, MixnetContractError> {
         match &mut self.state {
             EpochState::Rewarding {
-                ref mut last_rewarded,
+                last_rewarded,
                 final_node_id,
             } => {
                 if new_last_rewarded <= *last_rewarded {
@@ -254,7 +254,7 @@ impl JsonSchema for Interval {
         "Interval".to_owned()
     }
 
-    fn json_schema(gen: &mut SchemaGenerator) -> Schema {
+    fn json_schema(r#gen: &mut SchemaGenerator) -> Schema {
         let mut schema_object = SchemaObject {
             instance_type: Some(InstanceType::Object.into()),
             ..SchemaObject::default()
@@ -263,12 +263,13 @@ impl JsonSchema for Interval {
         let object_validation = schema_object.object();
         object_validation
             .properties
-            .insert("id".to_owned(), gen.subschema_for::<IntervalId>());
+            .insert("id".to_owned(), r#gen.subschema_for::<IntervalId>());
         object_validation.required.insert("id".to_owned());
 
-        object_validation
+        object_validation.properties.insert(
-            .properties
+            "epochs_in_interval".to_owned(),
-            .insert("epochs_in_interval".to_owned(), gen.subschema_for::<u32>());
+            r#gen.subschema_for::<u32>(),
+        );
         object_validation
             .required
             .insert("epochs_in_interval".to_owned());
@@ -277,7 +278,7 @@ impl JsonSchema for Interval {
         // serialization to string, so we just specify the schema to be String.
         object_validation.properties.insert(
             "current_epoch_start".to_owned(),
-            gen.subschema_for::<String>(),
+            r#gen.subschema_for::<String>(),
         );
         object_validation
             .required
@@ -285,7 +286,7 @@ impl JsonSchema for Interval {
 
         object_validation.properties.insert(
             "current_epoch_id".to_owned(),
-            gen.subschema_for::<EpochId>(),
+            r#gen.subschema_for::<EpochId>(),
         );
         object_validation
             .required
@@ -293,12 +294,12 @@ impl JsonSchema for Interval {
 
         object_validation
             .properties
-            .insert("epoch_length".to_owned(), gen.subschema_for::<Duration>());
+            .insert("epoch_length".to_owned(), r#gen.subschema_for::<Duration>());
         object_validation.required.insert("epoch_length".to_owned());
 
         object_validation.properties.insert(
             "total_elapsed_epochs".to_owned(),
-            gen.subschema_for::<EpochId>(),
+            r#gen.subschema_for::<EpochId>(),
         );
         object_validation
             .required

common/cosmwasm-smart-contracts/mixnet-contract/src/mixnode.rs

@@ -9,14 +9,14 @@ use crate::error::MixnetContractError;
 use crate::helpers::IntoBaseDecimal;
 use crate::nym_node::Role;
 use crate::reward_params::{NodeRewardingParameters, RewardingParams};
-use crate::rewarding::helpers::truncate_reward;
 use crate::rewarding::RewardDistribution;
+use crate::rewarding::helpers::truncate_reward;
 use crate::{
     Delegation, EpochEventId, EpochId, IdentityKey, IntervalEventId, NodeId, OperatingCostRange,
     Percent, ProfitMarginRange, SphinxKey,
 };
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{to_json_string, Addr, Coin, Decimal, StdResult, Uint128};
+use cosmwasm_std::{Addr, Coin, Decimal, StdResult, Uint128, to_json_string};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};

common/cosmwasm-smart-contracts/mixnet-contract/src/msg.rs

@@ -18,7 +18,7 @@ use crate::{
     VersionScoreFormulaParams,
 };
 use crate::{OperatingCostRange, ProfitMarginRange};
-use contracts_common::{signing::MessageSignature, IdentityKey, Percent};
+use contracts_common::{IdentityKey, Percent, signing::MessageSignature};
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Coin, Decimal};
 use std::time::Duration;
@@ -55,7 +55,7 @@ use crate::{
     types::{ContractState, ContractStateParams},
 };
 #[cfg(feature = "schema")]
-use contracts_common::{signing::Nonce, ContractBuildInformation};
+use contracts_common::{ContractBuildInformation, signing::Nonce};
 #[cfg(feature = "schema")]
 use cosmwasm_schema::QueryResponses;
 

common/cosmwasm-smart-contracts/mixnet-contract/src/reward_params.rs

@@ -3,9 +3,9 @@
 
 use crate::helpers::IntoBaseDecimal;
 use crate::nym_node::Role;
-use crate::{error::MixnetContractError, Percent};
+use crate::{Percent, error::MixnetContractError};
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{to_json_string, Decimal};
+use cosmwasm_std::{Decimal, to_json_string};
 
 pub type Performance = Percent;
 pub type WorkFactor = Decimal;

common/cosmwasm-smart-contracts/mixnet-contract/src/rewarding/simulator/mod.rs

@@ -4,8 +4,8 @@
 use crate::error::MixnetContractError;
 use crate::helpers::IntoBaseDecimal;
 use crate::reward_params::{NodeRewardingParameters, WorkFactor};
-use crate::rewarding::simulator::simulated_node::SimulatedNode;
 use crate::rewarding::RewardDistribution;
+use crate::rewarding::simulator::simulated_node::SimulatedNode;
 use crate::{Delegation, Interval, IntervalRewardParams, NodeCostParams, NodeId, RewardingParams};
 use cosmwasm_std::{Coin, Decimal};
 use std::collections::BTreeMap;
@@ -226,9 +226,9 @@ impl Simulator {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::Percent;
     use crate::helpers::compare_decimals;
     use crate::reward_params::RewardedSetParams;
-    use crate::Percent;
     use cosmwasm_std::testing::mock_env;
     use std::time::Duration;
 

common/cosmwasm-smart-contracts/mixnet-contract/src/types.rs

@@ -1,10 +1,10 @@
 // Copyright 2021-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::EpochId;
 use crate::config_score::{ConfigScoreParams, OutdatedVersionWeights, VersionScoreFormulaParams};
 use crate::nym_node::Role;
 use crate::reward_params::RewardedSetParams;
-use crate::EpochId;
 use contracts_common::Percent;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::Coin;

common/cosmwasm-smart-contracts/nym-performance-contract/src/error.rs

@@ -23,7 +23,9 @@ pub enum NymPerformanceContractError {
     #[error("{address} is not an authorised network monitor")]
     NotAuthorised { address: Addr },
 
-    #[error("attempted to submit performance data for epoch {epoch_id} and node {node_id} whilst last submitted was {last_epoch_id} for node {last_node_id}")]
+    #[error(
+        "attempted to submit performance data for epoch {epoch_id} and node {node_id} whilst last submitted was {last_epoch_id} for node {last_node_id}"
+    )]
     StalePerformanceSubmission {
         epoch_id: EpochId,
         node_id: NodeId,

common/cosmwasm-smart-contracts/nym-pool-contract/src/error.rs

@@ -16,7 +16,9 @@ pub enum NymPoolContractError {
     #[error(transparent)]
     StdErr(#[from] cosmwasm_std::StdError),
 
-    #[error("this sender is not authorised to revoke this grant. its neither the admin or the original (and still whitelisted) granter")]
+    #[error(
+        "this sender is not authorised to revoke this grant. its neither the admin or the original (and still whitelisted) granter"
+    )]
     UnauthorizedGrantRevocation,
 
     #[error("the specified address is already a whitelisted granter")]
@@ -28,7 +30,9 @@ pub enum NymPoolContractError {
     #[error("invalid coin denomination. got {got}, but expected {expected}")]
     InvalidDenom { expected: String, got: String },
 
-    #[error("there already exists an active grant for {grantee}. it was granted by {granter} at block height {created_at_height}")]
+    #[error(
+        "there already exists an active grant for {grantee}. it was granted by {granter} at block height {created_at_height}"
+    )]
     GrantAlreadyExist {
         granter: String,
         grantee: String,
@@ -38,13 +42,17 @@ pub enum NymPoolContractError {
     #[error("could not find any active grants for {grantee}")]
     GrantNotFound { grantee: String },
 
-    #[error("the provided timestamp value ({timestamp}) is set in the past. the current block timestamp is {current_block_timestamp}")]
+    #[error(
+        "the provided timestamp value ({timestamp}) is set in the past. the current block timestamp is {current_block_timestamp}"
+    )]
     TimestampInThePast {
         timestamp: u64,
         current_block_timestamp: u64,
     },
 
-    #[error("there are not enough tokens to process this request. {available} are available, but {required} is needed.")]
+    #[error(
+        "there are not enough tokens to process this request. {available} are available, but {required} is needed."
+    )]
     InsufficientTokens { available: Coin, required: Coin },
 
     #[error("the period length can't be zero")]
@@ -53,22 +61,30 @@ pub enum NymPoolContractError {
     #[error("the provided coin value is zero")]
     ZeroAmount,
 
-    #[error("the periodic spend limit of {periodic} was set to be higher than the total spend limit {total_limit}")]
+    #[error(
+        "the periodic spend limit of {periodic} was set to be higher than the total spend limit {total_limit}"
+    )]
     PeriodicGrantOverSpendLimit { periodic: Coin, total_limit: Coin },
 
-    #[error("the accumulation spend limit of {accumulation} was set to be lower than the periodic grant amount of {periodic_grant}")]
+    #[error(
+        "the accumulation spend limit of {accumulation} was set to be lower than the periodic grant amount of {periodic_grant}"
+    )]
     AccumulationBelowGrantAmount {
         accumulation: Coin,
         periodic_grant: Coin,
     },
 
-    #[error("the accumulation spend limit of {accumulation} was set to be higher than the total spend limit of {total_limit}")]
+    #[error(
+        "the accumulation spend limit of {accumulation} was set to be higher than the total spend limit of {total_limit}"
+    )]
     AccumulationOverSpendLimit {
         accumulation: Coin,
         total_limit: Coin,
     },
 
-    #[error("the specified delayed allowance would never be available. it would become active at {available_timestamp} yet it expires at {expiration_timestamp}")]
+    #[error(
+        "the specified delayed allowance would never be available. it would become active at {available_timestamp} yet it expires at {expiration_timestamp}"
+    )]
     UnattainableDelayedAllowance {
         expiration_timestamp: u64,
         available_timestamp: u64,

common/cosmwasm-smart-contracts/nym-pool-contract/src/types.rs

@@ -88,10 +88,10 @@ pub mod grants {
 
         pub fn basic_mut(&mut self) -> &mut BasicAllowance {
             match self {
-                Allowance::Basic(ref mut allowance) => allowance,
+                Allowance::Basic(allowance) => allowance,
-                Allowance::ClassicPeriodic(ref mut allowance) => &mut allowance.basic,
+                Allowance::ClassicPeriodic(allowance) => &mut allowance.basic,
-                Allowance::CumulativePeriodic(ref mut allowance) => &mut allowance.basic,
+                Allowance::CumulativePeriodic(allowance) => &mut allowance.basic,
-                Allowance::Delayed(ref mut allowance) => &mut allowance.basic,
+                Allowance::Delayed(allowance) => &mut allowance.basic,
             }
         }
 
@@ -752,7 +752,7 @@ pub mod query_responses {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cosmwasm_std::{coin, Uint128};
+    use cosmwasm_std::{Uint128, coin};
 
     const TEST_DENOM: &str = "unym";
 
@@ -873,8 +873,8 @@ mod tests {
         #[cfg(test)]
         mod basic_allowance {
             use super::*;
-            use cosmwasm_std::testing::mock_env;
             use cosmwasm_std::Timestamp;
+            use cosmwasm_std::testing::mock_env;
 
             #[test]
             fn doesnt_allow_expirations_in_the_past() {
@@ -1158,8 +1158,8 @@ mod tests {
         #[cfg(test)]
         mod delayed_allowance {
             use super::*;
-            use cosmwasm_std::testing::mock_env;
             use cosmwasm_std::Timestamp;
+            use cosmwasm_std::testing::mock_env;
 
             #[test]
             fn doesnt_allow_availability_in_the_past() {

common/cosmwasm-smart-contracts/nym-pool-contract/src/utils.rs

@@ -20,8 +20,8 @@ pub fn ensure_unix_timestamp_not_in_the_past(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cosmwasm_std::testing::mock_env;
     use cosmwasm_std::Timestamp;
+    use cosmwasm_std::testing::mock_env;
     use time::macros::datetime;
 
     #[test]

common/cosmwasm-smart-contracts/vesting-contract/src/error.rs

@@ -61,7 +61,9 @@ pub enum VestingContractError {
     #[error("VESTING ({l}): No bond found for account {0}", l = line!())]
     NoBondFound(String),
 
-    #[error("VESTING: Attempted to reduce mixnode bond pledge below zero! The current pledge is {current} and we attempted to reduce it by {decrease_by}.")]
+    #[error(
+        "VESTING: Attempted to reduce mixnode bond pledge below zero! The current pledge is {current} and we attempted to reduce it by {decrease_by}."
+    )]
     InvalidBondPledgeReduction { current: Coin, decrease_by: Coin },
 
     #[error("VESTING ({l}): Action can only be executed by account owner -> {0}", l = line!())]
@@ -85,13 +87,17 @@ pub enum VestingContractError {
     #[error("VESTING: ({l}: Account owned by {owner} has unpopulated vesting periods!", l = line!())]
     UnpopulatedVestingPeriods { owner: Addr },
 
-    #[error("VESTING: Vesting account associated with {0} already exists, only addresses with not existing vesting accounts can be added as staking addresses")]
+    #[error(
+        "VESTING: Vesting account associated with {0} already exists, only addresses with not existing vesting accounts can be added as staking addresses"
+    )]
     StakingAccountExists(String),
 
     #[error("VESTING: {address} is not permitted to perform staking on behalf of {for_account}")]
     InvalidStakingAccount { address: Addr, for_account: Addr },
 
-    #[error("VESTING: {address} ({acc_id} has already performed {num} individual delegations towards {mix_id}. No further delegations are allowed. Please consider consolidating those delegations instead. The current cap is {cap}.")]
+    #[error(
+        "VESTING: {address} ({acc_id} has already performed {num} individual delegations towards {mix_id}. No further delegations are allowed. Please consider consolidating those delegations instead. The current cap is {cap}."
+    )]
     TooManyDelegations {
         address: Addr,
         acc_id: VestingAccountStorageKey,

common/cosmwasm-smart-contracts/vesting-contract/src/messages.rs

@@ -6,9 +6,9 @@ use contracts_common::signing::MessageSignature;
 use cosmwasm_schema::cw_serde;
 use cosmwasm_std::{Coin, Timestamp};
 use mixnet_contract_common::{
+    Gateway, MixNode, NodeId,
     gateway::GatewayConfigUpdate,
     mixnode::{MixNodeConfigUpdate, NodeCostParams},
-    Gateway, MixNode, NodeId,
 };
 
 #[cfg(feature = "schema")]
@@ -18,10 +18,10 @@ use cosmwasm_schema::QueryResponses;
 
 #[cfg(feature = "schema")]
 use crate::{
-    account::Account,
-    types::{Period, PledgeData, VestingDelegation},
     AccountsResponse, AllDelegationsResponse, DelegationTimesResponse, OriginalVestingResponse,
     VestingCoinsResponse,
+    account::Account,
+    types::{Period, PledgeData, VestingDelegation},
 };
 
 #[cw_serde]

common/credential-proxy/src/deposits_buffer/helpers.rs

@@ -118,7 +118,9 @@ pub async fn make_deposits_request(
             // that one is tricky. deposits technically got made, but we somehow failed to parse response,
             // in this case terminate the proxy with 0 exit code so it wouldn't get automatically restarted
             // because it requires some serious MANUAL intervention
-            error!("CRITICAL FAILURE: failed to parse out deposit information from the contract transaction. either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually. error was: {err}");
+            error!(
+                "CRITICAL FAILURE: failed to parse out deposit information from the contract transaction. either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually. error was: {err}"
+            );
             cancellation_on_critical_failure.cancel();
             return Err(CredentialProxyError::DepositFailure);
         }
@@ -126,7 +128,10 @@ pub async fn make_deposits_request(
 
     if contract_data.len() != amount {
         // another critical failure, that one should be quite impossible and thus has to be manually inspected
-        error!("CRITICAL FAILURE: failed to parse out all deposit information from the contract transaction. got {} responses while we sent {amount} deposits! either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually", contract_data.len());
+        error!(
+            "CRITICAL FAILURE: failed to parse out all deposit information from the contract transaction. got {} responses while we sent {amount} deposits! either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually",
+            contract_data.len()
+        );
         cancellation_on_critical_failure.cancel();
         return Err(CredentialProxyError::DepositFailure);
     }
@@ -138,7 +143,9 @@ pub async fn make_deposits_request(
             Ok(deposit_id) => deposit_id,
             Err(err) => {
                 // another impossibility
-                error!("CRITICAL FAILURE: failed to parse out deposit id out of the response at index {response_index}: {err}. either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually");
+                error!(
+                    "CRITICAL FAILURE: failed to parse out deposit id out of the response at index {response_index}: {err}. either the chain got upgraded and the schema changed or the ecash contract got changed! terminating the process. it has to be inspected manually"
+                );
                 cancellation_on_critical_failure.cancel();
                 return Err(CredentialProxyError::DepositFailure);
             }

common/credential-proxy/src/deposits_buffer/mod.rs

@@ -17,7 +17,7 @@ use tokio_util::sync::CancellationToken;
 use tracing::{debug, info, instrument, warn};
 use uuid::Uuid;
 
-pub use helpers::{make_deposits_request, split_deposits, BufferedDeposit, PerformedDeposits};
+pub use helpers::{BufferedDeposit, PerformedDeposits, make_deposits_request, split_deposits};
 
 pub(crate) mod helpers;
 mod refill_task;
@@ -219,7 +219,9 @@ impl DepositsBuffer {
 
         match maybe_deposit {
             None => {
-                warn!("we currently don't have any usable deposits! are we using them up faster than we request them?");
+                warn!(
+                    "we currently don't have any usable deposits! are we using them up faster than we request them?"
+                );
 
                 // we have to wait until refill task has completed (either initiated by this or another fn call)
                 self.wait_for_deposit(request_uuid, requested_on, client_pubkey)
@@ -242,7 +244,9 @@ impl DepositsBuffer {
         let task_handle = self.inner.deposits_refill_task.take_task_join_handle();
         if let Some(task_handle) = task_handle {
             if !task_handle.is_finished() {
-                info!("the deposit refill task is currently in progress - waiting for the current transaction to finish before concluding shutdown");
+                info!(
+                    "the deposit refill task is currently in progress - waiting for the current transaction to finish before concluding shutdown"
+                );
                 let _ = task_handle.await;
             }
         }

common/credential-proxy/src/deposits_buffer/refill_task.rs

@@ -42,7 +42,9 @@ impl RefillTask {
 
         if let Some(existing_handle) = guard.as_ref() {
             if !existing_handle.is_finished() {
-                error!("CRITICAL BUG: there was already a deposit refill task spawned that hasn't yet finished")
+                error!(
+                    "CRITICAL BUG: there was already a deposit refill task spawned that hasn't yet finished"
+                )
             }
         }
 

common/credential-proxy/src/error.rs

@@ -3,7 +3,7 @@
 
 use nym_ecash_signer_check::SignerCheckError;
 use nym_validator_client::coconut::EcashApiError;
-use nym_validator_client::nym_api::{error::NymAPIError, EpochId};
+use nym_validator_client::nym_api::{EpochId, error::NymAPIError};
 use nym_validator_client::nyxd::error::NyxdError;
 use std::io;
 use std::net::SocketAddr;
@@ -33,7 +33,9 @@ pub enum CredentialProxyError {
     #[error("the provided expiration date is too early")]
     ExpirationDateTooEarly,
 
-    #[error("failed to bind to {address}: {source}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?")]
+    #[error(
+        "failed to bind to {address}: {source}. Are you sure nothing else is running on the specified port and your user has sufficient permission to bind to the requested address?"
+    )]
     SocketBindFailure {
         address: SocketAddr,
         source: io::Error,
@@ -89,7 +91,7 @@ pub enum CredentialProxyError {
     InsufficientNumberOfSigners { available: usize, threshold: u64 },
 
     #[error(
-    "we have only managed to obtain {available} partial credentials while the minimum threshold is {threshold}"
+        "we have only managed to obtain {available} partial credentials while the minimum threshold is {threshold}"
     )]
     InsufficientNumberOfCredentials { available: usize, threshold: u64 },
 
@@ -102,7 +104,9 @@ pub enum CredentialProxyError {
     #[error("the DKG has not yet been initialised in the system")]
     UninitialisedDkg,
 
-    #[error("credentials can't yet be issued in the system. approximate expected availability: {availability}")]
+    #[error(
+        "credentials can't yet be issued in the system. approximate expected availability: {availability}"
+    )]
     CredentialsNotYetIssuable { availability: OffsetDateTime },
 
     #[error("reached seemingly impossible ecash failure")]
@@ -140,7 +144,9 @@ pub enum CredentialProxyError {
     #[error("failed to obtain wallet shares with id {id}: {message}")]
     ShareByIdLoadError { message: String, id: i64 },
 
-    #[error("failed to obtain wallet shares with device_id {device_id} and credential_id: {credential_id}: {message}")]
+    #[error(
+        "failed to obtain wallet shares with device_id {device_id} and credential_id: {credential_id}: {message}"
+    )]
     ShareByDeviceLoadError {
         message: String,
         device_id: String,

common/credential-proxy/src/helpers.rs

@@ -1,8 +1,8 @@
 // Copyright 2025 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use rand::rngs::OsRng;
 use rand::RngCore;
+use rand::rngs::OsRng;
 use time::OffsetDateTime;
 use tracing::{debug, info, warn};
 use uuid::Uuid;

common/credential-proxy/src/http_helpers.rs

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::CredentialProxyError;
+use axum::Json;
 use axum::http::StatusCode;
 use axum::response::{IntoResponse, Response};
-use axum::Json;
 use nym_credential_proxy_requests::api::v1::ErrorResponse;
 use tracing::warn;
 use uuid::Uuid;

common/credential-proxy/src/nym_api_helpers.rs

@@ -5,12 +5,12 @@
 // it should have been therefore extracted to a common crate instead and imported as dependency
 
 use crate::error::CredentialProxyError;
-use futures::{stream, StreamExt};
+use futures::{StreamExt, stream};
 use nym_cache::CachedImmutableItems;
-use nym_credentials::ecash::utils::{cred_exp_date, ecash_today, EcashTime};
+use nym_credentials::ecash::utils::{EcashTime, cred_exp_date, ecash_today};
+use nym_validator_client::EcashApiClient;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::dkg_query_client::Epoch;
-use nym_validator_client::EcashApiClient;
 use std::cmp::min;
 use std::future::Future;
 use time::{Date, OffsetDateTime};

common/credential-proxy/src/quorum_checker.rs

@@ -5,8 +5,8 @@ use crate::error::CredentialProxyError;
 use crate::shared_state::nyxd_client::ChainClient;
 use nym_ecash_signer_check::{check_known_dealers, dkg_details_with_client};
 use std::ops::Deref;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 use tokio_util::sync::CancellationToken;
 use tracing::{error, info, warn};
@@ -67,7 +67,9 @@ impl QuorumStateChecker {
         let res = check_known_dealers(dkg_details).await?;
 
         let Some(signing_threshold) = res.threshold else {
-            warn!("signing threshold is currently unavailable and we have not yet implemented credential issuance during DKG transition");
+            warn!(
+                "signing threshold is currently unavailable and we have not yet implemented credential issuance during DKG transition"
+            );
             return Ok(false);
         };
 

common/credential-proxy/src/shared_state/ecash_state.rs

@@ -3,7 +3,7 @@
 
 use crate::error::CredentialProxyError;
 use crate::nym_api_helpers::{
-    ensure_sane_expiration_date, query_all_threshold_apis, CachedEpoch, CachedImmutableEpochItem,
+    CachedEpoch, CachedImmutableEpochItem, ensure_sane_expiration_date, query_all_threshold_apis,
 };
 use crate::quorum_checker::QuorumState;
 use crate::shared_state::nyxd_client::ChainClient;
@@ -16,20 +16,20 @@ use nym_credentials::ecash::utils::EcashTime;
 use nym_credentials::{
     AggregatedCoinIndicesSignatures, AggregatedExpirationDateSignatures, EpochVerificationKey,
 };
+use nym_validator_client::EcashApiClient;
 use nym_validator_client::client::NymApiClientExt;
 use nym_validator_client::coconut::EcashApiError;
 use nym_validator_client::nym_api::EpochId;
+use nym_validator_client::nyxd::Coin;
 use nym_validator_client::nyxd::contract_traits::dkg_query_client::Epoch;
 use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, PagedDkgQueryClient};
-use nym_validator_client::nyxd::Coin;
-use nym_validator_client::EcashApiClient;
 use time::{Date, OffsetDateTime};
 use tokio::sync::{RwLock, RwLockReadGuard};
 use tracing::info;
 
+pub use nym_compact_ecash::VerificationKeyAuth;
 pub use nym_compact_ecash::scheme::coin_indices_signatures::CoinIndexSignatureShare;
 pub use nym_compact_ecash::scheme::expiration_date_signatures::ExpirationDateSignatureShare;
-pub use nym_compact_ecash::VerificationKeyAuth;
 pub use nym_credentials::{IssuanceTicketBook, IssuedTicketBook};
 pub use nym_credentials_interface::{TicketType, TicketTypeRepr};
 

common/credential-proxy/src/shared_state/mod.rs

@@ -13,10 +13,10 @@ use nym_credential_proxy_requests::api::v1::ticketbook::models::{
 };
 use nym_credentials::{AggregatedCoinIndicesSignatures, AggregatedExpirationDateSignatures};
 use nym_ecash_contract_common::deposit::DepositId;
-use nym_validator_client::nym_api::EpochId;
-use nym_validator_client::nyxd::contract_traits::dkg_query_client::Epoch;
-use nym_validator_client::nyxd::Coin;
 use nym_validator_client::EcashApiClient;
+use nym_validator_client::nym_api::EpochId;
+use nym_validator_client::nyxd::Coin;
+use nym_validator_client::nyxd::contract_traits::dkg_query_client::Epoch;
 use std::sync::Arc;
 use std::time::Duration;
 use time::{Date, OffsetDateTime};
@@ -92,7 +92,9 @@ impl CredentialProxyState {
         let time_taken = start.elapsed();
         let formatted = humantime::format_duration(time_taken);
         if time_taken > Duration::from_secs(10) {
-            warn!("attempting to get buffered deposit took {formatted}. perhaps the buffer is too small or the process/chain is overloaded?")
+            warn!(
+                "attempting to get buffered deposit took {formatted}. perhaps the buffer is too small or the process/chain is overloaded?"
+            )
         } else {
             debug!("attempting to get buffered deposit took {formatted}")
         };
@@ -106,7 +108,9 @@ impl CredentialProxyState {
             .insert_deposit_usage_error(deposit_id, error)
             .await
         {
-            error!("failed to insert information about deposit (id: {deposit_id}) usage failure: {err}")
+            error!(
+                "failed to insert information about deposit (id: {deposit_id}) usage failure: {err}"
+            )
         }
     }
 

common/credential-proxy/src/shared_state/nyxd_client.rs

@@ -7,7 +7,7 @@ use nym_ecash_contract_common::msg::ExecuteMsg;
 use nym_validator_client::nyxd::contract_traits::NymContractsProvider;
 use nym_validator_client::nyxd::cosmwasm_client::types::ExecuteResult;
 use nym_validator_client::nyxd::{Coin, Config, CosmWasmClient, NyxdClient};
-use nym_validator_client::{nyxd, DirectSigningHttpRpcNyxdClient};
+use nym_validator_client::{DirectSigningHttpRpcNyxdClient, nyxd};
 use std::ops::Deref;
 use std::sync::Arc;
 use std::time::Duration;

common/credential-proxy/src/shared_state/required_deposit_cache.rs

@@ -3,8 +3,8 @@
 
 use crate::error::CredentialProxyError;
 use crate::shared_state::nyxd_client::ChainClient;
-use nym_validator_client::nyxd::contract_traits::EcashQueryClient;
 use nym_validator_client::nyxd::Coin;
+use nym_validator_client::nyxd::contract_traits::EcashQueryClient;
 use std::sync::Arc;
 use time::OffsetDateTime;
 use tokio::sync::RwLock;

common/credential-proxy/src/storage/manager.rs

@@ -380,8 +380,9 @@ impl SqliteStorageManager {
             return Ok(());
         }
 
-        let mut query_builder =
+        let mut query_builder = sqlx::QueryBuilder::new(
-            sqlx::QueryBuilder::new("INSERT INTO ecash_deposit (deposit_id, deposit_tx_hash, requested_on, deposit_amount, ed25519_deposit_private_key) ");
+            "INSERT INTO ecash_deposit (deposit_id, deposit_tx_hash, requested_on, deposit_amount, ed25519_deposit_private_key) ",
+        );
 
         query_builder.push_values(&deposits, |mut b, deposit| {
             b.push_bind(deposit.deposit_id)

common/credential-proxy/src/storage/mod.rs

@@ -13,8 +13,8 @@ use nym_credentials::{
 use nym_validator_client::ecash::BlindedSignatureResponse;
 use nym_validator_client::nym_api::EpochId;
 use nym_validator_client::nyxd::contract_traits::ecash_query_client::DepositId;
-use sqlx::sqlite::{SqliteAutoVacuum, SqliteSynchronous};
 use sqlx::ConnectOptions;
+use sqlx::sqlite::{SqliteAutoVacuum, SqliteSynchronous};
 use std::fmt::Debug;
 use std::path::Path;
 use std::time::Duration;
@@ -405,8 +405,8 @@ mod tests {
     use nym_compact_ecash::scheme::keygen::KeyPairUser;
     use nym_crypto::asymmetric::ed25519;
     use nym_validator_client::nyxd::{Coin, Hash};
-    use rand::rngs::OsRng;
     use rand::RngCore;
+    use rand::rngs::OsRng;
     use std::ops::Deref;
     use tempfile::{NamedTempFile, TempPath};
 

common/credential-proxy/src/ticketbook_manager/mod.rs

@@ -4,12 +4,12 @@
 use crate::deposits_buffer::DepositsBuffer;
 use crate::error::CredentialProxyError;
 use crate::quorum_checker::QuorumStateChecker;
+use crate::shared_state::CredentialProxyState;
 use crate::shared_state::ecash_state::EcashState;
 use crate::shared_state::nyxd_client::ChainClient;
 use crate::shared_state::required_deposit_cache::RequiredDepositCache;
-use crate::shared_state::CredentialProxyState;
-use crate::storage::pruner::StoragePruner;
 use crate::storage::CredentialProxyStorage;
+use crate::storage::pruner::StoragePruner;
 use crate::webhook::ZkNymWebhook;
 use nym_credentials::ecash::utils::ecash_default_expiration_date;
 use nym_validator_client::nym_api::EpochId;

common/credential-proxy/src/ticketbook_manager/shares_handlers.rs

@@ -8,7 +8,7 @@ use nym_credential_proxy_requests::api::v1::ticketbook::models::{
     GlobalDataParams, TicketbookWalletSharesResponse,
 };
 use nym_validator_client::nym_api::EpochId;
-use tracing::{debug, span, Instrument, Level};
+use tracing::{Instrument, Level, debug, span};
 use uuid::Uuid;
 
 impl TicketbookManager {

common/credential-proxy/src/ticketbook_manager/ticketbook_handlers.rs

@@ -12,7 +12,7 @@ use nym_credential_proxy_requests::api::v1::ticketbook::models::{
     TicketbookWalletSharesResponse,
 };
 use time::OffsetDateTime;
-use tracing::{error, info, span, warn, Instrument, Level};
+use tracing::{Instrument, Level, error, info, span, warn};
 use uuid::Uuid;
 
 impl TicketbookManager {

common/credential-proxy/src/ticketbook_manager/wallet_shares.rs

@@ -4,7 +4,7 @@
 use crate::error::CredentialProxyError;
 use crate::storage::models::BlindedShares;
 use crate::ticketbook_manager::TicketbookManager;
-use futures::{stream, StreamExt};
+use futures::{StreamExt, stream};
 use nym_compact_ecash::Base58;
 use nym_credential_proxy_requests::api::v1::ticketbook::models::{
     TicketbookAsyncRequest, TicketbookObtainParams, TicketbookRequest,

common/credential-proxy/src/webhook.rs

@@ -3,7 +3,7 @@
 
 use reqwest::header::AUTHORIZATION;
 use serde::Serialize;
-use tracing::{debug, error, instrument, span, Instrument, Level};
+use tracing::{Instrument, Level, debug, error, instrument, span};
 use url::Url;
 use uuid::Uuid;
 

common/credential-storage/src/persistent_storage/mod.rs

@@ -58,7 +58,6 @@ impl PersistentStorage {
             "Attempting to connect to database {}",
             database_path.as_ref().display()
         );
-
         let opts = sqlx::sqlite::SqliteConnectOptions::new()
             .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
             .synchronous(SqliteSynchronous::Normal)

common/credential-verification/src/bandwidth_storage_manager.rs

@@ -1,9 +1,9 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::error::*;
 use crate::BandwidthFlushingBehaviourConfig;
 use crate::ClientBandwidth;
+use crate::error::*;
 use nym_credentials::ecash::utils::ecash_today;
 use nym_credentials_interface::Bandwidth;
 use nym_gateway_requests::ServerResponse;

common/credential-verification/src/ecash/credential_sender.rs

@@ -1,10 +1,10 @@
 // Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+use crate::Error;
 use crate::ecash::error::EcashTicketError;
 use crate::ecash::helpers::for_each_api_concurrent;
 use crate::ecash::state::SharedState;
-use crate::Error;
 use cosmwasm_std::Fraction;
 use cw_utils::ThresholdResponse;
 use futures::channel::mpsc::UnboundedReceiver;
@@ -13,22 +13,22 @@ use nym_api_requests::constants::MIN_BATCH_REDEMPTION_DELAY;
 use nym_api_requests::ecash::models::{BatchRedeemTicketsBody, VerifyEcashTicketBody};
 use nym_credentials_interface::Bandwidth;
 use nym_credentials_interface::{ClientTicket, TicketType};
+use nym_validator_client::EcashApiClient;
 use nym_validator_client::coconut::EcashApiError;
 use nym_validator_client::nym_api::{EpochId, NymApiClientExt};
+use nym_validator_client::nyxd::AccountId;
 use nym_validator_client::nyxd::contract_traits::{
     EcashSigningClient, MultisigQueryClient, MultisigSigningClient, PagedMultisigQueryClient,
 };
 use nym_validator_client::nyxd::cosmwasm_client::ContractResponseData;
 use nym_validator_client::nyxd::cw3::Status;
-use nym_validator_client::nyxd::AccountId;
-use nym_validator_client::EcashApiClient;
 use si_scale::helpers::bibytes2;
 use std::collections::{HashMap, HashSet};
 use std::ops::Deref;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use time::OffsetDateTime;
 use tokio::sync::{Mutex, RwLockReadGuard};
-use tokio::time::{interval_at, Duration, Instant};
+use tokio::time::{Duration, Instant, interval_at};
 use tracing::{debug, error, info, instrument, trace, warn};
 
 enum ProposalResult {
@@ -352,7 +352,9 @@ impl CredentialHandler {
                 Ok(accepted)
             }
             Err(err) => {
-                error!("failed to send ticket {ticket_id} for verification to ecash signer '{client}': {err}. if we don't reach quorum, we'll retry later");
+                error!(
+                    "failed to send ticket {ticket_id} for verification to ecash signer '{client}': {err}. if we don't reach quorum, we'll retry later"
+                );
                 Err(EcashTicketError::ApiFailure(EcashApiError::NymApi {
                     source: nym_validator_client::ValidatorClientError::from(err),
                 }))
@@ -443,7 +445,9 @@ impl CredentialHandler {
         let rejected_ratio = rejected as f32 / total as f32;
         let rejected_perc = rejected_ratio * 100.;
         if rejected_ratio >= (1. - self.config.minimum_api_quorum) {
-            error!("{rejected_perc:.2}% of signers rejected ticket {ticket_id}. we won't be able to redeem it");
+            error!(
+                "{rejected_perc:.2}% of signers rejected ticket {ticket_id}. we won't be able to redeem it"
+            );
 
             self.shared_state
                 .storage
@@ -456,12 +460,19 @@ impl CredentialHandler {
         let accepted_ratio = (total - rejected - num_failures) as f32 / total as f32;
         let accepted_perc = accepted_ratio * 100.;
         match accepted_ratio {
-            n if n < self.multisig_threshold => error!("less than 2/3 of signers ({accepted_perc:.2}%) accepted ticket {ticket_id}. we won't be able to spend it"),
+            n if n < self.multisig_threshold => error!(
-            n if n < self.config.minimum_api_quorum => warn!("less than 80%, but more than 67% of signers ({accepted_perc:.2}%) accepted ticket {ticket_id}. technically we could redeem it, but we'll wait for the bigger quorum"),
+                "less than 2/3 of signers ({accepted_perc:.2}%) accepted ticket {ticket_id}. we won't be able to spend it"
+            ),
+            n if n < self.config.minimum_api_quorum => warn!(
+                "less than 80%, but more than 67% of signers ({accepted_perc:.2}%) accepted ticket {ticket_id}. technically we could redeem it, but we'll wait for the bigger quorum"
+            ),
             _ => {
                 trace!("{accepted_perc:.2}% of signers accepted ticket {ticket_id}");
-                self.shared_state.storage.update_verified_ticket(pending.ticket.ticket_id).await?;
+                self.shared_state
-                return Ok(true)
+                    .storage
+                    .update_verified_ticket(pending.ticket.ticket_id)
+                    .await?;
+                return Ok(true);
             }
         }
 
@@ -484,7 +495,10 @@ impl CredentialHandler {
             .send_pending_ticket_for_verification(&mut pending, Some(api_clients))
             .await?;
         if !got_quorum {
-            debug!("failed to reach quorum for ticket {}. apis: {:?} haven't responded. we'll retry later", pending.ticket.ticket_id, pending.pending);
+            debug!(
+                "failed to reach quorum for ticket {}. apis: {:?} haven't responded. we'll retry later",
+                pending.ticket.ticket_id, pending.pending
+            );
             self.pending_tickets.push(pending);
         } else {
             // since we reached the quorum we no longer need to hold the ticket's binary data
@@ -513,7 +527,10 @@ impl CredentialHandler {
             match self.try_resolve_pending_proposal(&mut pending, None).await {
                 Ok(resolution) => {
                     if resolution.is_pending() {
-                        warn!("still failed to reach quorum for proposal {}. apis: {:?} haven't responded. we'll retry later", pending.proposal_id, pending.pending);
+                        warn!(
+                            "still failed to reach quorum for proposal {}. apis: {:?} haven't responded. we'll retry later",
+                            pending.proposal_id, pending.pending
+                        );
                         still_failing.push(pending);
                     } else {
                         self.shared_state
@@ -527,7 +544,9 @@ impl CredentialHandler {
                     }
                 }
                 Err(err) => {
-                    error!("experienced internal error when attempting to resolve pending proposal: {err}");
+                    error!(
+                        "experienced internal error when attempting to resolve pending proposal: {err}"
+                    );
                     // make sure to update internal state to not lose any data
                     self.pending_redemptions.push(pending);
                     self.pending_redemptions.append(&mut still_failing);
@@ -547,7 +566,10 @@ impl CredentialHandler {
             {
                 Ok(got_quorum) => {
                     if !got_quorum {
-                        warn!("still failed to reach quorum for ticket {}. apis: {:?} haven't responded. we'll retry later", pending.ticket.ticket_id, pending.pending);
+                        warn!(
+                            "still failed to reach quorum for ticket {}. apis: {:?} haven't responded. we'll retry later",
+                            pending.ticket.ticket_id, pending.pending
+                        );
                         still_failing.push(pending);
                     } else {
                         // since we reached the quorum we no longer need to hold the ticket's binary data
@@ -558,7 +580,9 @@ impl CredentialHandler {
                     }
                 }
                 Err(err) => {
-                    error!("experienced internal error when attempting to resolve pending ticket: {err}");
+                    error!(
+                        "experienced internal error when attempting to resolve pending ticket: {err}"
+                    );
                     // make sure to update internal state to not lose any data
                     self.pending_tickets.push(pending);
                     self.pending_tickets.append(&mut still_failing);
@@ -591,7 +615,9 @@ impl CredentialHandler {
                 Ok(accepted)
             }
             Err(err) => {
-                error!("failed to send proposal {proposal_id} for redemption vote to ecash signer '{client}': {err}. if we don't reach quorum, we'll retry later");
+                error!(
+                    "failed to send proposal {proposal_id} for redemption vote to ecash signer '{client}': {err}. if we don't reach quorum, we'll retry later"
+                );
                 Ok(false)
             }
         }
@@ -713,7 +739,9 @@ impl CredentialHandler {
         let rejected_ratio = rejected as f32 / total as f32;
         let rejected_perc = rejected_ratio * 100.;
         if rejected_ratio >= (1. - self.multisig_threshold) {
-            error!("{rejected_perc:.2}% of signers rejected proposal {proposal_id}. we won't be able to execute it");
+            error!(
+                "{rejected_perc:.2}% of signers rejected proposal {proposal_id}. we won't be able to execute it"
+            );
             // no need to query the chain as with so many rejections it's impossible it has passed.
             return Ok(ProposalResult::Rejected);
         }
@@ -722,11 +750,15 @@ impl CredentialHandler {
         let accepted_perc = accepted_ratio * 100.;
         match accepted_ratio {
             n if n < self.multisig_threshold => {
-                error!("less than 2/3 of signers ({accepted_perc:.2}%) accepted proposal {proposal_id}. we're not yet be able to execute it to get funds out");
+                error!(
+                    "less than 2/3 of signers ({accepted_perc:.2}%) accepted proposal {proposal_id}. we're not yet be able to execute it to get funds out"
+                );
                 return Ok(ProposalResult::Pending);
             }
             n if n < self.config.minimum_api_quorum => {
-                warn!("the system seems to be a bit unstable: less than 80%, but more than 67% of signers ({accepted_perc:.2}%) accepted proposal {proposal_id}");
+                warn!(
+                    "the system seems to be a bit unstable: less than 80%, but more than 67% of signers ({accepted_perc:.2}%) accepted proposal {proposal_id}"
+                );
             }
             _ => {
                 trace!("{accepted_perc:.2}% of signers accepted proposal {proposal_id}");
@@ -784,7 +816,9 @@ impl CredentialHandler {
                 None
             }
             (_, Some(on_chain)) => {
-                warn!("we seem to have crashed after creating proposal, but before persisting it onto disk!");
+                warn!(
+                    "we seem to have crashed after creating proposal, but before persisting it onto disk!"
+                );
 
                 Some(on_chain)
             }
@@ -805,12 +839,20 @@ impl CredentialHandler {
                 if latest_stored.created_at + self.config.maximum_time_between_redemption < now {
                     {}
                 } else {
-                    debug!("we only have {} verified tickets. there's no point in creating a redemption request yet. (we need at least {} (configurable))", verified_tickets.len(), self.config.minimum_redemption_tickets);
+                    debug!(
+                        "we only have {} verified tickets. there's no point in creating a redemption request yet. (we need at least {} (configurable))",
+                        verified_tickets.len(),
+                        self.config.minimum_redemption_tickets
+                    );
                     return Ok(());
                 }
             } else {
                 // first proposal
-                debug!("we only have {} verified tickets. there's no point in creating a redemption request yet. (we need at least {} (configurable))", verified_tickets.len(), self.config.minimum_redemption_tickets);
+                debug!(
+                    "we only have {} verified tickets. there's no point in creating a redemption request yet. (we need at least {} (configurable))",
+                    verified_tickets.len(),
+                    self.config.minimum_redemption_tickets
+                );
                 return Ok(());
             }
         }
@@ -879,7 +921,10 @@ impl CredentialHandler {
             .try_resolve_pending_proposal(&mut pending, Some(api_clients))
             .await?;
         if resolution.is_pending() {
-            warn!("failed to reach quorum for proposal {proposal_id}. apis: {:?} haven't responded. we'll retry later", pending.pending);
+            warn!(
+                "failed to reach quorum for proposal {proposal_id}. apis: {:?} haven't responded. we'll retry later",
+                pending.pending
+            );
             self.pending_redemptions.push(pending);
         } else {
             self.shared_state
@@ -896,7 +941,9 @@ impl CredentialHandler {
     }
 
     async fn periodic_operations(&mut self) -> Result<(), EcashTicketError> {
-        trace!("attempting to resolve all pending operations -> tickets that are waiting for verification and possibly redemption");
+        trace!(
+            "attempting to resolve all pending operations -> tickets that are waiting for verification and possibly redemption"
+        );
 
         // 1. retry all operations that have failed in the past: verification requests and pending redemption
         self.resolve_pending().await?;

common/credential-verification/src/ecash/error.rs

@@ -72,7 +72,9 @@ pub enum EcashTicketError {
     #[error("the DKG contract is unavailable")]
     UnavailableDkgContract,
 
-    #[error("the DKG threshold value for epoch {epoch_id} is currently unavailable. we're probably mid-epoch transition")]
+    #[error(
+        "the DKG threshold value for epoch {epoch_id} is currently unavailable. we're probably mid-epoch transition"
+    )]
     DKGThresholdUnavailable { epoch_id: EpochId },
 
     #[error("could not create redemption proposal as we have tickets pending full verification")]

common/credential-verification/src/ecash/mod.rs

@@ -9,10 +9,10 @@ use error::EcashTicketError;
 use futures::channel::mpsc::{self, UnboundedSender};
 use nym_credentials::CredentialSpendingData;
 use nym_credentials_interface::{ClientTicket, CompactEcashError, NymPayInfo, VerificationKeyAuth};
-use nym_gateway_storage::traits::BandwidthGatewayStorage;
 use nym_gateway_storage::GatewayStorage;
-use nym_validator_client::nym_api::EpochId;
+use nym_gateway_storage::traits::BandwidthGatewayStorage;
 use nym_validator_client::DirectSigningHttpRpcNyxdClient;
+use nym_validator_client::nym_api::EpochId;
 use state::SharedState;
 use time::OffsetDateTime;
 use tokio::sync::{Mutex, RwLockReadGuard};

common/credential-verification/src/ecash/state.rs

@@ -1,19 +1,19 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::ecash::error::EcashTicketError;
 use crate::Error;
-use cosmwasm_std::{from_json, CosmosMsg, WasmMsg};
+use crate::ecash::error::EcashTicketError;
+use cosmwasm_std::{CosmosMsg, WasmMsg, from_json};
 use nym_credentials_interface::VerificationKeyAuth;
 use nym_ecash_contract_common::msg::ExecuteMsg;
 use nym_gateway_storage::traits::BandwidthGatewayStorage;
 use nym_validator_client::coconut::all_ecash_api_clients;
 use nym_validator_client::nym_api::EpochId;
+use nym_validator_client::nyxd::AccountId;
 use nym_validator_client::nyxd::contract_traits::{
     DkgQueryClient, MultisigQueryClient, NymContractsProvider,
 };
 use nym_validator_client::nyxd::cw3::ProposalResponse;
-use nym_validator_client::nyxd::AccountId;
 use nym_validator_client::{DirectSigningHttpRpcNyxdClient, EcashApiClient};
 use std::collections::BTreeMap;
 use std::ops::Deref;
@@ -53,7 +53,9 @@ impl SharedState {
         }
 
         let Ok(current_epoch) = nyxd_client.get_current_epoch().await else {
-            error!("the specified DKG contract address is invalid - no coconut credentials will be redeemable");
+            error!(
+                "the specified DKG contract address is invalid - no coconut credentials will be redeemable"
+            );
             // if we require coconut credentials, we MUST have DKG contract available
             return Err(EcashTicketError::UnavailableDkgContract.into());
         };

common/credential-verification/src/error.rs

@@ -35,7 +35,9 @@ pub enum Error {
     #[error("This gateway is only accepting coconut credentials for bandwidth")]
     OnlyCoconutCredentials,
 
-    #[error("insufficient bandwidth available to process the request. required: {required}B, available: {available}B")]
+    #[error(
+        "insufficient bandwidth available to process the request. required: {required}B, available: {available}B"
+    )]
     OutOfBandwidth { required: i64, available: i64 },
 
     #[error("Internal gateway storage error")]

common/credential-verification/src/lib.rs

@@ -4,7 +4,7 @@
 use crate::ecash::traits::EcashManager;
 use async_trait::async_trait;
 use bandwidth_storage_manager::BandwidthStorageManager;
-use nym_credentials::ecash::utils::{cred_exp_date, ecash_today, EcashTime};
+use nym_credentials::ecash::utils::{EcashTime, cred_exp_date, ecash_today};
 use nym_credentials_interface::{Bandwidth, ClientTicket, TicketType};
 use nym_gateway_requests::models::CredentialSpendingRequest;
 use std::sync::Arc;

common/credentials-interface/src/lib.rs

@@ -7,9 +7,12 @@ use thiserror::Error;
 use time::{Date, OffsetDateTime};
 
 pub use nym_compact_ecash::{
+    Base58, BlindedSignature, Bytable, EncodedDate, EncodedTicketType, PartialWallet, PayInfo,
+    PublicKeyUser, SecretKeyUser, VerificationKeyAuth, WithdrawalRequest,
     aggregate_verification_keys, aggregate_wallets, constants, ecash_parameters,
     error::CompactEcashError,
     generate_keypair_user, generate_keypair_user_from_seed, issue_verify,
+    scheme::Payment,
     scheme::coin_indices_signatures::aggregate_indices_signatures,
     scheme::coin_indices_signatures::{
         AnnotatedCoinIndexSignature, CoinIndexSignature, CoinIndexSignatureShare,
@@ -22,12 +25,10 @@ pub use nym_compact_ecash::{
     },
     scheme::keygen::KeyPairUser,
     scheme::withdrawal::RequestInfo,
-    scheme::Payment,
     scheme::{Wallet, WalletSignatures},
-    withdrawal_request, Base58, BlindedSignature, Bytable, EncodedDate, EncodedTicketType,
+    withdrawal_request,
-    PartialWallet, PayInfo, PublicKeyUser, SecretKeyUser, VerificationKeyAuth, WithdrawalRequest,
 };
-pub use nym_ecash_time::{ecash_today, EcashTime};
+pub use nym_ecash_time::{EcashTime, ecash_today};
 pub use nym_network_defaults::TicketTypeRepr;
 
 #[derive(Debug, Clone)]

common/crypto/src/asymmetric/ed25519/mod.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub use ed25519_dalek::SignatureError;
-pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
+pub use ed25519_dalek::{PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH, Verifier};
 
 use ed25519_dalek::Signer;
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
@@ -18,7 +18,7 @@ pub mod serde_helpers;
 pub use serde_helpers::*;
 
 #[cfg(feature = "sphinx")]
-use nym_sphinx_types::{DestinationAddressBytes, DESTINATION_ADDRESS_LENGTH};
+use nym_sphinx_types::{DESTINATION_ADDRESS_LENGTH, DestinationAddressBytes};
 
 #[cfg(feature = "rand")]
 use rand::{CryptoRng, Rng, RngCore};
@@ -75,7 +75,7 @@ pub struct KeyPair {
 impl KeyPair {
     #[cfg(feature = "rand")]
     pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Self {
-        let index = rng.gen();
+        let index = rng.r#gen();
         let ed25519_signing_key = ed25519_dalek::SigningKey::generate(rng);
 
         KeyPair {
@@ -504,10 +504,12 @@ mod tests {
             jwt_simple::algorithms::Edwards25519KeyPair::from_bytes(&jwt_keys.to_bytes()).unwrap();
 
         let compact_ed25519 = jwt_keys_inner.as_ref();
-        assert!(compact_ed25519
+        assert!(
-            .sk
+            compact_ed25519
-            .validate_public_key(&compact_ed25519.pk)
+                .sk
-            .is_ok());
+                .validate_public_key(&compact_ed25519.pk)
+                .is_ok()
+        );
 
         let dummy_message = "hello world";
         let sig1 = keys.private_key.sign(dummy_message).to_bytes();

common/crypto/src/asymmetric/x25519/mod.rs

@@ -168,6 +168,10 @@ impl PublicKey {
     pub fn to_base64(&self) -> String {
         base64::engine::general_purpose::STANDARD.encode(self.as_bytes())
     }
+
+    pub fn inner(&self) -> x25519_dalek::PublicKey {
+        self.0
+    }
 }
 
 impl FromStr for PublicKey {

common/crypto/src/hkdf.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use hkdf::{
-    hmac::{
-        digest::{crypto_common::BlockSizeUser, Digest},
-        SimpleHmac,
-    },
     Hkdf,
+    hmac::{
+        SimpleHmac,
+        digest::{Digest, crypto_common::BlockSizeUser},
+    },
 };
 use sha2::{Sha256, Sha512};
 

common/crypto/src/hmac.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use hmac::{
-    digest::{crypto_common::BlockSizeUser, CtOutput, Digest, Output},
     Mac, SimpleHmac,
+    digest::{CtOutput, Digest, Output, crypto_common::BlockSizeUser},
 };
 
 pub use hmac;

common/crypto/src/shared_key.rs

@@ -4,8 +4,8 @@
 use crate::asymmetric::x25519;
 use crate::hkdf;
 use cipher::{Key, KeyIvInit, StreamCipher};
-use digest::crypto_common::BlockSizeUser;
 use digest::Digest;
+use digest::crypto_common::BlockSizeUser;
 
 #[cfg(feature = "rand")]
 use rand::{CryptoRng, RngCore};

common/dkg/Cargo.toml

@@ -17,7 +17,6 @@ nym-contracts-common = { path = "../cosmwasm-smart-contracts/contracts-common",
 bs58 = { workspace = true }
 
 
-lazy_static = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 rand_core = { workspace = true }

common/dkg/src/bte/encryption.rs

@@ -13,9 +13,9 @@ use rand::CryptoRng;
 use rand_core::RngCore;
 use std::collections::HashMap;
 use std::ops::Neg;
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct Ciphertexts {
     pub rr: [G1Projective; NUM_CHUNKS],
     pub ss: [G1Projective; NUM_CHUNKS],
@@ -164,8 +164,7 @@ impl Ciphertexts {
     }
 }
 
-#[derive(Zeroize)]
+#[derive(Zeroize, ZeroizeOnDrop)]
-#[zeroize(drop)]
 /// Randomness generated during ciphertext generation that is required for proofs of knowledge.
 ///
 /// It must be handled with extreme care as its misuse might help malicious parties to recover
@@ -399,7 +398,7 @@ pub fn baby_step_giant_step(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::bte::{keygen, setup, DEFAULT_BSGS_TABLE};
+    use crate::bte::{keygen, setup, BSGS_TABLE};
     use rand_core::SeedableRng;
 
     fn verify_hazmat_rand(ciphertext: &Ciphertexts, randomness: &HazmatRandomness) {
@@ -457,8 +456,6 @@ mod tests {
         let (decryption_key1, public_key1) = keygen(&params, &mut rng);
         let (decryption_key2, public_key2) = keygen(&params, &mut rng);
 
-        let lookup_table = &DEFAULT_BSGS_TABLE;
-
         for _ in 0..10 {
             let m1 = Share::random(&mut rng);
             let m2 = Share::random(&mut rng);
@@ -467,22 +464,12 @@ mod tests {
             let (ciphertext, hazmat) = encrypt_shares(shares, &params, &mut rng);
             verify_hazmat_rand(&ciphertext, &hazmat);
 
-            let recovered1 = decrypt_share(
+            let recovered1 =
-                &params,
+                decrypt_share(&params, &decryption_key1, 0, &ciphertext, Some(&BSGS_TABLE))
-                &decryption_key1,
+                    .unwrap();
-                0,
+            let recovered2 =
-                &ciphertext,
+                decrypt_share(&params, &decryption_key2, 1, &ciphertext, Some(&BSGS_TABLE))
-                Some(lookup_table),
+                    .unwrap();
-            )
-            .unwrap();
-            let recovered2 = decrypt_share(
-                &params,
-                &decryption_key2,
-                1,
-                &ciphertext,
-                Some(lookup_table),
-            )
-            .unwrap();
             assert_eq!(m1, recovered1);
             assert_eq!(m2, recovered2);
         }
@@ -498,8 +485,6 @@ mod tests {
         let (decryption_key1, public_key1) = keygen(&params, &mut rng);
         let (decryption_key2, public_key2) = keygen(&params, &mut rng);
 
-        let lookup_table = &DEFAULT_BSGS_TABLE;
-
         for _ in 0..10 {
             let m1 = Share::random(&mut rng);
             let m2 = Share::random(&mut rng);
@@ -508,22 +493,12 @@ mod tests {
             let (ciphertext, hazmat) = encrypt_shares(shares, &params, &mut rng);
             verify_hazmat_rand(&ciphertext, &hazmat);
 
-            let recovered1 = decrypt_share(
+            let recovered1 =
-                &params,
+                decrypt_share(&params, &decryption_key1, 0, &ciphertext, Some(&BSGS_TABLE))
-                &decryption_key1,
+                    .unwrap();
-                0,
+            let recovered2 =
-                &ciphertext,
+                decrypt_share(&params, &decryption_key2, 1, &ciphertext, Some(&BSGS_TABLE))
-                Some(lookup_table),
+                    .unwrap();
-            )
-            .unwrap();
-            let recovered2 = decrypt_share(
-                &params,
-                &decryption_key2,
-                1,
-                &ciphertext,
-                Some(lookup_table),
-            )
-            .unwrap();
             assert_eq!(m1, recovered1);
             assert_eq!(m2, recovered2);
         }

common/dkg/src/bte/keys.rs

@@ -11,7 +11,7 @@ use group::GroupEncoding;
 use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use rand::CryptoRng;
 use rand_core::RngCore;
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 // produces public key and a decryption key for the root of the tree
 pub fn keygen(
@@ -48,7 +48,7 @@ pub fn keygen(
     (dk, key_with_proof)
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Zeroize)]
 pub struct PublicKey(pub(crate) G1Projective);
 
 impl PublicKey {
@@ -57,7 +57,7 @@ impl PublicKey {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct PublicKeyWithProof {
     pub(crate) key: PublicKey,
     pub(crate) proof: ProofOfDiscreteLog,
@@ -136,8 +136,7 @@ impl PublicKeyWithProof {
     }
 }
 
-#[derive(Debug, Zeroize)]
+#[derive(Debug, Zeroize, ZeroizeOnDrop)]
-#[zeroize(drop)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct DecryptionKey {
     // g1^rho
@@ -242,6 +241,7 @@ impl DecryptionKey {
     }
 }
 
+#[derive(Zeroize, ZeroizeOnDrop)]
 pub struct KeyPair {
     pub(crate) private_key: DecryptionKey,
     pub(crate) public_key: PublicKeyWithProof,

common/dkg/src/bte/mod.rs

@@ -1,11 +1,13 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
+use std::sync::LazyLock;
+
+use crate::bte::encryption::BabyStepGiantStepLookup;
 use crate::utils::hash_g2;
 use crate::{Chunk, Share};
 use bls12_381::{G1Affine, G2Affine, G2Prepared, G2Projective, Gt};
 use group::Curve;
-use lazy_static::lazy_static;
 
 pub mod encryption;
 pub mod keys;
@@ -16,14 +18,12 @@ pub mod proof_sharing;
 pub use encryption::{decrypt_share, encrypt_shares, Ciphertexts};
 pub use keys::{keygen, DecryptionKey, PublicKey, PublicKeyWithProof};
 
-lazy_static! {
+pub(crate) static PAIRING_BASE: LazyLock<Gt> =
-    pub(crate) static ref PAIRING_BASE: Gt =
+    LazyLock::new(|| bls12_381::pairing(&G1Affine::generator(), &G2Affine::generator()));
-        bls12_381::pairing(&G1Affine::generator(), &G2Affine::generator());
+pub(crate) static G2_GENERATOR_PREPARED: LazyLock<G2Prepared> =
-    pub(crate) static ref G2_GENERATOR_PREPARED: G2Prepared =
+    LazyLock::new(|| G2Prepared::from(G2Affine::generator()));
-        G2Prepared::from(G2Affine::generator());
+pub static BSGS_TABLE: LazyLock<BabyStepGiantStepLookup> =
-    pub(crate) static ref DEFAULT_BSGS_TABLE: encryption::BabyStepGiantStepLookup =
+    LazyLock::new(BabyStepGiantStepLookup::default);
-        encryption::BabyStepGiantStepLookup::default();
-}
 
 // Domain tries to follow guidelines specified by:
 // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1

common/dkg/src/bte/proof_chunking.rs

@@ -12,6 +12,7 @@ use ff::Field;
 use group::{Group, GroupEncoding};
 use rand::{CryptoRng, Rng};
 use rand_core::{RngCore, SeedableRng};
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 const CHUNKING_ORACLE_DOMAIN: &[u8] =
     b"NYM_COCONUT_NIDKG_V01_CS01_SHA-256_CHACHA20_CHUNKING_ORACLE";
@@ -67,7 +68,7 @@ impl<'a> Instance<'a> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct ProofOfChunking {
     y0: G1Projective,
     bb: Vec<G1Projective>,

common/dkg/src/bte/proof_discrete_log.rs

@@ -7,14 +7,14 @@ use ff::Field;
 use group::GroupEncoding;
 use rand::CryptoRng;
 use rand_core::RngCore;
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 // Domain tries to follow guidelines specified by:
 // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1
 const DISCRETE_LOG_DOMAIN: &[u8] =
     b"NYM_COCONUT_NIDKG_V01_CS01_WITH_BLS12381_XMD:SHA-256_SSWU_RO_PROOF_DISCRETE_LOG";
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct ProofOfDiscreteLog {
     pub(crate) rand_commitment: G1Projective,
     pub(crate) response: Scalar,
@@ -52,9 +52,9 @@ impl ProofOfDiscreteLog {
         let public_bytes = public.to_bytes();
         let rand_commit_bytes = rand_commit.to_bytes();
 
-        let mut bytes = Vec::with_capacity(96);
+        let mut bytes = [0u8; 96];
-        bytes.extend_from_slice(public_bytes.as_ref());
+        bytes[0..48].copy_from_slice(public_bytes.as_ref());
-        bytes.extend_from_slice(rand_commit_bytes.as_ref());
+        bytes[48..96].copy_from_slice(rand_commit_bytes.as_ref());
 
         hash_to_scalar(bytes, DISCRETE_LOG_DOMAIN)
     }

common/dkg/src/bte/proof_sharing.rs

@@ -12,6 +12,7 @@ use group::GroupEncoding;
 use rand::CryptoRng;
 use rand_core::RngCore;
 use std::collections::BTreeMap;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 // Domain tries to follow guidelines specified by:
 // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3.1
@@ -77,7 +78,7 @@ impl<'a> Instance<'a> {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct ProofOfSecretSharing {
     ff: G1Projective,
     aa: G2Projective,

common/dkg/src/dealing.rs

@@ -18,7 +18,7 @@ use rand_core::RngCore;
 use std::collections::BTreeMap;
 use zeroize::Zeroize;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Zeroize)]
 #[cfg_attr(test, derive(PartialEq, Eq))]
 pub struct RecoveredVerificationKeys {
     pub recovered_master: G2Projective,
@@ -83,7 +83,7 @@ impl RecoveredVerificationKeys {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Zeroize)]
 pub struct Dealing {
     pub public_coefficients: PublicCoefficients,
     pub ciphertexts: Ciphertexts,

common/dkg/src/interpolation/polynomial.rs

@@ -9,9 +9,9 @@ use group::GroupEncoding;
 use rand::CryptoRng;
 use rand_core::RngCore;
 use std::ops::{Add, Index, IndexMut};
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
 pub struct PublicCoefficients {
     pub(crate) coefficients: Vec<G2Projective>,
 }
@@ -111,8 +111,7 @@ impl IndexMut<usize> for PublicCoefficients {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Zeroize)]
+#[derive(Clone, Debug, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
-#[zeroize(drop)]
 pub struct Polynomial {
     coefficients: Vec<Scalar>,
 }

common/dkg/src/share.rs

@@ -6,14 +6,13 @@ use crate::error::DkgError;
 use crate::interpolation::perform_lagrangian_interpolation_at_origin;
 use crate::NodeIndex;
 use bls12_381::Scalar;
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 // if this type is changed, one must ensure all values can fit in it
 pub type Chunk = u16;
 
-#[derive(PartialEq, Eq, Debug, Zeroize)]
+#[derive(PartialEq, Eq, Debug, Zeroize, ZeroizeOnDrop)]
 #[cfg_attr(test, derive(Clone))]
-#[zeroize(drop)]
 pub struct Share(pub(crate) Scalar);
 
 pub fn combine_shares(shares: Vec<Share>, node_indices: &[NodeIndex]) -> Result<Scalar, DkgError> {
@@ -66,9 +65,8 @@ impl From<Scalar> for Share {
     }
 }
 
-#[derive(Default, Zeroize)]
+#[derive(Default, Zeroize, ZeroizeOnDrop)]
 #[cfg_attr(test, derive(Clone))]
-#[zeroize(drop)]
 pub(crate) struct ChunkedShare {
     pub(crate) chunks: [Chunk; NUM_CHUNKS],
 }

common/ecash-signer-check/src/client_check.rs

@@ -56,7 +56,10 @@ impl ClientUnderTest {
                 true
             }
             Ok(Err(err)) => {
-                warn!("{}: failed to retrieve build information: {err}. the signer is most likely down", self.api_client.current_url());
+                warn!(
+                    "{}: failed to retrieve build information: {err}. the signer is most likely down",
+                    self.api_client.current_url()
+                );
                 false
             }
             Err(_timeout) => {

common/ecash-signer-check/src/lib.rs

@@ -4,8 +4,8 @@
 use crate::client_check::check_client;
 use futures::stream::{FuturesUnordered, StreamExt};
 use nym_network_defaults::NymNetworkDetails;
-use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, PagedDkgQueryClient};
 use nym_validator_client::QueryHttpRpcNyxdClient;
+use nym_validator_client::nyxd::contract_traits::{DkgQueryClient, PagedDkgQueryClient};
 use std::collections::HashMap;
 use url::Url;
 

common/exit-policy/src/client.rs

@@ -1,8 +1,8 @@
 // Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::policy::PolicyError;
 use crate::ExitPolicy;
+use crate::policy::PolicyError;
 use reqwest::IntoUrl;
 
 pub async fn get_exit_policy(url: impl IntoUrl) -> Result<ExitPolicy, PolicyError> {

common/exit-policy/src/policy/address_policy.rs

@@ -639,27 +639,41 @@ mod test {
         policy.push(AddressPolicyAction::Accept, "*:0".parse()?);
 
         let policy = policy; // drop mut
-        assert!(policy
+        assert!(
-            .allows_sockaddr(&"[::6]:443".parse().unwrap())
+            policy
-            .unwrap());
+                .allows_sockaddr(&"[::6]:443".parse().unwrap())
-        assert!(policy
+                .unwrap()
-            .allows_sockaddr(&"127.0.0.1:443".parse().unwrap())
+        );
-            .unwrap());
+        assert!(
-        assert!(policy
+            policy
-            .allows_sockaddr(&"[::1]:80".parse().unwrap())
+                .allows_sockaddr(&"127.0.0.1:443".parse().unwrap())
-            .unwrap());
+                .unwrap()
-        assert!(!policy
+        );
-            .allows_sockaddr(&"[::2]:80".parse().unwrap())
+        assert!(
-            .unwrap());
+            policy
-        assert!(!policy
+                .allows_sockaddr(&"[::1]:80".parse().unwrap())
-            .allows_sockaddr(&"127.0.0.1:80".parse().unwrap())
+                .unwrap()
-            .unwrap());
+        );
-        assert!(policy
+        assert!(
-            .allows_sockaddr(&"127.0.0.1:66".parse().unwrap())
+            !policy
-            .is_none());
+                .allows_sockaddr(&"[::2]:80".parse().unwrap())
-        assert!(policy
+                .unwrap()
-            .allows_sockaddr(&"127.0.0.1:0".parse().unwrap())
+        );
-            .unwrap());
+        assert!(
+            !policy
+                .allows_sockaddr(&"127.0.0.1:80".parse().unwrap())
+                .unwrap()
+        );
+        assert!(
+            policy
+                .allows_sockaddr(&"127.0.0.1:66".parse().unwrap())
+                .is_none()
+        );
+        assert!(
+            policy
+                .allows_sockaddr(&"127.0.0.1:0".parse().unwrap())
+                .unwrap()
+        );
         Ok(())
     }