updated locks and versions bumped

Reduce SHUTDOWN_TIMEOUT to 3 sec

.github/workflows/build.yml

@@ -9,14 +9,12 @@ on:
       - 'gateway/**'
       - 'integrations/**'
       - 'mixnode/**'
-      - 'sdk/lib/socks5-listener/**'
       - 'sdk/rust/nym-sdk/**'
       - 'service-providers/**'
       - 'nym-api/**'
       - 'nym-outfox/**'
       - 'tools/nym-cli/**'
       - 'tools/ts-rs-cli/**'
-      - 'Cargo.toml'
   pull_request:
     paths:
       - 'clients/**'
@@ -25,14 +23,12 @@ on:
       - 'gateway/**'
       - 'integrations/**'
       - 'mixnode/**'
-      - 'sdk/lib/socks5-listener/**'
       - 'sdk/rust/nym-sdk/**'
       - 'service-providers/**'
       - 'nym-api/**'
       - 'nym-outfox/**'
       - 'tools/nym-cli/**'
       - 'tools/ts-rs-cli/**'
-      - 'Cargo.toml'
 
 jobs:
   build:

.gitignore

@@ -8,7 +8,6 @@
 .idea
 target
 .env
-.env.dev
 /.vscode/settings.json
 validator/.vscode
 sample-configs/validator-config.toml
@@ -42,5 +41,4 @@ storybook-static
 envs/qwerty.env
 .parcel-cache
 **/.DS_Store
-cpu-cycles/libcpucycles/build
-foxyfox.env
+cpu-cycles/libcpucycles/build

CHANGELOG.md

@@ -4,6 +4,36 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 
 ## [Unreleased]
 
+## [v1.1.20] (2023-06-06)
+
+- Explorer - Fix SP supported apps list ([#3458])
+- Investigate if we need to lower `SHUTDOWN_TIMEOUT` in  socks5 to zero (or almost zero) ([#3438])
+- Explorer - show all gateways in the default view regardless of the version number ([#3427])
+- service-provider-directory: add signature check when announcing ([#3360])
+- Support functionality for nym-name-service (nym-api, nym-cli, etc) ([#3355])
+- Edit the nym-network-requester to support the enabled-credentials-mode flag ([#3101])
+- [BUG] network requester documentation update ([#3493])
+- removing hardcoded version numbers ([#3485])
+- [BUG] network requester documentation update ([#3481])
+- [BUG] network requester documentation update ([#3469])
+- Sign when announcing service providers to the directory contract ([#3459])
+- mixnode documentation update ([#3435])
+- updated readme with new developer chat links + new docs links ([#3141])
+
+[#3458]: https://github.com/nymtech/nym/issues/3458
+[#3438]: https://github.com/nymtech/nym/issues/3438
+[#3427]: https://github.com/nymtech/nym/issues/3427
+[#3360]: https://github.com/nymtech/nym/issues/3360
+[#3355]: https://github.com/nymtech/nym/issues/3355
+[#3101]: https://github.com/nymtech/nym/issues/3101
+[#3493]: https://github.com/nymtech/nym/pull/3493
+[#3485]: https://github.com/nymtech/nym/pull/3485
+[#3481]: https://github.com/nymtech/nym/pull/3481
+[#3469]: https://github.com/nymtech/nym/pull/3469
+[#3459]: https://github.com/nymtech/nym/pull/3459
+[#3435]: https://github.com/nymtech/nym/pull/3435
+[#3141]: https://github.com/nymtech/nym/pull/3141
+
 ## [v1.1.19] (2023-05-16)
 
 - nym-name-service endpoint in nym-api ([#3403])

Cargo.toml

@@ -78,7 +78,6 @@ members = [
     "gateway/gateway-requests",
     "integrations/bity",
     "mixnode",
-    "sdk/lib/socks5-listener",
     "sdk/rust/nym-sdk",
     "service-providers/common",
     "service-providers/network-requester",
@@ -116,21 +115,19 @@ async-trait = "0.1.64"
 anyhow = "1.0.71"
 bip39 = { version = "2.0.0", features = ["zeroize"] }
 cfg-if = "1.0.0"
-cosmwasm-derive = "=1.2.5"
-cosmwasm-schema = "=1.2.5"
-cosmwasm-std = "=1.2.5"
-cosmwasm-storage = "=1.2.5"
-cosmrs = "=0.8.0"
-cw-utils = "=1.0.1"
-cw-storage-plus = "=1.0.1"
-cw2 = { version = "=1.0.1" }
-cw3 = { version = "=1.0.1" }
-cw3-fixed-multisig = { version = "=1.0.1" }
-cw4 = { version = "=1.0.1" }
-cw-controllers = { version = "=1.0.1" }
+cosmwasm-derive = "=1.0.0"
+cosmwasm-schema = "=1.0.0"
+cosmwasm-std = "=1.0.0"
+cosmwasm-storage = "=1.0.0"
+cw-controllers = "=0.13.4"
+cw-storage-plus = "=0.13.4"
+cw-utils = "=0.13.4"
+cw2 = { version = "=0.13.4" }
+cw3 = { version = "=0.13.4" }
+cw3-fixed-multisig = { version = "=0.13.4" }
+cw4 = { version = "=0.13.4" }
 dotenvy = "0.15.6"
 generic-array = "0.14.7"
-k256 = "0.11"
 lazy_static = "1.4.0"
 log = "0.4"
 once_cell = "1.7.2"

README.md

@@ -21,8 +21,8 @@ The platform is composed of multiple Rust crates. Top-level executable binary cr
 
 ### Building
 
-Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/building-nym.html).
-Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/stable/nym-apps/wallet#for-developers).
+Platform build instructions are available on [our docs site](https://nymtech.net/docs/binaries/build-nym.html).
+Wallet build instructions are also available on [our docs site](https://nymtech.net/docs/wallet/desktop-wallet.html).
 
 ### Developing
 
@@ -32,7 +32,11 @@ For Typescript components, please see [ts-packages](./ts-packages).
 
 ### Developer chat
 
-You can chat with us in [Keybase](https://keybase.io). Download their chat app, then click **Teams -> Join a team**. Type **nymtech.friends** into the team name and hit **continue**. For general chat, hang out in the **#general** channel. Our development takes place in the **#dev** channel. Node operators should be in the **#node-operators** channel.
+> We used to use Keybase for developer chats, but we have since migrated to Matrix and Discord. We no longer check the old **nymtech.friends** Keybase team. 
+
+You can chat to us in two places: 
+* The #dev channel on [Matrix](https://matrix.to/#/#dev:nymtech.chat)
+* The various developer channels on [Discord](https://discord.gg/nym)
 
 ### Rewards
 
@@ -46,7 +50,7 @@ Node, node operator and delegator rewards are determined according to the princi
 |<img src="https://render.githubusercontent.com/render/math?math=\lambda_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\lambda_{i}#gh-dark-mode-only">|ratio of stake operator has pledged to their node to the token circulating supply.
 |<img src="https://render.githubusercontent.com/render/math?math=\omega_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\omega_{i}#gh-dark-mode-only">|fraction of total effort undertaken by node `i`, set to `1/k`.
 |<img src="https://render.githubusercontent.com/render/math?math=k#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}k#gh-dark-mode-only">|number of nodes stakeholders are incentivised to create, set by the validators, a matter of governance. Currently determined by the `reward set` size, and set to 720 in testnet Sandbox.
-|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitiveness gets for a Sybil attacker.
+|<img src="https://render.githubusercontent.com/render/math?math=\alpha#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}\alpha#gh-dark-mode-only">|Sybil attack resistance parameter - the higher this parameter is set the stronger the reduction in competitivness gets for a Sybil attacker.
 |<img src="https://render.githubusercontent.com/render/math?math=PM_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PM_{i}#gh-dark-mode-only">|declared profit margin of operator `i`, defaults to 10% in.
 |<img src="https://render.githubusercontent.com/render/math?math=PF_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PF_{i}#gh-dark-mode-only">|uptime of node `i`, scaled to 0 - 1, for the rewarding epoch
 |<img src="https://render.githubusercontent.com/render/math?math=PP_{i}#gh-light-mode-only"><img src="https://render.githubusercontent.com/render/math?math=\color{white}PP_{i}#gh-dark-mode-only">|cost of operating node `i` for the duration of the rewarding epoch, set to 40 NYMT.
@@ -70,7 +74,7 @@ Operator of node `i` is credited with the following amount:
 <img src="https://render.githubusercontent.com/render/math?math=min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}min\{PP_{i},R_{i})\} %2b max\{0, (PM_{i} %2b (1 - PM_{i}) \cdot \lambda_{i}/\delta_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">
 
-Delegate with stake `s` receives:
+Delegate with stake `s` recieves:
 
 <img src="https://render.githubusercontent.com/render/math?math=max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-light-mode-only">
 <img src="https://render.githubusercontent.com/render/math?math=\color{white}max\{0, (1-PM_{i}) \cdot (s^'/\sigma_{i}) \cdot (R_{i} - PP_{i})\}#gh-dark-mode-only">

clients/native/Cargo.toml

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

clients/native/src/client/mod.rs

@@ -20,7 +20,6 @@ use nym_client_core::client::received_buffer::{
 use nym_client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
 use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskManager;
 use nym_validator_client::nyxd::QueryNyxdClient;
@@ -64,7 +63,6 @@ impl SocketClient {
         client_state: ClientState,
         self_address: &Recipient,
         shutdown: nym_task::TaskClient,
-        packet_type: PacketType,
     ) {
         info!("Starting websocket listener...");
 
@@ -90,7 +88,6 @@ impl SocketClient {
             self_address,
             shared_lane_queue_lengths,
             reply_controller_sender,
-            Some(packet_type),
         );
 
         websocket::Listener::new(config.get_listening_ip(), config.get_listening_port())
@@ -140,8 +137,7 @@ impl SocketClient {
         }
 
         let base_builder = self.create_base_client_builder().await?;
-        let packet_type = self.config.get_base().get_packet_type();
-        let mut started_client = base_builder.start_base(packet_type).await?;
+        let mut started_client = base_builder.start_base().await?;
         let self_address = started_client.address;
         let client_input = started_client.client_input.register_producer();
         let client_output = started_client.client_output.register_consumer();
@@ -154,7 +150,6 @@ impl SocketClient {
             client_state,
             &self_address,
             started_client.task_manager.subscribe(),
-            packet_type,
         );
 
         info!("Client startup finished!");
@@ -169,8 +164,7 @@ impl SocketClient {
         }
 
         let base_builder = self.create_base_client_builder().await?;
-        let packet_type = self.config.get_base().get_packet_type();
-        let mut started_client = base_builder.start_base(packet_type).await?;
+        let mut started_client = base_builder.start_base().await?;
         let address = started_client.address;
         let client_input = started_client.client_input.register_producer();
         let client_output = started_client.client_output.register_consumer();
@@ -192,7 +186,6 @@ impl SocketClient {
             reconstructed_receiver,
             address,
             shutdown_notifier: started_client.task_manager,
-            packet_type,
         })
     }
 }
@@ -206,7 +199,6 @@ pub struct DirectClient {
 
     // we need to keep reference to this guy otherwise things will start dropping
     shutdown_notifier: TaskManager,
-    packet_type: PacketType,
 }
 
 impl DirectClient {
@@ -227,7 +219,7 @@ impl DirectClient {
     /// well enough in local tests)
     pub async fn send_regular_message(&mut self, recipient: Recipient, message: Vec<u8>) {
         let lane = TransmissionLane::General;
-        let input_msg = InputMessage::new_regular(recipient, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
 
         self.client_input
             .input_sender
@@ -246,13 +238,7 @@ impl DirectClient {
         reply_surbs: u32,
     ) {
         let lane = TransmissionLane::General;
-        let input_msg = InputMessage::new_anonymous(
-            recipient,
-            message,
-            reply_surbs,
-            lane,
-            Some(self.packet_type),
-        );
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
 
         self.client_input
             .input_sender
@@ -266,8 +252,7 @@ impl DirectClient {
     /// well enough in local tests)
     pub async fn send_reply(&mut self, recipient_tag: AnonymousSenderTag, message: Vec<u8>) {
         let lane = TransmissionLane::General;
-        let input_msg =
-            InputMessage::new_reply(recipient_tag, message, lane, Some(self.packet_type));
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
 
         self.client_input
             .input_sender

clients/native/src/commands/init.rs

@@ -9,8 +9,8 @@ use crate::{
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_config::NymConfig;
+use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_crypto::asymmetric::identity;
 use nym_sphinx::addressing::clients::Recipient;
 use serde::Serialize;
@@ -152,9 +152,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
 
     // Setup gateway by either registering a new one, or creating a new config from the selected
     // one but with keys kept, or reusing the gateway configuration.
-    let key_store = OnDiskKeys::from_config(config.get_base());
-    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, _>(
-        &key_store,
+    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, PersistentStorage>(
         register_gateway,
         user_chosen_gateway_id,
         config.get_base(),
@@ -171,8 +169,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), ClientError> {
 
     print_saved_config(&config);
 
-    let address =
-        nym_client_core::init::get_client_address_from_stored_ondisk_keys(config.get_base())?;
+    let address = nym_client_core::init::get_client_address_from_stored_keys(config.get_base())?;
     let init_results = InitResults::new(&config, &address);
     println!("{}", args.output.format(&init_results));
 

clients/native/src/websocket/handler.rs

@@ -14,7 +14,6 @@ use nym_client_core::client::{
 use nym_client_websocket_requests::{requests::ClientRequest, responses::ServerResponse};
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::params::PacketType;
 use nym_sphinx::receiver::ReconstructedMessage;
 use nym_task::connections::{
     ConnectionCommand, ConnectionCommandSender, ConnectionId, LaneQueueLengths, TransmissionLane,
@@ -42,7 +41,6 @@ pub(crate) struct HandlerBuilder {
     self_full_address: Recipient,
     lane_queue_lengths: LaneQueueLengths,
     reply_controller_sender: ReplyControllerSender,
-    packet_type: Option<PacketType>,
 }
 
 impl HandlerBuilder {
@@ -53,7 +51,6 @@ impl HandlerBuilder {
         self_full_address: &Recipient,
         lane_queue_lengths: LaneQueueLengths,
         reply_controller_sender: ReplyControllerSender,
-        packet_type: Option<PacketType>,
     ) -> Self {
         Self {
             msg_input,
@@ -62,7 +59,6 @@ impl HandlerBuilder {
             self_full_address: *self_full_address,
             lane_queue_lengths,
             reply_controller_sender,
-            packet_type,
         }
     }
 
@@ -77,7 +73,6 @@ impl HandlerBuilder {
             received_response_type: Default::default(),
             lane_queue_lengths: self.lane_queue_lengths.clone(),
             reply_controller_sender: self.reply_controller_sender.clone(),
-            packet_type: self.packet_type,
         }
     }
 }
@@ -91,7 +86,6 @@ pub(crate) struct Handler {
     received_response_type: ReceivedResponseType,
     lane_queue_lengths: LaneQueueLengths,
     reply_controller_sender: ReplyControllerSender,
-    packet_type: Option<PacketType>,
 }
 
 impl Drop for Handler {
@@ -166,7 +160,7 @@ impl Handler {
         });
 
         // the ack control is now responsible for chunking, etc.
-        let input_msg = InputMessage::new_regular(recipient, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
         self.msg_input
             .send(input_msg)
             .await
@@ -197,8 +191,7 @@ impl Handler {
             TransmissionLane::ConnectionId(id)
         });
 
-        let input_msg =
-            InputMessage::new_anonymous(recipient, message, reply_surbs, lane, self.packet_type);
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
         self.msg_input
             .send(input_msg)
             .await
@@ -225,7 +218,7 @@ impl Handler {
             TransmissionLane::ConnectionId(id)
         });
 
-        let input_msg = InputMessage::new_reply(recipient_tag, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
         self.msg_input
             .send(input_msg)
             .await

clients/socks5/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nym-socks5-client"
-version = "1.1.19"
+version = "1.1.20"
 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"

clients/socks5/src/commands/init.rs

@@ -8,8 +8,8 @@ use crate::{
 };
 use clap::Args;
 use nym_bin_common::output_format::OutputFormat;
-use nym_client_core::client::key_manager::persistence::OnDiskKeys;
 use nym_config::NymConfig;
+use nym_credential_storage::persistent_storage::PersistentStorage;
 use nym_crypto::asymmetric::identity;
 use nym_socks5_client_core::config::Config;
 use nym_sphinx::addressing::clients::Recipient;
@@ -91,7 +91,6 @@ impl From<Init> for OverrideConfig {
             no_cover: init_config.no_cover,
             nyxd_urls: init_config.nyxd_urls,
             enabled_credentials_mode: init_config.enabled_credentials_mode,
-            outfox: false,
         }
     }
 }
@@ -159,9 +158,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
 
     // Setup gateway by either registering a new one, or creating a new config from the selected
     // one but with keys kept, or reusing the gateway configuration.
-    let key_store = OnDiskKeys::from_config(config.get_base());
-    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, _>(
-        &key_store,
+    let gateway = nym_client_core::init::setup_gateway_from_config::<Config, _, PersistentStorage>(
         register_gateway,
         user_chosen_gateway_id,
         config.get_base(),
@@ -180,8 +177,7 @@ pub(crate) async fn execute(args: &Init) -> Result<(), Socks5ClientError> {
 
     print_saved_config(&config);
 
-    let address =
-        nym_client_core::init::get_client_address_from_stored_ondisk_keys(config.get_base())?;
+    let address = nym_client_core::init::get_client_address_from_stored_keys(config.get_base())?;
     let init_results = InitResults::new(&config, &address);
     println!("{}", args.output.format(&init_results));
 

clients/socks5/src/commands/mod.rs

@@ -10,7 +10,6 @@ use nym_bin_common::completions::{fig_generate, ArgShell};
 use nym_config::{NymConfig, OptionalSet};
 use nym_socks5_client_core::config::old_config_v1_1_13::OldConfigV1_1_13;
 use nym_socks5_client_core::config::{BaseConfig, Config};
-use nym_sphinx::params::PacketType;
 use std::error::Error;
 
 pub mod init;
@@ -65,7 +64,6 @@ pub(crate) struct OverrideConfig {
     no_cover: bool,
     nyxd_urls: Option<Vec<url::Url>>,
     enabled_credentials_mode: Option<bool>,
-    outfox: bool,
 }
 
 pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Sync>> {
@@ -82,15 +80,9 @@ pub(crate) async fn execute(args: &Cli) -> Result<(), Box<dyn Error + Send + Syn
 }
 
 pub(crate) fn override_config(config: Config, args: OverrideConfig) -> Config {
-    let packet_type = if args.outfox {
-        PacketType::Outfox
-    } else {
-        PacketType::Mix
-    };
     config
         .with_base(BaseConfig::with_high_default_traffic_volume, args.fastmode)
         .with_base(BaseConfig::with_disabled_cover_traffic, args.no_cover)
-        .with_base(BaseConfig::with_packet_type, packet_type)
         .with_optional(Config::with_anonymous_replies, args.use_anonymous_replies)
         .with_optional(Config::with_port, args.port)
         .with_optional_custom_env_ext(

clients/socks5/src/commands/run.rs

@@ -9,7 +9,6 @@ use crate::{
 use clap::Args;
 use log::*;
 use nym_bin_common::version_checker::is_minor_version_compatible;
-use nym_client_core::client::base_client::storage::OnDiskPersistent;
 use nym_config::NymConfig;
 use nym_crypto::asymmetric::identity;
 use nym_socks5_client_core::{config::Config, NymClient};
@@ -68,9 +67,6 @@ pub(crate) struct Run {
     /// with bandwidth credential requirement.
     #[clap(long, hide = true)]
     enabled_credentials_mode: Option<bool>,
-
-    #[clap(long, hide = true, action)]
-    outfox: bool,
 }
 
 impl From<Run> for OverrideConfig {
@@ -83,7 +79,6 @@ impl From<Run> for OverrideConfig {
             no_cover: run_config.no_cover,
             nyxd_urls: run_config.nyxd_urls,
             enabled_credentials_mode: run_config.enabled_credentials_mode,
-            outfox: run_config.outfox,
         }
     }
 }
@@ -143,6 +138,5 @@ pub(crate) async fn execute(args: &Run) -> Result<(), Box<dyn std::error::Error
         return Err(Box::new(Socks5ClientError::FailedLocalVersionCheck));
     }
 
-    let storage = OnDiskPersistent::from_config(config.get_base()).await?;
-    NymClient::new(config, storage).run_forever().await
+    NymClient::new(config).run_forever().await
 }

clients/webassembly/.gitignore

@@ -1,5 +1,6 @@
 /target
 **/*.rs.bk
+Cargo.lock
 bin/
 pkg/
 wasm-pack.log

clients/webassembly/internal-dev/worker.js

@@ -106,25 +106,29 @@ function printAndDisplayTestResult(result) {
     });
 }
 
+function dummyGatewayConfig() {
+    return new GatewayEndpointConfig(
+        '336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9',
+        'n1rqqw8km7a0rvf8lr6k8dsdqvvkyn2mglj7xxfm',
+        'ws://85.159.212.96:9000',
+    )
+}
+
 async function testWithTester() {
-    const dummyGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();
 
     // A) construct with hardcoded topology
     const topology = dummyTopology()
-    const nodeTester = await new NymNodeTester(topology, dummyGateway);
+    const nodeTester = await new NymNodeTester(gatewayConfig, topology);
 
     // B) first get topology directly from nym-api
     // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
     // const topology = await current_network_topology(validator)
-    // const nodeTester = await new NymNodeTester(topology, dummyGateway);
+    // const nodeTester = await new NymNodeTester(gatewayConfig, topology);
     //
     // C) use nym-api in the constructor (note: it does no filtering for 'good' nodes on other layers)
     // const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
-    // const nodeTester = await NymNodeTester.new_with_api(validator, dummyGateway)
-
-    // D, E, F) you also don't have to specify the gateway. if you don't, a random one (from your topology) will be used
-    // const topology = dummyTopology()
-    // const nodeTester = await new NymNodeTester(topology);
+    // const nodeTester = await NymNodeTester.new_with_api(gatewayConfig, validator)
 
     self.onmessage = async event => {
         if (event.data && event.data.kind) {
@@ -142,7 +146,7 @@ async function testWithTester() {
 }
 
 async function testWithNymClient() {
-    const dummyGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();
     const topology = dummyTopology()
 
     let received = 0
@@ -164,7 +168,7 @@ async function testWithNymClient() {
 
     console.log('Instantiating WASM client...');
 
-    let clientBuilder = NymClientBuilder.new_tester(topology, onMessageHandler, dummyGateway)
+    let clientBuilder = NymClientBuilder.new_tester(gatewayConfig, topology, onMessageHandler)
     console.log('Web worker creating WASM client...');
     let local_client = await clientBuilder.start_client();
     console.log('WASM client running!');
@@ -222,10 +226,10 @@ async function normalNymClientUsage() {
 
     debug.topology_refresh_rate_ms = BigInt(60000)
 
-    const dummyGateway = "336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9";
+    const gatewayConfig = dummyGatewayConfig();
     const validator = 'https://qwerty-validator-api.qa.nymte.ch/api';
 
-    const config = new Config('my-awesome-wasm-client', validator, dummyGateway, debug);
+    const config = new Config('my-awesome-wasm-client', validator, gatewayConfig, debug);
 
     const onMessageHandler = (message) => {
         console.log(message);

clients/webassembly/src/client/config.rs

@@ -1,4 +1,4 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 // due to expansion of #[wasm_bindgen] macro on `Debug` Config struct
@@ -9,10 +9,10 @@
 use nym_client_core::config::{
     Acknowledgements as ConfigAcknowledgements, CoverTraffic as ConfigCoverTraffic,
     DebugConfig as ConfigDebug, GatewayConnection as ConfigGatewayConnection,
-    ReplySurbs as ConfigReplySurbs, Topology as ConfigTopology, Traffic as ConfigTraffic,
+    GatewayEndpointConfig, ReplySurbs as ConfigReplySurbs, Topology as ConfigTopology,
+    Traffic as ConfigTraffic,
 };
-use nym_sphinx::params::{PacketSize, PacketType};
-use nym_validator_client::client::IdentityKey;
+use nym_sphinx::params::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use url::Url;
@@ -29,13 +29,10 @@ pub struct Config {
 
     pub(crate) disabled_credentials_mode: bool,
 
-    /// Information regarding how the client should choose gateway.
-    /// If unspecified, the client will attempt to load the config from the storage.
-    pub(crate) gateway: Option<IdentityKey>,
+    /// Information regarding how the client should send data to gateway.
+    pub(crate) gateway_endpoint: GatewayEndpointConfig,
 
     pub(crate) debug: ConfigDebug,
-
-    pub(crate) packet_type: PacketType,
 }
 
 #[wasm_bindgen]
@@ -44,18 +41,9 @@ impl Config {
     pub fn new(
         id: String,
         validator_server: String,
-        packet_type: Option<String>,
-        gateway: Option<IdentityKey>,
+        gateway_endpoint: GatewayEndpointConfig,
         debug: Option<Debug>,
     ) -> Self {
-        let packet_type = if let Some(packet_type) = packet_type {
-            match packet_type.as_str() {
-                "outfox" => PacketType::Outfox,
-                _ => PacketType::Mix,
-            }
-        } else {
-            PacketType::Mix
-        };
         Config {
             id,
             nym_api_url: Some(
@@ -64,9 +52,8 @@ impl Config {
                     .expect("provided url was malformed"),
             ),
             disabled_credentials_mode: true,
-            gateway,
+            gateway_endpoint,
             debug: debug.map(Into::into).unwrap_or_default(),
-            packet_type,
         }
     }
 }
@@ -109,7 +96,6 @@ impl From<Traffic> for ConfigTraffic {
                 .disable_main_poisson_packet_distribution,
             primary_packet_size: PacketSize::RegularPacket,
             secondary_packet_size: use_extended_packet_size,
-            packet_type: None,
         }
     }
 }

clients/webassembly/src/client/mod.rs

@@ -6,10 +6,7 @@ use crate::client::helpers::{InputSender, NymClientTestRequest, WasmTopologyExt}
 use crate::client::response_pusher::ResponsePusher;
 use crate::constants::NODE_TESTER_CLIENT_ID;
 use crate::error::WasmClientError;
-use crate::helpers::{
-    choose_gateway, gateway_from_topology, parse_recipient, parse_sender_tag,
-    setup_reply_surb_storage_backend,
-};
+use crate::helpers::{parse_recipient, parse_sender_tag, setup_reply_surb_storage_backend};
 use crate::storage::traits::FullWasmClientStorage;
 use crate::storage::ClientStorage;
 use crate::topology::WasmNymTopology;
@@ -21,16 +18,16 @@ use nym_client_core::client::base_client::{
 };
 use nym_client_core::client::inbound_messages::InputMessage;
 use nym_client_core::client::replies::reply_storage::browser_backend;
-use nym_client_core::config::{CoverTraffic, DebugConfig, Topology, Traffic};
+use nym_client_core::config::{
+    CoverTraffic, DebugConfig, GatewayEndpointConfig, Topology, Traffic,
+};
 use nym_credential_storage::ephemeral_storage::EphemeralStorage;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use nym_task::TaskManager;
 use nym_topology::provider_trait::{HardcodedTopologyProvider, TopologyProvider};
 use nym_topology::NymTopology;
-use nym_validator_client::client::IdentityKey;
 use rand::rngs::OsRng;
-use rand::{thread_rng, RngCore};
+use rand::RngCore;
 use std::sync::Arc;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::future_to_promise;
@@ -53,7 +50,6 @@ pub struct NymClient {
     // even though we don't use graceful shutdowns, other components rely on existence of this struct
     // and if it's dropped, everything will start going offline
     _task_manager: TaskManager,
-    packet_type: Option<PacketType>,
 }
 
 #[wasm_bindgen]
@@ -70,7 +66,6 @@ pub struct NymClientBuilder {
     bandwidth_controller:
         Option<BandwidthController<FakeClient<DirectSigningNyxdClient>, EphemeralStorage>>,
     disabled_credentials: bool,
-    packet_type: Option<PacketType>,
 }
 
 #[wasm_bindgen]
@@ -89,7 +84,6 @@ impl NymClientBuilder {
             on_message,
             bandwidth_controller: None,
             disabled_credentials: true,
-            packet_type: None,
         }
     }
 
@@ -98,21 +92,19 @@ impl NymClientBuilder {
     // hardcoded topology
     // NOTE: you most likely want to use `[NymNodeTester]` instead.
     pub fn new_tester(
+        gateway_config: GatewayEndpointConfig,
         topology: WasmNymTopology,
         on_message: js_sys::Function,
-        gateway: Option<IdentityKey>,
     ) -> Self {
-        if let Some(gateway_id) = &gateway {
-            if !topology.ensure_contains_gateway_id(gateway_id) {
-                panic!("the specified topology does not contain the gateway used by the client")
-            }
+        if !topology.ensure_contains(&gateway_config) {
+            panic!("the specified topology does not contain the gateway used by the client")
         }
 
         let full_config = Config {
             id: NODE_TESTER_CLIENT_ID.to_string(),
             nym_api_url: None,
             disabled_credentials_mode: true,
-            gateway,
+            gateway_endpoint: gateway_config,
             debug: DebugConfig {
                 traffic: Traffic {
                     disable_main_poisson_packet_distribution: true,
@@ -128,7 +120,6 @@ impl NymClientBuilder {
                 },
                 ..Default::default()
             },
-            packet_type: PacketType::Mix,
         };
 
         NymClientBuilder {
@@ -141,7 +132,6 @@ impl NymClientBuilder {
             bandwidth_controller: None,
             disabled_credentials: true,
             storage_passphrase: None,
-            packet_type: None,
         }
     }
 
@@ -149,7 +139,7 @@ impl NymClientBuilder {
         ResponsePusher::new(client_output, on_message).start()
     }
 
-    fn topology_provider(&mut self) -> Option<Box<dyn TopologyProvider + Send + Sync>> {
+    fn topology_provider(&mut self) -> Option<Box<dyn TopologyProvider>> {
         if let Some(hardcoded_topology) = self.custom_topology.take() {
             Some(Box::new(HardcodedTopologyProvider::new(hardcoded_topology)))
         } else {
@@ -160,45 +150,27 @@ impl NymClientBuilder {
     async fn start_client_async(mut self) -> Result<NymClient, WasmClientError> {
         console_log!("Starting the wasm client");
 
+        let maybe_topology_provider = self.topology_provider();
+
         let disabled_credentials = if self.disabled_credentials {
             CredentialsToggle::Disabled
         } else {
             CredentialsToggle::Enabled
         };
 
-        let nym_api_endpoints = match &self.config.nym_api_url {
-            Some(endpoint) => vec![endpoint.clone()],
+        let nym_api_endpoints = match self.config.nym_api_url {
+            Some(endpoint) => vec![endpoint],
             None => Vec::new(),
         };
 
         // TODO: this will have to be re-used for surbs. but this is a problem for another PR.
-        let client_store =
+        let key_store =
             ClientStorage::new_async(&self.config.id, self.storage_passphrase.take()).await?;
 
-        // if we provided hardcoded topology, get gateway from it, otherwise get it the 'standard' way
-        let gateway_endpoint = if let Some(topology) = &self.custom_topology {
-            gateway_from_topology(
-                &mut thread_rng(),
-                self.config.gateway.as_deref(),
-                topology,
-                &client_store,
-            )
-            .await?
-        } else {
-            choose_gateway(
-                &client_store,
-                self.config.gateway.clone(),
-                &nym_api_endpoints,
-            )
-            .await?
-        };
-
-        let maybe_topology_provider = self.topology_provider();
-
         let mut base_builder: BaseClientBuilder<_, FullWasmClientStorage> = BaseClientBuilder::new(
-            &gateway_endpoint,
+            &self.config.gateway_endpoint,
             &self.config.debug,
-            client_store,
+            key_store,
             self.bandwidth_controller,
             self.reply_surb_storage_backend,
             disabled_credentials,
@@ -208,8 +180,7 @@ impl NymClientBuilder {
             base_builder = base_builder.with_topology_provider(topology_provider);
         }
 
-        let packet_type = self.config.packet_type;
-        let mut started_client = base_builder.start_base(packet_type).await?;
+        let mut started_client = base_builder.start_base().await?;
         let self_address = started_client.address.to_string();
 
         let client_input = started_client.client_input.register_producer();
@@ -223,7 +194,6 @@ impl NymClientBuilder {
             client_state: Arc::new(started_client.client_state),
             _full_topology: None,
             _task_manager: started_client.task_manager,
-            packet_type: self.packet_type,
         })
     }
 
@@ -299,7 +269,7 @@ impl NymClient {
         let input_msgs = request
             .test_msgs
             .into_iter()
-            .map(|p| InputMessage::new_regular(recipient, p, lane, None))
+            .map(|p| InputMessage::new_regular(recipient, p, lane))
             .collect();
 
         self.client_input.send_messages(input_msgs)
@@ -319,7 +289,7 @@ impl NymClient {
 
         let lane = TransmissionLane::General;
 
-        let input_msg = InputMessage::new_regular(recipient, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_regular(recipient, message, lane);
         self.client_input.send_message(input_msg)
     }
 
@@ -346,8 +316,7 @@ impl NymClient {
 
         let lane = TransmissionLane::General;
 
-        let input_msg =
-            InputMessage::new_anonymous(recipient, message, reply_surbs, lane, self.packet_type);
+        let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
         self.client_input.send_message(input_msg)
     }
 
@@ -365,7 +334,7 @@ impl NymClient {
 
         let lane = TransmissionLane::General;
 
-        let input_msg = InputMessage::new_reply(sender_tag, message, lane, self.packet_type);
+        let input_msg = InputMessage::new_reply(sender_tag, message, lane);
         self.client_input.send_message(input_msg)
     }
 }

clients/webassembly/src/error.rs

@@ -4,14 +4,12 @@
 use crate::storage::errors::ClientStorageError;
 use crate::topology::WasmTopologyError;
 use js_sys::Promise;
-use nym_client_core::config::GatewayEndpointConfig;
 use nym_client_core::error::ClientCoreError;
 use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use nym_gateway_client::error::GatewayClientError;
 use nym_node_tester_utils::error::NetworkTestingError;
 use nym_sphinx::addressing::clients::RecipientFormattingError;
 use nym_sphinx::anonymous_replies::requests::InvalidAnonymousSenderTagRepresentation;
-use nym_topology::NymTopologyError;
 use nym_validator_client::ValidatorClientError;
 use thiserror::Error;
 use wasm_bindgen::JsValue;
@@ -46,18 +44,12 @@ pub enum WasmClientError {
         source: ValidatorClientError,
     },
 
-    #[error("The provided wasm topology was invalid: {source}")]
+    #[error("The provided topology was invalid: {source}")]
     WasmTopologyError {
         #[from]
         source: WasmTopologyError,
     },
 
-    #[error("The provided nym topology was invalid: {source}")]
-    TopologyError {
-        #[from]
-        source: NymTopologyError,
-    },
-
     #[error("failed to test the node: {source}")]
     NodeTestingFailure {
         #[from]
@@ -76,9 +68,6 @@ pub enum WasmClientError {
     #[error("Mixnode {mixnode_identity} is not present in the current network topology")]
     NonExistentMixnode { mixnode_identity: String },
 
-    #[error("Gateway {gateway_identity} is not present in the current network topology")]
-    NonExistentGateway { gateway_identity: String },
-
     #[error("{raw} is not a valid Nym network recipient: {source}")]
     MalformedRecipient {
         raw: String,
@@ -96,11 +85,6 @@ pub enum WasmClientError {
         #[from]
         source: ClientStorageError,
     },
-
-    #[error("this client has already registered with a gateway: {gateway_config:?}")]
-    AlreadyRegistered {
-        gateway_config: GatewayEndpointConfig,
-    },
 }
 
 impl WasmClientError {

clients/webassembly/src/helpers.rs

@@ -2,24 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::WasmClientError;
-use crate::storage::ClientStorage;
 use crate::topology::WasmNymTopology;
 use js_sys::Promise;
 use nym_client_core::client::replies::reply_storage::browser_backend;
 use nym_client_core::config;
-use nym_client_core::config::GatewayEndpointConfig;
-use nym_client_core::init::GatewaySetup;
-use nym_crypto::asymmetric::identity;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_topology::NymTopology;
-use nym_validator_client::client::{IdentityKey, IdentityKeyRef};
 use nym_validator_client::NymApiClient;
-use rand::{CryptoRng, Rng};
 use url::Url;
 use wasm_bindgen::prelude::wasm_bindgen;
 use wasm_bindgen_futures::future_to_promise;
-use wasm_utils::{console_log, PromisableResult};
+use wasm_utils::PromisableResult;
 
 // don't get too excited about the name, under the hood it's just a big fat placeholder
 // with no persistence
@@ -78,88 +72,3 @@ pub fn current_network_topology(nym_api_url: String) -> Promise {
             .into_promise_result()
     })
 }
-
-pub(crate) async fn choose_gateway(
-    client_store: &ClientStorage,
-    chosen_gateway: Option<IdentityKey>,
-    nym_apis: &[Url],
-) -> Result<GatewayEndpointConfig, WasmClientError> {
-    let existing_gateway_config = client_store.read_gateway_config().await?;
-
-    console_log!("loaded: {:?}", existing_gateway_config);
-
-    if let Some(existing) = existing_gateway_config {
-        if let Some(provided) = &chosen_gateway {
-            if provided != &existing.gateway_id {
-                return Err(WasmClientError::AlreadyRegistered {
-                    gateway_config: existing,
-                });
-            }
-        }
-        return Ok(existing);
-    };
-
-    // if NOTHING is specified nor available, choose gateway randomly.
-    let setup = GatewaySetup::new(None, chosen_gateway, None);
-    let config = setup.try_get_gateway_details(nym_apis).await?;
-
-    // perform registration + persist the new gateway info
-    // TODO: this is actually quite bad. we shouldn't be persisting gateway info here since we did not have persisted
-    // the shared key yet. this will only happen when we start the base client itself.
-    // but unfortunately, we can't do much more until we do a bit more refactoring.
-    client_store.store_gateway_config(&config).await?;
-
-    console_log!("stored: {:?}", config);
-
-    Ok(config)
-}
-
-pub(crate) async fn gateway_from_topology<R: Rng + CryptoRng>(
-    rng: &mut R,
-    explicit_gateway: Option<IdentityKeyRef<'_>>,
-    topology: &NymTopology,
-    client_store: &ClientStorage,
-) -> Result<GatewayEndpointConfig, WasmClientError> {
-    let existing_gateway_config = client_store.read_gateway_config().await?;
-    console_log!("loaded: {:?}", existing_gateway_config);
-
-    let new_gateway: GatewayEndpointConfig = if let Some(provided) = explicit_gateway {
-        if let Some(existing) = existing_gateway_config {
-            // we have stored gateway info and explicitly provided identity key
-            //
-            // check if they match, otherwise return an error
-            return if provided != existing.gateway_id {
-                Err(WasmClientError::AlreadyRegistered {
-                    gateway_config: existing,
-                })
-            } else {
-                Ok(existing)
-            };
-        } else {
-            // we have explicitly provided identity key and didn't have any prior stored data
-            //
-            // try to grab details from the topology
-            let gateway_identity = identity::PublicKey::from_base58_string(provided)
-                .map_err(|source| WasmClientError::InvalidGatewayIdentity { source })?;
-            if let Some(gateway) = topology.get_gateway(&gateway_identity) {
-                gateway.clone().into()
-            } else {
-                return Err(WasmClientError::NonExistentGateway {
-                    gateway_identity: gateway_identity.to_base58_string(),
-                });
-            }
-        }
-    } else if let Some(existing) = existing_gateway_config {
-        // we have stored data and didn't provide anything separately - use what's stored!
-        return Ok(existing);
-    } else {
-        // we don't have anything stored nor we have provided anything
-        //
-        // just grab random gateway from our topology
-        topology.random_gateway(rng)?.clone().into()
-    };
-
-    console_log!("storing: {:?}", new_gateway);
-    client_store.store_gateway_config(&new_gateway).await?;
-    Ok(new_gateway)
-}

clients/webassembly/src/storage/mod.rs

@@ -3,7 +3,6 @@
 
 use crate::storage::errors::ClientStorageError;
 use js_sys::Promise;
-use nym_client_core::config::GatewayEndpointConfig;
 use nym_crypto::asymmetric::{encryption, identity};
 use nym_gateway_client::SharedKeys;
 use nym_sphinx::acknowledgements::AckKey;
@@ -24,14 +23,10 @@ const STORAGE_VERSION: u32 = 1;
 mod v1 {
     // stores
     pub const KEYS_STORE: &str = "keys";
-    pub const CORE_STORE: &str = "core";
 
     // keys
-    // TODO: to replace with FULL config
-    pub const GATEWAY_CONFIG: &str = "gateway_config";
-
     pub const ED25519_IDENTITY_KEYPAIR: &str = "ed25519_identity_keypair";
-    pub const X25519_ENCRYPTION_KEYPAIR: &str = "x25519_encryption_keypair";
+    pub const X25519_ENCRYPTION_KEYPAIR: &str = "x25519_encryption_key";
 
     // TODO: for those we could actually use the subtle crypto storage
     pub const AES128CTR_ACK_KEY: &str = "aes128ctr_ack_key";
@@ -72,7 +67,6 @@ impl ClientStorage {
                 let db = evt.db();
 
                 db.create_object_store(v1::KEYS_STORE)?;
-                db.create_object_store(v1::CORE_STORE)?;
             }
 
             Ok(())
@@ -110,15 +104,6 @@ impl ClientStorage {
         })
     }
 
-    pub(crate) async fn read_gateway_config(
-        &self,
-    ) -> Result<Option<GatewayEndpointConfig>, ClientStorageError> {
-        self.inner
-            .read_value(v1::CORE_STORE, JsValue::from_str(v1::GATEWAY_CONFIG))
-            .await
-            .map_err(Into::into)
-    }
-
     async fn may_read_identity_keypair(
         &self,
     ) -> Result<Option<identity::KeyPair>, ClientStorageError> {
@@ -243,18 +228,4 @@ impl ClientStorage {
             .await
             .map_err(Into::into)
     }
-
-    pub(crate) async fn store_gateway_config(
-        &self,
-        gateway_endpoint: &GatewayEndpointConfig,
-    ) -> Result<(), ClientStorageError> {
-        self.inner
-            .store_value(
-                v1::CORE_STORE,
-                JsValue::from_str(v1::GATEWAY_CONFIG),
-                gateway_endpoint,
-            )
-            .await
-            .map_err(Into::into)
-    }
 }

clients/webassembly/src/tester/mod.rs

@@ -3,7 +3,7 @@
 
 use crate::constants::NODE_TESTER_ID;
 use crate::error::WasmClientError;
-use crate::helpers::{current_network_topology_async, gateway_from_topology};
+use crate::helpers::current_network_topology_async;
 use crate::storage::ClientStorage;
 use crate::tester::ephemeral_receiver::EphemeralTestReceiver;
 use crate::tester::helpers::{
@@ -17,6 +17,7 @@ use nym_bandwidth_controller::BandwidthController;
 use nym_client_core::client::key_manager::ManagedKeys;
 use nym_client_core::config::GatewayEndpointConfig;
 use nym_credential_storage::ephemeral_storage::EphemeralStorage;
+use nym_crypto::asymmetric::identity;
 use nym_gateway_client::GatewayClient;
 use nym_node_tester_utils::receiver::SimpleMessageReceiver;
 use nym_node_tester_utils::{NodeTester, TestMessage};
@@ -26,9 +27,7 @@ use nym_sphinx::params::PacketSize;
 use nym_sphinx::preparer::PreparedFragment;
 use nym_task::TaskManager;
 use nym_topology::NymTopology;
-use nym_validator_client::client::IdentityKey;
 use rand::rngs::OsRng;
-use rand::{CryptoRng, Rng};
 use std::collections::HashSet;
 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
 use std::sync::{Arc, Mutex as SyncMutex};
@@ -73,7 +72,7 @@ pub struct NymNodeTester {
 
 #[wasm_bindgen]
 pub struct NymNodeTesterBuilder {
-    gateway: Option<IdentityKey>,
+    gateway_config: GatewayEndpointConfig,
 
     base_topology: NymTopology,
 
@@ -94,61 +93,48 @@ fn address(keys: &ManagedKeys, gateway_identity: NodeIdentity) -> Recipient {
 impl NymNodeTesterBuilder {
     #[wasm_bindgen(constructor)]
     pub fn new(
+        gateway_config: GatewayEndpointConfig,
         base_topology: WasmNymTopology,
-        gateway: Option<IdentityKey>,
     ) -> NymNodeTesterBuilder {
         NymNodeTesterBuilder {
-            gateway,
+            gateway_config,
             base_topology: base_topology.into(),
             bandwidth_controller: None,
         }
     }
 
     async fn _new_with_api(
+        gateway_config: GatewayEndpointConfig,
         api_url: String,
-        gateway: Option<IdentityKey>,
     ) -> Result<Self, WasmClientError> {
         let topology = current_network_topology_async(api_url).await?;
-        Ok(NymNodeTesterBuilder::new(topology, gateway))
+        Ok(NymNodeTesterBuilder::new(gateway_config, topology))
     }
 
-    pub fn new_with_api(gateway: Option<IdentityKey>, api_url: String) -> Promise {
+    pub fn new_with_api(gateway_config: GatewayEndpointConfig, api_url: String) -> Promise {
         future_to_promise(async move {
-            Self::_new_with_api(api_url, gateway)
+            Self::_new_with_api(gateway_config, api_url)
                 .await
                 .into_promise_result()
         })
     }
 
-    async fn gateway_info<R: Rng + CryptoRng>(
-        &self,
-        rng: &mut R,
-        client_store: &ClientStorage,
-    ) -> Result<GatewayEndpointConfig, WasmClientError> {
-        gateway_from_topology(
-            rng,
-            self.gateway.as_deref(),
-            &self.base_topology,
-            client_store,
-        )
-        .await
-    }
-
     async fn _setup_client(mut self) -> Result<NymNodeTester, WasmClientError> {
         let mut rng = OsRng;
         let task_manager = TaskManager::default();
 
-        let client_store = ClientStorage::new_async(NODE_TESTER_ID, None).await?;
+        let gateway_identity =
+            identity::PublicKey::from_base58_string(self.gateway_config.gateway_id)
+                .map_err(|source| WasmClientError::InvalidGatewayIdentity { source })?;
 
-        let gateway_endpoint = self.gateway_info(&mut rng, &client_store).await?;
-        let gateway_identity = gateway_endpoint.try_get_gateway_identity_key()?;
-        let mut managed_keys = ManagedKeys::load_or_generate(&mut rng, &client_store).await;
+        let key_store = ClientStorage::new_async(NODE_TESTER_ID, None).await?;
+        let mut managed_keys = ManagedKeys::load_or_generate(&mut rng, &key_store).await;
 
         let (mixnet_message_sender, mixnet_message_receiver) = mpsc::unbounded();
         let (ack_sender, ack_receiver) = mpsc::unbounded();
 
         let mut gateway_client = GatewayClient::new(
-            gateway_endpoint.gateway_listener,
+            self.gateway_config.gateway_listener,
             managed_keys.identity_keypair(),
             gateway_identity,
             managed_keys.gateway_shared_key(),
@@ -162,7 +148,7 @@ impl NymNodeTesterBuilder {
         gateway_client.set_disabled_credentials_mode(true);
         let shared_keys = gateway_client.authenticate_and_start().await?;
         managed_keys
-            .deal_with_gateway_key(shared_keys, &client_store)
+            .deal_with_gateway_key(shared_keys, &key_store)
             .await?;
 
         // TODO: make those values configurable later
@@ -241,24 +227,24 @@ async fn test_mixnode(
 impl NymNodeTester {
     #[wasm_bindgen(constructor)]
     #[allow(clippy::new_ret_no_self)]
-    pub fn new(topology: WasmNymTopology, gateway: Option<IdentityKey>) -> Promise {
+    pub fn new(gateway_config: GatewayEndpointConfig, topology: WasmNymTopology) -> Promise {
         console_log!("constructing node tester!");
-        NymNodeTesterBuilder::new(topology, gateway).setup_client()
+        NymNodeTesterBuilder::new(gateway_config, topology).setup_client()
     }
 
     async fn _new_with_api(
+        gateway_config: GatewayEndpointConfig,
         api_url: String,
-        gateway: Option<IdentityKey>,
     ) -> Result<Self, WasmClientError> {
-        NymNodeTesterBuilder::_new_with_api(api_url, gateway)
+        NymNodeTesterBuilder::_new_with_api(gateway_config, api_url)
             .await?
             ._setup_client()
             .await
     }
 
-    pub fn new_with_api(api_url: String, gateway: Option<IdentityKey>) -> Promise {
+    pub fn new_with_api(gateway_config: GatewayEndpointConfig, api_url: String) -> Promise {
         future_to_promise(async move {
-            Self::_new_with_api(api_url, gateway)
+            Self::_new_with_api(gateway_config, api_url)
                 .await
                 .into_promise_result()
         })

clients/webassembly/src/topology.rs

@@ -6,7 +6,7 @@ use nym_crypto::asymmetric::{encryption, identity};
 use nym_topology::gateway::GatewayConversionError;
 use nym_topology::mix::{Layer, MixnodeConversionError};
 use nym_topology::{gateway, mix, MixLayer, NymTopology};
-use nym_validator_client::client::{IdentityKeyRef, MixId};
+use nym_validator_client::client::MixId;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use thiserror::Error;
@@ -82,16 +82,11 @@ impl WasmNymTopology {
         })
     }
 
-    #[allow(dead_code)]
     pub(crate) fn ensure_contains(&self, gateway_config: &GatewayEndpointConfig) -> bool {
-        self.ensure_contains_gateway_id(&gateway_config.gateway_id)
-    }
-
-    pub(crate) fn ensure_contains_gateway_id(&self, gateway_id: IdentityKeyRef) -> bool {
         self.inner
             .gateways()
             .iter()
-            .any(|g| g.identity_key.to_base58_string() == gateway_id)
+            .any(|g| g.identity_key.to_base58_string() == gateway_config.gateway_id)
     }
 
     pub fn print(&self) {

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

@@ -130,7 +130,7 @@ impl AsyncFileWatcher {
                 Ok(event) => {
                     let now = Instant::now();
                     if self.should_propagate(&event, now) {
-                        self.last_received.insert(event.kind, now);
+                        self.last_received.insert(event.kind.clone(), now);
                         if let Err(_err) = self.event_sender.unbounded_send(event) {
                             log::error!("the file watcher receiver has been dropped!");
                         }

common/bandwidth-controller/src/lib.rs

@@ -26,7 +26,7 @@ pub mod error;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm_mockups;
 
-pub struct BandwidthController<C, St> {
+pub struct BandwidthController<C, St: Storage> {
     storage: St,
     client: C,
 }

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

@@ -37,19 +37,17 @@ use nym_gateway_client::{
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::addressing::nodes::NodeIdentity;
-use nym_sphinx::params::PacketType;
 use nym_sphinx::receiver::{ReconstructedMessage, SphinxMessageReceiver};
 use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
 use nym_task::{TaskClient, TaskManager};
 use nym_topology::provider_trait::TopologyProvider;
-use rand::rngs::OsRng;
+use rand::thread_rng;
 use std::sync::Arc;
 use tap::TapFallible;
 use url::Url;
 
 #[cfg(target_arch = "wasm32")]
 use nym_bandwidth_controller::wasm_mockups::DkgQueryClient;
-
 #[cfg(not(target_arch = "wasm32"))]
 use nym_validator_client::nyxd::traits::DkgQueryClient;
 
@@ -165,7 +163,7 @@ pub struct BaseClientBuilder<'a, C, S: MixnetClientStorage> {
     reply_storage_backend: S::ReplyStore,
     key_store: S::KeyStore,
 
-    custom_topology_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
+    custom_topology_provider: Option<Box<dyn TopologyProvider>>,
     bandwidth_controller: Option<BandwidthController<C, S::CredentialStore>>,
     managed_keys: ManagedKeys,
 }
@@ -218,10 +216,7 @@ where
         }
     }
 
-    pub fn with_topology_provider(
-        mut self,
-        provider: Box<dyn TopologyProvider + Send + Sync>,
-    ) -> Self {
+    pub fn with_topology_provider(mut self, provider: Box<dyn TopologyProvider>) -> Self {
         self.custom_topology_provider = Some(provider);
         self
     }
@@ -276,7 +271,6 @@ where
         lane_queue_lengths: LaneQueueLengths,
         client_connection_rx: ConnectionCommandReceiver,
         shutdown: TaskClient,
-        packet_type: PacketType,
     ) {
         info!("Starting real traffic stream...");
 
@@ -292,7 +286,7 @@ where
             lane_queue_lengths,
             client_connection_rx,
         )
-        .start_with_shutdown(shutdown, packet_type);
+        .start_with_shutdown(shutdown);
     }
 
     // buffer controlling all messages fetched from provider
@@ -373,9 +367,9 @@ where
     }
 
     fn setup_topology_provider(
-        custom_provider: Option<Box<dyn TopologyProvider + Send + Sync>>,
+        custom_provider: Option<Box<dyn TopologyProvider>>,
         nym_api_urls: Vec<Url>,
-    ) -> Box<dyn TopologyProvider + Send + Sync> {
+    ) -> Box<dyn TopologyProvider> {
         // if no custom provider was ... provided ..., create one using nym-api
         custom_provider.unwrap_or_else(|| {
             Box::new(NymApiTopologyProvider::new(
@@ -388,7 +382,7 @@ where
     // future responsible for periodically polling directory server and updating
     // the current global view of topology
     async fn start_topology_refresher(
-        topology_provider: Box<dyn TopologyProvider + Send + Sync>,
+        topology_provider: Box<dyn TopologyProvider>,
         topology_config: config::Topology,
         topology_accessor: TopologyAccessor,
         mut shutdown: TaskClient,
@@ -428,7 +422,7 @@ where
         Ok(())
     }
 
-    // controller for sending packets to mixnet (either real traffic or cover traffic)
+    // controller for sending sphinx packets to mixnet (either real traffic or cover traffic)
     // TODO: if we want to send control messages to gateway_client, this CAN'T take the ownership
     // over it. Perhaps GatewayClient needs to be thread-shareable or have some channel for
     // requests?
@@ -475,14 +469,11 @@ where
 
     async fn initial_key_setup(&mut self) {
         assert!(!self.managed_keys.is_valid());
-        let mut rng = OsRng;
+        let mut rng = thread_rng();
         self.managed_keys = ManagedKeys::load_or_generate(&mut rng, &self.key_store).await;
     }
 
-    pub async fn start_base(
-        mut self,
-        packet_type: PacketType,
-    ) -> Result<BaseClient, ClientCoreError>
+    pub async fn start_base(mut self) -> Result<BaseClient, ClientCoreError>
     where
         <S::ReplyStore as ReplyStorageBackend>::StorageError: Sync + Send,
         S::ReplyStore: Send + Sync,
@@ -553,11 +544,11 @@ where
             task_manager.subscribe(),
         );
 
-        // The message_sender is the transmitter for any component generating sphinx packets
+        // The sphinx_message_sender is the transmitter for any component generating sphinx packets
         // that are to be sent to the mixnet. They are used by cover traffic stream and real
         // traffic stream.
         // The MixTrafficController then sends the actual traffic
-        let message_sender =
+        let sphinx_message_sender =
             Self::start_mix_traffic_controller(gateway_client, task_manager.subscribe());
 
         // Channels that the websocket listener can use to signal downstream to the real traffic
@@ -579,14 +570,13 @@ where
             shared_topology_accessor.clone(),
             ack_receiver,
             input_receiver,
-            message_sender.clone(),
+            sphinx_message_sender.clone(),
             reply_storage,
             reply_controller_sender.clone(),
             reply_controller_receiver,
             shared_lane_queue_lengths.clone(),
             client_connection_rx,
             task_manager.subscribe(),
-            packet_type,
         );
 
         if !self
@@ -599,7 +589,7 @@ where
                 self.managed_keys.ack_key(),
                 self_address,
                 shared_topology_accessor.clone(),
-                message_sender,
+                sphinx_message_sender,
                 task_manager.subscribe(),
             );
         }

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

@@ -12,18 +12,13 @@ use nym_credential_storage::ephemeral_storage::{
 };
 use nym_credential_storage::storage::Storage as CredentialStorage;
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
-use crate::client::base_client::non_wasm_helpers;
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+#[cfg(not(target_arch = "wasm32"))]
 use crate::client::key_manager::persistence::OnDiskKeys;
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
-use crate::config::{persistence::key_pathfinder::ClientKeyPathfinder, Config};
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
-use crate::error::ClientCoreError;
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+
+#[cfg(not(target_arch = "wasm32"))]
 use nym_credential_storage::persistent_storage::PersistentStorage as PersistentCredentialStorage;
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+#[cfg(not(target_arch = "wasm32"))]
 use crate::client::replies::reply_storage::fs_backend;
 
 pub trait MixnetClientStorage {
@@ -74,14 +69,14 @@ impl MixnetClientStorage for Ephemeral {
     }
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+#[cfg(not(target_arch = "wasm32"))]
 pub struct OnDiskPersistent {
     pub(crate) key_store: OnDiskKeys,
     pub(crate) reply_store: fs_backend::Backend,
     pub(crate) credential_store: PersistentCredentialStorage,
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+#[cfg(not(target_arch = "wasm32"))]
 impl OnDiskPersistent {
     pub fn new(
         key_store: OnDiskKeys,
@@ -94,29 +89,9 @@ impl OnDiskPersistent {
             credential_store,
         }
     }
-
-    pub async fn from_config<T>(config: &Config<T>) -> Result<Self, ClientCoreError> {
-        let pathfinder = ClientKeyPathfinder::new_from_config(config);
-        let key_store = OnDiskKeys::new(pathfinder);
-
-        let reply_store = non_wasm_helpers::setup_fs_reply_surb_backend(
-            config.get_reply_surb_database_path(),
-            &config.get_debug_config().reply_surbs,
-        )
-        .await?;
-
-        let credential_store =
-            nym_credential_storage::initialise_persistent_storage(config.get_database_path()).await;
-
-        Ok(OnDiskPersistent {
-            key_store,
-            reply_store,
-            credential_store,
-        })
-    }
 }
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "fs-surb-storage"))]
+#[cfg(not(target_arch = "wasm32"))]
 impl MixnetClientStorage for OnDiskPersistent {
     type KeyStore = OnDiskKeys;
     type ReplyStore = fs_backend::Backend;

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

@@ -45,7 +45,7 @@ where
     #[cfg(target_arch = "wasm32")]
     next_delay: Pin<Box<wasm_timer::Delay>>,
 
-    /// Channel used for sending prepared nym packets to `MixTrafficController` that sends them
+    /// Channel used for sending prepared sphinx packets to `MixTrafficController` that sends them
     /// out to the network without any further delays.
     mix_tx: BatchMixMessageSender,
 
@@ -194,7 +194,6 @@ impl LoopCoverTrafficStream<OsRng> {
             self.average_ack_delay,
             self.cover_traffic.loop_cover_traffic_average_delay,
             cover_traffic_packet_size,
-            nym_sphinx::params::PacketType::Mix,
         )
         .expect("Somehow failed to generate a loop cover message with a valid topology");
 

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

@@ -4,7 +4,6 @@
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::forwarding::packet::MixPacket;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 
 pub type InputMessageSender = tokio::sync::mpsc::Sender<InputMessage>;
@@ -54,49 +53,18 @@ pub enum InputMessage {
         data: Vec<u8>,
         lane: TransmissionLane,
     },
-
-    MessageWrapper {
-        message: Box<InputMessage>,
-        packet_type: PacketType,
-    },
 }
 
 impl InputMessage {
-    pub fn new_premade(
-        msgs: Vec<MixPacket>,
-        lane: TransmissionLane,
-        packet_type: PacketType,
-    ) -> Self {
-        let message = InputMessage::Premade { msgs, lane };
-        if packet_type == PacketType::Mix {
-            message
-        } else {
-            InputMessage::new_wrapper(message, packet_type)
-        }
+    pub fn new_premade(msgs: Vec<MixPacket>, lane: TransmissionLane) -> Self {
+        InputMessage::Premade { msgs, lane }
     }
 
-    pub fn new_wrapper(message: InputMessage, packet_type: PacketType) -> Self {
-        InputMessage::MessageWrapper {
-            message: Box::new(message),
-            packet_type,
-        }
-    }
-
-    pub fn new_regular(
-        recipient: Recipient,
-        data: Vec<u8>,
-        lane: TransmissionLane,
-        packet_type: Option<PacketType>,
-    ) -> Self {
-        let message = InputMessage::Regular {
+    pub fn new_regular(recipient: Recipient, data: Vec<u8>, lane: TransmissionLane) -> Self {
+        InputMessage::Regular {
             recipient,
             data,
             lane,
-        };
-        if let Some(packet_type) = packet_type {
-            InputMessage::new_wrapper(message, packet_type)
-        } else {
-            message
         }
     }
 
@@ -105,18 +73,12 @@ impl InputMessage {
         data: Vec<u8>,
         reply_surbs: u32,
         lane: TransmissionLane,
-        packet_type: Option<PacketType>,
     ) -> Self {
-        let message = InputMessage::Anonymous {
+        InputMessage::Anonymous {
             recipient,
             data,
             reply_surbs,
             lane,
-        };
-        if let Some(packet_type) = packet_type {
-            InputMessage::new_wrapper(message, packet_type)
-        } else {
-            message
         }
     }
 
@@ -124,17 +86,11 @@ impl InputMessage {
         recipient_tag: AnonymousSenderTag,
         data: Vec<u8>,
         lane: TransmissionLane,
-        packet_type: Option<PacketType>,
     ) -> Self {
-        let message = InputMessage::Reply {
+        InputMessage::Reply {
             recipient_tag,
             data,
             lane,
-        };
-        if let Some(packet_type) = packet_type {
-            InputMessage::new_wrapper(message, packet_type)
-        } else {
-            message
         }
     }
 
@@ -144,7 +100,6 @@ impl InputMessage {
             | InputMessage::Anonymous { lane, .. }
             | InputMessage::Reply { lane, .. }
             | InputMessage::Premade { lane, .. } => lane,
-            InputMessage::MessageWrapper { message, .. } => message.lane(),
         }
     }
 }

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

@@ -37,27 +37,22 @@ impl ManagedKeys {
         !matches!(self, ManagedKeys::Invalidated)
     }
 
-    pub async fn try_load<S: KeyStore>(key_store: &S) -> Result<Self, S::StorageError> {
+    pub async fn must_load<S: KeyStore>(key_store: &S) -> Result<Self, S::StorageError> {
         Ok(ManagedKeys::FullyDerived(
             KeyManager::load_keys(key_store).await?,
         ))
     }
 
-    pub fn generate_new<R>(rng: &mut R) -> Self
-    where
-        R: RngCore + CryptoRng,
-    {
-        ManagedKeys::Initial(KeyManagerBuilder::new(rng))
-    }
-
     pub async fn load_or_generate<R, S>(rng: &mut R, key_store: &S) -> Self
     where
         R: RngCore + CryptoRng,
         S: KeyStore,
     {
-        Self::try_load(key_store)
-            .await
-            .unwrap_or_else(|_| Self::generate_new(rng))
+        if let Ok(loaded) = KeyManager::load_keys(key_store).await {
+            ManagedKeys::FullyDerived(loaded)
+        } else {
+            ManagedKeys::Initial(KeyManagerBuilder::new(rng))
+        }
     }
 
     pub fn identity_keypair(&self) -> Arc<identity::KeyPair> {

common/client-core/src/client/key_manager/persistence.rs

@@ -8,8 +8,6 @@ use std::error::Error;
 #[cfg(not(target_arch = "wasm32"))]
 use crate::config::persistence::key_pathfinder::ClientKeyPathfinder;
 #[cfg(not(target_arch = "wasm32"))]
-use crate::config::Config;
-#[cfg(not(target_arch = "wasm32"))]
 use nym_crypto::asymmetric::{encryption, identity};
 #[cfg(not(target_arch = "wasm32"))]
 use nym_gateway_requests::registration::handshake::SharedKeys;
@@ -81,10 +79,6 @@ impl OnDiskKeys {
         OnDiskKeys { pathfinder }
     }
 
-    pub fn from_config<T>(config: &Config<T>) -> Self {
-        OnDiskKeys::new(ClientKeyPathfinder::new_from_config(config))
-    }
-
     fn load_key<T: PemStorableKey>(
         &self,
         path: &std::path::Path,

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

@@ -40,15 +40,15 @@ where
     pub fn new(
         gateway_client: GatewayClient<C, St>,
     ) -> (MixTrafficController<C, St>, BatchMixMessageSender) {
-        let (message_sender, message_receiver) =
+        let (sphinx_message_sender, sphinx_message_receiver) =
             tokio::sync::mpsc::channel(MIX_MESSAGE_RECEIVER_BUFFER_SIZE);
         (
             MixTrafficController {
                 gateway_client,
-                mix_rx: message_receiver,
+                mix_rx: sphinx_message_receiver,
                 consecutive_gateway_failure_count: 0,
             },
-            message_sender,
+            sphinx_message_sender,
         )
     }
 

common/client-core/src/client/real_messages_control/acknowledgement_control/acknowledgement_listener.rs

@@ -71,7 +71,7 @@ impl AcknowledgementListener {
         while !shutdown.is_shutdown() {
             tokio::select! {
                 acks = self.ack_receiver.next() => match acks {
-                    Some(acks) => {self.handle_ack_receiver_item(acks).await}
+                    Some(acks) => self.handle_ack_receiver_item(acks).await,
                     None => {
                         log::trace!("AcknowledgementListener: Stopping since channel closed");
                         break;

common/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs

@@ -9,7 +9,6 @@ use log::*;
 use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
 use nym_sphinx::forwarding::packet::MixPacket;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::TransmissionLane;
 use rand::{CryptoRng, Rng};
 
@@ -72,11 +71,10 @@ where
         recipient: Recipient,
         content: Vec<u8>,
         lane: TransmissionLane,
-        packet_type: PacketType,
     ) {
         if let Err(err) = self
             .message_handler
-            .try_send_plain_message(recipient, content, lane, packet_type)
+            .try_send_plain_message(recipient, content, lane)
             .await
         {
             warn!("failed to send a plain message - {err}")
@@ -89,11 +87,10 @@ where
         content: Vec<u8>,
         reply_surbs: u32,
         lane: TransmissionLane,
-        packet_type: PacketType,
     ) {
         if let Err(err) = self
             .message_handler
-            .try_send_message_with_reply_surbs(recipient, content, reply_surbs, lane, packet_type)
+            .try_send_message_with_reply_surbs(recipient, content, reply_surbs, lane)
             .await
         {
             warn!("failed to send a repliable message - {err}")
@@ -106,17 +103,14 @@ where
                 recipient,
                 data,
                 lane,
-            } => {
-                self.handle_plain_message(recipient, data, lane, PacketType::Mix)
-                    .await
-            }
+            } => self.handle_plain_message(recipient, data, lane).await,
             InputMessage::Anonymous {
                 recipient,
                 data,
                 reply_surbs,
                 lane,
             } => {
-                self.handle_repliable_message(recipient, data, reply_surbs, lane, PacketType::Mix)
+                self.handle_repliable_message(recipient, data, reply_surbs, lane)
                     .await
             }
             InputMessage::Reply {
@@ -127,40 +121,6 @@ where
                 self.handle_reply(recipient_tag, data, lane).await;
             }
             InputMessage::Premade { msgs, lane } => self.handle_premade_packets(msgs, lane).await,
-            InputMessage::MessageWrapper {
-                message,
-                packet_type,
-            } => match *message {
-                InputMessage::Regular {
-                    recipient,
-                    data,
-                    lane,
-                } => {
-                    self.handle_plain_message(recipient, data, lane, packet_type)
-                        .await
-                }
-                InputMessage::Anonymous {
-                    recipient,
-                    data,
-                    reply_surbs,
-                    lane,
-                } => {
-                    self.handle_repliable_message(recipient, data, reply_surbs, lane, packet_type)
-                        .await
-                }
-                InputMessage::Reply {
-                    recipient_tag,
-                    data,
-                    lane,
-                } => {
-                    self.handle_reply(recipient_tag, data, lane).await;
-                }
-                InputMessage::Premade { msgs, lane } => {
-                    self.handle_premade_packets(msgs, lane).await
-                }
-                // MessageWrappers can't be nested
-                InputMessage::MessageWrapper { .. } => unimplemented!(),
-            },
         };
     }
 

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

@@ -16,7 +16,7 @@ use futures::channel::mpsc;
 use log::*;
 use nym_gateway_client::AcknowledgementReceiver;
 use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag;
-use nym_sphinx::params::{PacketSize, PacketType};
+use nym_sphinx::params::PacketSize;
 use nym_sphinx::{
     acknowledgements::AckKey,
     addressing::clients::Recipient,
@@ -249,11 +249,7 @@ where
         }
     }
 
-    pub(super) fn start_with_shutdown(
-        self,
-        shutdown: nym_task::TaskClient,
-        packet_type: PacketType,
-    ) {
+    pub(super) fn start_with_shutdown(self, shutdown: nym_task::TaskClient) {
         let mut acknowledgement_listener = self.acknowledgement_listener;
         let mut input_message_listener = self.input_message_listener;
         let mut retransmission_request_listener = self.retransmission_request_listener;
@@ -279,7 +275,7 @@ where
         let shutdown_handle = shutdown.clone();
         spawn_future(async move {
             retransmission_request_listener
-                .run_with_shutdown(shutdown_handle, packet_type)
+                .run_with_shutdown(shutdown_handle)
                 .await;
             debug!("The retransmission request listener has finished execution!");
         });

common/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs

@@ -11,9 +11,9 @@ use crate::client::real_messages_control::real_traffic_stream::RealMessage;
 use crate::client::replies::reply_controller::ReplyControllerSender;
 use futures::StreamExt;
 use log::*;
+use nym_sphinx::addressing::clients::Recipient;
 use nym_sphinx::chunking::fragment::Fragment;
 use nym_sphinx::preparer::PreparedFragment;
-use nym_sphinx::{addressing::clients::Recipient, params::PacketType};
 use nym_task::connections::TransmissionLane;
 use rand::{CryptoRng, Rng};
 use std::sync::{Arc, Weak};
@@ -48,20 +48,17 @@ where
         &mut self,
         packet_recipient: Recipient,
         chunk_data: Fragment,
-        packet_type: PacketType,
     ) -> Result<PreparedFragment, PreparationError> {
         debug!("retransmitting normal packet...");
 
-        // TODO: Figure out retransmission packet type signaling
         self.message_handler
-            .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data, packet_type)
+            .try_prepare_single_chunk_for_sending(packet_recipient, chunk_data)
             .await
     }
 
     async fn on_retransmission_request(
         &mut self,
         weak_timed_out_ack: Weak<PendingAcknowledgement>,
-        packet_type: PacketType,
     ) {
         let timed_out_ack = match weak_timed_out_ack.upgrade() {
             Some(timed_out_ack) => timed_out_ack,
@@ -88,7 +85,6 @@ where
                 self.prepare_normal_retransmission_chunk(
                     **recipient,
                     timed_out_ack.message_chunk.clone(),
-                    packet_type,
                 )
                 .await
             }
@@ -144,17 +140,13 @@ where
             .await
     }
 
-    pub(super) async fn run_with_shutdown(
-        &mut self,
-        mut shutdown: nym_task::TaskClient,
-        packet_type: PacketType,
-    ) {
+    pub(super) async fn run_with_shutdown(&mut self, mut shutdown: nym_task::TaskClient) {
         debug!("Started RetransmissionRequestListener with graceful shutdown support");
 
         while !shutdown.is_shutdown() {
             tokio::select! {
                 timed_out_ack = self.request_receiver.next() => match timed_out_ack {
-                    Some(timed_out_ack) => self.on_retransmission_request(timed_out_ack, packet_type).await,
+                    Some(timed_out_ack) => self.on_retransmission_request(timed_out_ack).await,
                     None => {
                         log::trace!("RetransmissionRequestListener: Stopping since channel closed");
                         break;

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

@@ -15,7 +15,7 @@ use nym_sphinx::anonymous_replies::requests::{AnonymousSenderTag, RepliableMessa
 use nym_sphinx::anonymous_replies::{ReplySurb, SurbEncryptionKey};
 use nym_sphinx::chunking::fragment::{Fragment, FragmentIdentifier};
 use nym_sphinx::message::NymMessage;
-use nym_sphinx::params::{PacketSize, PacketType, DEFAULT_NUM_MIX_HOPS};
+use nym_sphinx::params::{PacketSize, DEFAULT_NUM_MIX_HOPS};
 use nym_sphinx::preparer::{MessagePreparer, PreparedFragment};
 use nym_sphinx::Delay;
 use nym_task::connections::TransmissionLane;
@@ -27,7 +27,7 @@ use std::time::Duration;
 use thiserror::Error;
 
 // TODO: move that error elsewhere since it seems to be contaminating different files
-#[derive(Debug, Error)]
+#[derive(Debug, Clone, Error)]
 pub enum PreparationError {
     #[error(transparent)]
     NymTopologyError(#[from] NymTopologyError),
@@ -417,10 +417,9 @@ where
         recipient: Recipient,
         message: Vec<u8>,
         lane: TransmissionLane,
-        packet_type: PacketType,
     ) -> Result<(), PreparationError> {
         let message = NymMessage::new_plain(message);
-        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
+        self.try_split_and_send_non_reply_message(message, recipient, lane)
             .await
     }
 
@@ -429,9 +428,7 @@ where
         message: NymMessage,
         recipient: Recipient,
         lane: TransmissionLane,
-        packet_type: PacketType,
     ) -> Result<(), PreparationError> {
-        debug!("Sending non-reply message with packet type {packet_type}");
         // TODO: I really dislike existence of this assertion, it implies code has to be re-organised
         debug_assert!(!matches!(message, NymMessage::Reply(_)));
 
@@ -439,11 +436,7 @@ where
         let topology_permit = self.topology_access.get_read_permit().await;
         let topology = self.get_topology(&topology_permit)?;
 
-        let packet_size = if packet_type == PacketType::Outfox {
-            PacketSize::OutfoxRegularPacket
-        } else {
-            self.optimal_packet_size(&message)
-        };
+        let packet_size = self.optimal_packet_size(&message);
         debug!("Using {packet_size} packets for {message}");
         let fragments = self
             .message_preparer
@@ -460,7 +453,6 @@ where
                 topology,
                 &self.config.ack_key,
                 &recipient,
-                packet_type,
             )?;
 
             let real_message = RealMessage::new(
@@ -484,9 +476,7 @@ where
         &mut self,
         recipient: Recipient,
         amount: u32,
-        packet_type: PacketType,
     ) -> Result<(), PreparationError> {
-        debug!("Sending additional reply SURBs with packet type {packet_type}");
         let sender_tag = self.get_or_create_sender_tag(&recipient);
         let (reply_surbs, reply_keys) =
             self.generate_reply_surbs_with_keys(amount as usize).await?;
@@ -500,7 +490,6 @@ where
             message,
             recipient,
             TransmissionLane::AdditionalReplySurbs,
-            packet_type,
         )
         .await?;
 
@@ -516,9 +505,7 @@ where
         message: Vec<u8>,
         num_reply_surbs: u32,
         lane: TransmissionLane,
-        packet_type: PacketType,
     ) -> Result<(), SurbWrappedPreparationError> {
-        debug!("Sending message with reply SURBs with packet type {packet_type}");
         let sender_tag = self.get_or_create_sender_tag(&recipient);
         let (reply_surbs, reply_keys) = self
             .generate_reply_surbs_with_keys(num_reply_surbs as usize)
@@ -527,7 +514,7 @@ where
         let message =
             NymMessage::new_repliable(RepliableMessage::new_data(message, sender_tag, reply_surbs));
 
-        self.try_split_and_send_non_reply_message(message, recipient, lane, packet_type)
+        self.try_split_and_send_non_reply_message(message, recipient, lane)
             .await?;
 
         log::trace!("storing {} reply keys", reply_keys.len());
@@ -540,21 +527,13 @@ where
         &mut self,
         recipient: Recipient,
         chunk: Fragment,
-        packet_type: PacketType,
     ) -> Result<PreparedFragment, PreparationError> {
-        debug!("Sending single chunk with packet type {packet_type}");
         let topology_permit = self.topology_access.get_read_permit().await;
         let topology = self.get_topology(&topology_permit)?;
 
         let prepared_fragment = self
             .message_preparer
-            .prepare_chunk_for_sending(
-                chunk,
-                topology,
-                &self.config.ack_key,
-                &recipient,
-                packet_type,
-            )
+            .prepare_chunk_for_sending(chunk, topology, &self.config.ack_key, &recipient)
             .unwrap();
 
         Ok(prepared_fragment)
@@ -590,7 +569,6 @@ where
                         topology,
                         &self.config.ack_key,
                         reply_surb,
-                        PacketType::Mix,
                     )
                     .unwrap()
             })
@@ -610,13 +588,7 @@ where
 
         let prepared_fragment = self
             .message_preparer
-            .prepare_reply_chunk_for_sending(
-                chunk,
-                topology,
-                &self.config.ack_key,
-                reply_surb,
-                PacketType::Mix,
-            )
+            .prepare_reply_chunk_for_sending(chunk, topology, &self.config.ack_key, reply_surb)
             .unwrap();
 
         Ok(prepared_fragment)

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

@@ -26,7 +26,6 @@ use log::*;
 use nym_gateway_client::AcknowledgementReceiver;
 use nym_sphinx::acknowledgements::AckKey;
 use nym_sphinx::addressing::clients::Recipient;
-use nym_sphinx::params::PacketType;
 use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths};
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use std::sync::Arc;
@@ -208,7 +207,7 @@ impl RealMessagesController<OsRng> {
         }
     }
 
-    pub fn start_with_shutdown(self, shutdown: nym_task::TaskClient, packet_type: PacketType) {
+    pub fn start_with_shutdown(self, shutdown: nym_task::TaskClient) {
         let mut out_queue_control = self.out_queue_control;
         let ack_control = self.ack_control;
         let mut reply_control = self.reply_control;
@@ -224,6 +223,6 @@ impl RealMessagesController<OsRng> {
             debug!("The reply controller has finished execution!");
         });
 
-        ack_control.start_with_shutdown(shutdown, packet_type);
+        ack_control.start_with_shutdown(shutdown);
     }
 }

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

@@ -92,7 +92,7 @@ where
     // messages.
     sending_delay_controller: SendingDelayController,
 
-    /// Channel used for sending prepared packets to `MixTrafficController` that sends them
+    /// Channel used for sending prepared sphinx packets to `MixTrafficController` that sends them
     /// out to the network without any further delays.
     mix_tx: BatchMixMessageSender,
 
@@ -136,7 +136,7 @@ impl From<PreparedFragment> for RealMessage {
 
 impl RealMessage {
     pub(crate) fn packet_size(&self) -> usize {
-        self.mix_packet.packet().len()
+        self.mix_packet.sphinx_packet().len()
     }
 
     pub(crate) fn new(mix_packet: MixPacket, fragment_id: Option<FragmentIdentifier>) -> Self {
@@ -247,7 +247,6 @@ where
                         self.config.average_ack_delay,
                         self.config.traffic.average_packet_delay,
                         cover_traffic_packet_size,
-                        self.config.traffic.packet_type.unwrap_or_default(),
                     )
                     .expect(
                         "Somehow failed to generate a loop cover message with a valid topology",
@@ -387,7 +386,7 @@ where
 
             // On every iteration we get new messages from upstream. Given that these come bunched
             // in `Vec`, this ensures that on average we will fetch messages faster than we can
-            // send, which is a condition for being able to multiplex packets from multiple
+            // send, which is a condition for being able to multiplex sphinx packets from multiple
             // data streams.
             match Pin::new(&mut self.real_receiver).poll_recv(cx) {
                 // in the case our real message channel stream was closed, we should also indicate we are closed

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

@@ -512,11 +512,7 @@ where
             let to_send = min(remaining, 100);
             if let Err(err) = self
                 .message_handler
-                .try_send_additional_reply_surbs(
-                    recipient,
-                    to_send,
-                    nym_sphinx::params::PacketType::Mix,
-                )
+                .try_send_additional_reply_surbs(recipient, to_send)
                 .await
             {
                 warn!("failed to send additional surbs to {recipient} - {err}");

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

@@ -26,7 +26,7 @@ impl TopologyRefresherConfig {
 }
 
 pub struct TopologyRefresher {
-    topology_provider: Box<dyn TopologyProvider + Send + Sync>,
+    topology_provider: Box<dyn TopologyProvider>,
     topology_accessor: TopologyAccessor,
 
     refresh_rate: Duration,
@@ -37,7 +37,7 @@ impl TopologyRefresher {
     pub fn new(
         cfg: TopologyRefresherConfig,
         topology_accessor: TopologyAccessor,
-        topology_provider: Box<dyn TopologyProvider + Send + Sync>,
+        topology_provider: Box<dyn TopologyProvider>,
     ) -> Self {
         TopologyRefresher {
             topology_provider,
@@ -47,7 +47,7 @@ impl TopologyRefresher {
         }
     }
 
-    pub fn change_topology_provider(&mut self, provider: Box<dyn TopologyProvider + Send + Sync>) {
+    pub fn change_topology_provider(&mut self, provider: Box<dyn TopologyProvider>) {
         self.topology_provider = provider;
     }
 

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

@@ -28,7 +28,7 @@ impl SizedData for RealMessage {
 
 impl SizedData for Fragment {
     fn data_size(&self) -> usize {
-        // note that raw `Fragment` is smaller than packet payload
+        // note that raw `Fragment` is smaller than sphinx packet payload
         // as it doesn't include surb-ack or the [shared] key materials
         self.payload_size()
     }

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

@@ -3,30 +3,19 @@
 
 use nym_config::defaults::NymNetworkDetails;
 use nym_config::{NymConfig, OptionalSet, CRED_DB_FILE_NAME};
-use nym_crypto::asymmetric::identity;
-use nym_sphinx::params::{PacketSize, PacketType};
+use nym_sphinx::params::PacketSize;
 use serde::{Deserialize, Serialize};
 use std::marker::PhantomData;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::time::Duration;
 use url::Url;
 
-use crate::error::ClientCoreError;
 #[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;
 
 pub mod old_config_v1_1_13;
 pub mod persistence;
 
-pub const DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME: &str = "private_identity.pem";
-pub const DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME: &str = "public_identity.pem";
-pub const DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME: &str = "private_encryption.pem";
-pub const DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME: &str = "public_encryption.pem";
-pub const DEFAULT_GATEWAY_KEYS_FILENAME: &str = "gateway_shared.pem";
-pub const DEFAULT_ACK_KEY_FILENAME: &str = "ack_key.pem";
-pub const DEFAULT_REPLY_STORE_FILENAME: &str = "persistent_reply_store.sqlite";
-pub const DEFAULT_CREDENTIAL_STORE_FILENAME: &str = CRED_DB_FILE_NAME;
-
 pub const MISSING_VALUE: &str = "MISSING VALUE";
 
 // 'DEBUG'
@@ -118,37 +107,6 @@ impl<T> Config<T> {
         self
     }
 
-    #[must_use]
-    #[doc(hidden)]
-    // TODO: this totally contradicts our trait... we REALLY have to refactor it...
-    pub fn reset_data_directory<P: AsRef<Path>>(mut self, dir: P) -> Self {
-        self.client.private_identity_key_file =
-            dir.as_ref().join(DEFAULT_PRIVATE_IDENTITY_KEY_FILENAME);
-        self.client.public_identity_key_file =
-            dir.as_ref().join(DEFAULT_PUBLIC_IDENTITY_KEY_FILENAME);
-        self.client.private_encryption_key_file =
-            dir.as_ref().join(DEFAULT_PRIVATE_ENCRYPTION_KEY_FILENAME);
-        self.client.public_encryption_key_file =
-            dir.as_ref().join(DEFAULT_PUBLIC_ENCRYPTION_KEY_FILENAME);
-        self.client.gateway_shared_key_file = dir.as_ref().join(DEFAULT_GATEWAY_KEYS_FILENAME);
-        self.client.ack_key_file = dir.as_ref().join(DEFAULT_ACK_KEY_FILENAME);
-        self.client.reply_surb_database_path = dir.as_ref().join(DEFAULT_REPLY_STORE_FILENAME);
-        self.client.database_path = dir.as_ref().join(DEFAULT_CREDENTIAL_STORE_FILENAME);
-
-        self
-    }
-
-    #[must_use]
-    #[doc(hidden)]
-    // TODO: this totally contradicts our trait... we REALLY have to refactor it...
-    pub fn reset_nym_root_directory<P: AsRef<Path>>(mut self, dir: P) -> Self
-    where
-        T: NymConfig,
-    {
-        self.client.nym_root_directory = dir.as_ref().to_owned();
-        self
-    }
-
     pub fn set_empty_fields_to_defaults(&mut self) -> bool
     where
         T: NymConfig,
@@ -259,11 +217,6 @@ impl<T> Config<T> {
         self
     }
 
-    pub fn with_packet_type(mut self, packet_type: PacketType) -> Self {
-        self.client.packet_type = Some(packet_type);
-        self
-    }
-
     pub fn set_high_default_traffic_volume(&mut self) {
         self.debug.traffic.average_packet_delay = Duration::from_millis(10);
         // basically don't really send cover messages
@@ -451,10 +404,6 @@ impl<T> Config<T> {
     pub fn get_maximum_reply_key_age(&self) -> Duration {
         self.debug.reply_surbs.maximum_reply_key_age
     }
-
-    pub fn get_packet_type(&self) -> PacketType {
-        self.client.packet_type.unwrap_or(PacketType::Mix)
-    }
 }
 
 impl<T: NymConfig> Default for Config<T> {
@@ -497,14 +446,6 @@ impl GatewayEndpointConfig {
     }
 }
 
-// separate block so it wouldn't be exported via wasm bindgen
-impl GatewayEndpointConfig {
-    pub fn try_get_gateway_identity_key(&self) -> Result<identity::PublicKey, ClientCoreError> {
-        identity::PublicKey::from_base58_string(&self.gateway_id)
-            .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)
-    }
-}
-
 impl From<nym_topology::gateway::Node> for GatewayEndpointConfig {
     fn from(node: nym_topology::gateway::Node) -> GatewayEndpointConfig {
         let gateway_listener = node.clients_address();
@@ -577,8 +518,6 @@ pub struct Client<T> {
 
     #[serde(skip)]
     pub super_struct: PhantomData<T>,
-
-    pub packet_type: Option<PacketType>,
 }
 
 impl<T: NymConfig> Default for Client<T> {
@@ -617,7 +556,6 @@ impl<T: NymConfig> Default for Client<T> {
             reply_surb_database_path: Default::default(),
             nym_root_directory: T::default_root_directory(),
             super_struct: Default::default(),
-            packet_type: Default::default(),
         }
     }
 }
@@ -689,8 +627,6 @@ pub struct Traffic {
     /// Note that its use decreases overall anonymity.
     /// Do not set it it unless you understand the consequences of that change.
     pub secondary_packet_size: Option<PacketSize>,
-
-    pub packet_type: Option<PacketType>,
 }
 
 impl Traffic {
@@ -714,7 +650,6 @@ impl Default for Traffic {
             disable_main_poisson_packet_distribution: false,
             primary_packet_size: PacketSize::RegularPacket,
             secondary_packet_size: None,
-            packet_type: None,
         }
     }
 }

common/client-core/src/config/old_config_v1_1_13.rs

@@ -125,7 +125,6 @@ impl From<OldDebugConfigV1_1_13> for DebugConfig {
                     .disable_main_poisson_packet_distribution,
                 primary_packet_size: PacketSize::RegularPacket,
                 secondary_packet_size: value.use_extended_packet_size.map(Into::into),
-                packet_type: None,
             },
             cover_traffic: CoverTraffic {
                 loop_cover_traffic_average_delay: value.loop_cover_traffic_average_delay,
@@ -211,8 +210,8 @@ impl<T, U> From<OldConfigV1_1_13<T>> for Config<U> {
                 database_path: value.client.database_path,
                 reply_surb_database_path: value.client.reply_surb_database_path,
                 nym_root_directory: value.client.nym_root_directory,
+
                 super_struct: PhantomData,
-                packet_type: Some(nym_sphinx::params::PacketType::Mix),
             },
             logging: value.logging,
             debug: value.debug.into(),

common/client-core/src/config/persistence/key_pathfinder.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::Config;
+use nym_config::NymConfig;
 use std::path::{Path, PathBuf};
 
 #[derive(Debug)]
@@ -28,7 +29,7 @@ impl ClientKeyPathfinder {
         }
     }
 
-    pub fn new_from_config<T>(config: &Config<T>) -> Self {
+    pub fn new_from_config<T: NymConfig>(config: &Config<T>) -> Self {
         ClientKeyPathfinder {
             identity_private_key: config.get_private_identity_key_file(),
             identity_public_key: config.get_public_identity_key_file(),
@@ -40,17 +41,11 @@ impl ClientKeyPathfinder {
     }
 
     pub fn identity_key_pair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(
-            self.private_identity_key().to_path_buf(),
-            self.public_identity_key().to_path_buf(),
-        )
+        nym_pemstore::KeyPairPath::new(self.private_identity_key(), self.public_identity_key())
     }
 
     pub fn encryption_key_pair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(
-            self.private_encryption_key().to_path_buf(),
-            self.public_encryption_key().to_path_buf(),
-        )
+        nym_pemstore::KeyPairPath::new(self.private_encryption_key(), self.public_encryption_key())
     }
 
     pub fn any_file_exists(&self) -> bool {

common/client-core/src/error.rs

@@ -92,11 +92,6 @@ pub enum ClientCoreError {
 
     #[error("Unexpected exit")]
     UnexpectedExit,
-
-    #[error(
-        "This operation would have resulted in clients keys being overwritten without permission"
-    )]
-    ForbiddenKeyOverwrite,
 }
 
 /// Set of messages that the client can send to listeners via the task manager

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

@@ -1,15 +1,15 @@
 // Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::config::GatewayEndpointConfig;
 use crate::error::ClientCoreError;
 use futures::{SinkExt, StreamExt};
 use log::{debug, info, trace, warn};
+use nym_credential_storage::storage::Storage;
 use nym_crypto::asymmetric::identity;
 use nym_gateway_client::GatewayClient;
 use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_topology::{filter::VersionFilterable, gateway};
-use rand::{seq::SliceRandom, Rng};
+use rand::{seq::SliceRandom, thread_rng, Rng};
 use std::{sync::Arc, time::Duration};
 use tap::TapFallible;
 use tungstenite::Message;
@@ -27,6 +27,12 @@ use tokio_tungstenite::connect_async;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 #[cfg(not(target_arch = "wasm32"))]
 type WsConn = WebSocketStream<MaybeTlsStream<TcpStream>>;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::client::key_manager::persistence::OnDiskKeys;
+#[cfg(not(target_arch = "wasm32"))]
+use crate::config::{persistence::key_pathfinder::ClientKeyPathfinder, Config};
+#[cfg(not(target_arch = "wasm32"))]
+use nym_config::NymConfig;
 
 #[cfg(target_arch = "wasm32")]
 use nym_bandwidth_controller::wasm_mockups::DirectSigningNyxdClient;
@@ -55,9 +61,9 @@ impl GatewayWithLatency {
     }
 }
 
-pub(super) async fn current_gateways<R: Rng>(
+async fn current_gateways<R: Rng>(
     rng: &mut R,
-    nym_apis: &[Url],
+    nym_apis: Vec<Url>,
 ) -> Result<Vec<gateway::Node>, ClientCoreError> {
     let nym_api = nym_apis
         .choose(rng)
@@ -154,7 +160,7 @@ async fn measure_latency(gateway: gateway::Node) -> Result<GatewayWithLatency, C
     Ok(GatewayWithLatency::new(gateway, avg))
 }
 
-pub(super) async fn choose_gateway_by_latency<R: Rng>(
+async fn choose_gateway_by_latency<R: Rng>(
     rng: &mut R,
     gateways: Vec<gateway::Node>,
 ) -> Result<gateway::Node, ClientCoreError> {
@@ -187,7 +193,7 @@ pub(super) async fn choose_gateway_by_latency<R: Rng>(
     Ok(chosen.gateway.clone())
 }
 
-pub(super) fn uniformly_random_gateway<R: Rng>(
+fn uniformly_random_gateway<R: Rng>(
     rng: &mut R,
     gateways: Vec<gateway::Node>,
 ) -> Result<gateway::Node, ClientCoreError> {
@@ -197,14 +203,39 @@ pub(super) fn uniformly_random_gateway<R: Rng>(
         .cloned()
 }
 
-pub(super) async fn register_with_gateway(
-    gateway: &GatewayEndpointConfig,
+pub(super) async fn query_gateway_details(
+    validator_servers: Vec<Url>,
+    chosen_gateway_id: Option<identity::PublicKey>,
+    by_latency: bool,
+) -> Result<gateway::Node, ClientCoreError> {
+    let mut rng = thread_rng();
+    let gateways = current_gateways(&mut rng, validator_servers).await?;
+
+    // if we set an explicit gateway, use that one and nothing else
+    if let Some(explicitly_chosen) = chosen_gateway_id {
+        gateways
+            .into_iter()
+            .find(|gateway| gateway.identity_key == explicitly_chosen)
+            .ok_or_else(|| ClientCoreError::NoGatewayWithId(explicitly_chosen.to_string()))
+    } else if by_latency {
+        choose_gateway_by_latency(&mut rng, gateways).await
+    } else {
+        uniformly_random_gateway(&mut rng, gateways)
+    }
+}
+
+pub(super) async fn register_with_gateway<St>(
+    gateway: &gateway::Node,
     our_identity: Arc<identity::KeyPair>,
-) -> Result<Arc<SharedKeys>, ClientCoreError> {
+) -> Result<Arc<SharedKeys>, ClientCoreError>
+where
+    St: Storage,
+    <St as Storage>::StorageError: Send + Sync + 'static,
+{
     let timeout = Duration::from_millis(1500);
-    let mut gateway_client: GatewayClient<DirectSigningNyxdClient, _> = GatewayClient::new_init(
-        gateway.gateway_listener.clone(),
-        gateway.try_get_gateway_identity_key()?,
+    let mut gateway_client: GatewayClient<DirectSigningNyxdClient, St> = GatewayClient::new_init(
+        gateway.clients_address(),
+        gateway.identity_key,
         our_identity.clone(),
         timeout,
     );
@@ -218,3 +249,13 @@ pub(super) async fn register_with_gateway(
         .tap_err(|_| log::warn!("Failed to register with the gateway!"))?;
     Ok(shared_keys)
 }
+
+// TODO: make it generic
+#[cfg(not(target_arch = "wasm32"))]
+pub(super) fn on_disk_key_store<T>(config: &Config<T>) -> OnDiskKeys
+where
+    T: NymConfig,
+{
+    let pathfinder = ClientKeyPathfinder::new_from_config(config);
+    OnDiskKeys::new(pathfinder)
+}

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

@@ -3,10 +3,7 @@
 
 //! Collection of initialization steps used by client implementations
 
-use crate::client::base_client::storage::MixnetClientStorage;
-use crate::client::key_manager::persistence::KeyStore;
-use crate::client::key_manager::{KeyManager, ManagedKeys};
-use crate::init::helpers::{choose_gateway_by_latency, current_gateways, uniformly_random_gateway};
+use crate::client::key_manager::KeyManager;
 use crate::{
     config::{
         persistence::key_pathfinder::ClientKeyPathfinder, ClientCoreConfigTrait, Config,
@@ -15,101 +12,18 @@ use crate::{
     error::ClientCoreError,
 };
 use nym_config::NymConfig;
+use nym_credential_storage::storage::Storage;
 use nym_crypto::asymmetric::{encryption, identity};
+use nym_gateway_requests::registration::handshake::SharedKeys;
 use nym_sphinx::addressing::{clients::Recipient, nodes::NodeIdentity};
-use nym_validator_client::client::IdentityKey;
-use rand::rngs::OsRng;
 use serde::Serialize;
-use std::fmt::{Debug, Display};
+use std::fmt::Display;
+use std::sync::Arc;
 use tap::TapFallible;
 use url::Url;
 
 mod helpers;
 
-#[derive(Clone)]
-pub enum GatewaySetup {
-    /// Specifies usage of a new, random, gateway.
-    New {
-        /// Should the new gateway be selected based on latency.
-        by_latency: bool,
-    },
-    Specified {
-        /// Identity key of the gateway we want to try to use.
-        gateway_identity: IdentityKey,
-    },
-    Predefined {
-        /// Full gateway configuration
-        config: GatewayEndpointConfig,
-    },
-}
-
-impl From<GatewayEndpointConfig> for GatewaySetup {
-    fn from(config: GatewayEndpointConfig) -> Self {
-        GatewaySetup::Predefined { config }
-    }
-}
-
-impl From<IdentityKey> for GatewaySetup {
-    fn from(gateway_identity: IdentityKey) -> Self {
-        GatewaySetup::Specified { gateway_identity }
-    }
-}
-
-impl Default for GatewaySetup {
-    fn default() -> Self {
-        GatewaySetup::New { by_latency: false }
-    }
-}
-
-impl GatewaySetup {
-    pub fn new(
-        full_config: Option<GatewayEndpointConfig>,
-        gateway_identity: Option<IdentityKey>,
-        latency_based_selection: Option<bool>,
-    ) -> Self {
-        if let Some(config) = full_config {
-            GatewaySetup::Predefined { config }
-        } else if let Some(gateway_identity) = gateway_identity {
-            GatewaySetup::Specified { gateway_identity }
-        } else {
-            GatewaySetup::New {
-                by_latency: latency_based_selection.unwrap_or_default(),
-            }
-        }
-    }
-
-    pub async fn try_get_gateway_details(
-        self,
-        validator_servers: &[Url],
-    ) -> Result<GatewayEndpointConfig, ClientCoreError> {
-        match self {
-            GatewaySetup::New { by_latency } => {
-                let mut rng = OsRng;
-                let gateways = current_gateways(&mut rng, validator_servers).await?;
-                if by_latency {
-                    choose_gateway_by_latency(&mut rng, gateways).await
-                } else {
-                    uniformly_random_gateway(&mut rng, gateways)
-                }
-            }
-            .map(Into::into),
-            GatewaySetup::Specified { gateway_identity } => {
-                let user_gateway = identity::PublicKey::from_base58_string(&gateway_identity)
-                    .map_err(ClientCoreError::UnableToCreatePublicKeyFromGatewayId)?;
-
-                let mut rng = OsRng;
-                let gateways = current_gateways(&mut rng, validator_servers).await?;
-                gateways
-                    .into_iter()
-                    .find(|gateway| gateway.identity_key == user_gateway)
-                    .ok_or_else(|| ClientCoreError::NoGatewayWithId(gateway_identity.to_string()))
-            }
-            .map(Into::into),
-            GatewaySetup::Predefined { config } => Ok(config),
-        }
-    }
-}
-
 /// Struct describing the results of the client initialization procedure.
 #[derive(Debug, Serialize)]
 pub struct InitResults {
@@ -148,55 +62,29 @@ impl Display for InitResults {
     }
 }
 
-/// Recovers the already present gateway information or attempts to register with new gateway
-/// and stores the newly obtained key
-pub async fn get_registered_gateway<S>(
-    validator_servers: Vec<Url>,
-    key_store: &S::KeyStore,
-    setup: GatewaySetup,
-    overwrite_keys: bool,
-) -> Result<GatewayEndpointConfig, ClientCoreError>
+/// Authenticate and register with a gateway.
+/// Either pick one at random by querying the available gateways from the nym-api, or use the
+/// chosen one if it's among the available ones.
+/// The shared key is added to the supplied `KeyManager` and the endpoint details are returned.
+pub async fn register_with_gateway<St>(
+    identity_keys: Arc<identity::KeyPair>,
+    nym_api_endpoints: Vec<Url>,
+    chosen_gateway_id: Option<identity::PublicKey>,
+    by_latency: bool,
+) -> Result<(GatewayEndpointConfig, Arc<SharedKeys>), ClientCoreError>
 where
-    S: MixnetClientStorage,
-    <S::KeyStore as KeyStore>::StorageError: Send + Sync + 'static,
+    St: Storage,
+    <St as Storage>::StorageError: Send + Sync + 'static,
 {
-    let mut rng = OsRng;
-
-    // try load keys
-    let mut managed_keys = match ManagedKeys::try_load(key_store).await {
-        Ok(_) => {
-            // if we loaded something and we don't have full gateway details, check if we can overwrite the data
-            if let GatewaySetup::Predefined { config } = setup {
-                // we already have defined gateway details AND a shared key, so nothing more for us to do
-                return Ok(config);
-            } else if overwrite_keys {
-                ManagedKeys::generate_new(&mut rng)
-            } else {
-                return Err(ClientCoreError::ForbiddenKeyOverwrite);
-            }
-        }
-        Err(_) => ManagedKeys::generate_new(&mut rng),
-    };
-
-    // choose gateway
-    let gateway_details = setup.try_get_gateway_details(&validator_servers).await?;
-
-    // get our identity key
-    let our_identity = managed_keys.identity_keypair();
+    // Get the gateway details of the gateway we will use
+    let gateway =
+        helpers::query_gateway_details(nym_api_endpoints, chosen_gateway_id, by_latency).await?;
+    log::debug!("Querying gateway gives: {gateway}");
 
     // Establish connection, authenticate and generate keys for talking with the gateway
-    let shared_keys = helpers::register_with_gateway(&gateway_details, our_identity).await?;
+    let shared_keys = helpers::register_with_gateway::<St>(&gateway, identity_keys).await?;
 
-    managed_keys
-        .deal_with_gateway_key(shared_keys, key_store)
-        .await
-        .map_err(|source| ClientCoreError::KeyStoreError {
-            source: Box::new(source),
-        })?;
-
-    // TODO: here we should be probably persisting gateway details as opposed to returning them
-
-    Ok(gateway_details)
+    Ok((gateway.into(), shared_keys))
 }
 
 /// Convenience function for setting up the gateway for a client given a `Config`. Depending on the
@@ -206,8 +94,8 @@ where
 /// b. Create a new gateway configuration but keep existing keys. This assumes that the caller
 ///    knows what they are doing and that the keys match the requested gateway.
 /// c. Create a new gateway configuration with a newly registered gateway and keys.
-pub async fn setup_gateway_from_config<C, T, KSt>(
-    key_store: &KSt,
+#[cfg(not(target_arch = "wasm32"))]
+pub async fn setup_gateway_from_config<C, T, St>(
     register_gateway: bool,
     user_chosen_gateway_id: Option<identity::PublicKey>,
     config: &Config<T>,
@@ -216,8 +104,8 @@ pub async fn setup_gateway_from_config<C, T, KSt>(
 where
     C: NymConfig + ClientCoreConfigTrait,
     T: NymConfig,
-    KSt: KeyStore,
-    <KSt as KeyStore>::StorageError: Send + Sync + 'static,
+    St: Storage,
+    <St as Storage>::StorageError: Send + Sync + 'static,
 {
     let id = config.get_id();
 
@@ -228,42 +116,41 @@ where
         return load_existing_gateway_config::<C>(&id);
     }
 
-    let gateway_setup = GatewaySetup::new(
-        None,
-        user_chosen_gateway_id.map(|id| id.to_base58_string()),
-        Some(by_latency),
-    );
     // Else, we proceed by querying the nym-api
-    let gateway = gateway_setup
-        .try_get_gateway_details(&config.get_nym_api_endpoints())
-        .await?;
-    log::debug!("Querying gateway gives: {:?}", gateway);
+    let gateway = helpers::query_gateway_details(
+        config.get_nym_api_endpoints(),
+        user_chosen_gateway_id,
+        by_latency,
+    )
+    .await?;
+    log::debug!("Querying gateway gives: {}", gateway);
 
     // If we are not registering, just return this and assume the caller has the keys already and
     // wants to keep the,
     if !register_gateway && user_chosen_gateway_id.is_some() {
         eprintln!("Using gateway provided by user, keeping existing keys");
-        return Ok(gateway);
+        return Ok(gateway.into());
     }
 
-    let mut rng = OsRng;
+    let key_store = helpers::on_disk_key_store(config);
+    let mut rng = rand::thread_rng();
     let mut managed_keys =
-        crate::client::key_manager::ManagedKeys::load_or_generate(&mut rng, key_store).await;
+        crate::client::key_manager::ManagedKeys::load_or_generate(&mut rng, &key_store).await;
 
     // Create new keys and derive our identity
     let our_identity = managed_keys.identity_keypair();
 
     // Establish connection, authenticate and generate keys for talking with the gateway
     eprintln!("Registering with new gateway");
-    let shared_keys = helpers::register_with_gateway(&gateway, our_identity).await?;
+    let shared_keys = helpers::register_with_gateway::<St>(&gateway, our_identity).await?;
     managed_keys
-        .deal_with_gateway_key(shared_keys, key_store)
+        .deal_with_gateway_key(shared_keys, &key_store)
         .await
         .map_err(|source| ClientCoreError::KeyStoreError {
             source: Box::new(source),
         })?;
 
-    Ok(gateway)
+    Ok(gateway.into())
 }
 
 /// Read and reuse the existing gateway configuration from a file that was generate earlier.
@@ -299,29 +186,31 @@ pub fn get_client_address(
     )
 }
 
+pub fn load_identity_keys(
+    pathfinder: &ClientKeyPathfinder,
+) -> Result<identity::KeyPair, ClientCoreError> {
+    let identity_keypair: identity::KeyPair =
+        nym_pemstore::load_keypair(&pathfinder.identity_key_pair_path())
+            .tap_err(|_| log::error!("Failed to read stored identity key files"))?;
+    Ok(identity_keypair)
+}
+
 /// Get the client address by loading the keys from stored files.
-// TODO: rethink that sucker
-pub fn get_client_address_from_stored_ondisk_keys<T>(
+pub fn get_client_address_from_stored_keys<T>(
     config: &Config<T>,
 ) -> Result<Recipient, ClientCoreError>
 where
     T: nym_config::NymConfig,
 {
-    fn load_identity_keys(
-        pathfinder: &ClientKeyPathfinder,
-    ) -> Result<identity::KeyPair, ClientCoreError> {
-        let identity_keypair: identity::KeyPair =
-            nym_pemstore::load_keypair(&pathfinder.identity_key_pair_path())
-                .tap_err(|_| log::error!("Failed to read stored identity key files"))?;
-        Ok(identity_keypair)
-    }
-
     fn load_sphinx_keys(
         pathfinder: &ClientKeyPathfinder,
     ) -> Result<encryption::KeyPair, ClientCoreError> {
         let sphinx_keypair: encryption::KeyPair =
-            nym_pemstore::load_keypair(&pathfinder.encryption_key_pair_path())
-                .tap_err(|_| log::error!("Failed to read stored sphinx key files"))?;
+            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
+                pathfinder.private_encryption_key().to_owned(),
+                pathfinder.public_encryption_key().to_owned(),
+            ))
+            .tap_err(|_| log::error!("Failed to read stored sphinx key files"))?;
         Ok(sphinx_keypair)
     }
 

common/client-libs/gateway-client/src/client.rs

@@ -12,8 +12,6 @@ use futures::{SinkExt, StreamExt};
 use log::*;
 use nym_bandwidth_controller::BandwidthController;
 use nym_coconut_interface::Credential;
-use nym_credential_storage::ephemeral_storage::EphemeralStorage as EphemeralCredentialStorage;
-use nym_credential_storage::storage::Storage as CredentialStorage;
 use nym_crypto::asymmetric::identity;
 use nym_gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use nym_gateway_requests::iv::IV;
@@ -28,6 +26,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use tungstenite::protocol::Message;
 
+use nym_credential_storage::storage::Storage;
 #[cfg(not(target_arch = "wasm32"))]
 use nym_validator_client::nyxd::traits::DkgQueryClient;
 #[cfg(not(target_arch = "wasm32"))]
@@ -43,7 +42,7 @@ use wasm_utils::websocket::JSWebsocket;
 const DEFAULT_RECONNECTION_ATTEMPTS: usize = 10;
 const DEFAULT_RECONNECTION_BACKOFF: Duration = Duration::from_secs(5);
 
-pub struct GatewayClient<C, St> {
+pub struct GatewayClient<C, St: Storage> {
     authenticated: bool,
     disabled_credentials_mode: bool,
     bandwidth_remaining: i64,
@@ -69,7 +68,12 @@ pub struct GatewayClient<C, St> {
     shutdown: TaskClient,
 }
 
-impl<C, St> GatewayClient<C, St> {
+impl<C, St> GatewayClient<C, St>
+where
+    C: Sync + Send,
+    St: Storage,
+    <St as Storage>::StorageError: Send + Sync + 'static,
+{
     // TODO: put it all in a Config struct
     #[allow(clippy::too_many_arguments)]
     pub fn new(
@@ -120,6 +124,40 @@ impl<C, St> GatewayClient<C, St> {
         self.reconnection_backoff = backoff
     }
 
+    pub fn new_init(
+        gateway_address: String,
+        gateway_identity: identity::PublicKey,
+        local_identity: Arc<identity::KeyPair>,
+        response_timeout_duration: Duration,
+    ) -> Self {
+        use futures::channel::mpsc;
+
+        // note: this packet_router is completely invalid in normal circumstances, but "works"
+        // perfectly fine here, because it's not meant to be used
+        let (ack_tx, _) = mpsc::unbounded();
+        let (mix_tx, _) = mpsc::unbounded();
+        let shutdown = TaskClient::dummy();
+        let packet_router = PacketRouter::new(ack_tx, mix_tx, shutdown.clone());
+
+        GatewayClient::<C, St> {
+            authenticated: false,
+            disabled_credentials_mode: true,
+            bandwidth_remaining: 0,
+            gateway_address,
+            gateway_identity,
+            local_identity,
+            shared_key: None,
+            connection: SocketState::NotConnected,
+            packet_router,
+            response_timeout_duration,
+            bandwidth_controller: None,
+            should_reconnect_on_failure: false,
+            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
+            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
+            shutdown,
+        }
+    }
+
     pub fn gateway_identity(&self) -> identity::PublicKey {
         self.gateway_identity
     }
@@ -531,9 +569,7 @@ impl<C, St> GatewayClient<C, St> {
 
     pub async fn claim_bandwidth(&mut self) -> Result<(), GatewayClientError>
     where
-        C: DkgQueryClient + Send + Sync,
-        St: CredentialStorage,
-        <St as CredentialStorage>::StorageError: Send + Sync + 'static,
+        C: DkgQueryClient,
     {
         if !self.authenticated {
             return Err(GatewayClientError::NotAuthenticated);
@@ -571,7 +607,7 @@ impl<C, St> GatewayClient<C, St> {
     fn estimate_required_bandwidth(&self, packets: &[MixPacket]) -> i64 {
         packets
             .iter()
-            .map(|packet| packet.packet().len())
+            .map(|packet| packet.sphinx_packet().len())
             .sum::<usize>() as i64
     }
 
@@ -579,8 +615,6 @@ impl<C, St> GatewayClient<C, St> {
         &mut self,
         packets: Vec<MixPacket>,
     ) -> Result<(), GatewayClientError> {
-        debug!("Sending {} mix packets", packets.len());
-
         if !self.authenticated {
             return Err(GatewayClientError::NotAuthenticated);
         }
@@ -625,10 +659,9 @@ impl<C, St> GatewayClient<C, St> {
     ) -> Result<(), GatewayClientError> {
         if let Err(err) = self.send_websocket_message_without_response(msg).await {
             if err.is_closed_connection() && self.should_reconnect_on_failure {
-                debug!("Going to attempt a reconnection");
+                info!("Going to attempt a reconnection");
                 self.attempt_reconnection().await
             } else {
-                warn!("{err}");
                 Err(err)
             }
         } else {
@@ -655,9 +688,9 @@ impl<C, St> GatewayClient<C, St> {
         if !self.authenticated {
             return Err(GatewayClientError::NotAuthenticated);
         }
-        if (mix_packet.packet().len() as i64) > self.bandwidth_remaining {
+        if (mix_packet.sphinx_packet().len() as i64) > self.bandwidth_remaining {
             return Err(GatewayClientError::NotEnoughBandwidth(
-                mix_packet.packet().len() as i64,
+                mix_packet.sphinx_packet().len() as i64,
                 self.bandwidth_remaining,
             ));
         }
@@ -740,9 +773,7 @@ impl<C, St> GatewayClient<C, St> {
 
     pub async fn authenticate_and_start(&mut self) -> Result<Arc<SharedKeys>, GatewayClientError>
     where
-        C: DkgQueryClient + Send + Sync,
-        St: CredentialStorage,
-        <St as CredentialStorage>::StorageError: Send + Sync + 'static,
+        C: DkgQueryClient,
     {
         if !self.connection.is_established() {
             self.establish_connection().await?;
@@ -761,40 +792,3 @@ impl<C, St> GatewayClient<C, St> {
         Ok(shared_key)
     }
 }
-
-impl<C> GatewayClient<C, EphemeralCredentialStorage> {
-    // for initialisation we do not need credential storage. Though it's still a bit weird we have to set the generic...
-    pub fn new_init(
-        gateway_address: String,
-        gateway_identity: identity::PublicKey,
-        local_identity: Arc<identity::KeyPair>,
-        response_timeout_duration: Duration,
-    ) -> Self {
-        use futures::channel::mpsc;
-
-        // note: this packet_router is completely invalid in normal circumstances, but "works"
-        // perfectly fine here, because it's not meant to be used
-        let (ack_tx, _) = mpsc::unbounded();
-        let (mix_tx, _) = mpsc::unbounded();
-        let shutdown = TaskClient::dummy();
-        let packet_router = PacketRouter::new(ack_tx, mix_tx, shutdown.clone());
-
-        GatewayClient::<C, EphemeralCredentialStorage> {
-            authenticated: false,
-            disabled_credentials_mode: true,
-            bandwidth_remaining: 0,
-            gateway_address,
-            gateway_identity,
-            local_identity,
-            shared_key: None,
-            connection: SocketState::NotConnected,
-            packet_router,
-            response_timeout_duration,
-            bandwidth_controller: None,
-            should_reconnect_on_failure: false,
-            reconnection_attempts: DEFAULT_RECONNECTION_ATTEMPTS,
-            reconnection_backoff: DEFAULT_RECONNECTION_BACKOFF,
-            shutdown,
-        }
-    }
-}

common/client-libs/gateway-client/src/packet_router.rs

@@ -50,15 +50,10 @@ impl PacketRouter {
         let ack_overhead = PacketSize::AckPacket.size() + MAX_NODE_ADDRESS_UNPADDED_LEN;
 
         for received_packet in unwrapped_packets {
-            if received_packet.len() == PacketSize::AckPacket.plaintext_size()
-                || received_packet.len() == PacketSize::OutfoxAckPacket.plaintext_size()
-            {
+            if received_packet.len() == PacketSize::AckPacket.plaintext_size() {
                 received_acks.push(received_packet);
             } else if received_packet.len()
                 == PacketSize::RegularPacket.plaintext_size() - ack_overhead
-                || received_packet.len()
-                    == PacketSize::OutfoxRegularPacket.plaintext_size() - ack_overhead
-                || received_packet.len() == PacketSize::OutfoxRegularPacket.size() - 6
             {
                 trace!("routing regular packet");
                 received_messages.push(received_packet);

common/client-libs/mixnet-client/src/client.rs

@@ -4,11 +4,10 @@
 use futures::channel::mpsc;
 use futures::StreamExt;
 use log::*;
-use nym_sphinx::addressing::nodes::NymNodeRoutingAddress;
-use nym_sphinx::framing::codec::NymCodec;
-use nym_sphinx::framing::packet::FramedNymPacket;
-use nym_sphinx::params::PacketType;
-use nym_sphinx::NymPacket;
+use nym_sphinx::framing::codec::SphinxCodec;
+use nym_sphinx::framing::packet::FramedSphinxPacket;
+use nym_sphinx::params::PacketMode;
+use nym_sphinx::{addressing::nodes::NymNodeRoutingAddress, SphinxPacket};
 use std::collections::HashMap;
 use std::io;
 use std::net::SocketAddr;
@@ -51,8 +50,8 @@ pub trait SendWithoutResponse {
     fn send_without_response(
         &mut self,
         address: NymNodeRoutingAddress,
-        packet: NymPacket,
-        packet_type: PacketType,
+        packet: SphinxPacket,
+        packet_mode: PacketMode,
     ) -> io::Result<()>;
 }
 
@@ -62,12 +61,12 @@ pub struct Client {
 }
 
 struct ConnectionSender {
-    channel: mpsc::Sender<FramedNymPacket>,
+    channel: mpsc::Sender<FramedSphinxPacket>,
     current_reconnection_attempt: Arc<AtomicU32>,
 }
 
 impl ConnectionSender {
-    fn new(channel: mpsc::Sender<FramedNymPacket>) -> Self {
+    fn new(channel: mpsc::Sender<FramedSphinxPacket>) -> Self {
         ConnectionSender {
             channel,
             current_reconnection_attempt: Arc::new(AtomicU32::new(0)),
@@ -85,7 +84,7 @@ impl Client {
 
     async fn manage_connection(
         address: SocketAddr,
-        receiver: mpsc::Receiver<FramedNymPacket>,
+        receiver: mpsc::Receiver<FramedSphinxPacket>,
         connection_timeout: Duration,
         current_reconnection: &AtomicU32,
     ) {
@@ -97,7 +96,7 @@ impl Client {
                     debug!("Managed to establish connection to {}", address);
                     // if we managed to connect, reset the reconnection count (whatever it might have been)
                     current_reconnection.store(0, Ordering::Release);
-                    Framed::new(stream, NymCodec)
+                    Framed::new(stream, SphinxCodec)
                 }
                 Err(err) => {
                     debug!(
@@ -149,7 +148,11 @@ impl Client {
         }
     }
 
-    fn make_connection(&mut self, address: NymNodeRoutingAddress, pending_packet: FramedNymPacket) {
+    fn make_connection(
+        &mut self,
+        address: NymNodeRoutingAddress,
+        pending_packet: FramedSphinxPacket,
+    ) {
         let (mut sender, receiver) = mpsc::channel(self.config.maximum_connection_buffer_size);
 
         // this CAN'T fail because we just created the channel which has a non-zero capacity
@@ -197,12 +200,12 @@ impl SendWithoutResponse for Client {
     fn send_without_response(
         &mut self,
         address: NymNodeRoutingAddress,
-        packet: NymPacket,
-        packet_type: PacketType,
+        packet: SphinxPacket,
+        packet_mode: PacketMode,
     ) -> io::Result<()> {
         trace!("Sending packet to {:?}", address);
         let framed_packet =
-            FramedNymPacket::new(packet, packet_type, self.config.use_legacy_version);
+            FramedSphinxPacket::new(packet, packet_mode, self.config.use_legacy_version);
 
         if let Some(sender) = self.conn_new.get_mut(&address) {
             if let Err(err) = sender.channel.try_send(framed_packet) {

common/client-libs/mixnet-client/src/forwarder.rs

@@ -59,14 +59,14 @@ impl PacketForwarder {
                      trace!("Going to forward packet to {:?}", mix_packet.next_hop());
 
                     let next_hop = mix_packet.next_hop();
-                    let packet_type = mix_packet.packet_type();
-                    let packet = mix_packet.into_packet();
+                    let packet_mode = mix_packet.packet_mode();
+                    let sphinx_packet = mix_packet.into_sphinx_packet();
                     // we don't care about responses, we just want to fire packets
                     // as quickly as possible
 
                     if let Err(err) =
                         self.mixnet_client
-                            .send_without_response(next_hop, packet, packet_type)
+                            .send_without_response(next_hop, sphinx_packet, packet_mode)
                     {
                         debug!("failed to forward the packet - {err}")
                     }

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

@@ -40,7 +40,7 @@ nym-api-requests = { path = "../../../nym-api/nym-api-requests" }
 async-trait = { workspace = true, optional = true }
 bip39 = { workspace = true, features = ["rand"], optional = true }
 nym-config = { path = "../../config", optional = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32", "cosmwasm"], optional = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32", "cosmwasm"], optional = true }
 # note that this has the same version as used by cosmrs
 eyre = { version = "0.6", optional = true }
 cw3 = { workspace = true, optional = true }
@@ -54,7 +54,7 @@ cosmwasm-std = { workspace = true, optional = true }
 
 [dev-dependencies]
 bip39 = { workspace = true }
-cosmrs = { workspace = true, features = ["rpc", "bip32"] }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support", features = ["rpc", "bip32"] }
 tokio = { version = "1.24.1", features = ["rt-multi-thread", "macros"] }
 ts-rs = "6.1.2"
 

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

@@ -11,9 +11,7 @@ use nym_api_requests::models::{
 };
 use nym_coconut_dkg_common::types::NodeIndex;
 use nym_coconut_interface::VerificationKey;
-pub use nym_mixnet_contract_common::{
-    mixnode::MixNodeDetails, GatewayBond, IdentityKey, IdentityKeyRef, MixId,
-};
+pub use nym_mixnet_contract_common::{mixnode::MixNodeDetails, GatewayBond, IdentityKeyRef, MixId};
 use url::Url;
 
 #[cfg(feature = "nyxd-client")]
@@ -33,7 +31,7 @@ use nym_mixnet_contract_common::{
     families::{Family, FamilyHead},
     mixnode::MixNodeBond,
     pending_events::{PendingEpochEvent, PendingIntervalEvent},
-    Delegation, RewardedSetNodeStatus, UnbondedMixnode,
+    Delegation, IdentityKey, RewardedSetNodeStatus, UnbondedMixnode,
 };
 #[cfg(feature = "nyxd-client")]
 use nym_network_defaults::NymNetworkDetails;

common/client-libs/validator-client/src/nyxd/fee/mod.rs

@@ -127,7 +127,7 @@ impl GasAdjustable for Gas {
 mod sealed {
     use cosmrs::tx::{self, Gas};
     use cosmrs::Coin as CosmosCoin;
-    use cosmrs::{AccountId, Denom as CosmosDenom};
+    use cosmrs::{AccountId, Decimal as CosmosDecimal, Denom as CosmosDenom};
     use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     fn cosmos_denom_inner_getter(val: &CosmosDenom) -> String {
@@ -144,11 +144,29 @@ mod sealed {
         }
     }
 
+    fn cosmos_decimal_inner_getter(val: &CosmosDecimal) -> u64 {
+        // haha, this code is so disgusting. I'll make a PR on cosmrs to slightly alleviate those issues...
+        // note: unwrap here is fine as the to_string is just returning a stringified u64 which, well, is a valid u64
+        val.to_string().parse().unwrap()
+    }
+
+    // at the time of writing it the current cosmrs' Decimal is extremely limited...
+    #[derive(Serialize, Deserialize)]
+    #[serde(remote = "CosmosDecimal")]
+    struct Decimal(#[serde(getter = "cosmos_decimal_inner_getter")] u64);
+
+    impl From<Decimal> for CosmosDecimal {
+        fn from(val: Decimal) -> Self {
+            val.0.into()
+        }
+    }
+
     #[derive(Serialize, Deserialize, Clone)]
     struct Coin {
         #[serde(with = "Denom")]
         denom: CosmosDenom,
-        amount: u128,
+        #[serde(with = "Decimal")]
+        amount: CosmosDecimal,
     }
 
     impl From<Coin> for CosmosCoin {

common/client-libs/validator-client/src/nyxd/mod.rs

@@ -39,7 +39,7 @@ pub use cosmrs::tendermint::validator::Info as TendermintValidatorInfo;
 pub use cosmrs::tendermint::Time as TendermintTime;
 pub use cosmrs::tx::{self, Gas};
 pub use cosmrs::Coin as CosmosCoin;
-pub use cosmrs::{bip32, AccountId, Denom};
+pub use cosmrs::{bip32, AccountId, Decimal, Denom};
 use cosmwasm_std::Addr;
 pub use cosmwasm_std::Coin as CosmWasmCoin;
 pub use fee::{gas_price::GasPrice, GasAdjustable, GasAdjustment};

common/client-libs/validator-client/src/nyxd/traits/sp_directory_query_client.rs

@@ -1,12 +1,12 @@
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use nym_contracts_common::ContractBuildInformation;
+use nym_contracts_common::{signing::Nonce, ContractBuildInformation};
 use nym_service_provider_directory_common::{
     msg::QueryMsg as SpQueryMsg,
     response::{
         ConfigResponse, PagedServicesListResponse, ServiceInfoResponse, ServicesListResponse,
     },
-    NymAddress, ServiceId, ServiceInfo,
+    NymAddress, Service, ServiceId,
 };
 use serde::Deserialize;
 
@@ -63,17 +63,14 @@ pub trait SpDirectoryQueryClient {
             .await
     }
 
-    async fn get_all_services(&self) -> Result<Vec<ServiceInfo>, NyxdError> {
+    async fn get_all_services(&self) -> Result<Vec<Service>, NyxdError> {
         let mut services = Vec::new();
         let mut start_after = None;
-
         loop {
             let mut paged_response = self.get_services_paged(start_after.take(), None).await?;
-
-            let last_id = paged_response.services.last().map(|serv| serv.service_id);
             services.append(&mut paged_response.services);
 
-            if let Some(start_after_res) = last_id {
+            if let Some(start_after_res) = paged_response.start_next_after {
                 start_after = Some(start_after_res)
             } else {
                 break;
@@ -82,6 +79,13 @@ pub trait SpDirectoryQueryClient {
 
         Ok(services)
     }
+
+    async fn get_service_signing_nonce(&self, address: &AccountId) -> Result<Nonce, NyxdError> {
+        self.query_service_provider_contract(SpQueryMsg::SigningNonce {
+            address: address.to_string(),
+        })
+        .await
+    }
 }
 
 #[async_trait]

common/client-libs/validator-client/src/nyxd/traits/sp_directory_signing_client.rs

@@ -2,8 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use async_trait::async_trait;
+use nym_contracts_common::signing::MessageSignature;
 use nym_service_provider_directory_common::{
-    msg::ExecuteMsg as SpExecuteMsg, NymAddress, ServiceId, ServiceType,
+    msg::ExecuteMsg as SpExecuteMsg, NymAddress, ServiceDetails, ServiceId,
 };
 
 use crate::nyxd::{
@@ -22,16 +23,16 @@ pub trait SpDirectorySigningClient {
 
     async fn announce_service_provider(
         &self,
-        nym_address: NymAddress,
-        service_type: ServiceType,
+        service: ServiceDetails,
+        owner_signature: MessageSignature,
         deposit: Coin,
         fee: Option<Fee>,
     ) -> Result<ExecuteResult, NyxdError> {
         self.execute_service_provider_directory_contract(
             fee,
             SpExecuteMsg::Announce {
-                nym_address,
-                service_type,
+                service,
+                owner_signature,
             },
             vec![deposit],
         )

common/commands/Cargo.toml

@@ -14,7 +14,7 @@ clap = { version = "4.0", features = ["derive"] }
 cw-utils = { workspace = true }
 handlebars = "3.0.1"
 humantime-serde = "1.0"
-k256 = { workspace = true, features = ["ecdsa", "sha256"] }
+k256 = { version = "0.10", features = ["ecdsa", "sha256"] }
 log = { workspace = true }
 rand = {version = "0.6", features = ["std"] }
 serde = { version = "1.0", features = ["derive"] }
@@ -25,7 +25,7 @@ toml = "0.5.6"
 url = "2.2"
 tap = "1"
 
-cosmrs = { workspace = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 cosmwasm-std = { workspace = true }
 
 nym-validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
@@ -40,3 +40,4 @@ nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" }
 nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" }
 nym-service-provider-directory-common = { path = "../cosmwasm-smart-contracts/service-provider-directory" }
 nym-name-service-common = { path = "../cosmwasm-smart-contracts/name-service" }
+nym-sphinx = { path = "../../common/nymsphinx" }

common/commands/src/validator/cosmwasm/generators/multisig.rs

@@ -56,8 +56,6 @@ pub async fn generate(args: Args) {
                 .expect("threshold can't be converted to Decimal"),
         },
         max_voting_period: Duration::Time(args.max_voting_period),
-        executor: None,
-        proposal_deposit: None,
         coconut_bandwidth_contract_address: coconut_bandwidth_contract_address.to_string(),
         coconut_dkg_contract_address: coconut_dkg_contract_address.to_string(),
     };

common/commands/src/validator/mixnet/mod.rs

@@ -14,6 +14,7 @@ pub struct Mixnet {
     pub command: MixnetCommands,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Subcommand)]
 pub enum MixnetCommands {
     /// Query the mixnet directory

common/commands/src/validator/mixnet/operators/mod.rs

@@ -15,6 +15,7 @@ pub struct MixnetOperators {
     pub command: MixnetOperatorsCommands,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Subcommand)]
 pub enum MixnetOperatorsCommands {
     /// Manage your mixnode

common/commands/src/validator/mixnet/operators/service/announce.rs

@@ -1,6 +1,7 @@
 use clap::Parser;
 use log::info;
-use nym_service_provider_directory_common::{Coin, NymAddress, ServiceType};
+use nym_contracts_common::signing::MessageSignature;
+use nym_service_provider_directory_common::{Coin, NymAddress, ServiceDetails, ServiceType};
 use nym_validator_client::nyxd::traits::SpDirectorySigningClient;
 
 use crate::context::SigningClient;
@@ -10,9 +11,15 @@ pub struct Args {
     #[clap(long)]
     pub nym_address: String,
 
+    #[clap(long)]
+    pub signature: MessageSignature,
+
     /// Deposit to be made to the service provider directory, in curent DENOMINATION (e.g. 'unym')
     #[clap(long)]
     pub deposit: u128,
+
+    #[clap(long)]
+    pub identity_key: String,
 }
 
 pub async fn announce(args: Args, client: SigningClient) {
@@ -20,12 +27,17 @@ pub async fn announce(args: Args, client: SigningClient) {
 
     let nym_address = NymAddress::Address(args.nym_address);
     let service_type = ServiceType::NetworkRequester;
+    let service = ServiceDetails {
+        nym_address,
+        service_type,
+        identity_key: args.identity_key,
+    };
 
     let denom = client.current_chain_details().mix_denom.base.as_str();
     let deposit = Coin::new(args.deposit, denom);
 
     let res = client
-        .announce_service_provider(nym_address, service_type, deposit.into(), None)
+        .announce_service_provider(service, args.signature, deposit.into(), None)
         .await
         .expect("Failed to announce service provider");
 

common/commands/src/validator/mixnet/operators/service/announce_sign_payload.rs

@@ -0,0 +1,61 @@
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    context::SigningClient,
+    utils::{account_id_to_cw_addr, DataWrapper},
+};
+
+use clap::Parser;
+use cosmwasm_std::Coin;
+
+use nym_bin_common::output_format::OutputFormat;
+use nym_service_provider_directory_common::{
+    signing_types::construct_service_provider_announce_sign_payload, NymAddress,
+    ServiceType::NetworkRequester,
+};
+use nym_sphinx::addressing::clients::Recipient;
+use nym_validator_client::nyxd::traits::SpDirectoryQueryClient;
+
+#[derive(Debug, Parser)]
+pub struct Args {
+    #[clap(long)]
+    pub nym_address: Recipient,
+
+    #[clap(long)]
+    pub amount: u128,
+
+    #[clap(long)]
+    pub identity_key: String,
+
+    #[clap(short, long, default_value_t = OutputFormat::default())]
+    output: OutputFormat,
+}
+
+pub async fn create_payload(args: Args, client: SigningClient) {
+    let service = nym_service_provider_directory_common::ServiceDetails {
+        nym_address: NymAddress::new(&args.nym_address.to_string()),
+        service_type: NetworkRequester,
+        identity_key: args.identity_key,
+    };
+
+    let denom = client.current_chain_details().mix_denom.base.as_str();
+    let deposit = Coin::new(args.amount, denom);
+
+    let nonce = match client.get_service_signing_nonce(client.address()).await {
+        Ok(nonce) => nonce,
+        Err(err) => {
+            eprint!(
+                "failed to query for the signing nonce of {}: {err}",
+                client.address()
+            );
+            return;
+        }
+    };
+
+    let address = account_id_to_cw_addr(client.address());
+    let payload =
+        construct_service_provider_announce_sign_payload(nonce, address, deposit, service);
+    let wrapper = DataWrapper::new(payload.to_base58_string().unwrap());
+    println!("{}", args.output.format(&wrapper))
+}

common/commands/src/validator/mixnet/operators/service/mod.rs

@@ -1,6 +1,7 @@
 use clap::{Args, Subcommand};
 
 pub mod announce;
+pub mod announce_sign_payload;
 pub mod delete;
 
 #[derive(Debug, Args)]
@@ -10,10 +11,13 @@ pub struct MixnetOperatorsService {
     pub command: MixnetOperatorsServiceCommands,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, Subcommand)]
 pub enum MixnetOperatorsServiceCommands {
     /// Announce service provider to the world
     Announce(announce::Args),
     /// Delete entry for service provider from the directory
     Delete(delete::Args),
+    /// Create base58-encoded payload required for producing valid announce signature.
+    CreateServiceAnnounceSignPayload(announce_sign_payload::Args),
 }

common/commands/src/validator/mixnet/query/query_all_service_providers.rs

@@ -37,7 +37,7 @@ pub async fn query(args: Args, client: &QueryClientWithNyxd) {
                 for service in res.services {
                     table.add_row(vec![
                         service.service_id.to_string(),
-                        service.service.announcer.to_string(),
+                        service.announcer.to_string(),
                         service.service.service_type.to_string(),
                         service.service.nym_address.to_string(),
                     ]);

common/config/src/lib.rs

@@ -10,7 +10,7 @@ use std::any::type_name;
 use std::fmt::Debug;
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::str::FromStr;
 use std::{fs, io};
 
@@ -31,29 +31,17 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
 
     // default, most probable, implementations; can be easily overridden where required
     fn default_config_directory(id: &str) -> PathBuf {
-        Self::default_config_directory_with_root(Self::default_root_directory(), id)
-    }
-
-    fn default_config_directory_with_root<P: AsRef<Path>>(root: P, id: &str) -> PathBuf {
-        root.as_ref().join(id).join(CONFIG_DIR)
+        Self::default_root_directory().join(id).join(CONFIG_DIR)
     }
 
     fn default_data_directory(id: &str) -> PathBuf {
-        Self::default_data_directory_with_root(Self::default_root_directory(), id)
-    }
-
-    fn default_data_directory_with_root<P: AsRef<Path>>(root: P, id: &str) -> PathBuf {
-        root.as_ref().join(id).join(DATA_DIR)
+        Self::default_root_directory().join(id).join(DATA_DIR)
     }
 
     fn default_config_file_path(id: &str) -> PathBuf {
         Self::default_config_directory(id).join(Self::config_file_name())
     }
 
-    fn default_config_file_path_with_root<P: AsRef<Path>>(root: P, id: &str) -> PathBuf {
-        Self::default_config_directory_with_root(root, id).join(Self::config_file_name())
-    }
-
     // We provide a second set of functions that tries to not panic.
 
     fn try_default_root_directory() -> Option<PathBuf>;
@@ -111,12 +99,8 @@ pub trait NymConfig: Default + Serialize + DeserializeOwned {
 
     fn load_from_file(id: &str) -> io::Result<Self> {
         let file = Self::default_config_file_path(id);
-        Self::load_from_filepath(file)
-    }
-
-    fn load_from_filepath<P: AsRef<Path>>(filepath: P) -> io::Result<Self> {
-        log::trace!("Loading from file: {:#?}", filepath.as_ref().to_owned());
-        let config_contents = fs::read_to_string(filepath)?;
+        log::trace!("Loading from file: {:#?}", file);
+        let config_contents = fs::read_to_string(file)?;
 
         toml::from_str(&config_contents)
             .map_err(|toml_err| io::Error::new(io::ErrorKind::Other, toml_err))

common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/msg.rs

@@ -14,7 +14,7 @@ pub struct InstantiateMsg {
     pub mix_denom: String,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     DepositFunds { data: DepositData },

common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::msg::ExecuteMsg;
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct SpendCredentialData {
     funds: Coin,
     blinded_serial_number: String,
@@ -43,7 +43,7 @@ pub enum SpendCredentialStatus {
     Spent,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct SpendCredential {
     funds: Coin,
     blinded_serial_number: String,
@@ -74,7 +74,7 @@ impl SpendCredential {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedSpendCredentialResponse {
     pub spend_credentials: Vec<SpendCredential>,
     pub per_page: usize,
@@ -95,7 +95,7 @@ impl PagedSpendCredentialResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct SpendCredentialResponse {
     pub spend_credential: Option<SpendCredential>,
 }

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

@@ -1,6 +1,6 @@
 [package]
 name = "nym-contracts-common"
-version = "0.4.0"
+version = "0.5.0"
 description = "Common library for Nym cosmwasm contracts"
 edition = { workspace = true }
 authors = { workspace = true }

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

@@ -15,7 +15,7 @@ pub type Nonce = u32;
 
 // define this type explicitly for [hopefully] better usability
 // (so you wouldn't need to worry about whether you should use bytes, bs58, etc.)
-#[derive(Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, PartialEq, JsonSchema)]
 pub struct MessageSignature(Vec<u8>);
 
 impl MessageSignature {

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

@@ -11,6 +11,9 @@ use std::ops::Mul;
 use std::str::FromStr;
 use thiserror::Error;
 
+pub type IdentityKey = String;
+pub type IdentityKeyRef<'a> = &'a str;
+
 pub fn truncate_decimal(amount: Decimal) -> Uint128 {
     amount * Uint128::new(1)
 }

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

@@ -6,8 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cosmwasm-schema = { workspace = true }
 cw4 = { workspace = true }
-cw-controllers = { workspace = true }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

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

@@ -1,7 +1,13 @@
-use cosmwasm_schema::{cw_serde, QueryResponses};
+// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
+// SPDX-License-Identifier: Apache-2.0
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 use cw4::Member;
 
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub struct InstantiateMsg {
     /// The admin is the only account that can update the group state.
     /// Omit it to make the group immutable.
@@ -9,7 +15,8 @@ pub struct InstantiateMsg {
     pub members: Vec<Member>,
 }
 
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     /// Change the admin
     UpdateAdmin { admin: Option<String> },
@@ -25,24 +32,23 @@ pub enum ExecuteMsg {
     RemoveHook { addr: String },
 }
 
-#[cw_serde]
-#[derive(QueryResponses)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    #[returns(cw_controllers::AdminResponse)]
+    /// Return AdminResponse
     Admin {},
-    #[returns(cw4::TotalWeightResponse)]
-    TotalWeight { at_height: Option<u64> },
-    #[returns(cw4::MemberListResponse)]
+    /// Return TotalWeightResponse
+    TotalWeight {},
+    /// Returns MembersListResponse
     ListMembers {
         start_after: Option<String>,
         limit: Option<u32>,
     },
-    #[returns(cw4::MemberResponse)]
+    /// Returns MemberResponse
     Member {
         addr: String,
         at_height: Option<u64>,
     },
-    /// Shows all registered hooks.
-    #[returns(cw_controllers::HooksResponse)]
+    /// Shows all registered hooks. Returns HooksResponse.
     Hooks {},
 }

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

@@ -1,6 +1,6 @@
 [package]
 name = "nym-mixnet-contract-common"
-version = "0.5.0"
+version = "0.6.0"
 description = "Common library for the Nym mixnet contract"
 rust-version = "1.62"
 edition = { workspace = true }
@@ -15,7 +15,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
 thiserror = "1.0"
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.4.0" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 # use 0.4.1 as that's the version used by cosmwasm-std 1.0.0
 # (and ideally we don't want to pull the same dependency twice)
 serde-json-wasm = "=0.4.1"

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

@@ -37,7 +37,7 @@ pub fn generate_owner_storage_subkey(
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
 pub struct Delegation {
     /// Address of the owner of this delegation.
     pub owner: Addr,
@@ -114,7 +114,7 @@ impl Delegation {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixNodeDelegationsResponse {
     pub delegations: Vec<Delegation>,
     pub start_next_after: Option<OwnerProxySubKey>,
@@ -129,7 +129,7 @@ impl PagedMixNodeDelegationsResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedDelegatorDelegationsResponse {
     pub delegations: Vec<Delegation>,
     pub start_next_after: Option<(MixId, OwnerProxySubKey)>,
@@ -147,7 +147,7 @@ impl PagedDelegatorDelegationsResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDelegationResponse {
     pub delegation: Option<Delegation>,
     pub mixnode_still_bonded: bool,
@@ -162,7 +162,7 @@ impl MixNodeDelegationResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedAllDelegationsResponse {
     pub delegations: Vec<Delegation>,
     pub start_next_after: Option<StorageKey>,

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

@@ -23,7 +23,7 @@ pub struct Gateway {
     pub version: String,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayBond {
     pub pledge_amount: Coin,
     pub owner: Addr,
@@ -132,7 +132,7 @@ impl GatewayConfigUpdate {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedGatewayResponse {
     pub nodes: Vec<GatewayBond>,
     pub per_page: usize,
@@ -153,13 +153,13 @@ impl PagedGatewayResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayOwnershipResponse {
     pub address: Addr,
     pub gateway: Option<GatewayBond>,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct GatewayBondResponse {
     pub identity: IdentityKey,
     pub gateway: Option<GatewayBond>,

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

@@ -489,7 +489,7 @@ impl CurrentIntervalResponse {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct PendingEpochEventsResponse {
     pub seconds_until_executable: i64,
     pub events: Vec<PendingEpochEvent>,
@@ -510,7 +510,7 @@ impl PendingEpochEventsResponse {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub struct PendingIntervalEventsResponse {
     pub seconds_until_executable: i64,
     pub events: Vec<PendingIntervalEvent>,

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

@@ -33,7 +33,7 @@ impl RewardedSetNodeStatus {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeDetails {
     pub bond_information: MixNodeBond,
     pub rewarding_details: MixNodeRewarding,
@@ -86,7 +86,7 @@ impl MixNodeDetails {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeRewarding {
     /// Information provided by the operator that influence the cost function.    
     pub cost_params: MixNodeCostParams,
@@ -465,7 +465,7 @@ impl MixNodeRewarding {
 }
 
 // operator information + data assigned by the contract(s)
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeBond {
     /// Unique id assigned to the bonded mixnode.
     pub mix_id: MixId,
@@ -559,7 +559,7 @@ pub struct MixNode {
     pub version: String,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixNodeCostParams {
     pub profit_margin_percent: Percent,
 
@@ -686,7 +686,7 @@ impl MixNodeConfigUpdate {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixnodeBondsResponse {
     pub nodes: Vec<MixNodeBond>,
     pub per_page: usize,
@@ -703,7 +703,7 @@ impl PagedMixnodeBondsResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct PagedMixnodesDetailsResponse {
     pub nodes: Vec<MixNodeDetails>,
     pub per_page: usize,
@@ -745,19 +745,19 @@ impl PagedUnbondedMixnodesResponse {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixOwnershipResponse {
     pub address: Addr,
     pub mixnode_details: Option<MixNodeDetails>,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixnodeDetailsResponse {
     pub mix_id: MixId,
     pub mixnode_details: Option<MixNodeDetails>,
 }
 
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize, JsonSchema)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize, JsonSchema)]
 pub struct MixnodeRewardingDetailsResponse {
     pub mix_id: MixId,
     pub rewarding_details: Option<MixNodeRewarding>,

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

@@ -7,19 +7,19 @@ use crate::{BlockHeight, EpochEventId, IntervalEventId, MixId};
 use cosmwasm_std::{Addr, Coin};
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingEpochEvent {
     pub id: EpochEventId,
     pub event: PendingEpochEventData,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingEpochEventData {
     pub created_at: BlockHeight,
     pub kind: PendingEpochEventKind,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum PendingEpochEventKind {
     // can't just pass the `Delegation` struct here as it's impossible to determine
     // `cumulative_reward_ratio` ahead of time
@@ -68,19 +68,19 @@ impl From<(EpochEventId, PendingEpochEventData)> for PendingEpochEvent {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingIntervalEvent {
     pub id: IntervalEventId,
     pub event: PendingIntervalEventData,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct PendingIntervalEventData {
     pub created_at: BlockHeight,
     pub kind: PendingIntervalEventKind,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum PendingIntervalEventKind {
     ChangeMixCostParams {
         mix_id: MixId,

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

@@ -35,7 +35,7 @@ pub struct RewardDistribution {
     pub delegates: Decimal,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct PendingRewardResponse {
     pub amount_staked: Option<Coin>,
     pub amount_earned: Option<Coin>,
@@ -46,7 +46,7 @@ pub struct PendingRewardResponse {
     pub mixnode_still_fully_bonded: bool,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct EstimatedCurrentEpochRewardResponse {
     pub original_stake: Option<Coin>,
 

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

@@ -4,6 +4,7 @@
 use crate::error::MixnetContractError;
 use crate::families::{Family, FamilyHead};
 use crate::{Layer, RewardedSetNodeStatus};
+use contracts_common::IdentityKey;
 use cosmwasm_std::Addr;
 use cosmwasm_std::Coin;
 use schemars::JsonSchema;
@@ -11,8 +12,6 @@ use serde::{Deserialize, Serialize};
 use std::ops::Index;
 
 // type aliases for better reasoning about available data
-pub type IdentityKey = String;
-pub type IdentityKeyRef<'a> = &'a str;
 pub type SphinxKey = String;
 pub type SphinxKeyRef<'a> = &'a str;
 pub type EpochId = u32;
@@ -23,7 +22,7 @@ pub type EpochEventId = u32;
 pub type IntervalEventId = u32;
 
 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, PartialEq)]
 pub struct LayerAssignment {
     mix_id: MixId,
     layer: Layer,
@@ -119,7 +118,7 @@ impl Index<Layer> for LayerDistribution {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ContractState {
     pub owner: Addr, // only the owner account can update state
     pub rewarding_validator_address: Addr,
@@ -131,7 +130,7 @@ pub struct ContractState {
     pub params: ContractStateParams,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct ContractStateParams {
     /// Minimum amount a delegator must stake in orders for his delegation to get accepted.
     pub minimum_mixnode_delegation: Option<Coin>,

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

@@ -8,9 +8,8 @@ edition = "2021"
 [dependencies]
 cw-utils = { workspace = true }
 cw3 = { workspace = true }
+cw3-fixed-multisig = { workspace = true, features = ["library"] }
 cw4 = { workspace= true }
-cw-storage-plus = { workspace = true }
-cosmwasm-schema = { workspace = true }
 cosmwasm-std = { workspace = true }
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }

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

@@ -2,8 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use cosmwasm_std::StdError;
-use cw3::DepositError;
-use cw_utils::{PaymentError, ThresholdError};
+use cw_utils::ThresholdError;
 
 use thiserror::Error;
 
@@ -18,6 +17,9 @@ pub enum ContractError {
     #[error("Group contract invalid address '{addr}'")]
     InvalidGroup { addr: String },
 
+    #[error("Coconut bandwidth contract address not found")]
+    InvalidCoconutBandwidth {},
+
     #[error("Unauthorized")]
     Unauthorized {},
 
@@ -41,10 +43,4 @@ pub enum ContractError {
 
     #[error("Cannot close completed or passed proposals")]
     WrongCloseStatus {},
-
-    #[error("{0}")]
-    Payment(#[from] PaymentError),
-
-    #[error("{0}")]
-    Deposit(#[from] DepositError),
 }

common/cosmwasm-smart-contracts/multisig-contract/src/lib.rs

@@ -1,3 +1,2 @@
 pub mod error;
 pub mod msg;
-pub mod state;

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

@@ -1,15 +1,15 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use cosmwasm_schema::{cw_serde, QueryResponses};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
 use cosmwasm_std::{CosmosMsg, Empty};
-use cw3::{UncheckedDepositInfo, Vote};
+use cw3::Vote;
 use cw4::MemberChangedHookMsg;
 use cw_utils::{Duration, Expiration, Threshold};
 
-use crate::state::Executor;
-
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct InstantiateMsg {
     // this is the group contract that contains the member list
     pub group_addr: String,
@@ -17,15 +17,11 @@ pub struct InstantiateMsg {
     pub coconut_dkg_contract_address: String,
     pub threshold: Threshold,
     pub max_voting_period: Duration,
-    // who is able to execute passed proposals
-    // None means that anyone can execute
-    pub executor: Option<Executor>,
-    /// The cost of creating a proposal (if any).
-    pub proposal_deposit: Option<UncheckedDepositInfo>,
 }
 
 // TODO: add some T variants? Maybe good enough as fixed Empty for now
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     Propose {
         title: String,
@@ -49,44 +45,41 @@ pub enum ExecuteMsg {
 }
 
 // We can also add this as a cw3 extension
-#[cw_serde]
-#[derive(QueryResponses)]
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
 pub enum QueryMsg {
-    #[returns(cw_utils::ThresholdResponse)]
+    /// Return ThresholdResponse
     Threshold {},
-    #[returns(cw3::ProposalResponse)]
+    /// Returns ProposalResponse
     Proposal { proposal_id: u64 },
-    #[returns(cw3::ProposalListResponse)]
+    /// Returns ProposalListResponse
     ListProposals {
         start_after: Option<u64>,
         limit: Option<u32>,
     },
-    #[returns(cw3::ProposalListResponse)]
+    /// Returns ProposalListResponse
     ReverseProposals {
         start_before: Option<u64>,
         limit: Option<u32>,
     },
-    #[returns(cw3::VoteResponse)]
+    /// Returns VoteResponse
     Vote { proposal_id: u64, voter: String },
-    #[returns(cw3::VoteListResponse)]
+    /// Returns VoteListResponse
     ListVotes {
         proposal_id: u64,
         start_after: Option<String>,
         limit: Option<u32>,
     },
-    #[returns(cw3::VoterResponse)]
+    /// Returns VoterInfo
     Voter { address: String },
-    #[returns(cw3::VoterListResponse)]
+    /// Returns VoterListResponse
     ListVoters {
         start_after: Option<String>,
         limit: Option<u32>,
     },
-    /// Gets the current configuration.
-    #[returns(crate::state::Config)]
-    Config {},
 }
-
-#[cw_serde]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[serde(rename_all = "snake_case")]
 pub struct MigrateMsg {
     pub coconut_bandwidth_address: String,
     pub coconut_dkg_address: String,

common/cosmwasm-smart-contracts/multisig-contract/src/state.rs

@@ -1,59 +0,0 @@
-use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, QuerierWrapper};
-use cw3::DepositInfo;
-use cw4::Cw4Contract;
-use cw_storage_plus::Item;
-use cw_utils::{Duration, Threshold};
-
-use crate::error::ContractError;
-
-/// Defines who is able to execute proposals once passed
-#[cw_serde]
-pub enum Executor {
-    /// Any member of the voting group, even with 0 points
-    Member,
-    /// Only the given address
-    Only(Addr),
-}
-
-#[cw_serde]
-pub struct Config {
-    pub threshold: Threshold,
-    pub max_voting_period: Duration,
-    // Total weight and voters are queried from this contract
-    pub group_addr: Cw4Contract,
-    pub coconut_bandwidth_addr: Addr,
-    pub coconut_dkg_addr: Addr,
-    // who is able to execute passed proposals
-    // None means that anyone can execute
-    pub executor: Option<Executor>,
-    /// The price, if any, of creating a new proposal.
-    pub proposal_deposit: Option<DepositInfo>,
-}
-
-impl Config {
-    // Executor can be set in 3 ways:
-    // - Member: any member of the voting group is authorized
-    // - Only: only passed address is authorized
-    // - None: Everyone are authorized
-    pub fn authorize(&self, querier: &QuerierWrapper, sender: &Addr) -> Result<(), ContractError> {
-        if let Some(executor) = &self.executor {
-            match executor {
-                Executor::Member => {
-                    self.group_addr
-                        .is_member(querier, sender, None)?
-                        .ok_or(ContractError::Unauthorized {})?;
-                }
-                Executor::Only(addr) => {
-                    if addr != sender {
-                        return Err(ContractError::Unauthorized {});
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-// unique items
-pub const CONFIG: Item<Config> = Item::new("config");

common/cosmwasm-smart-contracts/service-provider-directory/Cargo.toml

@@ -7,5 +7,9 @@ edition = "2021"
 
 [dependencies]
 cosmwasm-std = { workspace = true }
+nym-contracts-common = { path = "../contracts-common", version = "0.5.0" }
 schemars = "0.8"
 serde = { workspace = true, features = ["derive"] }
+thiserror = { workspace = true }
+cw-utils = { workspace = true }
+cw-controllers = { workspace = true }

common/cosmwasm-smart-contracts/service-provider-directory/src/error.rs

@@ -1,10 +1,12 @@
 use cosmwasm_std::{Addr, StdError};
 use cw_controllers::AdminError;
-use nym_service_provider_directory_common::{NymAddress, ServiceId};
+use nym_contracts_common::signing::verifier::ApiVerifierError;
 use thiserror::Error;
 
+use crate::{NymAddress, ServiceId};
+
 #[derive(Error, Debug, PartialEq)]
-pub enum ContractError {
+pub enum SpContractError {
     #[error("{0}")]
     Std(#[from] StdError),
 
@@ -46,6 +48,21 @@ pub enum ContractError {
         value: String,
         error_message: String,
     },
+
+    #[error("Failed to recover ed25519 public key from its base58 representation - {0}")]
+    MalformedEd25519IdentityKey(String),
+
+    #[error("Failed to recover ed25519 signature from its base58 representation - {0}")]
+    MalformedEd25519Signature(String),
+
+    #[error("Provided ed25519 signature did not verify correctly")]
+    InvalidEd25519Signature,
+
+    #[error("failed to verify message signature: {source}")]
+    SignatureVerificationFailure {
+        #[from]
+        source: ApiVerifierError,
+    },
 }
 
-pub(crate) type Result<T, E = ContractError> = std::result::Result<T, E>;
+pub type Result<T, E = SpContractError> = std::result::Result<T, E>;

common/cosmwasm-smart-contracts/service-provider-directory/src/events.rs

@@ -39,16 +39,16 @@ pub fn new_announce_event(service_id: ServiceId, service: Service) -> Event {
     Event::new(ServiceProviderEventType::Announce)
         .add_attribute(ACTION, ServiceProviderEventType::Announce)
         .add_attribute(SERVICE_ID, service_id.to_string())
-        .add_attribute(SERVICE_TYPE, service.service_type.to_string())
-        .add_attribute(NYM_ADDRESS, service.nym_address.to_string())
+        .add_attribute(SERVICE_TYPE, service.service.service_type.to_string())
+        .add_attribute(NYM_ADDRESS, service.service.nym_address.to_string())
         .add_attribute(OWNER, service.announcer.to_string())
 }
 
-pub fn new_delete_id_event(service_id: ServiceId, service: Service) -> Event {
+pub fn new_delete_id_event(service: Service) -> Event {
     Event::new(ServiceProviderEventType::DeleteId)
         .add_attribute(ACTION, ServiceProviderEventType::DeleteId)
-        .add_attribute(SERVICE_ID, service_id.to_string())
-        .add_attribute(NYM_ADDRESS, service.nym_address.to_string())
+        .add_attribute(SERVICE_ID, service.service_id.to_string())
+        .add_attribute(NYM_ADDRESS, service.service.nym_address.to_string())
 }
 
 pub fn new_update_deposit_required_event(deposit_required: Coin) -> Event {

common/cosmwasm-smart-contracts/service-provider-directory/src/lib.rs

@@ -1,6 +1,8 @@
+pub mod error;
 pub mod events;
 pub mod msg;
 pub mod response;
+pub mod signing_types;
 pub mod types;
 
 // Re-export all types at the top-level

common/cosmwasm-smart-contracts/service-provider-directory/src/msg.rs

@@ -1,5 +1,6 @@
-use crate::{NymAddress, ServiceId, ServiceType};
+use crate::{NymAddress, ServiceDetails, ServiceId};
 use cosmwasm_std::Coin;
+use nym_contracts_common::signing::MessageSignature;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
@@ -22,8 +23,8 @@ pub struct MigrateMsg {}
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     Announce {
-        nym_address: NymAddress,
-        service_type: ServiceType,
+        service: ServiceDetails,
+        owner_signature: MessageSignature,
     },
     DeleteId {
         service_id: ServiceId,
@@ -44,9 +45,12 @@ impl ExecuteMsg {
     pub fn default_memo(&self) -> String {
         match self {
             ExecuteMsg::Announce {
-                nym_address,
-                service_type,
-            } => format!("announcing {nym_address} as type {service_type}"),
+                service,
+                owner_signature: _,
+            } => format!(
+                "announcing {} as type {}",
+                service.nym_address, service.service_type
+            ),
             ExecuteMsg::DeleteId { service_id } => {
                 format!("deleting service with service id {service_id}")
             }
@@ -76,6 +80,9 @@ pub enum QueryMsg {
         limit: Option<u32>,
         start_after: Option<ServiceId>,
     },
+    SigningNonce {
+        address: String,
+    },
     Config {},
     GetContractVersion {},
     #[serde(rename = "get_cw2_contract_version")]

common/cosmwasm-smart-contracts/service-provider-directory/src/response.rs

@@ -1,4 +1,4 @@
-use crate::{msg::ExecuteMsg, Service, ServiceId, ServiceInfo};
+use crate::{Service, ServiceId};
 use cosmwasm_std::Coin;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -13,22 +13,17 @@ pub struct ServiceInfoResponse {
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub struct ServicesListResponse {
-    pub services: Vec<ServiceInfo>,
+    pub services: Vec<Service>,
 }
 
 impl ServicesListResponse {
-    pub fn new(services: Vec<(ServiceId, Service)>) -> ServicesListResponse {
-        ServicesListResponse {
-            services: services
-                .into_iter()
-                .map(|(service_id, service)| ServiceInfo::new(service_id, service))
-                .collect(),
-        }
+    pub fn new(services: Vec<Service>) -> ServicesListResponse {
+        ServicesListResponse { services }
     }
 }
 
-impl From<&[ServiceInfo]> for ServicesListResponse {
-    fn from(services: &[ServiceInfo]) -> Self {
+impl From<&[Service]> for ServicesListResponse {
+    fn from(services: &[Service]) -> Self {
         Self {
             services: services.to_vec(),
         }
@@ -38,21 +33,17 @@ impl From<&[ServiceInfo]> for ServicesListResponse {
 #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
 #[serde(rename_all = "snake_case")]
 pub struct PagedServicesListResponse {
-    pub services: Vec<ServiceInfo>,
+    pub services: Vec<Service>,
     pub per_page: usize,
     pub start_next_after: Option<ServiceId>,
 }
 
 impl PagedServicesListResponse {
     pub fn new(
-        services: Vec<(ServiceId, Service)>,
+        services: Vec<Service>,
         per_page: usize,
         start_next_after: Option<ServiceId>,
     ) -> PagedServicesListResponse {
-        let services = services
-            .into_iter()
-            .map(|(service_id, service)| ServiceInfo::new(service_id, service))
-            .collect();
         PagedServicesListResponse {
             services,
             per_page,
@@ -66,12 +57,3 @@ impl PagedServicesListResponse {
 pub struct ConfigResponse {
     pub deposit_required: Coin,
 }
-
-impl From<Service> for ExecuteMsg {
-    fn from(service: Service) -> Self {
-        ExecuteMsg::Announce {
-            nym_address: service.nym_address,
-            service_type: service.service_type,
-        }
-    }
-}

common/cosmwasm-smart-contracts/service-provider-directory/src/signing_types.rs

@@ -0,0 +1,33 @@
+use cosmwasm_std::{Addr, Coin};
+use nym_contracts_common::signing::{
+    ContractMessageContent, MessageType, Nonce, SignableMessage, SigningPurpose,
+};
+use serde::Serialize;
+
+use crate::ServiceDetails;
+
+pub type SignableServiceProviderAnnounceMsg =
+    SignableMessage<ContractMessageContent<ServiceProviderAnnounce>>;
+
+#[derive(Serialize)]
+pub struct ServiceProviderAnnounce {
+    service: ServiceDetails,
+}
+
+impl SigningPurpose for ServiceProviderAnnounce {
+    fn message_type() -> MessageType {
+        MessageType::new("service-provider-announce")
+    }
+}
+
+pub fn construct_service_provider_announce_sign_payload(
+    nonce: Nonce,
+    sender: Addr,
+    deposit: Coin,
+    service: ServiceDetails,
+) -> SignableServiceProviderAnnounceMsg {
+    let payload = ServiceProviderAnnounce { service };
+    let proxy = None;
+    let content = ContractMessageContent::new(sender, proxy, vec![deposit], payload);
+    SignableMessage::new(nonce, content)
+}

common/cosmwasm-smart-contracts/service-provider-directory/src/types.rs

@@ -1,6 +1,7 @@
 use std::fmt::{Display, Formatter};
 
 use cosmwasm_std::{Addr, Coin};
+use nym_contracts_common::IdentityKey;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -9,11 +10,11 @@ pub type ServiceId = u32;
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug, JsonSchema)]
 pub struct Service {
-    /// The address of the service.
-    pub nym_address: NymAddress,
-    /// The service type.
-    pub service_type: ServiceType,
-    /// Service owner.
+    /// Unique id assigned to the anounced service.
+    pub service_id: ServiceId,
+    /// The announced service.
+    pub service: ServiceDetails,
+    /// Address of the service owner.
     pub announcer: Addr,
     /// Block height at which the service was added.
     pub block_height: u64,
@@ -21,6 +22,16 @@ pub struct Service {
     pub deposit: Coin,
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq, Debug, JsonSchema)]
+pub struct ServiceDetails {
+    /// The address of the service.
+    pub nym_address: NymAddress,
+    /// The service type.
+    pub service_type: ServiceType,
+    /// The identity key of the service.
+    pub identity_key: IdentityKey,
+}
+
 /// The types of addresses supported.
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -28,7 +39,7 @@ pub enum NymAddress {
     /// String representation of a nym address, which is of the form
     /// client_id.client_enc@gateway_id.
     Address(String),
-    // For the future when we have a nym-dns contract
+    // String name that can looked up in the nym-name-service contract (once it exists)
     //Name(String),
 }
 
@@ -41,6 +52,7 @@ impl NymAddress {
     pub fn as_str(&self) -> &str {
         match self {
             NymAddress::Address(address) => address,
+            //NymAddress::Name(name) => name,
         }
     }
 }
@@ -66,19 +78,3 @@ impl std::fmt::Display for ServiceType {
         write!(f, "{service_type}")
     }
 }
-
-#[derive(Serialize, Deserialize, PartialEq, Debug, Clone, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub struct ServiceInfo {
-    pub service_id: ServiceId,
-    pub service: Service,
-}
-
-impl ServiceInfo {
-    pub fn new(service_id: ServiceId, service: Service) -> Self {
-        Self {
-            service_id,
-            service,
-        }
-    }
-}

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

@@ -1,6 +1,6 @@
 [package]
 name = "nym-vesting-contract-common"
-version = "0.6.0"
+version = "0.7.0"
 description = "Common library for the Nym vesting contract"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,8 +9,8 @@ repository = { workspace = true }
 
 [dependencies]
 cosmwasm-std = { workspace = true }
-mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.5.0" }
-contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.4.0" }
+mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common", version = "0.6.0" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common", version = "0.5.0" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 ts-rs = {version = "6.1.2", optional = true}

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

@@ -28,7 +28,7 @@ pub enum Period {
     After,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct PledgeData {
     pub amount: Coin,
     pub block_time: Timestamp,
@@ -49,7 +49,7 @@ impl PledgeData {
 }
 
 #[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum PledgeCap {
     Percent(Percent),
     Absolute(Uint128), // This has to be in unym
@@ -77,7 +77,7 @@ impl Default for PledgeCap {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct OriginalVestingResponse {
     pub amount: Coin,
     pub number_of_periods: usize,

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

@@ -55,7 +55,7 @@ impl VestingSpecification {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, JsonSchema)]
+#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum ExecuteMsg {
     // Families

common/credentials/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 bls12_381 = { version = "0.5", default-features = false, features = ["pairings", "alloc", "experimental"] }
-cosmrs = { workspace = true }
+cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegrant_support" }
 thiserror = "1.0"
 
 # I guess temporarily until we get serde support in coconut up and running