Wrap up rebase

clients/native/src/client/mod.rs

@@ -170,6 +170,8 @@ impl SocketClient {
         let packet_type = self.config.get_base().get_packet_type();
         let mut started_client = base_builder.start_base(packet_type).await?;
         let address = started_client.address;
+        let client_input = started_client.client_input.register_producer();
+        let client_output = started_client.client_output.register_consumer();
 
         // register our receiver
         let (reconstructed_sender, reconstructed_receiver) = mpsc::unbounded();

clients/webassembly/src/client/mod.rs

@@ -208,9 +208,9 @@ impl NymClientBuilder {
             base_builder = base_builder.with_topology_provider(topology_provider);
         }
 
-        let mut started_client = base_builder.start_base().await?;
-        let self_address = started_client.address.to_string();
         let packet_type = self.config.packet_type;
+        let mut started_client = base_builder.start_base(packet_type).await?;
+        let self_address = started_client.address.to_string();
 
         let client_input = started_client.client_input.register_producer();
         let client_output = started_client.client_output.register_consumer();

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

@@ -40,11 +40,17 @@ impl ClientKeyPathfinder {
     }
 
     pub fn identity_key_pair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(self.private_identity_key(), self.public_identity_key())
+        nym_pemstore::KeyPairPath::new(
+            self.private_identity_key().to_path_buf(),
+            self.public_identity_key().to_path_buf(),
+        )
     }
 
     pub fn encryption_key_pair_path(&self) -> nym_pemstore::KeyPairPath {
-        nym_pemstore::KeyPairPath::new(self.private_encryption_key(), self.public_encryption_key())
+        nym_pemstore::KeyPairPath::new(
+            self.private_encryption_key().to_path_buf(),
+            self.public_encryption_key().to_path_buf(),
+        )
     }
 
     pub fn any_file_exists(&self) -> bool {

common/store-cipher/src/lib.rs

@@ -7,7 +7,7 @@ use rand::{thread_rng, CryptoRng, Fill, RngCore};
 use serde::{Deserialize, Serialize};
 use serde_helpers::{argon2_algorithm_helper, argon2_params_helper, argon2_version_helper};
 use thiserror::Error;
-use zeroize::{Zeroize, ZeroizeOnDrop};
+use zeroize::Zeroize;
 
 pub use aes_gcm::Aes256Gcm;
 pub use aes_gcm::{Key, KeySizeUser};
@@ -161,7 +161,7 @@ impl CiphertextInfo {
     }
 }
 
-#[derive(Zeroize, ZeroizeOnDrop)]
+#[derive(Zeroize)]
 pub struct StoreCipher<C = Aes256Gcm>
 where
     C: KeySizeUser,

nym-wallet/src-tauri/Cargo.toml

@@ -75,4 +75,4 @@ ts-rs = "6.1.2"
 [features]
 default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
-generate-ts = []
+generate-ts = []

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

@@ -3,12 +3,8 @@ use nym_client_core::client::{
     inbound_messages::InputMessage,
     received_buffer::ReconstructedMessagesReceiver,
 };
-use nym_sphinx::{addressing::clients::Recipient, receiver::ReconstructedMessage};
-use nym_sphinx::{
-    addressing::clients::{ClientIdentity, Recipient},
-    params::PacketType,
-    receiver::ReconstructedMessage,
-};
+use nym_sphinx::addressing::clients::Recipient;
+use nym_sphinx::{params::PacketType, receiver::ReconstructedMessage};
 use nym_task::{
     connections::{ConnectionCommandSender, LaneQueueLengths, TransmissionLane},
     TaskManager,