Merge pull request #2855 from nymtech/jon/chore/add-nym-prefix-to-mixnet-and-vesting-contract-packages

contracts: add nym prefix to mixnet and vesting contract packages

Cargo.lock

@@ -698,7 +698,6 @@ dependencies = [
  "async-trait",
  "client-connections",
  "config",
- "crypto",
  "dashmap 5.4.0",
  "dirs",
  "futures",
@@ -708,8 +707,9 @@ dependencies = [
  "humantime-serde",
  "log",
  "nonexhaustive-delayqueue",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx",
- "pemstore",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -753,10 +753,10 @@ dependencies = [
 name = "coconut-dkg-common"
 version = "0.1.0"
 dependencies = [
- "contracts-common",
  "cosmwasm-std",
  "cw-utils",
  "multisig-contract-common",
+ "nym-contracts-common",
  "schemars",
  "serde",
 ]
@@ -875,19 +875,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"
 
-[[package]]
-name = "contracts-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "cosmwasm-std",
- "dkg",
- "schemars",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "cookie"
 version = "0.16.2"
@@ -1052,11 +1039,11 @@ dependencies = [
  "config",
  "credential-storage",
  "credentials",
- "crypto",
  "log",
  "logging",
  "network-defaults",
- "pemstore",
+ "nym-crypto",
+ "nym-pemstore",
  "rand 0.7.3",
  "serde",
  "thiserror",
@@ -1083,8 +1070,8 @@ dependencies = [
  "bls12_381 0.5.0",
  "coconut-interface",
  "cosmrs",
- "crypto",
  "nym-api-requests",
+ "nym-crypto",
  "rand 0.7.3",
  "thiserror",
  "validator-client",
@@ -1246,31 +1233,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto"
-version = "0.1.0"
-dependencies = [
- "aes 0.8.2",
- "blake3",
- "bs58",
- "cipher 0.4.3",
- "ctr 0.9.2",
- "digest 0.10.6",
- "ed25519-dalek",
- "generic-array 0.14.6",
- "hkdf 0.12.3",
- "hmac 0.12.1",
- "nymsphinx-types",
- "pemstore",
- "rand 0.7.3",
- "rand_chacha 0.2.2",
- "serde",
- "serde_bytes",
- "subtle-encoding",
- "thiserror",
- "x25519-dalek",
-]
-
 [[package]]
 name = "crypto-bigint"
 version = "0.3.2"
@@ -1666,7 +1628,7 @@ dependencies = [
  "ff 0.11.1",
  "group 0.11.0",
  "lazy_static",
- "pemstore",
+ "nym-pemstore",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
@@ -1889,7 +1851,6 @@ version = "1.1.9"
 dependencies = [
  "chrono",
  "clap 4.1.4",
- "contracts-common",
  "dotenv",
  "humantime-serde",
  "isocountry",
@@ -1897,8 +1858,9 @@ dependencies = [
  "log",
  "logging",
  "maxminddb",
- "mixnet-contract-common",
  "network-defaults",
+ "nym-contracts-common",
+ "nym-mixnet-contract-common",
  "okapi",
  "pretty_env_logger",
  "rand 0.8.5",
@@ -2158,15 +2120,15 @@ dependencies = [
  "coconut-interface",
  "credential-storage",
  "credentials",
- "crypto",
  "futures",
  "gateway-requests",
  "getrandom 0.2.8",
  "log",
  "mobile-storage",
  "network-defaults",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx",
- "pemstore",
  "rand 0.7.3",
  "serde",
  "task",
@@ -2190,11 +2152,11 @@ dependencies = [
  "bs58",
  "coconut-interface",
  "credentials",
- "crypto",
  "futures",
  "log",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx",
- "pemstore",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -3216,35 +3178,16 @@ dependencies = [
  "tokio-util",
 ]
 
-[[package]]
-name = "mixnet-contract-common"
-version = "0.1.0"
-dependencies = [
- "bs58",
- "contracts-common",
- "cosmwasm-std",
- "humantime-serde",
- "log",
- "rand_chacha 0.3.1",
- "schemars",
- "serde",
- "serde_json",
- "serde_repr",
- "thiserror",
- "time 0.3.17",
- "ts-rs",
-]
-
 [[package]]
 name = "mixnode-common"
 version = "0.1.0"
 dependencies = [
  "bytes",
- "crypto",
  "futures",
  "humantime-serde",
  "log",
  "network-defaults",
+ "nym-crypto",
  "nymsphinx-acknowledgements",
  "nymsphinx-addressing",
  "nymsphinx-forwarding",
@@ -3439,11 +3382,9 @@ dependencies = [
  "coconut-interface",
  "config",
  "console-subscriber",
- "contracts-common",
  "cosmwasm-std",
  "credential-storage",
  "credentials",
- "crypto",
  "cw-utils",
  "cw3",
  "cw4",
@@ -3458,13 +3399,16 @@ dependencies = [
  "lazy_static",
  "log",
  "logging",
- "mixnet-contract-common",
  "multisig-contract-common",
  "nym-api-requests",
+ "nym-contracts-common",
+ "nym-crypto",
+ "nym-mixnet-contract-common",
+ "nym-pemstore",
+ "nym-vesting-contract-common",
  "nymcoconut",
  "nymsphinx",
  "okapi",
- "pemstore",
  "pin-project",
  "pretty_env_logger",
  "rand 0.7.3",
@@ -3488,7 +3432,6 @@ dependencies = [
  "url",
  "validator-client",
  "version-checker",
- "vesting-contract-common",
 ]
 
 [[package]]
@@ -3500,7 +3443,7 @@ dependencies = [
  "cosmrs",
  "cosmwasm-std",
  "getset",
- "mixnet-contract-common",
+ "nym-mixnet-contract-common",
  "schemars",
  "serde",
  "ts-rs",
@@ -3564,9 +3507,10 @@ dependencies = [
  "humantime-serde",
  "k256",
  "log",
- "mixnet-contract-common",
  "multisig-contract-common",
  "network-defaults",
+ "nym-mixnet-contract-common",
+ "nym-vesting-contract-common",
  "rand 0.6.5",
  "serde",
  "serde_json",
@@ -3576,7 +3520,6 @@ dependencies = [
  "toml",
  "url",
  "validator-client",
- "vesting-contract-common",
 ]
 
 [[package]]
@@ -3592,7 +3535,6 @@ dependencies = [
  "config",
  "credential-storage",
  "credentials",
- "crypto",
  "dirs",
  "futures",
  "gateway-client",
@@ -3601,8 +3543,9 @@ dependencies = [
  "log",
  "logging",
  "network-defaults",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx",
- "pemstore",
  "pretty_env_logger",
  "rand 0.7.3",
  "serde",
@@ -3619,6 +3562,44 @@ dependencies = [
  "websocket-requests",
 ]
 
+[[package]]
+name = "nym-contracts-common"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "cosmwasm-std",
+ "dkg",
+ "schemars",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "nym-crypto"
+version = "0.1.0"
+dependencies = [
+ "aes 0.8.2",
+ "blake3",
+ "bs58",
+ "cipher 0.4.3",
+ "ctr 0.9.2",
+ "digest 0.10.6",
+ "ed25519-dalek",
+ "generic-array 0.14.6",
+ "hkdf 0.12.3",
+ "hmac 0.12.1",
+ "nym-pemstore",
+ "nymsphinx-types",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
+ "serde",
+ "serde_bytes",
+ "subtle-encoding",
+ "thiserror",
+ "x25519-dalek",
+]
+
 [[package]]
 name = "nym-gateway"
 version = "1.1.9"
@@ -3635,7 +3616,6 @@ dependencies = [
  "completions",
  "config",
  "credentials",
- "crypto",
  "dashmap 4.0.2",
  "dirs",
  "dotenv",
@@ -3649,10 +3629,11 @@ dependencies = [
  "mixnode-common",
  "network-defaults",
  "nym-api-requests",
+ "nym-crypto",
+ "nym-pemstore",
  "nym-types",
  "nymsphinx",
  "once_cell",
- "pemstore",
  "pretty_env_logger",
  "rand 0.7.3",
  "serde",
@@ -3671,6 +3652,25 @@ dependencies = [
  "version-checker",
 ]
 
+[[package]]
+name = "nym-mixnet-contract-common"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "cosmwasm-std",
+ "humantime-serde",
+ "log",
+ "nym-contracts-common",
+ "rand_chacha 0.3.1",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "thiserror",
+ "time 0.3.17",
+ "ts-rs",
+]
+
 [[package]]
 name = "nym-mixnode"
 version = "1.1.10"
@@ -3683,7 +3683,6 @@ dependencies = [
  "colored",
  "completions",
  "config",
- "crypto",
  "cupid",
  "dirs",
  "dotenv",
@@ -3695,11 +3694,12 @@ dependencies = [
  "mixnet-client",
  "mixnode-common",
  "nonexhaustive-delayqueue",
+ "nym-crypto",
+ "nym-pemstore",
  "nym-types",
  "nymsphinx",
  "nymsphinx-params",
  "nymsphinx-types",
- "pemstore",
  "pretty_env_logger",
  "rand 0.7.3",
  "rocket",
@@ -3782,19 +3782,26 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "nym-pemstore"
+version = "0.1.0"
+dependencies = [
+ "pem",
+]
+
 [[package]]
 name = "nym-sdk"
 version = "0.1.0"
 dependencies = [
  "client-connections",
  "client-core",
- "crypto",
  "futures",
  "gateway-client",
  "gateway-requests",
  "log",
  "logging",
  "network-defaults",
+ "nym-crypto",
  "nymsphinx",
  "pretty_env_logger",
  "rand 0.7.3",
@@ -3820,7 +3827,6 @@ dependencies = [
  "config",
  "credential-storage",
  "credentials",
- "crypto",
  "dirs",
  "futures",
  "gateway-client",
@@ -3830,9 +3836,10 @@ dependencies = [
  "logging",
  "mobile-storage",
  "network-defaults",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx",
  "ordered-buffer",
- "pemstore",
  "pin-project",
  "pretty_env_logger",
  "proxy-helpers",
@@ -3862,7 +3869,9 @@ dependencies = [
  "eyre",
  "itertools",
  "log",
- "mixnet-contract-common",
+ "nym-mixnet-contract-common",
+ "nym-vesting-contract",
+ "nym-vesting-contract-common",
  "reqwest",
  "schemars",
  "serde",
@@ -3873,8 +3882,33 @@ dependencies = [
  "ts-rs",
  "url",
  "validator-client",
- "vesting-contract",
- "vesting-contract-common",
+]
+
+[[package]]
+name = "nym-vesting-contract"
+version = "1.1.3"
+dependencies = [
+ "cosmwasm-std",
+ "cw-storage-plus",
+ "nym-contracts-common",
+ "nym-mixnet-contract-common",
+ "nym-vesting-contract-common",
+ "schemars",
+ "serde",
+ "thiserror",
+ "vergen 5.1.17",
+]
+
+[[package]]
+name = "nym-vesting-contract-common"
+version = "0.1.0"
+dependencies = [
+ "cosmwasm-std",
+ "nym-contracts-common",
+ "nym-mixnet-contract-common",
+ "schemars",
+ "serde",
+ "ts-rs",
 ]
 
 [[package]]
@@ -3885,16 +3919,16 @@ dependencies = [
  "cosmrs",
  "cosmwasm-std",
  "hex-literal",
- "mixnet-contract-common",
  "network-defaults",
+ "nym-mixnet-contract-common",
  "nym-types",
+ "nym-vesting-contract",
+ "nym-vesting-contract-common",
  "serde",
  "serde_json",
  "strum 0.23.0",
  "ts-rs",
  "validator-client",
- "vesting-contract",
- "vesting-contract-common",
 ]
 
 [[package]]
@@ -3911,7 +3945,7 @@ dependencies = [
  "getrandom 0.2.8",
  "group 0.11.0",
  "itertools",
- "pemstore",
+ "nym-pemstore",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "serde",
@@ -3924,8 +3958,8 @@ dependencies = [
 name = "nymsphinx"
 version = "0.1.0"
 dependencies = [
- "crypto",
- "mixnet-contract-common",
+ "nym-crypto",
+ "nym-mixnet-contract-common",
  "nymsphinx-acknowledgements",
  "nymsphinx-addressing",
  "nymsphinx-anonymous-replies",
@@ -3946,11 +3980,11 @@ dependencies = [
 name = "nymsphinx-acknowledgements"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "nym-crypto",
+ "nym-pemstore",
  "nymsphinx-addressing",
  "nymsphinx-params",
  "nymsphinx-types",
- "pemstore",
  "rand 0.7.3",
  "thiserror",
  "topology",
@@ -3960,7 +3994,7 @@ dependencies = [
 name = "nymsphinx-addressing"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "nym-crypto",
  "nymsphinx-types",
  "rand 0.7.3",
  "serde",
@@ -3972,7 +4006,7 @@ name = "nymsphinx-anonymous-replies"
 version = "0.1.0"
 dependencies = [
  "bs58",
- "crypto",
+ "nym-crypto",
  "nymsphinx-addressing",
  "nymsphinx-params",
  "nymsphinx-types",
@@ -3999,7 +4033,7 @@ dependencies = [
 name = "nymsphinx-cover"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "nym-crypto",
  "nymsphinx-acknowledgements",
  "nymsphinx-addressing",
  "nymsphinx-chunking",
@@ -4035,7 +4069,7 @@ dependencies = [
 name = "nymsphinx-params"
 version = "0.1.0"
 dependencies = [
- "crypto",
+ "nym-crypto",
  "nymsphinx-types",
  "thiserror",
 ]
@@ -4290,13 +4324,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "pemstore"
-version = "0.1.0"
-dependencies = [
- "pem",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@@ -6503,9 +6530,9 @@ name = "topology"
 version = "0.1.0"
 dependencies = [
  "bs58",
- "crypto",
  "log",
- "mixnet-contract-common",
+ "nym-crypto",
+ "nym-mixnet-contract-common",
  "nymsphinx-addressing",
  "nymsphinx-types",
  "rand 0.7.3",
@@ -6658,13 +6685,13 @@ name = "ts-rs-cli"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "mixnet-contract-common",
  "nym-api-requests",
+ "nym-mixnet-contract-common",
  "nym-types",
+ "nym-vesting-contract-common",
  "nym-wallet-types",
  "ts-rs",
  "validator-client",
- "vesting-contract-common",
  "walkdir",
 ]
 
@@ -6879,7 +6906,6 @@ dependencies = [
  "coconut-interface",
  "colored",
  "config",
- "contracts-common",
  "cosmrs",
  "cosmwasm-std",
  "cw3",
@@ -6890,10 +6916,13 @@ dependencies = [
  "group-contract-common",
  "itertools",
  "log",
- "mixnet-contract-common",
  "multisig-contract-common",
  "network-defaults",
  "nym-api-requests",
+ "nym-contracts-common",
+ "nym-mixnet-contract-common",
+ "nym-vesting-contract",
+ "nym-vesting-contract-common",
  "prost 0.10.4",
  "reqwest",
  "serde",
@@ -6903,8 +6932,6 @@ dependencies = [
  "tokio",
  "ts-rs",
  "url",
- "vesting-contract",
- "vesting-contract-common",
 ]
 
 [[package]]
@@ -6966,33 +6993,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "vesting-contract"
-version = "1.1.3"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "cw-storage-plus",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "thiserror",
- "vergen 5.1.17",
- "vesting-contract-common",
-]
-
-[[package]]
-name = "vesting-contract-common"
-version = "0.1.0"
-dependencies = [
- "contracts-common",
- "cosmwasm-std",
- "mixnet-contract-common",
- "schemars",
- "serde",
- "ts-rs",
-]
-
 [[package]]
 name = "walkdir"
 version = "2.3.2"

clients/client-core/Cargo.toml

@@ -26,13 +26,13 @@ time = "0.3.17"
 # internal
 config = { path = "../../common/config" }
 client-connections = { path = "../../common/client-connections" }
-crypto = { path = "../../common/crypto" }
+nym-crypto = { path = "../../common/crypto" }
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 #gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm", "coconut"] }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 nonexhaustive-delayqueue = { path = "../../common/nonexhaustive-delayqueue" }
 nymsphinx = { path = "../../common/nymsphinx" }
-pemstore = { path = "../../common/pemstore" }
+nym-pemstore = { path = "../../common/pemstore" }
 topology = { path = "../../common/topology" }
 validator-client = { path = "../../common/client-libs/validator-client", default-features = false }
 task = { path = "../../common/task" }

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

@@ -22,7 +22,6 @@ use crate::config::{Config, DebugConfig, GatewayEndpointConfig};
 use crate::error::ClientCoreError;
 use crate::spawn_future;
 use client_connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths};
-use crypto::asymmetric::{encryption, identity};
 use futures::channel::mpsc;
 use gateway_client::bandwidth::BandwidthController;
 #[cfg(target_arch = "wasm32")]
@@ -32,6 +31,7 @@ use gateway_client::{
     MixnetMessageSender,
 };
 use log::{debug, info};
+use nym_crypto::asymmetric::{encryption, identity};
 use nymsphinx::acknowledgements::AckKey;
 use nymsphinx::addressing::clients::Recipient;
 use nymsphinx::addressing::nodes::NodeIdentity;

clients/client-core/src/client/key_manager.rs

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::persistence::key_pathfinder::ClientKeyPathfinder;
-use crypto::asymmetric::{encryption, identity};
 use gateway_requests::registration::handshake::SharedKeys;
 use log::*;
+use nym_crypto::asymmetric::{encryption, identity};
 use nymsphinx::acknowledgements::AckKey;
 use rand::{CryptoRng, RngCore};
 use std::io;
@@ -72,17 +72,17 @@ impl KeyManager {
     /// Loads previously stored client keys from the disk.
     fn load_client_keys(client_pathfinder: &ClientKeyPathfinder) -> io::Result<Self> {
         let identity_keypair: identity::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
                 client_pathfinder.private_identity_key().to_owned(),
                 client_pathfinder.public_identity_key().to_owned(),
             ))?;
         let encryption_keypair: encryption::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
                 client_pathfinder.private_encryption_key().to_owned(),
                 client_pathfinder.public_encryption_key().to_owned(),
             ))?;
 
-        let ack_key: AckKey = pemstore::load_key(client_pathfinder.ack_key())?;
+        let ack_key: AckKey = nym_pemstore::load_key(client_pathfinder.ack_key())?;
 
         Ok(KeyManager {
             identity_keypair: Arc::new(identity_keypair),
@@ -98,7 +98,7 @@ impl KeyManager {
         let mut key_manager = Self::load_client_keys(client_pathfinder)?;
 
         let gateway_shared_key: SharedKeys =
-            pemstore::load_key(client_pathfinder.gateway_shared_key())?;
+            nym_pemstore::load_key(client_pathfinder.gateway_shared_key())?;
 
         key_manager.gateway_shared_key = Some(Arc::new(gateway_shared_key));
 
@@ -113,7 +113,7 @@ impl KeyManager {
         let mut key_manager = Self::load_client_keys(client_pathfinder)?;
 
         let gateway_shared_key: Result<SharedKeys, io::Error> =
-            pemstore::load_key(client_pathfinder.gateway_shared_key());
+            nym_pemstore::load_key(client_pathfinder.gateway_shared_key());
 
         // It's ok if the gateway key was not found
         let gateway_shared_key = match gateway_shared_key {
@@ -132,27 +132,27 @@ impl KeyManager {
     // it is done so for the consistency sake so that you wouldn't require an rng instance
     // during `load_keys` to generate the said key.
     pub fn store_keys(&self, client_pathfinder: &ClientKeyPathfinder) -> io::Result<()> {
-        pemstore::store_keypair(
+        nym_pemstore::store_keypair(
             self.identity_keypair.as_ref(),
-            &pemstore::KeyPairPath::new(
+            &nym_pemstore::KeyPairPath::new(
                 client_pathfinder.private_identity_key().to_owned(),
                 client_pathfinder.public_identity_key().to_owned(),
             ),
         )?;
-        pemstore::store_keypair(
+        nym_pemstore::store_keypair(
             self.encryption_keypair.as_ref(),
-            &pemstore::KeyPairPath::new(
+            &nym_pemstore::KeyPairPath::new(
                 client_pathfinder.private_encryption_key().to_owned(),
                 client_pathfinder.public_encryption_key().to_owned(),
             ),
         )?;
 
-        pemstore::store_key(self.ack_key.as_ref(), client_pathfinder.ack_key())?;
+        nym_pemstore::store_key(self.ack_key.as_ref(), client_pathfinder.ack_key())?;
 
         match self.gateway_shared_key.as_ref() {
             None => debug!("No gateway shared key available to store!"),
             Some(gate_key) => {
-                pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
+                nym_pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
             }
         }
 
@@ -168,7 +168,7 @@ impl KeyManager {
                 ))
             }
             Some(gate_key) => {
-                pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
+                nym_pemstore::store_key(gate_key.as_ref(), client_pathfinder.gateway_shared_key())?
             }
         }
 

clients/client-core/src/client/received_buffer.rs

@@ -4,13 +4,13 @@
 use crate::client::replies::reply_controller::ReplyControllerSender;
 use crate::client::replies::reply_storage::SentReplyKeys;
 use crate::spawn_future;
-use crypto::asymmetric::encryption;
-use crypto::Digest;
 use futures::channel::mpsc;
 use futures::lock::Mutex;
 use futures::StreamExt;
 use gateway_client::MixnetMessageReceiver;
 use log::*;
+use nym_crypto::asymmetric::encryption;
+use nym_crypto::Digest;
 use nymsphinx::anonymous_replies::requests::{
     RepliableMessage, RepliableMessageContent, ReplyMessage, ReplyMessageContent,
 };

clients/client-core/src/client/replies/reply_storage/backend/fs_backend/models.rs

@@ -3,8 +3,8 @@
 
 use crate::client::replies::reply_storage::backend::fs_backend::error::StorageError;
 use crate::client::replies::reply_storage::key_storage::UsedReplyKey;
-use crypto::generic_array::typenum::Unsigned;
-use crypto::Digest;
+use nym_crypto::generic_array::typenum::Unsigned;
+use nym_crypto::Digest;
 use nymsphinx::addressing::clients::{Recipient, RecipientBytes};
 use nymsphinx::anonymous_replies::encryption_key::EncryptionKeyDigest;
 use nymsphinx::anonymous_replies::requests::{AnonymousSenderTag, SENDER_TAG_SIZE};

clients/client-core/src/error.rs

@@ -1,8 +1,8 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::asymmetric::identity::Ed25519RecoveryError;
 use gateway_client::error::GatewayClientError;
+use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use topology::NymTopologyError;
 use validator_client::ValidatorClientError;
 

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

@@ -7,11 +7,11 @@ use crate::{
     error::ClientCoreError,
 };
 use config::NymConfig;
-use crypto::asymmetric::identity;
 #[cfg(target_arch = "wasm32")]
 use gateway_client::wasm_mockups::SigningNyxdClient;
 use gateway_client::GatewayClient;
 use gateway_requests::registration::handshake::SharedKeys;
+use nym_crypto::asymmetric::identity;
 use rand::{seq::SliceRandom, thread_rng};
 use std::{sync::Arc, time::Duration};
 use tap::TapFallible;

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

@@ -11,7 +11,7 @@ use serde::Serialize;
 use tap::TapFallible;
 
 use config::NymConfig;
-use crypto::asymmetric::{encryption, identity};
+use nym_crypto::asymmetric::{encryption, identity};
 use url::Url;
 
 use crate::client::key_manager::KeyManager;
@@ -188,7 +188,7 @@ where
         pathfinder: &ClientKeyPathfinder,
     ) -> Result<identity::KeyPair, ClientCoreError> {
         let identity_keypair: identity::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
                 pathfinder.private_identity_key().to_owned(),
                 pathfinder.public_identity_key().to_owned(),
             ))
@@ -200,7 +200,7 @@ where
         pathfinder: &ClientKeyPathfinder,
     ) -> Result<encryption::KeyPair, ClientCoreError> {
         let sphinx_keypair: encryption::KeyPair =
-            pemstore::load_keypair(&pemstore::KeyPairPath::new(
+            nym_pemstore::load_keypair(&nym_pemstore::KeyPairPath::new(
                 pathfinder.private_encryption_key().to_owned(),
                 pathfinder.public_encryption_key().to_owned(),
             ))

clients/credential/Cargo.toml

@@ -20,9 +20,9 @@ config = { path = "../../common/config" }
 completions = { path = "../../common/completions" }
 credentials = { path = "../../common/credentials" }
 credential-storage = { path = "../../common/credential-storage" }
-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
+nym-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] }
 logging = { path = "../../common/logging"}
 network-defaults = { path = "../../common/network-defaults" }
-pemstore = { path = "../../common/pemstore" }
+nym-pemstore = { path = "../../common/pemstore" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }
 

clients/credential/src/commands.rs

@@ -12,8 +12,8 @@ use credential_storage::storage::Storage;
 use credential_storage::PersistentStorage;
 use credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES};
 use credentials::coconut::utils::obtain_aggregate_signature;
-use crypto::asymmetric::{encryption, identity};
 use network_defaults::VOUCHER_INFO;
+use nym_crypto::asymmetric::{encryption, identity};
 use validator_client::nyxd::traits::DkgQueryClient;
 use validator_client::nyxd::tx::Hash;
 use validator_client::nyxd::CosmWasmClient;

clients/credential/src/error.rs

@@ -6,8 +6,8 @@ use thiserror::Error;
 
 use credential_storage::error::StorageError;
 use credentials::error::Error as CredentialError;
-use crypto::asymmetric::encryption::KeyRecoveryError;
-use crypto::asymmetric::identity::Ed25519RecoveryError;
+use nym_crypto::asymmetric::encryption::KeyRecoveryError;
+use nym_crypto::asymmetric::identity::Ed25519RecoveryError;
 use validator_client::nyxd::error::NyxdError;
 use validator_client::ValidatorClientError;
 

clients/credential/src/state.rs

@@ -4,7 +4,7 @@
 use coconut_interface::Parameters;
 use credentials::coconut::bandwidth::BandwidthVoucher;
 
-use crypto::asymmetric::{encryption, identity};
+use nym_crypto::asymmetric::{encryption, identity};
 
 pub(crate) struct KeyPair {
     pub public_key: String,

clients/native/Cargo.toml

@@ -42,13 +42,13 @@ config = { path = "../../common/config" }
 completions = { path = "../../common/completions" }
 credential-storage = { path = "../../common/credential-storage" }
 credentials = { path = "../../common/credentials" }
-crypto = { path = "../../common/crypto" }
+nym-crypto = { path = "../../common/crypto" }
 logging = { path = "../../common/logging"}
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 network-defaults = { path = "../../common/network-defaults" }
 nymsphinx = { path = "../../common/nymsphinx" }
-pemstore = { path = "../../common/pemstore" }
+nym-pemstore = { path = "../../common/pemstore" }
 task = { path = "../../common/task" }
 topology = { path = "../../common/topology" }
 validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] }

clients/native/src/commands/init.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 use clap::Args;
 use config::NymConfig;
-use crypto::asymmetric::identity;
+use nym_crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;

clients/native/src/commands/run.rs

@@ -12,8 +12,8 @@ use crate::{
 
 use clap::Args;
 use config::NymConfig;
-use crypto::asymmetric::identity;
 use log::*;
+use nym_crypto::asymmetric::identity;
 use version_checker::is_minor_version_compatible;
 
 #[derive(Args, Clone)]

clients/socks5/Cargo.toml

@@ -36,14 +36,14 @@ completions = { path = "../../common/completions" }
 credential-storage = { path = "../../common/credential-storage", optional = true }
 mobile-storage = { path = "../../common/mobile-storage", optional = true }
 credentials = { path = "../../common/credentials" }
-crypto = { path = "../../common/crypto" }
+nym-crypto = { path = "../../common/crypto" }
 logging = { path = "../../common/logging"}
 gateway-client = { path = "../../common/client-libs/gateway-client" }
 gateway-requests = { path = "../../gateway/gateway-requests" }
 network-defaults = { path = "../../common/network-defaults" }
 nymsphinx = { path = "../../common/nymsphinx" }
 ordered-buffer = { path = "../../common/socks5/ordered-buffer" }
-pemstore = { path = "../../common/pemstore" }
+nym-pemstore = { path = "../../common/pemstore" }
 proxy-helpers = { path = "../../common/socks5/proxy-helpers" }
 service-providers-common = { path = "../../service-providers/common" }
 socks5-requests = { path = "../../common/socks5/requests" }

clients/socks5/src/commands/init.rs

@@ -8,7 +8,7 @@ use crate::{
 };
 use clap::Args;
 use config::NymConfig;
-use crypto::asymmetric::identity;
+use nym_crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use serde::Serialize;
 use std::fmt::Display;

clients/socks5/src/commands/run.rs

@@ -9,8 +9,8 @@ use crate::{
 
 use clap::Args;
 use config::NymConfig;
-use crypto::asymmetric::identity;
 use log::*;
+use nym_crypto::asymmetric::identity;
 use nymsphinx::addressing::clients::Recipient;
 use version_checker::is_minor_version_compatible;
 

clients/webassembly/Cargo.toml

@@ -34,7 +34,7 @@ client-core = { path = "../client-core", default-features = false, features = ["
 client-connections = { path = "../../common/client-connections" }
 coconut-interface = { path = "../../common/coconut-interface" }
 credentials = { path = "../../common/credentials" }
-crypto = { path = "../../common/crypto" }
+nym-crypto = { path = "../../common/crypto" }
 nymsphinx = { path = "../../common/nymsphinx" }
 topology = { path = "../../common/topology" }
 gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm"] }

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

@@ -20,11 +20,11 @@ tokio = { version = "1.24.1", features = ["macros"] }
 # internal
 coconut-interface = { path = "../../coconut-interface" }
 credentials = { path = "../../credentials" }
-crypto = { path = "../../crypto" }
+nym-crypto = { path = "../../crypto" }
 gateway-requests = { path = "../../../gateway/gateway-requests" }
 network-defaults = { path = "../../network-defaults" }
 nymsphinx = { path = "../../nymsphinx" }
-pemstore = { path = "../../pemstore" }
+nym-pemstore = { path = "../../pemstore" }
 validator-client = { path = "../validator-client" }
 task = { path = "../../task" }
 serde = { version = "1.0", features = ["derive"]}

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

@@ -10,7 +10,6 @@ pub use crate::packet_router::{
 use crate::socket_state::{PartiallyDelegated, SocketState};
 use crate::{cleanup_socket_message, try_decrypt_binary_message};
 use coconut_interface::Credential;
-use crypto::asymmetric::identity;
 use futures::{SinkExt, StreamExt};
 use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes;
 use gateway_requests::iv::IV;
@@ -18,6 +17,7 @@ use gateway_requests::registration::handshake::{client_handshake, SharedKeys};
 use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse, PROTOCOL_VERSION};
 use log::*;
 use network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN};
+use nym_crypto::asymmetric::identity;
 use nymsphinx::forwarding::packet::MixPacket;
 use rand::rngs::OsRng;
 use std::convert::TryFrom;

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

@@ -12,13 +12,13 @@ base64 = "0.13"
 colored = "2.0"
 
 coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" }
-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
-mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
-vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
+nym-contracts-common = { path = "../../cosmwasm-smart-contracts/contracts-common" }
+nym-mixnet-contract-common = { path= "../../cosmwasm-smart-contracts/mixnet-contract" }
+nym-vesting-contract-common = { path= "../../cosmwasm-smart-contracts/vesting-contract" }
 coconut-bandwidth-contract-common = { path= "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" }
 group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" }
-vesting-contract = { path = "../../../contracts/vesting" }
+nym-vesting-contract = { path = "../../../contracts/vesting" }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 reqwest = { version = "0.11", features = ["json"] }

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

@@ -4,9 +4,6 @@
 use crate::{nym_api, ValidatorClientError};
 use coconut_dkg_common::types::NodeIndex;
 use coconut_interface::VerificationKey;
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::MixId;
-use mixnet_contract_common::{GatewayBond, IdentityKeyRef};
 use nym_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
@@ -14,6 +11,9 @@ use nym_api_requests::models::{
     GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse,
     RewardEstimationResponse, StakeSaturationResponse,
 };
+use nym_mixnet_contract_common::mixnode::MixNodeDetails;
+use nym_mixnet_contract_common::MixId;
+use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef};
 
 #[cfg(feature = "nyxd-client")]
 use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient, MultisigQueryClient};
@@ -30,17 +30,17 @@ use coconut_interface::Base58;
 #[cfg(feature = "nyxd-client")]
 use cw3::ProposalResponse;
 #[cfg(feature = "nyxd-client")]
-use mixnet_contract_common::{
+use network_defaults::NymNetworkDetails;
+#[cfg(feature = "nyxd-client")]
+use nym_api_requests::models::MixNodeBondAnnotated;
+#[cfg(feature = "nyxd-client")]
+use nym_mixnet_contract_common::{
     families::{Family, FamilyHead},
     mixnode::MixNodeBond,
     pending_events::{PendingEpochEvent, PendingIntervalEvent},
     Delegation, IdentityKey, RewardedSetNodeStatus, UnbondedMixnode,
 };
 #[cfg(feature = "nyxd-client")]
-use network_defaults::NymNetworkDetails;
-#[cfg(feature = "nyxd-client")]
-use nym_api_requests::models::MixNodeBondAnnotated;
-#[cfg(feature = "nyxd-client")]
 use std::str::FromStr;
 use url::Url;
 

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

@@ -3,8 +3,6 @@
 
 use crate::nym_api::error::NymAPIError;
 use crate::nym_api::routes::{CORE_STATUS_COUNT, SINCE_ARG};
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use nym_api_requests::coconut::{
     BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse,
 };
@@ -15,6 +13,8 @@ use nym_api_requests::models::{
     MixnodeUptimeHistoryResponse, RequestError, RewardEstimationResponse, StakeSaturationResponse,
     UptimeResponse,
 };
+use nym_mixnet_contract_common::mixnode::MixNodeDetails;
+use nym_mixnet_contract_common::{GatewayBond, IdentityKeyRef, MixId};
 use reqwest::Response;
 use serde::{Deserialize, Serialize};
 use url::Url;

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

@@ -17,13 +17,13 @@ use cosmrs::rpc::HttpClientUrl;
 use cosmrs::tx::Msg;
 use execute::execute;
 use log::debug;
-use mixnet_contract_common::MixId;
 use network_defaults::{ChainDetails, NymNetworkDetails};
+use nym_mixnet_contract_common::MixId;
+use nym_vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
+use nym_vesting_contract_common::PledgeCap;
 use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::time::SystemTime;
-use vesting_contract_common::ExecuteMsg as VestingExecuteMsg;
-use vesting_contract_common::PledgeCap;
 
 pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
 pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient;

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

@@ -8,7 +8,7 @@ use async_trait::async_trait;
 use coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg;
 use coconut_dkg_common::types::EncodedBTEPublicKeyWithProof;
 use coconut_dkg_common::verification_key::VerificationKeyShare;
-use contracts_common::dealings::ContractSafeBytes;
+use nym_contracts_common::dealings::ContractSafeBytes;
 
 #[async_trait]
 pub trait DkgSigningClient {

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

@@ -6,17 +6,17 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
-use mixnet_contract_common::families::Family;
-use mixnet_contract_common::mixnode::{
+use nym_mixnet_contract_common::delegation::{MixNodeDelegationResponse, OwnerProxySubKey};
+use nym_mixnet_contract_common::families::Family;
+use nym_mixnet_contract_common::mixnode::{
     MixNodeDetails, MixnodeRewardingDetailsResponse, PagedMixnodesDetailsResponse,
     PagedUnbondedMixnodesResponse, StakeSaturationResponse, UnbondedMixnodeResponse,
 };
-use mixnet_contract_common::reward_params::{Performance, RewardingParams};
-use mixnet_contract_common::rewarding::{
+use nym_mixnet_contract_common::reward_params::{Performance, RewardingParams};
+use nym_mixnet_contract_common::rewarding::{
     EstimatedCurrentEpochRewardResponse, PendingRewardResponse,
 };
-use mixnet_contract_common::{
+use nym_mixnet_contract_common::{
     delegation, ContractBuildInformation, ContractState, ContractStateParams,
     CurrentIntervalResponse, EpochEventId, GatewayBondResponse, GatewayOwnershipResponse,
     IdentityKey, IntervalEventId, LayerDistribution, MixId, MixOwnershipResponse,

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

@@ -8,9 +8,9 @@ use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient};
 use async_trait::async_trait;
 use cosmrs::AccountId;
-use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
-use mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
-use mixnet_contract_common::{
+use nym_mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
+use nym_mixnet_contract_common::reward_params::{IntervalRewardingParamsUpdate, Performance};
+use nym_mixnet_contract_common::{
     ContractStateParams, ExecuteMsg as MixnetExecuteMsg, Gateway, LayerAssignment, MixId, MixNode,
 };
 

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

@@ -6,16 +6,16 @@ pub use crate::nyxd::cosmwasm_client::client::CosmWasmClient;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::NyxdClient;
 use async_trait::async_trait;
-use contracts_common::ContractBuildInformation;
 use cosmwasm_std::{Coin as CosmWasmCoin, Timestamp};
-use mixnet_contract_common::MixId;
-use serde::Deserialize;
-use vesting_contract::vesting::Account;
-use vesting_contract_common::{
+use nym_contracts_common::ContractBuildInformation;
+use nym_mixnet_contract_common::MixId;
+use nym_vesting_contract_common::{
     messages::QueryMsg as VestingQueryMsg, AccountVestingCoins, AccountsResponse,
     AllDelegationsResponse, BaseVestingAccountInfo, DelegationTimesResponse,
     OriginalVestingResponse, Period, PledgeData, VestingCoinsResponse, VestingDelegation,
 };
+use serde::Deserialize;
+use vesting_contract::vesting::Account;
 
 #[async_trait]
 pub trait VestingQueryClient {

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

@@ -6,10 +6,12 @@ use crate::nyxd::cosmwasm_client::types::ExecuteResult;
 use crate::nyxd::error::NyxdError;
 use crate::nyxd::{Coin, Fee, NyxdClient};
 use async_trait::async_trait;
-use mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
-use mixnet_contract_common::{Gateway, MixId, MixNode};
-use vesting_contract_common::messages::{ExecuteMsg as VestingExecuteMsg, VestingSpecification};
-use vesting_contract_common::PledgeCap;
+use nym_mixnet_contract_common::mixnode::{MixNodeConfigUpdate, MixNodeCostParams};
+use nym_mixnet_contract_common::{Gateway, MixId, MixNode};
+use nym_vesting_contract_common::messages::{
+    ExecuteMsg as VestingExecuteMsg, VestingSpecification,
+};
+use nym_vesting_contract_common::PledgeCap;
 
 #[async_trait]
 pub trait VestingSigningClient {

common/commands/Cargo.toml

@@ -30,8 +30,8 @@ cosmwasm-std = { version = "1.0.0" }
 
 validator-client = { path = "../client-libs/validator-client", features = ["nyxd-client"] }
 network-defaults = { path = "../network-defaults" }
-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
-vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" }
+nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+nym-vesting-contract-common = { path = "../cosmwasm-smart-contracts/vesting-contract" }
 coconut-bandwidth-contract-common = { path = "../cosmwasm-smart-contracts/coconut-bandwidth-contract" }
 coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" }
 multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" }

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

@@ -5,7 +5,7 @@ use clap::Parser;
 use log::{debug, info};
 
 use cosmwasm_std::Decimal;
-use mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
+use nym_mixnet_contract_common::{InitialRewardingParams, InstantiateMsg, Percent};
 use std::str::FromStr;
 use std::time::Duration;
 use validator_client::nyxd::AccountId;

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

@@ -6,8 +6,8 @@ use std::str::FromStr;
 use clap::Parser;
 use log::{debug, info};
 
+use nym_vesting_contract_common::InitMsg;
 use validator_client::nyxd::AccountId;
-use vesting_contract_common::InitMsg;
 
 #[derive(Debug, Parser)]
 pub struct Args {

common/commands/src/validator/mixnet/delegators/delegate_to_mixnode.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::{Coin, MixId};
+use nym_mixnet_contract_common::{Coin, MixId};
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/delegators/query_for_delegations.rs

@@ -9,7 +9,7 @@ use crate::utils::{pretty_cosmwasm_coin, show_error_passthrough};
 
 use comfy_table::Table;
 use cosmwasm_std::Addr;
-use mixnet_contract_common::{Delegation, PendingEpochEvent, PendingEpochEventKind};
+use nym_mixnet_contract_common::{Delegation, PendingEpochEvent, PendingEpochEventKind};
 
 #[derive(Debug, Parser)]
 pub struct Args {}

common/commands/src/validator/mixnet/delegators/rewards/claim_delegator_reward.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixId;
+use nym_mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/delegators/rewards/vesting_claim_delegator_reward.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixId;
+use nym_mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/delegators/undelegate_from_mixnode.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixId;
+use nym_mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/delegators/vesting_delegate_to_mixnode.rs

@@ -4,7 +4,7 @@
 use clap::Parser;
 use log::info;
 
-use mixnet_contract_common::{Coin, MixId};
+use nym_mixnet_contract_common::{Coin, MixId};
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;
 

common/commands/src/validator/mixnet/delegators/vesting_undelegate_from_mixnode.rs

@@ -3,7 +3,7 @@
 
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixId;
+use nym_mixnet_contract_common::MixId;
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;
 

common/commands/src/validator/mixnet/operators/gateway/bond_gateway.rs

@@ -4,8 +4,8 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::{info, warn};
-use mixnet_contract_common::Coin;
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
+use nym_mixnet_contract_common::Coin;
 use validator_client::nyxd::traits::MixnetSigningClient;
 
 #[derive(Debug, Parser)]
@@ -55,7 +55,7 @@ pub async fn bond_gateway(args: Args, client: SigningClient) {
         return;
     }
 
-    let gateway = mixnet_contract_common::Gateway {
+    let gateway = nym_mixnet_contract_common::Gateway {
         host: args.host,
         mix_port: args.mix_port.unwrap_or(DEFAULT_MIX_LISTENING_PORT),
         clients_port: args.clients_port.unwrap_or(DEFAULT_CLIENT_LISTENING_PORT),

common/commands/src/validator/mixnet/operators/gateway/vesting_bond_gateway.rs

@@ -4,8 +4,8 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::{info, warn};
-use mixnet_contract_common::{Coin, Gateway};
 use network_defaults::{DEFAULT_CLIENT_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT};
+use nym_mixnet_contract_common::{Coin, Gateway};
 use validator_client::nyxd::VestingSigningClient;
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/operators/mixnode/bond_mixnode.rs

@@ -5,10 +5,10 @@ use clap::Parser;
 use cosmwasm_std::Uint128;
 use log::{info, warn};
 
-use mixnet_contract_common::{Coin, MixNodeCostParams, Percent};
 use network_defaults::{
     DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
+use nym_mixnet_contract_common::{Coin, MixNodeCostParams, Percent};
 use validator_client::nyxd::traits::MixnetSigningClient;
 use validator_client::nyxd::CosmWasmCoin;
 
@@ -70,7 +70,7 @@ pub async fn bond_mixnode(args: Args, client: SigningClient) {
         return;
     }
 
-    let mixnode = mixnet_contract_common::MixNode {
+    let mixnode = nym_mixnet_contract_common::MixNode {
         host: args.host,
         mix_port: args.mix_port.unwrap_or(DEFAULT_MIX_LISTENING_PORT),
         verloc_port: args.verloc_port.unwrap_or(DEFAULT_VERLOC_LISTENING_PORT),

common/commands/src/validator/mixnet/operators/mixnode/settings/update_config.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixNodeConfigUpdate;
+use nym_mixnet_contract_common::MixNodeConfigUpdate;
 use validator_client::nyxd::traits::{MixnetQueryClient, MixnetSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/mixnet/operators/mixnode/settings/vesting_update_config.rs

@@ -4,7 +4,7 @@
 use crate::context::SigningClient;
 use clap::Parser;
 use log::info;
-use mixnet_contract_common::MixNodeConfigUpdate;
+use nym_mixnet_contract_common::MixNodeConfigUpdate;
 use validator_client::nyxd::traits::MixnetQueryClient;
 use validator_client::nyxd::VestingSigningClient;
 

common/commands/src/validator/mixnet/operators/mixnode/vesting_bond_mixnode.rs

@@ -5,11 +5,11 @@ use crate::context::SigningClient;
 use clap::Parser;
 use cosmwasm_std::Uint128;
 use log::{info, warn};
-use mixnet_contract_common::{Coin, MixNodeCostParams};
-use mixnet_contract_common::{MixNode, Percent};
 use network_defaults::{
     DEFAULT_HTTP_API_LISTENING_PORT, DEFAULT_MIX_LISTENING_PORT, DEFAULT_VERLOC_LISTENING_PORT,
 };
+use nym_mixnet_contract_common::{Coin, MixNodeCostParams};
+use nym_mixnet_contract_common::{MixNode, Percent};
 use validator_client::nyxd::{CosmWasmCoin, VestingSigningClient};
 
 #[derive(Debug, Parser)]

common/commands/src/validator/vesting/create_vesting_schedule.rs

@@ -6,13 +6,13 @@ use std::str::FromStr;
 use clap::Parser;
 use log::info;
 
-use mixnet_contract_common::Coin;
 use network_defaults::NymNetworkDetails;
+use nym_mixnet_contract_common::Coin;
+use nym_vesting_contract_common::messages::VestingSpecification;
+use nym_vesting_contract_common::PledgeCap;
 use validator_client::nyxd::AccountId;
 use validator_client::nyxd::VestingSigningClient;
 use validator_client::nyxd::{CosmosCoin, Denom};
-use vesting_contract_common::messages::VestingSpecification;
-use vesting_contract_common::PledgeCap;
 
 use crate::context::SigningClient;
 

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

@@ -11,5 +11,5 @@ cw-utils = "0.13.4"
 schemars = "0.8"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 
-contracts-common = { path = "../contracts-common" }
-multisig-contract-common = { path = "../multisig-contract" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
+multisig-contract-common = { path = "../multisig-contract" }

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

@@ -1,5 +1,5 @@
 [package]
-name = "contracts-common"
+name = "nym-contracts-common"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
@@ -15,4 +15,4 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "1"
 
 [dev-dependencies]
-serde_json = "1.0.0"
+serde_json = "1.0.0"

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

@@ -1,5 +1,5 @@
 [package]
-name = "mixnet-contract-common"
+name = "nym-mixnet-contract-common"
 version = "0.1.0"
 authors = ["Jędrzej Stuczyński <andrew@nymtech.net>"]
 edition = "2021"
@@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_repr = "0.1"
 schemars = "0.8"
 thiserror = "1.0"
-contracts-common = { path = "../contracts-common" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
 serde_json = "1.0.0"
 humantime-serde = "1.1.1"
 

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

@@ -1,12 +1,12 @@
 [package]
-name = "vesting-contract-common"
+name = "nym-vesting-contract-common"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 cosmwasm-std = "1.0.0"
-mixnet-contract-common = { path = "../mixnet-contract" }
-contracts-common = { path = "../contracts-common" }
+mixnet-contract-common = { path = "../mixnet-contract", package = "nym-mixnet-contract-common" }
+contracts-common = { path = "../contracts-common", package = "nym-contracts-common" }
 serde = { version = "1.0", features = ["derive"] }
 schemars = "0.8"
 ts-rs = {version = "6.1.2", optional = true}

common/credentials/Cargo.toml

@@ -12,7 +12,7 @@ thiserror = "1.0"
 
 # I guess temporarily until we get serde support in coconut up and running
 coconut-interface = { path = "../coconut-interface" }
-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
+nym-crypto = { path = "../crypto", features = ["rand", "asymmetric", "symmetric", "hashing"] }
 nym-api-requests = { path = "../../nym-api/nym-api-requests" }
 validator-client = { path = "../client-libs/validator-client" }
 

common/credentials/src/coconut/bandwidth.rs

@@ -10,7 +10,7 @@ use coconut_interface::{
     hash_to_scalar, prepare_blind_sign, Attribute, BlindSignRequest, Credential, Parameters,
     PrivateAttribute, PublicAttribute, Signature, VerificationKey,
 };
-use crypto::asymmetric::{encryption, identity};
+use nym_crypto::asymmetric::{encryption, identity};
 
 use cosmrs::tx::Hash;
 

common/credentials/src/coconut/params.rs

@@ -1,9 +1,9 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::aes::Aes128;
-use crypto::blake3;
-use crypto::ctr;
+use nym_crypto::aes::Aes128;
+use nym_crypto::blake3;
+use nym_crypto::ctr;
 
 type Aes128Ctr = ctr::Ctr64LE<Aes128>;
 

common/credentials/src/coconut/utils.rs

@@ -5,10 +5,10 @@ use coconut_interface::{
     aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute,
     BlindedSignature, Credential, Parameters, Signature, SignatureShare, VerificationKey,
 };
-use crypto::asymmetric::encryption::PublicKey;
-use crypto::shared_key::recompute_shared_key;
-use crypto::symmetric::stream_cipher;
 use nym_api_requests::coconut::BlindSignRequestBody;
+use nym_crypto::asymmetric::encryption::PublicKey;
+use nym_crypto::shared_key::recompute_shared_key;
+use nym_crypto::symmetric::stream_cipher;
 use validator_client::client::CoconutApiClient;
 
 use crate::coconut::bandwidth::{BandwidthVoucher, PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES};

common/credentials/src/error.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use coconut_interface::CoconutError;
-use crypto::asymmetric::encryption::KeyRecoveryError;
+use nym_crypto::asymmetric::encryption::KeyRecoveryError;
 use validator_client::ValidatorClientError;
 
 use thiserror::Error;

common/crypto/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "crypto"
+name = "nym-crypto"
 version = "0.1.0"
 authors = ["Jedrzej Stuczynski <andrew@nymtech.net"]
 edition = "2021"
@@ -26,7 +26,7 @@ thiserror = "1.0.37"
 
 # internal
 nymsphinx-types = { path = "../nymsphinx/types" }
-pemstore = { path = "../../common/pemstore" }
+nym-pemstore = { path = "../../common/pemstore" }
 
 [dev-dependencies]
 rand_chacha = "0.2"

common/crypto/dkg/Cargo.toml

@@ -25,7 +25,7 @@ serde_derive = "1.0"
 thiserror = "1.0"
 zeroize = { version = "1.4", features = ["zeroize_derive"] }
 
-pemstore = { path = "../../pemstore" }
+nym-pemstore = { path = "../../pemstore" }
 
 [dependencies.group]
 version = "0.11"

common/crypto/dkg/src/bte/keys.rs

@@ -8,7 +8,7 @@ use crate::utils::{deserialize_g1, deserialize_g2, deserialize_scalar};
 use bls12_381::{G1Projective, G2Projective, Scalar};
 use ff::Field;
 use group::GroupEncoding;
-use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use rand_core::RngCore;
 use zeroize::Zeroize;
 

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

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
 use thiserror::Error;
 

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

@@ -4,8 +4,8 @@
 pub use ed25519_dalek::ed25519::signature::Signature as SignatureTrait;
 pub use ed25519_dalek::SignatureError;
 pub use ed25519_dalek::{Verifier, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SIGNATURE_LENGTH};
+use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use nymsphinx_types::{DestinationAddressBytes, DESTINATION_ADDRESS_LENGTH};
-use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use thiserror::Error;

common/mixnode-common/Cargo.toml

@@ -18,7 +18,7 @@ tokio-util = { version = "0.7.4", features = ["codec"] }
 url = "2.2"
 thiserror = "1.0.37"
 
-crypto =  { path = "../crypto" }
+nym-crypto =  { path = "../crypto" }
 network-defaults = { path = "../network-defaults" }
 nymsphinx-acknowledgements = { path = "../nymsphinx/acknowledgements" }
 nymsphinx-addressing = { path = "../nymsphinx/addressing" }

common/mixnode-common/src/verloc/listener.rs

@@ -4,9 +4,9 @@
 use crate::verloc::error::RttError;
 use crate::verloc::packet::{EchoPacket, ReplyPacket};
 use bytes::{BufMut, BytesMut};
-use crypto::asymmetric::identity;
 use futures::StreamExt;
 use log::*;
+use nym_crypto::asymmetric::identity;
 use std::fmt::{Display, Formatter};
 use std::net::SocketAddr;
 use std::sync::Arc;

common/mixnode-common/src/verloc/measurement.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::asymmetric::identity;
+use nym_crypto::asymmetric::identity;
 use serde::{Serialize, Serializer};
 use std::cmp::Ordering;
 use std::fmt::{self, Display, Formatter};

common/mixnode-common/src/verloc/mod.rs

@@ -3,11 +3,11 @@
 
 use crate::verloc::listener::PacketListener;
 use crate::verloc::sender::{PacketSender, TestedNode};
-use crypto::asymmetric::identity;
 use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use log::*;
 use network_defaults::mainnet::NYM_API;
+use nym_crypto::asymmetric::identity;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 use std::net::SocketAddr;

common/mixnode-common/src/verloc/packet.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::verloc::error::RttError;
-use crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH};
+use nym_crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH, SIGNATURE_LENGTH};
 use std::convert::TryInto;
 
 pub(crate) struct EchoPacket {

common/mixnode-common/src/verloc/sender.rs

@@ -4,8 +4,8 @@
 use crate::verloc::error::RttError;
 use crate::verloc::measurement::Measurement;
 use crate::verloc::packet::{EchoPacket, ReplyPacket};
-use crypto::asymmetric::identity;
 use log::*;
+use nym_crypto::asymmetric::identity;
 use rand::{thread_rng, Rng};
 use std::net::SocketAddr;
 use std::sync::Arc;

common/nymcoconut/Cargo.toml

@@ -18,7 +18,7 @@ bs58 = "0.4.0"
 sha2 = "0.9"
 
 dkg = { path = "../crypto/dkg" }
-pemstore = { path = "../pemstore" }
+nym-pemstore = { path = "../pemstore" }
 
 [dependencies.ff]
 version = "0.11"

common/nymcoconut/src/scheme/keygen.rs

@@ -9,7 +9,7 @@ use std::convert::TryInto;
 
 use bls12_381::{G1Projective, G2Projective, Scalar};
 use group::Curve;
-use pemstore::traits::{PemStorableKey, PemStorableKeyPair};
+use nym_pemstore::traits::{PemStorableKey, PemStorableKeyPair};
 use serde_derive::{Deserialize, Serialize};
 
 use crate::error::{CoconutError, Result};

common/nymsphinx/Cargo.toml

@@ -22,11 +22,11 @@ nymsphinx-types = { path = "types" }
 
 # those dependencies are due to intriducing preparer and receiver. Perpaphs that indicates they should be moved
 # to separate crate?
-crypto = { path = "../crypto" }
+nym-crypto = { path = "../crypto" }
 topology = { path = "../topology" }
 
 [dev-dependencies]
-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
 
 # do not include this when compiling into wasm as it somehow when combined together with reqwest, it will require
 # net2 via tokio-util -> tokio -> mio -> net2

common/nymsphinx/acknowledgements/Cargo.toml

@@ -10,11 +10,11 @@ edition = "2021"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 thiserror = "1.0.37"
 
-crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
+nym-crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-types = { path = "../types" }
-pemstore = { path = "../../pemstore" }
+nym-pemstore = { path = "../../pemstore" }
 topology = { path = "../../topology" }
 
 

common/nymsphinx/acknowledgements/src/identifier.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::AckKey;
-use crypto::symmetric::stream_cipher::{self, encrypt, iv_from_slice, random_iv, IvSizeUser};
+use nym_crypto::symmetric::stream_cipher::{self, encrypt, iv_from_slice, random_iv, IvSizeUser};
 use nymsphinx_params::{
     packet_sizes::PacketSize, AckEncryptionAlgorithm, SerializedFragmentIdentifier, FRAG_ID_LEN,
 };

common/nymsphinx/acknowledgements/src/key.rs

@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::symmetric::stream_cipher::{generate_key, CipherKey, KeySizeUser};
+use nym_crypto::symmetric::stream_cipher::{generate_key, CipherKey, KeySizeUser};
+use nym_pemstore::traits::PemStorableKey;
 use nymsphinx_params::AckEncryptionAlgorithm;
-use pemstore::traits::PemStorableKey;
 use rand::{CryptoRng, RngCore};
 use std::fmt::{self, Display, Formatter};
 

common/nymsphinx/addressing/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
+nym-crypto = { path = "../../crypto", features = ["asymmetric"] } # all addresses are expressed in terms on their crypto keys
 nymsphinx-types = { path = "../types" } # we need to be able to refer to some types defined inside sphinx crate
 serde = "1.0" # implementing serialization/deserialization for some types, like `Recipient`
 thiserror = "1.0.37"

common/nymsphinx/addressing/src/clients.rs

@@ -5,7 +5,7 @@
 // it's already destructed).
 
 use crate::nodes::{NodeIdentity, NODE_IDENTITY_SIZE};
-use crypto::asymmetric::{encryption, identity};
+use nym_crypto::asymmetric::{encryption, identity};
 use nymsphinx_types::Destination;
 use serde::de::{Error as SerdeError, Unexpected, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};

common/nymsphinx/addressing/src/nodes.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::asymmetric::identity;
+use nym_crypto::asymmetric::identity;
 use nymsphinx_types::{NodeAddressBytes, NODE_ADDRESS_LENGTH};
 use std::convert::{TryFrom, TryInto};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};

common/nymsphinx/anonymous-replies/Cargo.toml

@@ -12,11 +12,11 @@ bs58 = "0.4"
 serde = "1.0"
 thiserror = "1"
 
-crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
+nym-crypto = { path = "../../crypto", features = ["symmetric", "rand"] }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-params = { path = "../params" }
 nymsphinx-types = { path = "../types" }
 topology = { path = "../../topology" }
 
 [target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen]
-version = "0.2.83"
+version = "0.2.83"

common/nymsphinx/anonymous-replies/src/encryption_key.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::{
+use nym_crypto::{
     crypto_hash,
     generic_array::{typenum::Unsigned, GenericArray},
     symmetric::stream_cipher::{generate_key, CipherKey, KeySizeUser},

common/nymsphinx/anonymous-replies/src/reply_surb.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::encryption_key::{SurbEncryptionKey, SurbEncryptionKeyError, SurbEncryptionKeySize};
-use crypto::{generic_array::typenum::Unsigned, Digest};
+use nym_crypto::{generic_array::typenum::Unsigned, Digest};
 use nymsphinx_addressing::clients::Recipient;
 use nymsphinx_addressing::nodes::{NymNodeRoutingAddress, MAX_NODE_ADDRESS_UNPADDED_LEN};
 use nymsphinx_params::packet_sizes::PacketSize;

common/nymsphinx/cover/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 thiserror = "1.0.37"
 
-crypto = { path = "../../crypto" }
+nym-crypto = { path = "../../crypto" }
 nymsphinx-acknowledgements = { path = "../acknowledgements" }
 nymsphinx-addressing = { path = "../addressing" }
 nymsphinx-chunking = { path = "../chunking" }

common/nymsphinx/cover/src/lib.rs

@@ -1,8 +1,8 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::shared_key::new_ephemeral_shared_key;
-use crypto::symmetric::stream_cipher;
+use nym_crypto::shared_key::new_ephemeral_shared_key;
+use nym_crypto::symmetric::stream_cipher;
 use nymsphinx_acknowledgements::surb_ack::SurbAck;
 use nymsphinx_acknowledgements::AckKey;
 use nymsphinx_addressing::clients::Recipient;

common/nymsphinx/params/Cargo.toml

@@ -9,5 +9,5 @@ edition = "2021"
 [dependencies]
 thiserror = "1.0.37"
 
-crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
+nym-crypto = { path = "../../crypto", features = ["hashing", "symmetric"] }
 nymsphinx-types = { path = "../types" }

common/nymsphinx/params/src/lib.rs

@@ -1,9 +1,9 @@
 // Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::aes::Aes128;
-use crypto::blake3;
-use crypto::ctr;
+use nym_crypto::aes::Aes128;
+use nym_crypto::blake3;
+use nym_crypto::ctr;
 
 type Aes128Ctr = ctr::Ctr64BE<Aes128>;
 

common/nymsphinx/src/message.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::chunking;
-use crypto::asymmetric::encryption;
-use crypto::Digest;
+use nym_crypto::asymmetric::encryption;
+use nym_crypto::Digest;
 use nymsphinx_addressing::clients::Recipient;
 use nymsphinx_addressing::nodes::MAX_NODE_ADDRESS_UNPADDED_LEN;
 use nymsphinx_anonymous_replies::requests::{

common/nymsphinx/src/preparer/payload.rs

@@ -1,11 +1,11 @@
 // Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
-use crypto::aes::cipher::{KeyIvInit, StreamCipher};
-use crypto::asymmetric::encryption;
-use crypto::shared_key::new_ephemeral_shared_key;
-use crypto::symmetric::stream_cipher;
-use crypto::symmetric::stream_cipher::CipherKey;
+use nym_crypto::aes::cipher::{KeyIvInit, StreamCipher};
+use nym_crypto::asymmetric::encryption;
+use nym_crypto::shared_key::new_ephemeral_shared_key;
+use nym_crypto::symmetric::stream_cipher;
+use nym_crypto::symmetric::stream_cipher::CipherKey;
 use nymsphinx_acknowledgements::surb_ack::SurbAck;
 use nymsphinx_anonymous_replies::SurbEncryptionKey;
 use nymsphinx_chunking::fragment::Fragment;

common/nymsphinx/src/receiver.rs

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::message::{NymMessage, NymMessageError, PaddedMessage, PlainMessage};
-use crypto::aes::cipher::{KeyIvInit, StreamCipher};
-use crypto::asymmetric::encryption;
-use crypto::shared_key::recompute_shared_key;
-use crypto::symmetric::stream_cipher;
-use crypto::symmetric::stream_cipher::CipherKey;
+use nym_crypto::aes::cipher::{KeyIvInit, StreamCipher};
+use nym_crypto::asymmetric::encryption;
+use nym_crypto::shared_key::recompute_shared_key;
+use nym_crypto::symmetric::stream_cipher;
+use nym_crypto::symmetric::stream_cipher::CipherKey;
 use nymsphinx_anonymous_replies::requests::AnonymousSenderTag;
 use nymsphinx_anonymous_replies::SurbEncryptionKey;
 use nymsphinx_chunking::fragment::Fragment;
@@ -184,8 +184,8 @@ impl Default for MessageReceiver {
 #[cfg(test)]
 mod message_receiver {
     use super::*;
-    use crypto::asymmetric::identity;
-    use mixnet_contract_common::Layer;
+    use nym_crypto::asymmetric::identity;
+    use nym_mixnet_contract_common::Layer;
     use std::collections::HashMap;
     use topology::{gateway, mix, NymTopology};
 

common/pemstore/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pemstore"
+name = "nym-pemstore"
 version = "0.1.0"
 authors = ["Jedrzej Stuczynski <andrew@nymtech.net>"]
 edition = "2021"

common/topology/Cargo.toml

@@ -13,8 +13,8 @@ rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 thiserror = "1.0.37"
 
 ## internal
-crypto = { path = "../crypto" }
-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
+nym-crypto = { path = "../crypto" }
+nym-mixnet-contract-common = { path = "../cosmwasm-smart-contracts/mixnet-contract" }
 nymsphinx-addressing = { path = "../nymsphinx/addressing" }
 nymsphinx-types = { path = "../nymsphinx/types" }
 version-checker = { path = "../version-checker" }

common/topology/src/gateway.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{filter, NetworkAddress};
-use crypto::asymmetric::{encryption, identity};
-use mixnet_contract_common::GatewayBond;
+use nym_crypto::asymmetric::{encryption, identity};
+use nym_mixnet_contract_common::GatewayBond;
 use nymsphinx_addressing::nodes::{NodeIdentity, NymNodeRoutingAddress};
 use nymsphinx_types::Node as SphinxNode;
 use std::convert::{TryFrom, TryInto};

common/topology/src/lib.rs

@@ -3,8 +3,8 @@
 
 use crate::filter::VersionFilterable;
 use log::warn;
-use mixnet_contract_common::mixnode::MixNodeDetails;
-use mixnet_contract_common::GatewayBond;
+use nym_mixnet_contract_common::mixnode::MixNodeDetails;
+use nym_mixnet_contract_common::GatewayBond;
 use nymsphinx_addressing::nodes::NodeIdentity;
 use nymsphinx_types::Node as SphinxNode;
 use rand::Rng;
@@ -303,10 +303,10 @@ mod converting_mixes_to_vec {
 
     #[cfg(test)]
     mod when_nodes_exist {
-        use crypto::asymmetric::{encryption, identity};
+        use nym_crypto::asymmetric::{encryption, identity};
 
         use super::*;
-        use mixnet_contract_common::Layer;
+        use nym_mixnet_contract_common::Layer;
 
         #[test]
         fn returns_a_vec_with_hashmap_values() {

common/topology/src/mix.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{filter, NetworkAddress};
-use crypto::asymmetric::{encryption, identity};
-use mixnet_contract_common::{Layer, MixId, MixNodeBond};
+use nym_crypto::asymmetric::{encryption, identity};
+use nym_mixnet_contract_common::{Layer, MixId, MixNodeBond};
 use nymsphinx_addressing::nodes::NymNodeRoutingAddress;
 use nymsphinx_types::Node as SphinxNode;
 use std::convert::{TryFrom, TryInto};

common/types/Cargo.toml

@@ -25,16 +25,16 @@ cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegr
 validator-client = { path = "../../common/client-libs/validator-client", features = [
     "nyxd-client",
 ] }
-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
+nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" }
+nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" }
 config = { path = "../../common/config" }
 coconut-interface = { path = "../../common/coconut-interface" }
 # Used for Type conversion, can be extracted but its a lot of work
-vesting-contract = { path = "../../contracts/vesting" }
+nym-vesting-contract = { path = "../../contracts/vesting" }
 
 [dev-dependencies]
 tempfile = "3.3.0"
 
 [features]
 default = []
-generate-ts = ["mixnet-contract-common/generate-ts"]
+generate-ts = ["nym-mixnet-contract-common/generate-ts"]

common/types/src/delegation.rs

@@ -3,7 +3,7 @@ use crate::deprecated::DelegationEvent;
 use crate::error::TypesError;
 use crate::mixnode::MixNodeCostParams;
 use cosmwasm_std::Decimal;
-use mixnet_contract_common::{Delegation as MixnetContractDelegation, MixId};
+use nym_mixnet_contract_common::{Delegation as MixnetContractDelegation, MixId};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

common/types/src/deprecated.rs

@@ -4,7 +4,7 @@
 use crate::currency::DecCoin;
 use crate::error::TypesError;
 use crate::pending_events::{PendingEpochEvent, PendingEpochEventData};
-use mixnet_contract_common::{IdentityKey, MixId};
+use nym_mixnet_contract_common::{IdentityKey, MixId};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

common/types/src/gateway.rs

@@ -1,6 +1,6 @@
 use crate::currency::{DecCoin, RegisteredCoins};
 use crate::error::TypesError;
-use mixnet_contract_common::{
+use nym_mixnet_contract_common::{
     Gateway as MixnetContractGateway, GatewayBond as MixnetContractGatewayBond,
 };
 use schemars::JsonSchema;

common/types/src/mixnode.rs

@@ -4,7 +4,7 @@
 use crate::currency::{DecCoin, RegisteredCoins};
 use crate::error::TypesError;
 use cosmwasm_std::Decimal;
-use mixnet_contract_common::{
+use nym_mixnet_contract_common::{
     EpochId, MixId, MixNode, MixNodeBond as MixnetContractMixNodeBond,
     MixNodeCostParams as MixnetContractMixNodeCostParams,
     MixNodeDetails as MixnetContractMixNodeDetails,

common/types/src/pending_events.rs

@@ -4,7 +4,7 @@
 use crate::currency::{DecCoin, RegisteredCoins};
 use crate::error::TypesError;
 use crate::mixnode::MixNodeCostParams;
-use mixnet_contract_common::{
+use nym_mixnet_contract_common::{
     BlockHeight, EpochEventId, IntervalEventId, IntervalRewardingParamsUpdate, MixId,
     PendingEpochEvent as MixnetContractPendingEpochEvent,
     PendingEpochEventKind as MixnetContractPendingEpochEventKind,

common/types/src/vesting.rs

@@ -1,10 +1,10 @@
 use crate::currency::{DecCoin, RegisteredCoins};
 use crate::error::TypesError;
+use nym_vesting_contract_common::OriginalVestingResponse as ContractOriginalVestingResponse;
+use nym_vesting_contract_common::PledgeData as ContractPledgeData;
 use serde::{Deserialize, Serialize};
 use vesting_contract::vesting::Account as ContractVestingAccount;
 use vesting_contract::vesting::VestingPeriod as ContractVestingPeriod;
-use vesting_contract_common::OriginalVestingResponse as ContractOriginalVestingResponse;
-use vesting_contract_common::PledgeData as ContractPledgeData;
 
 #[cfg_attr(feature = "generate-ts", derive(ts_rs::TS))]
 #[cfg_attr(

contracts/Cargo.toml

@@ -1,5 +1,13 @@
 [workspace]
-members = ["coconut-bandwidth", "mixnet", "vesting", "multisig/cw3-flex-multisig", "multisig/cw4-group", "coconut-test", "coconut-dkg"]
+members = [
+    "coconut-bandwidth",
+    "mixnet",
+    "vesting",
+    "multisig/cw3-flex-multisig",
+    "multisig/cw4-group",
+    "coconut-test",
+    "coconut-dkg"
+]
 
 [profile.release]
 opt-level = 3
@@ -10,4 +18,4 @@ debug-assertions = false
 codegen-units = 1
 panic = 'abort'
 incremental = false
-overflow-checks = true
+overflow-checks = true