diff --git a/Cargo.lock b/Cargo.lock index bd1c7007fa..43ed1faa62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -246,14 +246,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "bandwidth-claim-contract" -version = "0.1.0" -dependencies = [ - "schemars", - "serde", -] - [[package]] name = "base16ct" version = "0.1.1" @@ -701,39 +693,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "coconut-bandwidth-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "multisig-contract-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-dkg-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "multisig-contract-common", - "nym-contracts-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-interface" -version = "0.1.0" -dependencies = [ - "bs58", - "getset", - "nymcoconut", - "serde", - "thiserror", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -974,11 +933,11 @@ version = "0.1.0" dependencies = [ "bip39", "clap 4.1.4", - "coconut-interface", - "credential-storage", "log", "nym-bin-common", + "nym-coconut-interface", "nym-config", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-network-defaults", @@ -991,17 +950,6 @@ dependencies = [ "validator-client", ] -[[package]] -name = "credential-storage" -version = "0.1.0" -dependencies = [ - "async-trait", - "log", - "sqlx 0.5.13", - "thiserror", - "tokio", -] - [[package]] name = "criterion" version = "0.4.0" @@ -1934,13 +1882,13 @@ name = "gateway-client" version = "0.1.0" dependencies = [ "async-trait", - "coconut-interface", - "credential-storage", "futures", "gateway-requests", "getrandom 0.2.8", "log", "mobile-storage", + "nym-coconut-interface", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-network-defaults", @@ -1967,9 +1915,9 @@ name = "gateway-requests" version = "0.1.0" dependencies = [ "bs58", - "coconut-interface", "futures", "log", + "nym-coconut-interface", "nym-credentials", "nym-crypto", "nym-pemstore", @@ -2122,15 +2070,6 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "group-contract-common" -version = "0.1.0" -dependencies = [ - "cw4", - "schemars", - "serde", -] - [[package]] name = "h2" version = "0.3.15" @@ -3027,20 +2966,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "multisig-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "cw3", - "cw3-fixed-multisig", - "cw4", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -3145,12 +3070,8 @@ dependencies = [ "bs58", "cfg-if", "clap 4.1.4", - "coconut-bandwidth-contract-common", - "coconut-dkg-common", - "coconut-interface", "console-subscriber", "cosmwasm-std", - "credential-storage", "cw-utils", "cw3", "cw4", @@ -3161,16 +3082,20 @@ dependencies = [ "humantime-serde", "lazy_static", "log", - "multisig-contract-common", "nym-api-requests", "nym-bin-common", + "nym-coconut-bandwidth-contract-common", + "nym-coconut-dkg-common", + "nym-coconut-interface", "nym-config", "nym-contracts-common", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-dkg", "nym-inclusion-probability", "nym-mixnet-contract-common", + "nym-multisig-contract-common", "nym-pemstore", "nym-sphinx", "nym-task", @@ -3205,16 +3130,24 @@ name = "nym-api-requests" version = "0.1.0" dependencies = [ "bs58", - "coconut-interface", "cosmrs", "cosmwasm-std", "getset", + "nym-coconut-interface", "nym-mixnet-contract-common", "schemars", "serde", "ts-rs", ] +[[package]] +name = "nym-bandwidth-claim-contract" +version = "0.1.0" +dependencies = [ + "schemars", + "serde", +] + [[package]] name = "nym-bin-common" version = "0.2.0" @@ -3277,8 +3210,6 @@ dependencies = [ "bs58", "cfg-if", "clap 4.1.4", - "coconut-bandwidth-contract-common", - "coconut-dkg-common", "comfy-table", "cosmrs", "cosmwasm-std", @@ -3287,8 +3218,10 @@ dependencies = [ "humantime-serde", "k256", "log", - "multisig-contract-common", + "nym-coconut-bandwidth-contract-common", + "nym-coconut-dkg-common", "nym-mixnet-contract-common", + "nym-multisig-contract-common", "nym-network-defaults", "nym-vesting-contract-common", "rand 0.6.5", @@ -3308,8 +3241,6 @@ version = "1.1.12" dependencies = [ "clap 4.1.4", "client-core", - "coconut-interface", - "credential-storage", "dirs", "futures", "gateway-client", @@ -3317,7 +3248,9 @@ dependencies = [ "lazy_static", "log", "nym-bin-common", + "nym-coconut-interface", "nym-config", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-network-defaults", @@ -3338,6 +3271,39 @@ dependencies = [ "websocket-requests", ] +[[package]] +name = "nym-coconut-bandwidth-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-dkg-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "nym-contracts-common", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-interface" +version = "0.1.0" +dependencies = [ + "bs58", + "getset", + "nymcoconut", + "serde", + "thiserror", +] + [[package]] name = "nym-config" version = "0.1.0" @@ -3363,14 +3329,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nym-credential-storage" +version = "0.1.0" +dependencies = [ + "async-trait", + "log", + "sqlx 0.5.13", + "thiserror", + "tokio", +] + [[package]] name = "nym-credentials" version = "0.1.0" dependencies = [ "bls12_381 0.5.0", - "coconut-interface", "cosmrs", "nym-api-requests", + "nym-coconut-interface", "nym-crypto", "rand 0.7.3", "thiserror", @@ -3443,7 +3420,6 @@ dependencies = [ "bip39", "bs58", "clap 4.1.4", - "coconut-interface", "colored", "dashmap 4.0.2", "dirs", @@ -3457,6 +3433,7 @@ dependencies = [ "mixnode-common", "nym-api-requests", "nym-bin-common", + "nym-coconut-interface", "nym-config", "nym-credentials", "nym-crypto", @@ -3482,6 +3459,15 @@ dependencies = [ "validator-client", ] +[[package]] +name = "nym-group-contract-common" +version = "0.1.0" +dependencies = [ + "cw4", + "schemars", + "serde", +] + [[package]] name = "nym-inclusion-probability" version = "0.1.0" @@ -3551,6 +3537,20 @@ dependencies = [ "validator-client", ] +[[package]] +name = "nym-multisig-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "cw3", + "cw3-fixed-multisig", + "cw4", + "schemars", + "serde", + "thiserror", +] + [[package]] name = "nym-network-defaults" version = "0.1.0" @@ -3708,8 +3708,6 @@ version = "1.1.12" dependencies = [ "clap 4.1.4", "client-core", - "coconut-interface", - "credential-storage", "dirs", "futures", "gateway-client", @@ -3718,7 +3716,9 @@ dependencies = [ "log", "mobile-storage", "nym-bin-common", + "nym-coconut-interface", "nym-config", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-network-defaults", @@ -3941,12 +3941,12 @@ dependencies = [ name = "nym-types" version = "1.0.0" dependencies = [ - "coconut-interface", "cosmrs", "cosmwasm-std", "eyre", "itertools", "log", + "nym-coconut-interface", "nym-config", "nym-mixnet-contract-common", "nym-vesting-contract", @@ -6745,9 +6745,6 @@ dependencies = [ "async-trait", "base64 0.13.1", "bip39", - "coconut-bandwidth-contract-common", - "coconut-dkg-common", - "coconut-interface", "colored", "cosmrs", "cosmwasm-std", @@ -6755,15 +6752,18 @@ dependencies = [ "cw4", "flate2", "futures", - "group-contract-common", "itertools", "log", - "multisig-contract-common", "nym-api-requests", + "nym-coconut-bandwidth-contract-common", + "nym-coconut-dkg-common", + "nym-coconut-interface", "nym-config", "nym-contracts-common", "nym-execute", + "nym-group-contract-common", "nym-mixnet-contract-common", + "nym-multisig-contract-common", "nym-network-defaults", "nym-vesting-contract", "nym-vesting-contract-common", diff --git a/clients/credential/Cargo.toml b/clients/credential/Cargo.toml index a42e01ebe7..ca836f3858 100644 --- a/clients/credential/Cargo.toml +++ b/clients/credential/Cargo.toml @@ -15,10 +15,10 @@ thiserror = "1.0" url = "2.2" tokio = { version = "1.24.1", features = ["rt-multi-thread", "net", "signal", "macros"] } # async runtime -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-config = { path = "../../common/config" } nym-credentials = { path = "../../common/credentials" } -credential-storage = { path = "../../common/credential-storage" } +nym-credential-storage = { path = "../../common/credential-storage" } nym-crypto = { path = "../../common/crypto", features = ["rand", "asymmetric", "symmetric", "aes", "hashing"] } nym-bin-common = { path = "../../common/bin-common"} nym-network-defaults = { path = "../../common/network-defaults" } diff --git a/clients/credential/src/commands.rs b/clients/credential/src/commands.rs index e97bb3abf5..fe58078f54 100644 --- a/clients/credential/src/commands.rs +++ b/clients/credential/src/commands.rs @@ -7,9 +7,9 @@ use nym_bin_common::completions::ArgShell; use rand::rngs::OsRng; use std::str::FromStr; -use coconut_interface::{Base58, Parameters}; -use credential_storage::storage::Storage; -use credential_storage::PersistentStorage; +use nym_coconut_interface::{Base58, Parameters}; +use nym_credential_storage::storage::Storage; +use nym_credential_storage::PersistentStorage; use nym_credentials::coconut::bandwidth::{BandwidthVoucher, TOTAL_ATTRIBUTES}; use nym_credentials::coconut::utils::obtain_aggregate_signature; use nym_crypto::asymmetric::{encryption, identity}; diff --git a/clients/credential/src/error.rs b/clients/credential/src/error.rs index a7ee182e6a..aa32d845c1 100644 --- a/clients/credential/src/error.rs +++ b/clients/credential/src/error.rs @@ -4,7 +4,7 @@ use std::time::SystemTimeError; use thiserror::Error; -use credential_storage::error::StorageError; +use nym_credential_storage::error::StorageError; use nym_credentials::error::Error as CredentialError; use nym_crypto::asymmetric::encryption::KeyRecoveryError; use nym_crypto::asymmetric::identity::Ed25519RecoveryError; diff --git a/clients/credential/src/main.rs b/clients/credential/src/main.rs index 90e7a27f32..3965eba15f 100644 --- a/clients/credential/src/main.rs +++ b/clients/credential/src/main.rs @@ -77,7 +77,7 @@ async fn main() -> Result<()> { .client_home_directory .join(DATA_DIR) .join(CRED_DB_FILE_NAME); - let shared_storage = credential_storage::initialise_storage(db_path).await; + let shared_storage = nym_credential_storage::initialise_storage(db_path).await; let recovery_storage = recovery_storage::RecoveryStorage::new(r.recovery_dir)?; let network_details = NymNetworkDetails::new_from_env(); diff --git a/clients/credential/src/state.rs b/clients/credential/src/state.rs index f73bef228e..a4894a8ced 100644 --- a/clients/credential/src/state.rs +++ b/clients/credential/src/state.rs @@ -1,7 +1,7 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_interface::Parameters; +use nym_coconut_interface::Parameters; use nym_credentials::coconut::bandwidth::BandwidthVoucher; use nym_crypto::asymmetric::{encryption, identity}; diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index b75a51d839..a111f91fe1 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -36,9 +36,9 @@ tokio-tungstenite = "0.14" # websocket ## internal nym-bin-common = { path = "../../common/bin-common" } client-core = { path = "../client-core", features = ["fs-surb-storage"] } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-config = { path = "../../common/config" } -credential-storage = { path = "../../common/credential-storage" } +nym-credential-storage = { path = "../../common/credential-storage" } nym-credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } gateway-client = { path = "../../common/client-libs/gateway-client" } diff --git a/clients/native/src/client/mod.rs b/clients/native/src/client/mod.rs index 796435fb5f..aedfc0494d 100644 --- a/clients/native/src/client/mod.rs +++ b/clients/native/src/client/mod.rs @@ -74,7 +74,7 @@ impl SocketClient { let client = validator_client::Client::new_query(client_config) .expect("Could not construct query client"); BandwidthController::new( - credential_storage::initialise_storage(config.get_base().get_database_path()).await, + nym_credential_storage::initialise_storage(config.get_base().get_database_path()).await, client, ) } diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index 095aa1af89..c1bc449dd4 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -29,9 +29,9 @@ url = "2.2" # internal nym-bin-common = { path = "../../common/bin-common" } client-core = { path = "../client-core", features = ["fs-surb-storage"] } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-config = { path = "../../common/config" } -credential-storage = { path = "../../common/credential-storage", optional = true } +nym-credential-storage = { path = "../../common/credential-storage", optional = true } mobile-storage = { path = "../../common/mobile-storage", optional = true } nym-credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } @@ -49,6 +49,6 @@ nym-topology = { path = "../../common/topology" } validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] } [features] -default = ["credential-storage"] +default = ["nym-credential-storage"] eth = [] mobile = ["mobile-storage", "gateway-client/mobile"] diff --git a/clients/socks5/src/client/mod.rs b/clients/socks5/src/client/mod.rs index 5a6454d361..50d0718ca7 100644 --- a/clients/socks5/src/client/mod.rs +++ b/clients/socks5/src/client/mod.rs @@ -92,7 +92,7 @@ impl NymClient { #[cfg(not(feature = "mobile"))] let storage = - credential_storage::initialise_storage(config.get_base().get_database_path()).await; + nym_credential_storage::initialise_storage(config.get_base().get_database_path()).await; #[cfg(feature = "mobile")] let storage = mobile_storage::PersistentStorage {}; diff --git a/clients/webassembly/Cargo.toml b/clients/webassembly/Cargo.toml index 14a16cd11d..190cc8e8d9 100644 --- a/clients/webassembly/Cargo.toml +++ b/clients/webassembly/Cargo.toml @@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4" # internal client-core = { path = "../client-core", default-features = false, features = ["wasm"] } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } nym-sphinx = { path = "../../common/nymsphinx" } diff --git a/common/bandwidth-claim-contract/Cargo.toml b/common/bandwidth-claim-contract/Cargo.toml index e63e100d7a..bb9d6a85b3 100644 --- a/common/bandwidth-claim-contract/Cargo.toml +++ b/common/bandwidth-claim-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "bandwidth-claim-contract" +name = "nym-bandwidth-claim-contract" version = "0.1.0" edition = "2021" diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index 32b78d6791..f630a24154 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -18,7 +18,7 @@ async-trait = { workspace = true } tokio = { version = "1.24.1", features = ["macros"] } # internal -coconut-interface = { path = "../../coconut-interface" } +nym-coconut-interface = { path = "../../coconut-interface" } nym-credentials = { path = "../../credentials" } nym-crypto = { path = "../../crypto" } gateway-requests = { path = "../../../gateway/gateway-requests" } @@ -47,7 +47,7 @@ features = ["net", "sync", "time"] [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite] version = "0.14" -[target."cfg(not(target_arch = \"wasm32\"))".dependencies.credential-storage] +[target."cfg(not(target_arch = \"wasm32\"))".dependencies.nym-credential-storage] path = "../../credential-storage" # wasm-only dependencies diff --git a/common/client-libs/gateway-client/src/bandwidth.rs b/common/client-libs/gateway-client/src/bandwidth.rs index 1b4b21ea8c..5d1d0c50bf 100644 --- a/common/client-libs/gateway-client/src/bandwidth.rs +++ b/common/client-libs/gateway-client/src/bandwidth.rs @@ -7,7 +7,7 @@ use crate::error::GatewayClientError; use crate::wasm_mockups::Storage; #[cfg(not(target_arch = "wasm32"))] #[cfg(not(feature = "mobile"))] -use credential_storage::storage::Storage; +use nym_credential_storage::storage::Storage; #[cfg(not(target_arch = "wasm32"))] #[cfg(feature = "mobile")] @@ -22,7 +22,7 @@ use crate::wasm_mockups::StorageError; #[cfg(not(target_arch = "wasm32"))] #[cfg(not(feature = "mobile"))] -use credential_storage::error::StorageError; +use nym_credential_storage::error::StorageError; #[cfg(target_arch = "wasm32")] use crate::wasm_mockups::{Client, CosmWasmClient}; @@ -30,7 +30,7 @@ use std::str::FromStr; #[cfg(not(target_arch = "wasm32"))] use validator_client::{nyxd::CosmWasmClient, Client}; use { - coconut_interface::Base58, + nym_coconut_interface::Base58, nym_credentials::coconut::{ bandwidth::prepare_for_spending, utils::obtain_aggregate_verification_key, }, @@ -42,7 +42,7 @@ use crate::wasm_mockups::PersistentStorage; #[cfg(not(target_arch = "wasm32"))] #[cfg(not(feature = "mobile"))] -use credential_storage::PersistentStorage; +use nym_credential_storage::PersistentStorage; #[cfg(not(target_arch = "wasm32"))] #[cfg(feature = "mobile")] @@ -69,17 +69,17 @@ where pub async fn prepare_coconut_credential( &self, - ) -> Result<(coconut_interface::Credential, i64), GatewayClientError> { + ) -> Result<(nym_coconut_interface::Credential, i64), GatewayClientError> { let bandwidth_credential = self.storage.get_next_coconut_credential().await?; let voucher_value = u64::from_str(&bandwidth_credential.voucher_value) .map_err(|_| StorageError::InconsistentData)?; let voucher_info = bandwidth_credential.voucher_info.clone(); let serial_number = - coconut_interface::Attribute::try_from_bs58(bandwidth_credential.serial_number)?; + nym_coconut_interface::Attribute::try_from_bs58(bandwidth_credential.serial_number)?; let binding_number = - coconut_interface::Attribute::try_from_bs58(bandwidth_credential.binding_number)?; + nym_coconut_interface::Attribute::try_from_bs58(bandwidth_credential.binding_number)?; let signature = - coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?; + nym_coconut_interface::Signature::try_from_bs58(bandwidth_credential.signature)?; let epoch_id = u64::from_str(&bandwidth_credential.epoch_id) .map_err(|_| StorageError::InconsistentData)?; diff --git a/common/client-libs/gateway-client/src/client.rs b/common/client-libs/gateway-client/src/client.rs index a1d1662fd6..0919a81e85 100644 --- a/common/client-libs/gateway-client/src/client.rs +++ b/common/client-libs/gateway-client/src/client.rs @@ -9,13 +9,13 @@ 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 futures::{SinkExt, StreamExt}; use gateway_requests::authentication::encrypted_address::EncryptedAddressBytes; use gateway_requests::iv::IV; use gateway_requests::registration::handshake::{client_handshake, SharedKeys}; use gateway_requests::{BinaryRequest, ClientControlRequest, ServerResponse, PROTOCOL_VERSION}; use log::*; +use nym_coconut_interface::Credential; use nym_crypto::asymmetric::identity; use nym_network_defaults::{REMAINING_BANDWIDTH_THRESHOLD, TOKENS_TO_BURN}; use nym_sphinx::forwarding::packet::MixPacket; @@ -33,7 +33,7 @@ use validator_client::nyxd::CosmWasmClient; #[cfg(not(target_arch = "wasm32"))] #[cfg(not(feature = "mobile"))] -use credential_storage::PersistentStorage; +use nym_credential_storage::PersistentStorage; #[cfg(not(target_arch = "wasm32"))] #[cfg(feature = "mobile")] diff --git a/common/client-libs/gateway-client/src/error.rs b/common/client-libs/gateway-client/src/error.rs index 84c8aedd6a..c83ee33e42 100644 --- a/common/client-libs/gateway-client/src/error.rs +++ b/common/client-libs/gateway-client/src/error.rs @@ -3,13 +3,13 @@ #[cfg(target_arch = "wasm32")] use crate::wasm_mockups::StorageError; -#[cfg(not(feature = "mobile"))] -#[cfg(not(target_arch = "wasm32"))] -use credential_storage::error::StorageError; use gateway_requests::registration::handshake::error::HandshakeError; #[cfg(feature = "mobile")] #[cfg(not(target_arch = "wasm32"))] use mobile_storage::StorageError; +#[cfg(not(feature = "mobile"))] +#[cfg(not(target_arch = "wasm32"))] +use nym_credential_storage::error::StorageError; use std::io; use thiserror::Error; use tungstenite::Error as WsError; @@ -31,7 +31,7 @@ pub enum GatewayClientError { CredentialStorageError(#[from] StorageError), #[error("Coconut error - {0}")] - CoconutError(#[from] coconut_interface::CoconutError), + CoconutError(#[from] nym_coconut_interface::CoconutError), // TODO: see if `JsValue` is a reasonable type for this #[cfg(target_arch = "wasm32")] diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index 911dee4db4..f218d7a6c7 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -11,13 +11,13 @@ rust-version = "1.56" base64 = "0.13" colored = "2.0" -coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { path = "../../cosmwasm-smart-contracts/coconut-dkg" } 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" } +nym-coconut-bandwidth-contract-common = { path= "../../cosmwasm-smart-contracts/coconut-bandwidth-contract" } +nym-multisig-contract-common = { path = "../../cosmwasm-smart-contracts/multisig-contract" } +nym-group-contract-common = { path = "../../cosmwasm-smart-contracts/group-contract" } nym-vesting-contract = { path = "../../../contracts/vesting" } serde = { version = "1", features = ["derive"] } serde_json = "1" @@ -28,7 +28,7 @@ url = { version = "2.2", features = ["serde"] } tokio = { version = "1.24.1", features = ["sync", "time"] } futures = "0.3" -coconut-interface = { path = "../../coconut-interface" } +nym-coconut-interface = { path = "../../coconut-interface" } nym-network-defaults = { path = "../../network-defaults" } nym-api-requests = { path = "../../../nym-api/nym-api-requests" } nym-execute = { path = "../../execute" } diff --git a/common/client-libs/validator-client/src/client.rs b/common/client-libs/validator-client/src/client.rs index 882bb56f95..ee6dd47be9 100644 --- a/common/client-libs/validator-client/src/client.rs +++ b/common/client-libs/validator-client/src/client.rs @@ -2,8 +2,6 @@ // SPDX-License-Identifier: Apache-2.0 use crate::{nym_api, ValidatorClientError}; -use coconut_dkg_common::types::NodeIndex; -use coconut_interface::VerificationKey; use nym_api_requests::coconut::{ BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse, }; @@ -11,6 +9,8 @@ use nym_api_requests::models::{ GatewayCoreStatusResponse, MixnodeCoreStatusResponse, MixnodeStatusResponse, RewardEstimationResponse, StakeSaturationResponse, }; +use nym_coconut_dkg_common::types::NodeIndex; +use nym_coconut_interface::VerificationKey; pub use nym_mixnet_contract_common::{mixnode::MixNodeDetails, GatewayBond, IdentityKeyRef, MixId}; #[cfg(feature = "nyxd-client")] @@ -18,17 +18,17 @@ use crate::nyxd::traits::{DkgQueryClient, MixnetQueryClient, MultisigQueryClient #[cfg(feature = "nyxd-client")] use crate::nyxd::{self, CosmWasmClient, NyxdClient, QueryNyxdClient, SigningNyxdClient}; #[cfg(feature = "nyxd-client")] -use coconut_dkg_common::{ +use cw3::ProposalResponse; +#[cfg(feature = "nyxd-client")] +use nym_api_requests::models::MixNodeBondAnnotated; +#[cfg(feature = "nyxd-client")] +use nym_coconut_dkg_common::{ dealer::ContractDealing, types::{DealerDetails, EpochId}, verification_key::ContractVKShare, }; #[cfg(feature = "nyxd-client")] -use coconut_interface::Base58; -#[cfg(feature = "nyxd-client")] -use cw3::ProposalResponse; -#[cfg(feature = "nyxd-client")] -use nym_api_requests::models::MixNodeBondAnnotated; +use nym_coconut_interface::Base58; #[cfg(feature = "nyxd-client")] use nym_mixnet_contract_common::{ families::{Family, FamilyHead}, diff --git a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs index fd196cf6e7..3912500f47 100644 --- a/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs +++ b/common/client-libs/validator-client/src/nyxd/cosmwasm_client/logs.rs @@ -6,8 +6,8 @@ use cosmrs::tendermint::abci; use itertools::Itertools; use serde::{Deserialize, Serialize}; -pub use coconut_bandwidth_contract_common::event_attributes::*; -pub use coconut_dkg_common::event_attributes::*; +pub use nym_coconut_bandwidth_contract_common::event_attributes::*; +pub use nym_coconut_dkg_common::event_attributes::*; // it seems that currently validators just emit stringified events (which are also returned as part of deliverTx response) // as theirs logs diff --git a/common/client-libs/validator-client/src/nyxd/error.rs b/common/client-libs/validator-client/src/nyxd/error.rs index fab3965217..2330edbdf7 100644 --- a/common/client-libs/validator-client/src/nyxd/error.rs +++ b/common/client-libs/validator-client/src/nyxd/error.rs @@ -140,7 +140,7 @@ pub enum NyxdError { CosmwasmStdError(#[from] cosmwasm_std::StdError), #[error("Coconut interface error: {0}")] - CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError), + CoconutInterfaceError(#[from] nym_coconut_interface::error::CoconutInterfaceError), #[error("Account had an unexpected bech32 prefix. Expected: {expected}, got: {got}")] UnexpectedBech32Prefix { got: String, expected: String }, diff --git a/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs index 7cacd57801..71758a124b 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_query_client.rs @@ -4,8 +4,8 @@ use crate::nyxd::error::NyxdError; use crate::nyxd::{CosmWasmClient, NyxdClient}; -use coconut_bandwidth_contract_common::msg::QueryMsg; -use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; +use nym_coconut_bandwidth_contract_common::msg::QueryMsg; +use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; use async_trait::async_trait; diff --git a/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs index a7d03c9625..b21ce7543e 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/coconut_bandwidth_signing_client.rs @@ -5,8 +5,8 @@ pub use crate::nyxd::cosmwasm_client::signing_client::SigningCosmWasmClient; use crate::nyxd::cosmwasm_client::types::ExecuteResult; use crate::nyxd::error::NyxdError; use crate::nyxd::{Coin, Fee, NyxdClient}; -use coconut_bandwidth_contract_common::spend_credential::SpendCredentialData; -use coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg}; +use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialData; +use nym_coconut_bandwidth_contract_common::{deposit::DepositData, msg::ExecuteMsg}; use async_trait::async_trait; diff --git a/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs index 296f8913eb..20e032dff0 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/dkg_query_client.rs @@ -4,13 +4,13 @@ use crate::nyxd::error::NyxdError; use crate::nyxd::{CosmWasmClient, NyxdClient}; use async_trait::async_trait; -use coconut_dkg_common::dealer::{ +use cosmrs::AccountId; +use nym_coconut_dkg_common::dealer::{ DealerDetailsResponse, PagedDealerResponse, PagedDealingsResponse, }; -use coconut_dkg_common::msg::QueryMsg as DkgQueryMsg; -use coconut_dkg_common::types::{Epoch, EpochId, InitialReplacementData}; -use coconut_dkg_common::verification_key::PagedVKSharesResponse; -use cosmrs::AccountId; +use nym_coconut_dkg_common::msg::QueryMsg as DkgQueryMsg; +use nym_coconut_dkg_common::types::{Epoch, EpochId, InitialReplacementData}; +use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse; #[async_trait] pub trait DkgQueryClient { diff --git a/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs index 45fdd2cbbc..b99260e120 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/dkg_signing_client.rs @@ -5,9 +5,9 @@ use crate::nyxd::cosmwasm_client::types::ExecuteResult; use crate::nyxd::error::NyxdError; use crate::nyxd::{Fee, NyxdClient, SigningCosmWasmClient}; 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 nym_coconut_dkg_common::msg::ExecuteMsg as DkgExecuteMsg; +use nym_coconut_dkg_common::types::EncodedBTEPublicKeyWithProof; +use nym_coconut_dkg_common::verification_key::VerificationKeyShare; use nym_contracts_common::dealings::ContractSafeBytes; #[async_trait] diff --git a/common/client-libs/validator-client/src/nyxd/traits/group_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/group_query_client.rs index 57a6f6a98f..f41fb2e261 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/group_query_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/group_query_client.rs @@ -4,7 +4,7 @@ use crate::nyxd::error::NyxdError; use crate::nyxd::{CosmWasmClient, NyxdClient}; -use group_contract_common::msg::QueryMsg; +use nym_group_contract_common::msg::QueryMsg; use async_trait::async_trait; use cw4::MemberResponse; diff --git a/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs b/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs index c396cecec4..392a9a9cd0 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/multisig_query_client.rs @@ -5,7 +5,7 @@ use crate::nyxd::error::NyxdError; use crate::nyxd::{CosmWasmClient, NyxdClient}; use cw3::{ProposalListResponse, ProposalResponse}; -use multisig_contract_common::msg::QueryMsg; +use nym_multisig_contract_common::msg::QueryMsg; use async_trait::async_trait; diff --git a/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs b/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs index 6e4069c4a2..6d716ece8a 100644 --- a/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs +++ b/common/client-libs/validator-client/src/nyxd/traits/multisig_signing_client.rs @@ -6,9 +6,9 @@ use crate::nyxd::cosmwasm_client::types::ExecuteResult; use crate::nyxd::error::NyxdError; use crate::nyxd::{Fee, NyxdClient}; -use coconut_bandwidth_contract_common::msg::ExecuteMsg as CoconutBandwidthExecuteMsg; use cw3::Vote; -use multisig_contract_common::msg::ExecuteMsg; +use nym_coconut_bandwidth_contract_common::msg::ExecuteMsg as CoconutBandwidthExecuteMsg; +use nym_multisig_contract_common::msg::ExecuteMsg; use async_trait::async_trait; use cosmwasm_std::{to_binary, Coin, CosmosMsg, WasmMsg}; diff --git a/common/coconut-interface/Cargo.toml b/common/coconut-interface/Cargo.toml index 285750cb3a..18f9115052 100644 --- a/common/coconut-interface/Cargo.toml +++ b/common/coconut-interface/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coconut-interface" +name = "nym-coconut-interface" version = "0.1.0" edition = "2021" description = "Crutch library until there is proper SerDe support for coconut structs" diff --git a/common/commands/Cargo.toml b/common/commands/Cargo.toml index cf941a1961..5a872b0ec1 100644 --- a/common/commands/Cargo.toml +++ b/common/commands/Cargo.toml @@ -32,6 +32,6 @@ validator-client = { path = "../client-libs/validator-client", features = ["nyxd nym-network-defaults = { path = "../network-defaults" } 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" } +nym-coconut-bandwidth-contract-common = { path = "../cosmwasm-smart-contracts/coconut-bandwidth-contract" } +nym-coconut-dkg-common = { path = "../cosmwasm-smart-contracts/coconut-dkg" } +nym-multisig-contract-common = { path = "../cosmwasm-smart-contracts/multisig-contract" } diff --git a/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs b/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs index 936ec5b383..2640a5e89b 100644 --- a/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs +++ b/common/commands/src/validator/cosmwasm/generators/coconut_bandwidth.rs @@ -6,7 +6,7 @@ use std::str::FromStr; use clap::Parser; use log::{debug, info}; -use coconut_bandwidth_contract_common::msg::InstantiateMsg; +use nym_coconut_bandwidth_contract_common::msg::InstantiateMsg; use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] diff --git a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs index 6386d9b600..6a1294fe16 100644 --- a/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs +++ b/common/commands/src/validator/cosmwasm/generators/coconut_dkg.rs @@ -5,8 +5,8 @@ use clap::Parser; use log::{debug, info}; use std::str::FromStr; -use coconut_dkg_common::msg::InstantiateMsg; -use coconut_dkg_common::types::TimeConfiguration; +use nym_coconut_dkg_common::msg::InstantiateMsg; +use nym_coconut_dkg_common::types::TimeConfiguration; use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] diff --git a/common/commands/src/validator/cosmwasm/generators/multisig.rs b/common/commands/src/validator/cosmwasm/generators/multisig.rs index 0d0be11477..3db5af2022 100644 --- a/common/commands/src/validator/cosmwasm/generators/multisig.rs +++ b/common/commands/src/validator/cosmwasm/generators/multisig.rs @@ -7,7 +7,7 @@ use clap::Parser; use cosmwasm_std::Decimal; use cw_utils::{Duration, Threshold}; use log::{debug, info}; -use multisig_contract_common::msg::InstantiateMsg; +use nym_multisig_contract_common::msg::InstantiateMsg; use validator_client::nyxd::AccountId; #[derive(Debug, Parser)] diff --git a/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/Cargo.toml b/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/Cargo.toml index 0d4cf1ef86..c91b3b94ac 100644 --- a/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coconut-bandwidth-contract-common" +name = "nym-coconut-bandwidth-contract-common" version = "0.1.0" edition = "2021" @@ -9,4 +9,4 @@ edition = "2021" cosmwasm-std = "1.0.0" schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -multisig-contract-common = { path = "../multisig-contract" } +nym-multisig-contract-common = { path = "../multisig-contract" } diff --git a/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs b/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs index 28842576c6..ffece73fd4 100644 --- a/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs +++ b/common/cosmwasm-smart-contracts/coconut-bandwidth-contract/src/spend_credential.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use cosmwasm_std::{from_binary, to_binary, Addr, Coin, CosmosMsg, StdResult, WasmMsg}; -use multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; +use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml index 59eb21e5c0..24a14cfb0b 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml +++ b/common/cosmwasm-smart-contracts/coconut-dkg/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coconut-dkg-common" +name = "nym-coconut-dkg-common" version = "0.1.0" edition = "2021" @@ -12,4 +12,4 @@ schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } contracts-common = { path = "../contracts-common", package = "nym-contracts-common" } -multisig-contract-common = { path = "../multisig-contract" } +nym-multisig-contract-common = { path = "../multisig-contract" } diff --git a/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs b/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs index 90b66acde7..9b8338b6f1 100644 --- a/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs +++ b/common/cosmwasm-smart-contracts/coconut-dkg/src/verification_key.rs @@ -5,7 +5,7 @@ use crate::msg::ExecuteMsg; use crate::types::{EpochId, NodeIndex}; use cosmwasm_std::{from_binary, to_binary, Addr, CosmosMsg, StdResult, Timestamp, WasmMsg}; use cw_utils::Expiration; -use multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; +use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; use serde::{Deserialize, Serialize}; pub type VerificationKeyShare = String; diff --git a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml index 6389f8fb3c..ba25bbb653 100644 --- a/common/cosmwasm-smart-contracts/group-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/group-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "group-contract-common" +name = "nym-group-contract-common" version = "0.1.0" edition = "2021" diff --git a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml index 096e4affe0..0d5a62759e 100644 --- a/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/multisig-contract/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "multisig-contract-common" +name = "nym-multisig-contract-common" version = "0.1.0" edition = "2021" diff --git a/common/credential-storage/Cargo.toml b/common/credential-storage/Cargo.toml index ec828bce97..c488eab99b 100644 --- a/common/credential-storage/Cargo.toml +++ b/common/credential-storage/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "credential-storage" +name = "nym-credential-storage" version = "0.1.0" edition = "2021" diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml index e1d09d00ab..c7c64c4301 100644 --- a/common/credentials/Cargo.toml +++ b/common/credentials/Cargo.toml @@ -11,7 +11,7 @@ cosmrs = { git = "https://github.com/neacsu/cosmos-rust", branch = "neacsu/feegr thiserror = "1.0" # I guess temporarily until we get serde support in coconut up and running -coconut-interface = { path = "../coconut-interface" } +nym-coconut-interface = { path = "../coconut-interface" } 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" } diff --git a/common/credentials/src/coconut/bandwidth.rs b/common/credentials/src/coconut/bandwidth.rs index 78563211a2..9c87e75341 100644 --- a/common/credentials/src/coconut/bandwidth.rs +++ b/common/credentials/src/coconut/bandwidth.rs @@ -6,7 +6,7 @@ // right now this has no double-spending protection, spender binding, etc // it's the simplest possible case -use coconut_interface::{ +use nym_coconut_interface::{ hash_to_scalar, prepare_blind_sign, Attribute, BlindSignRequest, Credential, Parameters, PrivateAttribute, PublicAttribute, Signature, VerificationKey, }; @@ -282,7 +282,7 @@ pub fn prepare_for_spending( #[cfg(test)] mod test { use super::*; - use coconut_interface::Base58; + use nym_coconut_interface::Base58; use rand::rngs::OsRng; fn voucher_fixture() -> BandwidthVoucher { diff --git a/common/credentials/src/coconut/utils.rs b/common/credentials/src/coconut/utils.rs index 4de5b8f8ea..5a912705ce 100644 --- a/common/credentials/src/coconut/utils.rs +++ b/common/credentials/src/coconut/utils.rs @@ -1,11 +1,11 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_interface::{ +use nym_api_requests::coconut::BlindSignRequestBody; +use nym_coconut_interface::{ aggregate_signature_shares, aggregate_verification_keys, prove_bandwidth_credential, Attribute, BlindedSignature, Credential, Parameters, Signature, SignatureShare, VerificationKey, }; -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; diff --git a/common/credentials/src/error.rs b/common/credentials/src/error.rs index 4c146b0af8..e35cca27e4 100644 --- a/common/credentials/src/error.rs +++ b/common/credentials/src/error.rs @@ -1,7 +1,7 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_interface::CoconutError; +use nym_coconut_interface::CoconutError; use nym_crypto::asymmetric::encryption::KeyRecoveryError; use validator_client::ValidatorClientError; diff --git a/common/types/Cargo.toml b/common/types/Cargo.toml index 1bdf334f42..33fb8c327c 100644 --- a/common/types/Cargo.toml +++ b/common/types/Cargo.toml @@ -28,7 +28,7 @@ validator-client = { path = "../../common/client-libs/validator-client", feature nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" } nym-config = { path = "../../common/config" } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } # Used for Type conversion, can be extracted but its a lot of work nym-vesting-contract = { path = "../../contracts/vesting" } diff --git a/contracts/coconut-bandwidth/Cargo.toml b/contracts/coconut-bandwidth/Cargo.toml index 3e3342bcd7..1f71495471 100644 --- a/contracts/coconut-bandwidth/Cargo.toml +++ b/contracts/coconut-bandwidth/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coconut-bandwidth" +name = "nym-coconut-bandwidth" version = "0.1.0" edition = "2021" @@ -9,9 +9,9 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" } -coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } -multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" } +nym-bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" } +nym-coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } +nym-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" } cosmwasm-std = "1.0.0" cosmwasm-storage = "1.0.0" diff --git a/contracts/coconut-bandwidth/src/contract.rs b/contracts/coconut-bandwidth/src/contract.rs index a5cfa5a415..6ed901a443 100644 --- a/contracts/coconut-bandwidth/src/contract.rs +++ b/contracts/coconut-bandwidth/src/contract.rs @@ -5,7 +5,9 @@ use cosmwasm_std::{ entry_point, to_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult, }; -use coconut_bandwidth_contract_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg}; +use nym_coconut_bandwidth_contract_common::msg::{ + ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg, +}; use crate::error::ContractError; use crate::queries::{query_all_spent_credentials_paged, query_spent_credential}; diff --git a/contracts/coconut-bandwidth/src/queries.rs b/contracts/coconut-bandwidth/src/queries.rs index 1de10ef3a6..534696752f 100644 --- a/contracts/coconut-bandwidth/src/queries.rs +++ b/contracts/coconut-bandwidth/src/queries.rs @@ -1,11 +1,11 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_bandwidth_contract_common::spend_credential::{ - PagedSpendCredentialResponse, SpendCredential, SpendCredentialResponse, -}; use cosmwasm_std::{Deps, Order, StdResult}; use cw_storage_plus::Bound; +use nym_coconut_bandwidth_contract_common::spend_credential::{ + PagedSpendCredentialResponse, SpendCredential, SpendCredentialResponse, +}; use crate::storage::{self, SPEND_CREDENTIAL_PAGE_DEFAULT_LIMIT, SPEND_CREDENTIAL_PAGE_MAX_LIMIT}; diff --git a/contracts/coconut-bandwidth/src/storage.rs b/contracts/coconut-bandwidth/src/storage.rs index 549e64caaf..554c447672 100644 --- a/contracts/coconut-bandwidth/src/storage.rs +++ b/contracts/coconut-bandwidth/src/storage.rs @@ -1,8 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_bandwidth_contract_common::spend_credential::SpendCredential; use cw_storage_plus::{Index, IndexList, IndexedMap, UniqueIndex}; +use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredential; // storage prefixes const SPEND_CREDENTIAL_PK_NAMESPACE: &str = "sc"; @@ -44,10 +44,10 @@ mod tests { use crate::storage::SpendCredential; use crate::support::tests::fixtures; use crate::support::tests::fixtures::TEST_MIX_DENOM; - use coconut_bandwidth_contract_common::spend_credential::SpendCredentialStatus; use cosmwasm_std::testing::MockStorage; use cosmwasm_std::Addr; use cosmwasm_std::Coin; + use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialStatus; #[test] fn spend_credential_single_read_retrieval() { diff --git a/contracts/coconut-bandwidth/src/support/tests/fixtures.rs b/contracts/coconut-bandwidth/src/support/tests/fixtures.rs index c1c68a7f0c..1b5ac62dbe 100644 --- a/contracts/coconut-bandwidth/src/support/tests/fixtures.rs +++ b/contracts/coconut-bandwidth/src/support/tests/fixtures.rs @@ -1,8 +1,10 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_bandwidth_contract_common::spend_credential::{SpendCredential, SpendCredentialData}; use cosmwasm_std::{Addr, Coin}; +use nym_coconut_bandwidth_contract_common::spend_credential::{ + SpendCredential, SpendCredentialData, +}; pub const TEST_MIX_DENOM: &str = "unym"; diff --git a/contracts/coconut-bandwidth/src/support/tests/helpers.rs b/contracts/coconut-bandwidth/src/support/tests/helpers.rs index 31a4a6f279..d5a4f275b6 100644 --- a/contracts/coconut-bandwidth/src/support/tests/helpers.rs +++ b/contracts/coconut-bandwidth/src/support/tests/helpers.rs @@ -5,9 +5,9 @@ pub const MULTISIG_CONTRACT: &str = "multisig contract address"; pub const POOL_CONTRACT: &str = "mix pool contract address"; use crate::contract::instantiate; -use coconut_bandwidth_contract_common::msg::InstantiateMsg; use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier}; use cosmwasm_std::{Empty, MemoryStorage, OwnedDeps}; +use nym_coconut_bandwidth_contract_common::msg::InstantiateMsg; use super::fixtures::TEST_MIX_DENOM; diff --git a/contracts/coconut-bandwidth/src/transactions.rs b/contracts/coconut-bandwidth/src/transactions.rs index 92d3a28bd1..9d7baf40b3 100644 --- a/contracts/coconut-bandwidth/src/transactions.rs +++ b/contracts/coconut-bandwidth/src/transactions.rs @@ -1,17 +1,17 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_bandwidth_contract_common::spend_credential::{ +use cosmwasm_std::{BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Response}; +use nym_coconut_bandwidth_contract_common::spend_credential::{ to_cosmos_msg, SpendCredential, SpendCredentialData, }; -use cosmwasm_std::{BankMsg, Coin, DepsMut, Env, Event, MessageInfo, Response}; use crate::error::ContractError; use crate::state::{ADMIN, CONFIG}; use crate::storage; -use coconut_bandwidth_contract_common::deposit::DepositData; -use coconut_bandwidth_contract_common::events::{ +use nym_coconut_bandwidth_contract_common::deposit::DepositData; +use nym_coconut_bandwidth_contract_common::events::{ DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO, DEPOSIT_VALUE, }; @@ -113,11 +113,11 @@ mod tests { use super::*; use crate::support::tests::fixtures::spend_credential_data_fixture; use crate::support::tests::helpers::{self, MULTISIG_CONTRACT, POOL_CONTRACT}; - use coconut_bandwidth_contract_common::msg::ExecuteMsg; use cosmwasm_std::testing::{mock_env, mock_info}; use cosmwasm_std::{from_binary, Coin, CosmosMsg, WasmMsg}; use cw_controllers::AdminError; - use multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; + use nym_coconut_bandwidth_contract_common::msg::ExecuteMsg; + use nym_multisig_contract_common::msg::ExecuteMsg as MultisigExecuteMsg; #[test] fn invalid_deposit() { diff --git a/contracts/coconut-dkg/Cargo.toml b/contracts/coconut-dkg/Cargo.toml index 4e8d1dcafc..6198886828 100644 --- a/contracts/coconut-dkg/Cargo.toml +++ b/contracts/coconut-dkg/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "coconut-dkg" +name = "nym-coconut-dkg" version = "0.1.0" edition = "2021" @@ -9,7 +9,7 @@ edition = "2021" crate-type = ["cdylib", "rlib"] [dependencies] -coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } cosmwasm-std = "1.0.0" cosmwasm-storage = "1.0.0" @@ -24,6 +24,6 @@ thiserror = "1.0.23" [dev-dependencies] cw-multi-test = { version = "0.13.4" } cw4-group = { path = "../multisig/cw4-group" } -group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } +nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } lazy_static = "1.4" rusty-fork = "0.3" diff --git a/contracts/coconut-dkg/src/contract.rs b/contracts/coconut-dkg/src/contract.rs index fb0138b47f..9b3b13212a 100644 --- a/contracts/coconut-dkg/src/contract.rs +++ b/contracts/coconut-dkg/src/contract.rs @@ -17,12 +17,12 @@ use crate::state::{State, MULTISIG, STATE}; use crate::verification_key_shares::queries::query_vk_shares_paged; use crate::verification_key_shares::transactions::try_commit_verification_key_share; use crate::verification_key_shares::transactions::try_verify_verification_key_share; -use coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg}; -use coconut_dkg_common::types::{Epoch, EpochState}; use cosmwasm_std::{ entry_point, to_binary, Deps, DepsMut, Env, MessageInfo, QueryResponse, Response, }; use cw4::Cw4Contract; +use nym_coconut_dkg_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg}; +use nym_coconut_dkg_common::types::{Epoch, EpochState}; /// Instantiate the contract. /// @@ -136,13 +136,13 @@ mod tests { use super::*; use crate::support::tests::fixtures::TEST_MIX_DENOM; use crate::support::tests::helpers::{ADMIN_ADDRESS, MULTISIG_CONTRACT}; - use coconut_dkg_common::msg::ExecuteMsg::RegisterDealer; - use coconut_dkg_common::types::NodeIndex; use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; use cosmwasm_std::{coins, Addr}; use cw4::Member; use cw_multi_test::{App, AppBuilder, AppResponse, ContractWrapper, Executor}; - use group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; + use nym_coconut_dkg_common::msg::ExecuteMsg::RegisterDealer; + use nym_coconut_dkg_common::types::NodeIndex; + use nym_group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; fn instantiate_with_group(app: &mut App, members: &[Addr]) -> Addr { let group_code_id = app.store_code(Box::new(ContractWrapper::new( diff --git a/contracts/coconut-dkg/src/dealers/queries.rs b/contracts/coconut-dkg/src/dealers/queries.rs index b638629851..f7ef4209c1 100644 --- a/contracts/coconut-dkg/src/dealers/queries.rs +++ b/contracts/coconut-dkg/src/dealers/queries.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 use crate::dealers::storage::{self, IndexedDealersMap}; -use coconut_dkg_common::dealer::{DealerDetailsResponse, DealerType, PagedDealerResponse}; use cosmwasm_std::{Deps, Order, StdResult}; use cw_storage_plus::Bound; +use nym_coconut_dkg_common::dealer::{DealerDetailsResponse, DealerType, PagedDealerResponse}; fn query_dealers( deps: Deps<'_>, diff --git a/contracts/coconut-dkg/src/dealers/storage.rs b/contracts/coconut-dkg/src/dealers/storage.rs index 398193de23..b6c2c1f8bb 100644 --- a/contracts/coconut-dkg/src/dealers/storage.rs +++ b/contracts/coconut-dkg/src/dealers/storage.rs @@ -1,9 +1,9 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_dkg_common::types::{DealerDetails, NodeIndex}; use cosmwasm_std::{Addr, StdResult, Storage}; use cw_storage_plus::{Index, IndexList, IndexedMap, Item, UniqueIndex}; +use nym_coconut_dkg_common::types::{DealerDetails, NodeIndex}; const CURRENT_DEALERS_PK: &str = "crd"; const PAST_DEALERS_PK: &str = "ptd"; diff --git a/contracts/coconut-dkg/src/dealers/transactions.rs b/contracts/coconut-dkg/src/dealers/transactions.rs index 9a4197dd8d..e7d019ee65 100644 --- a/contracts/coconut-dkg/src/dealers/transactions.rs +++ b/contracts/coconut-dkg/src/dealers/transactions.rs @@ -6,8 +6,8 @@ use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA; use crate::epoch_state::utils::check_epoch_state; use crate::error::ContractError; use crate::state::STATE; -use coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState}; use cosmwasm_std::{Addr, DepsMut, MessageInfo, Response}; +use nym_coconut_dkg_common::types::{DealerDetails, EncodedBTEPublicKeyWithProof, EpochState}; // currently we only require that // a) it's part of the signer group @@ -81,9 +81,9 @@ pub(crate) mod tests { use crate::support::tests::fixtures::dealer_details_fixture; use crate::support::tests::helpers; use crate::support::tests::helpers::{add_fixture_dealer, GROUP_MEMBERS}; - use coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration}; use cosmwasm_std::testing::{mock_env, mock_info}; use cw4::Member; + use nym_coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration}; use rusty_fork::rusty_fork_test; rusty_fork_test! { diff --git a/contracts/coconut-dkg/src/dealings/queries.rs b/contracts/coconut-dkg/src/dealings/queries.rs index 0bf0452c14..a11b7bd4a5 100644 --- a/contracts/coconut-dkg/src/dealings/queries.rs +++ b/contracts/coconut-dkg/src/dealings/queries.rs @@ -3,10 +3,10 @@ use crate::dealings::storage; use crate::dealings::storage::DEALINGS_BYTES; -use coconut_dkg_common::dealer::{ContractDealing, PagedDealingsResponse}; -use coconut_dkg_common::types::TOTAL_DEALINGS; use cosmwasm_std::{Deps, Order, StdResult}; use cw_storage_plus::Bound; +use nym_coconut_dkg_common::dealer::{ContractDealing, PagedDealingsResponse}; +use nym_coconut_dkg_common::types::TOTAL_DEALINGS; pub fn query_dealings_paged( deps: Deps<'_>, diff --git a/contracts/coconut-dkg/src/dealings/storage.rs b/contracts/coconut-dkg/src/dealings/storage.rs index 26cb5b35db..0395fa8c74 100644 --- a/contracts/coconut-dkg/src/dealings/storage.rs +++ b/contracts/coconut-dkg/src/dealings/storage.rs @@ -1,9 +1,9 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_dkg_common::types::{ContractSafeBytes, TOTAL_DEALINGS}; use cosmwasm_std::Addr; use cw_storage_plus::Map; +use nym_coconut_dkg_common::types::{ContractSafeBytes, TOTAL_DEALINGS}; pub(crate) const DEALINGS_PAGE_MAX_LIMIT: u32 = 2; pub(crate) const DEALINGS_PAGE_DEFAULT_LIMIT: u32 = 1; diff --git a/contracts/coconut-dkg/src/dealings/transactions.rs b/contracts/coconut-dkg/src/dealings/transactions.rs index b9220cff9e..e5a9d9bb1b 100644 --- a/contracts/coconut-dkg/src/dealings/transactions.rs +++ b/contracts/coconut-dkg/src/dealings/transactions.rs @@ -6,8 +6,8 @@ use crate::dealings::storage::DEALINGS_BYTES; use crate::epoch_state::storage::INITIAL_REPLACEMENT_DATA; use crate::epoch_state::utils::check_epoch_state; use crate::error::ContractError; -use coconut_dkg_common::types::{ContractSafeBytes, EpochState}; use cosmwasm_std::{DepsMut, MessageInfo, Response}; +use nym_coconut_dkg_common::types::{ContractSafeBytes, EpochState}; pub fn try_commit_dealings( deps: DepsMut<'_>, @@ -54,10 +54,10 @@ pub(crate) mod tests { use crate::support::tests::fixtures::{dealer_details_fixture, dealing_bytes_fixture}; use crate::support::tests::helpers; use crate::support::tests::helpers::add_fixture_dealer; - use coconut_dkg_common::dealer::DealerDetails; - use coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration}; use cosmwasm_std::testing::{mock_env, mock_info}; use cosmwasm_std::Addr; + use nym_coconut_dkg_common::dealer::DealerDetails; + use nym_coconut_dkg_common::types::{InitialReplacementData, TimeConfiguration}; #[test] fn invalid_commit_dealing() { diff --git a/contracts/coconut-dkg/src/epoch_state/queries.rs b/contracts/coconut-dkg/src/epoch_state/queries.rs index c6aedb17e8..a7b968bf3f 100644 --- a/contracts/coconut-dkg/src/epoch_state/queries.rs +++ b/contracts/coconut-dkg/src/epoch_state/queries.rs @@ -3,8 +3,8 @@ use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA, THRESHOLD}; use crate::error::ContractError; -use coconut_dkg_common::types::{Epoch, InitialReplacementData}; use cosmwasm_std::Storage; +use nym_coconut_dkg_common::types::{Epoch, InitialReplacementData}; pub(crate) fn query_current_epoch(storage: &dyn Storage) -> Result { CURRENT_EPOCH @@ -28,8 +28,8 @@ pub(crate) fn query_initial_dealers( pub(crate) mod test { use super::*; use crate::support::tests::helpers::init_contract; - use coconut_dkg_common::types::{EpochState, TimeConfiguration}; use cosmwasm_std::testing::mock_env; + use nym_coconut_dkg_common::types::{EpochState, TimeConfiguration}; #[test] fn query_state() { diff --git a/contracts/coconut-dkg/src/epoch_state/storage.rs b/contracts/coconut-dkg/src/epoch_state/storage.rs index 95536fd7c9..d146f5894a 100644 --- a/contracts/coconut-dkg/src/epoch_state/storage.rs +++ b/contracts/coconut-dkg/src/epoch_state/storage.rs @@ -1,8 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_dkg_common::types::{Epoch, InitialReplacementData}; use cw_storage_plus::Item; +use nym_coconut_dkg_common::types::{Epoch, InitialReplacementData}; pub(crate) const CURRENT_EPOCH: Item<'_, Epoch> = Item::new("current_epoch"); pub const THRESHOLD: Item = Item::new("threshold"); diff --git a/contracts/coconut-dkg/src/epoch_state/transactions.rs b/contracts/coconut-dkg/src/epoch_state/transactions.rs index 3a812f6437..b2fb55125e 100644 --- a/contracts/coconut-dkg/src/epoch_state/transactions.rs +++ b/contracts/coconut-dkg/src/epoch_state/transactions.rs @@ -7,8 +7,8 @@ use crate::epoch_state::storage::{CURRENT_EPOCH, INITIAL_REPLACEMENT_DATA, THRES use crate::epoch_state::utils::check_epoch_state; use crate::error::ContractError; use crate::state::STATE; -use coconut_dkg_common::types::{Epoch, EpochState, InitialReplacementData}; use cosmwasm_std::{Addr, Deps, DepsMut, Env, Order, Response, Storage}; +use nym_coconut_dkg_common::types::{Epoch, EpochState, InitialReplacementData}; fn reset_epoch_state(storage: &mut dyn Storage) -> Result<(), ContractError> { THRESHOLD.remove(storage); @@ -182,12 +182,12 @@ pub(crate) mod tests { use crate::error::ContractError::EarlyEpochStateAdvancement; use crate::support::tests::fixtures::dealer_details_fixture; use crate::support::tests::helpers::{init_contract, GROUP_MEMBERS}; - use coconut_dkg_common::types::{ - ContractSafeBytes, DealerDetails, EpochState, TimeConfiguration, - }; use cosmwasm_std::testing::mock_env; use cosmwasm_std::Addr; use cw4::Member; + use nym_coconut_dkg_common::types::{ + ContractSafeBytes, DealerDetails, EpochState, TimeConfiguration, + }; use rusty_fork::rusty_fork_test; // Because of the global variable handling group, we need individual process for each test diff --git a/contracts/coconut-dkg/src/epoch_state/utils.rs b/contracts/coconut-dkg/src/epoch_state/utils.rs index 78e91b6a14..cfbe82dfba 100644 --- a/contracts/coconut-dkg/src/epoch_state/utils.rs +++ b/contracts/coconut-dkg/src/epoch_state/utils.rs @@ -3,8 +3,8 @@ use crate::epoch_state::storage::CURRENT_EPOCH; use crate::error::ContractError; -use coconut_dkg_common::types::EpochState; use cosmwasm_std::Storage; +use nym_coconut_dkg_common::types::EpochState; pub(crate) fn check_epoch_state( storage: &dyn Storage, @@ -25,8 +25,8 @@ pub(crate) fn check_epoch_state( pub(crate) mod test { use super::*; use crate::support::tests::helpers::init_contract; - use coconut_dkg_common::types::{Epoch, TimeConfiguration}; use cosmwasm_std::testing::mock_env; + use nym_coconut_dkg_common::types::{Epoch, TimeConfiguration}; #[test] pub fn check_state() { diff --git a/contracts/coconut-dkg/src/support/tests/fixtures.rs b/contracts/coconut-dkg/src/support/tests/fixtures.rs index 02a73b0ccf..1771ee1310 100644 --- a/contracts/coconut-dkg/src/support/tests/fixtures.rs +++ b/contracts/coconut-dkg/src/support/tests/fixtures.rs @@ -1,10 +1,10 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_dkg_common::dealer::DealerDetails; -use coconut_dkg_common::types::ContractSafeBytes; -use coconut_dkg_common::verification_key::ContractVKShare; use cosmwasm_std::Addr; +use nym_coconut_dkg_common::dealer::DealerDetails; +use nym_coconut_dkg_common::types::ContractSafeBytes; +use nym_coconut_dkg_common::verification_key::ContractVKShare; pub const TEST_MIX_DENOM: &str = "unym"; diff --git a/contracts/coconut-dkg/src/support/tests/helpers.rs b/contracts/coconut-dkg/src/support/tests/helpers.rs index b806dd4989..f626b8bd89 100644 --- a/contracts/coconut-dkg/src/support/tests/helpers.rs +++ b/contracts/coconut-dkg/src/support/tests/helpers.rs @@ -3,8 +3,6 @@ use crate::contract::instantiate; use crate::dealers::storage::current_dealers; -use coconut_dkg_common::msg::InstantiateMsg; -use coconut_dkg_common::types::DealerDetails; use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier}; use cosmwasm_std::{ from_binary, to_binary, Addr, ContractResult, DepsMut, Empty, MemoryStorage, OwnedDeps, @@ -12,6 +10,8 @@ use cosmwasm_std::{ }; use cw4::{Cw4QueryMsg, Member, MemberListResponse, MemberResponse}; use lazy_static::lazy_static; +use nym_coconut_dkg_common::msg::InstantiateMsg; +use nym_coconut_dkg_common::types::DealerDetails; use std::sync::Mutex; use super::fixtures::TEST_MIX_DENOM; diff --git a/contracts/coconut-dkg/src/verification_key_shares/queries.rs b/contracts/coconut-dkg/src/verification_key_shares/queries.rs index e3300330ea..958fd6b68f 100644 --- a/contracts/coconut-dkg/src/verification_key_shares/queries.rs +++ b/contracts/coconut-dkg/src/verification_key_shares/queries.rs @@ -3,10 +3,10 @@ use crate::verification_key_shares::storage; use crate::verification_key_shares::storage::vk_shares; -use coconut_dkg_common::types::EpochId; -use coconut_dkg_common::verification_key::PagedVKSharesResponse; use cosmwasm_std::{Deps, Order, StdResult}; use cw_storage_plus::Bound; +use nym_coconut_dkg_common::types::EpochId; +use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse; pub fn query_vk_shares_paged( deps: Deps<'_>, diff --git a/contracts/coconut-dkg/src/verification_key_shares/storage.rs b/contracts/coconut-dkg/src/verification_key_shares/storage.rs index 13ecd5370a..b27605322d 100644 --- a/contracts/coconut-dkg/src/verification_key_shares/storage.rs +++ b/contracts/coconut-dkg/src/verification_key_shares/storage.rs @@ -4,10 +4,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::constants::{VK_SHARES_EPOCH_ID_IDX_NAMESPACE, VK_SHARES_PK_NAMESPACE}; -use coconut_dkg_common::types::EpochId; -use coconut_dkg_common::verification_key::ContractVKShare; use cosmwasm_std::Addr; use cw_storage_plus::{Index, IndexList, IndexedMap, MultiIndex}; +use nym_coconut_dkg_common::types::EpochId; +use nym_coconut_dkg_common::verification_key::ContractVKShare; pub(crate) const VERIFICATION_KEY_SHARES_PAGE_MAX_LIMIT: u32 = 75; pub(crate) const VERIFICATION_KEY_SHARES_PAGE_DEFAULT_LIMIT: u32 = 50; diff --git a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs index 2d6002a003..677e4d70d6 100644 --- a/contracts/coconut-dkg/src/verification_key_shares/transactions.rs +++ b/contracts/coconut-dkg/src/verification_key_shares/transactions.rs @@ -8,9 +8,11 @@ use crate::epoch_state::utils::check_epoch_state; use crate::error::ContractError; use crate::state::{MULTISIG, STATE}; use crate::verification_key_shares::storage::vk_shares; -use coconut_dkg_common::types::EpochState; -use coconut_dkg_common::verification_key::{to_cosmos_msg, ContractVKShare, VerificationKeyShare}; use cosmwasm_std::{Addr, DepsMut, Env, MessageInfo, Response}; +use nym_coconut_dkg_common::types::EpochState; +use nym_coconut_dkg_common::verification_key::{ + to_cosmos_msg, ContractVKShare, VerificationKeyShare, +}; pub fn try_commit_verification_key_share( deps: DepsMut<'_>, @@ -92,10 +94,10 @@ mod tests { use crate::epoch_state::transactions::advance_epoch_state; use crate::support::tests::helpers; use crate::support::tests::helpers::{add_fixture_dealer, MULTISIG_CONTRACT}; - use coconut_dkg_common::dealer::DealerDetails; - use coconut_dkg_common::types::{EpochState, TimeConfiguration}; use cosmwasm_std::testing::{mock_env, mock_info}; use cw_controllers::AdminError; + use nym_coconut_dkg_common::dealer::DealerDetails; + use nym_coconut_dkg_common::types::{EpochState, TimeConfiguration}; #[test] fn current_epoch_id() { diff --git a/contracts/coconut-test/Cargo.toml b/contracts/coconut-test/Cargo.toml index 7eaa724fd0..846cf3ed7b 100644 --- a/contracts/coconut-test/Cargo.toml +++ b/contracts/coconut-test/Cargo.toml @@ -2,15 +2,16 @@ name = "coconut-test" version = "0.1.0" edition = "2021" +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" } -coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } -coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } -multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" } -group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } +nym-bandwidth-claim-contract = { path = "../../common/bandwidth-claim-contract" } +nym-coconut-bandwidth-contract-common = { path = "../../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } +nym-coconut-dkg-common = { path = "../../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-multisig-contract-common = { path = "../../common/cosmwasm-smart-contracts/multisig-contract" } +nym-group-contract-common = { path = "../../common/cosmwasm-smart-contracts/group-contract" } cosmwasm-std = "1.0.0" cosmwasm-storage = "1.0.0" @@ -24,8 +25,8 @@ schemars = "0.8" serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = "1.0.23" -coconut-bandwidth = { path = "../coconut-bandwidth" } -coconut-dkg = { path = "../coconut-dkg" } +nym-coconut-bandwidth = { path = "../coconut-bandwidth" } +nym-coconut-dkg = { path = "../coconut-dkg" } cw-multi-test = { version = "0.13.4" } cw3-flex-multisig = { path = "../multisig/cw3-flex-multisig" } cw4-group = { path = "../multisig/cw4-group" } diff --git a/contracts/coconut-test/src/deposit_and_release.rs b/contracts/coconut-test/src/deposit_and_release.rs index 0212741261..374b14e3a6 100644 --- a/contracts/coconut-test/src/deposit_and_release.rs +++ b/contracts/coconut-test/src/deposit_and_release.rs @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 use crate::helpers::*; -use coconut_bandwidth::error::ContractError; -use coconut_bandwidth_contract_common::{ - deposit::DepositData, - msg::{ExecuteMsg, InstantiateMsg}, -}; use cosmwasm_std::{coins, Addr}; use cw_controllers::AdminError; use cw_multi_test::Executor; +use nym_coconut_bandwidth::error::ContractError; +use nym_coconut_bandwidth_contract_common::{ + deposit::DepositData, + msg::{ExecuteMsg, InstantiateMsg}, +}; const TEST_MIX_DENOM: &str = "unym"; diff --git a/contracts/coconut-test/src/helpers.rs b/contracts/coconut-test/src/helpers.rs index f5bd455d62..c679176177 100644 --- a/contracts/coconut-test/src/helpers.rs +++ b/contracts/coconut-test/src/helpers.rs @@ -4,7 +4,7 @@ use cosmwasm_std::{entry_point, Addr, Coin, DepsMut, Empty, Env, Response}; use cw3_flex_multisig::state::CONFIG; use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper}; -use multisig_contract_common::error::ContractError; +use nym_multisig_contract_common::error::ContractError; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -43,18 +43,18 @@ pub fn mock_app(init_funds: &[Coin]) -> App { } pub fn contract_dkg() -> Box> { let contract = ContractWrapper::new( - coconut_dkg::contract::execute, - coconut_dkg::contract::instantiate, - coconut_dkg::contract::query, + nym_coconut_dkg::contract::execute, + nym_coconut_dkg::contract::instantiate, + nym_coconut_dkg::contract::query, ); Box::new(contract) } pub fn contract_bandwidth() -> Box> { let contract = ContractWrapper::new( - coconut_bandwidth::contract::execute, - coconut_bandwidth::contract::instantiate, - coconut_bandwidth::contract::query, + nym_coconut_bandwidth::contract::execute, + nym_coconut_bandwidth::contract::instantiate, + nym_coconut_bandwidth::contract::query, ); Box::new(contract) } diff --git a/contracts/coconut-test/src/spend_credential_creates_proposal.rs b/contracts/coconut-test/src/spend_credential_creates_proposal.rs index 7d68073b40..12742ef049 100644 --- a/contracts/coconut-test/src/spend_credential_creates_proposal.rs +++ b/contracts/coconut-test/src/spend_credential_creates_proposal.rs @@ -1,16 +1,16 @@ use crate::helpers::*; -use coconut_bandwidth::error::ContractError; -use coconut_bandwidth_contract_common::{ +use cosmwasm_std::{coins, Addr, Coin, Decimal}; +use cw_multi_test::Executor; +use cw_utils::{Duration, Threshold}; +use nym_coconut_bandwidth::error::ContractError; +use nym_coconut_bandwidth_contract_common::{ msg::{ ExecuteMsg as CoconutBandwidthExecuteMsg, InstantiateMsg as CoconutBandwidthInstantiateMsg, }, spend_credential::SpendCredentialData, }; -use cosmwasm_std::{coins, Addr, Coin, Decimal}; -use cw_multi_test::Executor; -use cw_utils::{Duration, Threshold}; -use group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; -use multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg; +use nym_group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; +use nym_multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg; pub const TEST_COIN_DENOM: &str = "unym"; pub const TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS: &str = diff --git a/contracts/coconut-test/src/submit_vk_creates_proposal.rs b/contracts/coconut-test/src/submit_vk_creates_proposal.rs index 884637f18c..540a6d8c02 100644 --- a/contracts/coconut-test/src/submit_vk_creates_proposal.rs +++ b/contracts/coconut-test/src/submit_vk_creates_proposal.rs @@ -7,19 +7,19 @@ use crate::helpers::{ use crate::spend_credential_creates_proposal::{ TEST_COCONUT_BANDWIDTH_CONTRACT_ADDRESS, TEST_COCONUT_DKG_CONTRACT_ADDRESS, TEST_COIN_DENOM, }; -use coconut_dkg_common::msg::ExecuteMsg::{ - AdvanceEpochState, CommitVerificationKeyShare, RegisterDealer, -}; -use coconut_dkg_common::msg::InstantiateMsg as DkgInstantiateMsg; -use coconut_dkg_common::msg::QueryMsg::GetVerificationKeys; -use coconut_dkg_common::verification_key::PagedVKSharesResponse; use cosmwasm_std::{coins, Addr, Decimal}; use cw4::Member; use cw_multi_test::Executor; use cw_utils::{Duration, Threshold}; -use group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; -use multisig_contract_common::msg::ExecuteMsg::{Execute, Vote}; -use multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg; +use nym_coconut_dkg_common::msg::ExecuteMsg::{ + AdvanceEpochState, CommitVerificationKeyShare, RegisterDealer, +}; +use nym_coconut_dkg_common::msg::InstantiateMsg as DkgInstantiateMsg; +use nym_coconut_dkg_common::msg::QueryMsg::GetVerificationKeys; +use nym_coconut_dkg_common::verification_key::PagedVKSharesResponse; +use nym_group_contract_common::msg::InstantiateMsg as GroupInstantiateMsg; +use nym_multisig_contract_common::msg::ExecuteMsg::{Execute, Vote}; +use nym_multisig_contract_common::msg::InstantiateMsg as MultisigInstantiateMsg; #[test] fn dkg_proposal() { diff --git a/contracts/multisig/cw3-flex-multisig/Cargo.toml b/contracts/multisig/cw3-flex-multisig/Cargo.toml index dd127b54ba..6cee7f8529 100644 --- a/contracts/multisig/cw3-flex-multisig/Cargo.toml +++ b/contracts/multisig/cw3-flex-multisig/Cargo.toml @@ -27,8 +27,8 @@ cosmwasm-std = { version = "1.0.0" } schemars = "0.8.1" serde = { version = "1.0.103", default-features = false, features = ["derive"] } -group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } -multisig-contract-common = { path= "../../../common/cosmwasm-smart-contracts/multisig-contract" } +nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } +nym-multisig-contract-common = { path= "../../../common/cosmwasm-smart-contracts/multisig-contract" } [dev-dependencies] cosmwasm-schema = { version = "1.0.0" } diff --git a/contracts/multisig/cw3-flex-multisig/src/contract.rs b/contracts/multisig/cw3-flex-multisig/src/contract.rs index edd1a648b2..bb24d38774 100644 --- a/contracts/multisig/cw3-flex-multisig/src/contract.rs +++ b/contracts/multisig/cw3-flex-multisig/src/contract.rs @@ -18,8 +18,8 @@ use cw_storage_plus::Bound; use cw_utils::{maybe_addr, Expiration, ThresholdResponse}; use crate::state::{Config, CONFIG}; -use multisig_contract_common::error::ContractError; -use multisig_contract_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg}; +use nym_multisig_contract_common::error::ContractError; +use nym_multisig_contract_common::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg}; // version info for migration info const CONTRACT_NAME: &str = "crates.io:cw3-flex-multisig"; @@ -502,7 +502,7 @@ mod tests { // uploads code and returns address of group contract fn instantiate_group(app: &mut App, members: Vec) -> Addr { let group_id = app.store_code(contract_group()); - let msg = group_contract_common::msg::InstantiateMsg { + let msg = nym_group_contract_common::msg::InstantiateMsg { admin: Some(OWNER.into()), members, }; @@ -1410,7 +1410,7 @@ mod tests { // adds NEWBIE with 2 power -> with snapshot, invalid vote // removes VOTER3 -> with snapshot, can vote on proposal let newbie: &str = "newbie"; - let update_msg = group_contract_common::msg::ExecuteMsg::UpdateMembers { + let update_msg = nym_group_contract_common::msg::ExecuteMsg::UpdateMembers { remove: vec![VOTER3.into()], add: vec![member(VOTER2, 21), member(newbie, 2)], }; @@ -1623,7 +1623,7 @@ mod tests { // admin changes the group (3 -> 0, 2 -> 9, 0 -> 29) - total = 56, require 29 to pass let newbie: &str = "newbie"; - let update_msg = group_contract_common::msg::ExecuteMsg::UpdateMembers { + let update_msg = nym_group_contract_common::msg::ExecuteMsg::UpdateMembers { remove: vec![VOTER3.into()], add: vec![member(VOTER2, 9), member(newbie, 29)], }; @@ -1702,7 +1702,7 @@ mod tests { // admin changes the group (3 -> 0, 2 -> 9, 0 -> 28) - total = 55, require 28 to pass let newbie: &str = "newbie"; - let update_msg = group_contract_common::msg::ExecuteMsg::UpdateMembers { + let update_msg = nym_group_contract_common::msg::ExecuteMsg::UpdateMembers { remove: vec![VOTER3.into()], add: vec![member(VOTER2, 9), member(newbie, 29)], }; diff --git a/contracts/multisig/cw4-group/Cargo.toml b/contracts/multisig/cw4-group/Cargo.toml index 7c98f4c991..8002cca469 100644 --- a/contracts/multisig/cw4-group/Cargo.toml +++ b/contracts/multisig/cw4-group/Cargo.toml @@ -24,7 +24,7 @@ crate-type = ["cdylib", "rlib"] library = [] [dependencies] -group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } +nym-group-contract-common = { path = "../../../common/cosmwasm-smart-contracts/group-contract" } cw-utils = { version = "0.13.4" } cw2 = { version = "0.13.4" } diff --git a/contracts/multisig/cw4-group/src/contract.rs b/contracts/multisig/cw4-group/src/contract.rs index cb9c4f2787..543388c6fa 100644 --- a/contracts/multisig/cw4-group/src/contract.rs +++ b/contracts/multisig/cw4-group/src/contract.rs @@ -14,7 +14,7 @@ use cw_utils::maybe_addr; use crate::error::ContractError; use crate::state::{ADMIN, HOOKS, MEMBERS, TOTAL}; -use group_contract_common::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; +use nym_group_contract_common::msg::{ExecuteMsg, InstantiateMsg, QueryMsg}; // version info for migration info const CONTRACT_NAME: &str = "crates.io:cw4-group"; diff --git a/contracts/multisig/cw4-group/src/helpers.rs b/contracts/multisig/cw4-group/src/helpers.rs index ac0e56f42b..eae8a2434e 100644 --- a/contracts/multisig/cw4-group/src/helpers.rs +++ b/contracts/multisig/cw4-group/src/helpers.rs @@ -5,7 +5,7 @@ use std::ops::Deref; use cosmwasm_std::{to_binary, Addr, CosmosMsg, StdResult, WasmMsg}; use cw4::{Cw4Contract, Member}; -use group_contract_common::msg::ExecuteMsg; +use nym_group_contract_common::msg::ExecuteMsg; /// Cw4GroupContract is a wrapper around Cw4Contract that provides a lot of helpers /// for working with cw4-group contracts. diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index aabd70c18c..c7f54810c6 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -52,7 +52,7 @@ tokio-util = { version = "0.7.4", features = ["codec"] } url = { version = "2.2", features = ["serde"] } # internal -coconut-interface = { path = "../common/coconut-interface" } +nym-coconut-interface = { path = "../common/coconut-interface" } nym-credentials = { path = "../common/credentials" } nym-config = { path = "../common/config" } nym-crypto = { path = "../common/crypto" } diff --git a/gateway/gateway-requests/Cargo.toml b/gateway/gateway-requests/Cargo.toml index 65c8ce026a..3fce04a8ae 100644 --- a/gateway/gateway-requests/Cargo.toml +++ b/gateway/gateway-requests/Cargo.toml @@ -22,7 +22,7 @@ thiserror = "1.0" nym-crypto = { path = "../../common/crypto" } nym-pemstore = { path = "../../common/pemstore" } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-credentials = { path = "../../common/credentials" } [dependencies.tungstenite] diff --git a/gateway/gateway-requests/src/types.rs b/gateway/gateway-requests/src/types.rs index 4f2e2735d0..0685c0d473 100644 --- a/gateway/gateway-requests/src/types.rs +++ b/gateway/gateway-requests/src/types.rs @@ -5,7 +5,7 @@ use crate::authentication::encrypted_address::EncryptedAddressBytes; use crate::iv::IV; use crate::registration::handshake::SharedKeys; use crate::{GatewayMacSize, PROTOCOL_VERSION}; -use coconut_interface::Credential; +use nym_coconut_interface::Credential; use nym_crypto::generic_array::typenum::Unsigned; use nym_crypto::hmac::recompute_keyed_hmac_and_verify_tag; use nym_crypto::symmetric::stream_cipher; diff --git a/gateway/src/node/client_handling/bandwidth.rs b/gateway/src/node/client_handling/bandwidth.rs index d51cf111a1..99f1cf095b 100644 --- a/gateway/src/node/client_handling/bandwidth.rs +++ b/gateway/src/node/client_handling/bandwidth.rs @@ -1,7 +1,7 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_interface::Credential; +use nym_coconut_interface::Credential; pub struct Bandwidth { value: u64, diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs index d8fb0a56d2..7ff47a9f11 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs @@ -62,7 +62,7 @@ pub(crate) enum RequestHandlingError { ProposalIdError { reason: String }, #[error("Coconut interface error - {0}")] - CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError), + CoconutInterfaceError(#[from] nym_coconut_interface::error::CoconutInterfaceError), #[error("Credential error - {0}")] CredentialError(#[from] nym_credentials::error::Error), diff --git a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs index aa07567b0a..8c50f93c36 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/coconut.rs @@ -1,8 +1,8 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_interface::Credential; use log::*; +use nym_coconut_interface::Credential; use std::time::{Duration, SystemTime}; use validator_client::nyxd::traits::DkgQueryClient; use validator_client::{ diff --git a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs index 6727e0a733..eafc2992cf 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::node::client_handling::websocket::connection_handler::authenticated::RequestHandlingError; -use bandwidth_claim_contract::msg::ExecuteMsg; -use bandwidth_claim_contract::payment::LinkPaymentData; +use nym_bandwidth_claim_contract::msg::ExecuteMsg; +use nym_bandwidth_claim_contract::payment::LinkPaymentData; use nym_credentials::token::bandwidth::TokenCredential; use nym_crypto::asymmetric::identity::{PublicKey, Signature, SIGNATURE_LENGTH}; use nym_network_defaults::{ETH_EVENT_NAME, ETH_MIN_BLOCK_DEPTH}; diff --git a/nym-api/Cargo.toml b/nym-api/Cargo.toml index a2ff4a2d4c..acbbc3c305 100644 --- a/nym-api/Cargo.toml +++ b/nym-api/Cargo.toml @@ -64,12 +64,12 @@ rocket_okapi = { version = "0.8.0-rc.2", features = ["swagger"] } schemars = { version = "0.8", features = ["preserve_order"] } ## internal -coconut-bandwidth-contract-common = { path = "../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } -coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } -coconut-interface = { path = "../common/coconut-interface" } +nym-coconut-bandwidth-contract-common = { path = "../common/cosmwasm-smart-contracts/coconut-bandwidth-contract" } +nym-coconut-dkg-common = { path = "../common/cosmwasm-smart-contracts/coconut-dkg" } +nym-coconut-interface = { path = "../common/coconut-interface" } nym-config = { path = "../common/config" } cosmwasm-std = "1.0.0" -credential-storage = { path = "../common/credential-storage" } +nym-credential-storage = { path = "../common/credential-storage" } nym-credentials = { path = "../common/credentials" } nym-crypto = { path = "../common/crypto" } cw3 = { version = "0.13.4" } @@ -80,7 +80,7 @@ nym-inclusion-probability = { path = "../common/inclusion-probability" } nym-mixnet-contract-common = { path = "../common/cosmwasm-smart-contracts/mixnet-contract" } nym-vesting-contract-common = { path = "../common/cosmwasm-smart-contracts/vesting-contract" } nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } -multisig-contract-common = { path = "../common/cosmwasm-smart-contracts/multisig-contract" } +nym-multisig-contract-common = { path = "../common/cosmwasm-smart-contracts/multisig-contract" } nymcoconut = { path = "../common/nymcoconut" } nym-sphinx = { path = "../common/nymsphinx" } nym-pemstore = { path = "../common/pemstore" } diff --git a/nym-api/nym-api-requests/Cargo.toml b/nym-api/nym-api-requests/Cargo.toml index 8290327315..e2c21bc49e 100644 --- a/nym-api/nym-api-requests/Cargo.toml +++ b/nym-api/nym-api-requests/Cargo.toml @@ -14,7 +14,7 @@ schemars = { version = "0.8", features = ["preserve_order"] } serde = { version = "1.0", features = ["derive"] } ts-rs = { version = "6.1.2", optional = true } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } nym-mixnet-contract-common = { path= "../../common/cosmwasm-smart-contracts/mixnet-contract" } [features] diff --git a/nym-api/nym-api-requests/src/coconut.rs b/nym-api/nym-api-requests/src/coconut.rs index 18afdd81e9..6f79bc2f21 100644 --- a/nym-api/nym-api-requests/src/coconut.rs +++ b/nym-api/nym-api-requests/src/coconut.rs @@ -5,7 +5,7 @@ use cosmrs::AccountId; use getset::{CopyGetters, Getters}; use serde::{Deserialize, Serialize}; -use coconut_interface::{ +use nym_coconut_interface::{ error::CoconutInterfaceError, Attribute, Base58, BlindSignRequest, Credential, VerificationKey, }; diff --git a/nym-api/src/coconut/client.rs b/nym-api/src/coconut/client.rs index 9975bf646e..3ada819048 100644 --- a/nym-api/src/coconut/client.rs +++ b/nym-api/src/coconut/client.rs @@ -2,14 +2,14 @@ // SPDX-License-Identifier: Apache-2.0 use crate::coconut::error::Result; -use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; -use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse}; -use coconut_dkg_common::types::{ - EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, -}; -use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use cw3::ProposalResponse; use cw4::MemberResponse; +use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; +use nym_coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse}; +use nym_coconut_dkg_common::types::{ + EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, +}; +use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use nym_contracts_common::dealings::ContractSafeBytes; use nym_dkg::Threshold; use validator_client::nyxd::cosmwasm_client::types::ExecuteResult; diff --git a/nym-api/src/coconut/comm.rs b/nym-api/src/coconut/comm.rs index f4c834600f..39fb970a02 100644 --- a/nym-api/src/coconut/comm.rs +++ b/nym-api/src/coconut/comm.rs @@ -3,8 +3,8 @@ use crate::coconut::error::Result; use crate::nyxd; -use coconut_dkg_common::types::EpochId; -use coconut_interface::VerificationKey; +use nym_coconut_dkg_common::types::EpochId; +use nym_coconut_interface::VerificationKey; use nym_credentials::coconut::utils::obtain_aggregate_verification_key; use validator_client::CoconutApiClient; diff --git a/nym-api/src/coconut/deposit.rs b/nym-api/src/coconut/deposit.rs index 27e77b34fc..4d3eab394f 100644 --- a/nym-api/src/coconut/deposit.rs +++ b/nym-api/src/coconut/deposit.rs @@ -1,11 +1,11 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use coconut_bandwidth_contract_common::events::{ +use nym_api_requests::coconut::BlindSignRequestBody; +use nym_coconut_bandwidth_contract_common::events::{ DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO, DEPOSIT_VALUE, }; -use nym_api_requests::coconut::BlindSignRequestBody; use nym_credentials::coconut::bandwidth::BandwidthVoucher; use nym_crypto::asymmetric::encryption; use nym_crypto::asymmetric::identity::{self, Signature}; diff --git a/nym-api/src/coconut/dkg/client.rs b/nym-api/src/coconut/dkg/client.rs index 3dce7926ea..8064ca5a7b 100644 --- a/nym-api/src/coconut/dkg/client.rs +++ b/nym-api/src/coconut/dkg/client.rs @@ -3,13 +3,13 @@ use crate::coconut::client::Client; use crate::coconut::error::CoconutError; -use coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse}; -use coconut_dkg_common::types::{ - EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, NodeIndex, -}; -use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use cw3::ProposalResponse; use cw4::MemberResponse; +use nym_coconut_dkg_common::dealer::{ContractDealing, DealerDetails, DealerDetailsResponse}; +use nym_coconut_dkg_common::types::{ + EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, NodeIndex, +}; +use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use nym_contracts_common::dealings::ContractSafeBytes; use nym_dkg::Threshold; use validator_client::nyxd::cosmwasm_client::logs::{find_attribute, NODE_INDEX}; diff --git a/nym-api/src/coconut/dkg/controller.rs b/nym-api/src/coconut/dkg/controller.rs index a5532ed146..b4fc713741 100644 --- a/nym-api/src/coconut/dkg/controller.rs +++ b/nym-api/src/coconut/dkg/controller.rs @@ -14,7 +14,7 @@ use crate::coconut::keypair::KeyPair as CoconutKeyPair; use crate::nyxd; use crate::support::config::Config; use anyhow::Result; -use coconut_dkg_common::types::EpochState; +use nym_coconut_dkg_common::types::EpochState; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use nym_task::{TaskClient, TaskManager}; use rand::rngs::OsRng; diff --git a/nym-api/src/coconut/dkg/dealing.rs b/nym-api/src/coconut/dkg/dealing.rs index 500da47a6a..7c8424acf6 100644 --- a/nym-api/src/coconut/dkg/dealing.rs +++ b/nym-api/src/coconut/dkg/dealing.rs @@ -4,7 +4,7 @@ use crate::coconut::dkg::client::DkgClient; use crate::coconut::dkg::state::{ConsistentState, State}; use crate::coconut::error::CoconutError; -use coconut_dkg_common::types::TOTAL_DEALINGS; +use nym_coconut_dkg_common::types::TOTAL_DEALINGS; use nym_contracts_common::dealings::ContractSafeBytes; use nym_dkg::bte::setup; use nym_dkg::Dealing; @@ -86,9 +86,9 @@ pub(crate) mod tests { use crate::coconut::dkg::state::PersistentState; use crate::coconut::tests::DummyClient; use crate::coconut::KeyPair; - use coconut_dkg_common::dealer::DealerDetails; - use coconut_dkg_common::types::InitialReplacementData; use cosmwasm_std::Addr; + use nym_coconut_dkg_common::dealer::DealerDetails; + use nym_coconut_dkg_common::types::InitialReplacementData; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use nym_dkg::bte::{Params, PublicKeyWithProof}; use nymcoconut::{ttp_keygen, Parameters}; diff --git a/nym-api/src/coconut/dkg/public_key.rs b/nym-api/src/coconut/dkg/public_key.rs index 39c78b88b9..cf779cd8a1 100644 --- a/nym-api/src/coconut/dkg/public_key.rs +++ b/nym-api/src/coconut/dkg/public_key.rs @@ -4,7 +4,7 @@ use crate::coconut::dkg::client::DkgClient; use crate::coconut::dkg::state::State; use crate::coconut::error::CoconutError; -use coconut_dkg_common::dealer::DealerType; +use nym_coconut_dkg_common::dealer::DealerType; pub(crate) async fn public_key_submission( dkg_client: &DkgClient, diff --git a/nym-api/src/coconut/dkg/state.rs b/nym-api/src/coconut/dkg/state.rs index 5ee9a9825e..6d37161572 100644 --- a/nym-api/src/coconut/dkg/state.rs +++ b/nym-api/src/coconut/dkg/state.rs @@ -4,9 +4,9 @@ use crate::coconut::dkg::complaints::ComplaintReason; use crate::coconut::error::CoconutError; use crate::coconut::keypair::KeyPair as CoconutKeyPair; -use coconut_dkg_common::dealer::DealerDetails; -use coconut_dkg_common::types::EpochState; use cosmwasm_std::Addr; +use nym_coconut_dkg_common::dealer::DealerDetails; +use nym_coconut_dkg_common::types::EpochState; use nym_dkg::bte::{keys::KeyPair as DkgKeyPair, PublicKey, PublicKeyWithProof}; use nym_dkg::{NodeIndex, RecoveredVerificationKeys, Threshold}; use nymcoconut::SecretKey; @@ -337,7 +337,7 @@ impl State { pub async fn set_coconut_keypair( &mut self, - coconut_keypair: Option, + coconut_keypair: Option, ) { self.coconut_keypair.set(coconut_keypair).await } diff --git a/nym-api/src/coconut/dkg/verification_key.rs b/nym-api/src/coconut/dkg/verification_key.rs index 490ebc1c0e..402db402ee 100644 --- a/nym-api/src/coconut/dkg/verification_key.rs +++ b/nym-api/src/coconut/dkg/verification_key.rs @@ -6,12 +6,12 @@ use crate::coconut::dkg::complaints::ComplaintReason; use crate::coconut::dkg::state::{ConsistentState, State}; use crate::coconut::error::CoconutError; use crate::coconut::helpers::accepted_vote_err; -use coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID; -use coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS}; -use coconut_dkg_common::verification_key::owner_from_cosmos_msgs; -use coconut_interface::KeyPair as CoconutKeyPair; use cosmwasm_std::Addr; use cw3::{ProposalResponse, Status}; +use nym_coconut_dkg_common::event_attributes::DKG_PROPOSAL_ID; +use nym_coconut_dkg_common::types::{NodeIndex, TOTAL_DEALINGS}; +use nym_coconut_dkg_common::verification_key::owner_from_cosmos_msgs; +use nym_coconut_interface::KeyPair as CoconutKeyPair; use nym_credentials::coconut::bandwidth::{PRIVATE_ATTRIBUTES, PUBLIC_ATTRIBUTES}; use nym_dkg::bte::{decrypt_share, setup}; use nym_dkg::error::DkgError; @@ -277,9 +277,9 @@ pub(crate) mod tests { use crate::coconut::dkg::state::PersistentState; use crate::coconut::tests::DummyClient; use crate::coconut::KeyPair; - use coconut_dkg_common::dealer::DealerDetails; - use coconut_dkg_common::types::InitialReplacementData; - use coconut_dkg_common::verification_key::ContractVKShare; + use nym_coconut_dkg_common::dealer::DealerDetails; + use nym_coconut_dkg_common::types::InitialReplacementData; + use nym_coconut_dkg_common::verification_key::ContractVKShare; use nym_contracts_common::dealings::ContractSafeBytes; use nym_dkg::bte::keys::KeyPair as DkgKeyPair; use nymcoconut::aggregate_verification_keys; diff --git a/nym-api/src/coconut/error.rs b/nym-api/src/coconut/error.rs index f376f8cda9..387f4219f0 100644 --- a/nym-api/src/coconut/error.rs +++ b/nym-api/src/coconut/error.rs @@ -71,7 +71,7 @@ pub enum CoconutError { DifferentPublicAttributes(String, String), #[error("Error in coconut interface - {0}")] - CoconutInterfaceError(#[from] coconut_interface::error::CoconutInterfaceError), + CoconutInterfaceError(#[from] nym_coconut_interface::error::CoconutInterfaceError), #[error("Storage error - {0}")] StorageError(#[from] NymApiStorageError), diff --git a/nym-api/src/coconut/helpers.rs b/nym-api/src/coconut/helpers.rs index 986bb6b305..5d2cda6a6d 100644 --- a/nym-api/src/coconut/helpers.rs +++ b/nym-api/src/coconut/helpers.rs @@ -8,7 +8,8 @@ use validator_client::nyxd::error::NyxdError::AbciError; // thus the transaction might fail pub(crate) fn accepted_vote_err(ret: Result<(), CoconutError>) -> Result<(), CoconutError> { if let Err(CoconutError::NyxdError(AbciError { ref log, .. })) = ret { - let accepted_err = multisig_contract_common::error::ContractError::NotOpen {}.to_string(); + let accepted_err = + nym_multisig_contract_common::error::ContractError::NotOpen {}.to_string(); // If redundant voting is not the case, error out on all other error variants if !log.value().contains(&accepted_err) { ret?; diff --git a/nym-api/src/coconut/keypair.rs b/nym-api/src/coconut/keypair.rs index e97ca82000..330a1a26de 100644 --- a/nym-api/src/coconut/keypair.rs +++ b/nym-api/src/coconut/keypair.rs @@ -6,7 +6,7 @@ use tokio::sync::{RwLock, RwLockReadGuard}; #[derive(Clone, Debug)] pub struct KeyPair { - inner: Arc>>, + inner: Arc>>, } impl KeyPair { @@ -20,7 +20,7 @@ impl KeyPair { self.inner.read().await } - pub async fn set(&self, keypair: Option) { + pub async fn set(&self, keypair: Option) { let mut w_lock = self.inner.write().await; *w_lock = keypair; } diff --git a/nym-api/src/coconut/mod.rs b/nym-api/src/coconut/mod.rs index 3f104d4dad..d28b734d8d 100644 --- a/nym-api/src/coconut/mod.rs +++ b/nym-api/src/coconut/mod.rs @@ -7,19 +7,19 @@ use crate::coconut::deposit::extract_encryption_key; use crate::coconut::error::{CoconutError, Result}; use crate::coconut::helpers::accepted_vote_err; use crate::support::storage::NymApiStorage; -use coconut_bandwidth_contract_common::spend_credential::{ - funds_from_cosmos_msgs, SpendCredentialStatus, -}; -use coconut_dkg_common::types::EpochId; -use coconut_interface::KeyPair as CoconutKeyPair; -use coconut_interface::{ - Attribute, BlindSignRequest, BlindedSignature, Parameters, VerificationKey, -}; use getset::{CopyGetters, Getters}; use keypair::KeyPair; use nym_api_requests::coconut::{ BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse, }; +use nym_coconut_bandwidth_contract_common::spend_credential::{ + funds_from_cosmos_msgs, SpendCredentialStatus, +}; +use nym_coconut_dkg_common::types::EpochId; +use nym_coconut_interface::KeyPair as CoconutKeyPair; +use nym_coconut_interface::{ + Attribute, BlindSignRequest, BlindedSignature, Parameters, VerificationKey, +}; use nym_config::defaults::NYM_API_VERSION; use nym_credentials::coconut::params::{ NymApiCredentialEncryptionAlgorithm, NymApiCredentialHkdfAlgorithm, @@ -190,7 +190,7 @@ impl InternalSignRequest { fn blind_sign(request: InternalSignRequest, key_pair: &CoconutKeyPair) -> Result { let params = Parameters::new(request.total_params())?; - Ok(coconut_interface::blind_sign( + Ok(nym_coconut_interface::blind_sign( ¶ms, &key_pair.secret_key(), request.blind_sign_request(), diff --git a/nym-api/src/coconut/tests.rs b/nym-api/src/coconut/tests.rs index 6f6ff2ae32..065c7ac5a5 100644 --- a/nym-api/src/coconut/tests.rs +++ b/nym-api/src/coconut/tests.rs @@ -3,18 +3,18 @@ use super::InternalSignRequest; use crate::coconut::error::{CoconutError, Result}; -use coconut_bandwidth_contract_common::events::{ - DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO, - DEPOSIT_VALUE, -}; -use coconut_bandwidth_contract_common::spend_credential::{ - SpendCredential, SpendCredentialResponse, -}; -use coconut_interface::{hash_to_scalar, Credential, VerificationKey}; use cosmwasm_std::{to_binary, Addr, CosmosMsg, Decimal, WasmMsg}; use nym_api_requests::coconut::{ BlindSignRequestBody, BlindedSignatureResponse, VerifyCredentialBody, VerifyCredentialResponse, }; +use nym_coconut_bandwidth_contract_common::events::{ + DEPOSITED_FUNDS_EVENT_TYPE, DEPOSIT_ENCRYPTION_KEY, DEPOSIT_IDENTITY_KEY, DEPOSIT_INFO, + DEPOSIT_VALUE, +}; +use nym_coconut_bandwidth_contract_common::spend_credential::{ + SpendCredential, SpendCredentialResponse, +}; +use nym_coconut_interface::{hash_to_scalar, Credential, VerificationKey}; use nym_config::defaults::VOUCHER_INFO; use nym_credentials::coconut::bandwidth::BandwidthVoucher; use nym_credentials::coconut::params::{ @@ -35,16 +35,16 @@ use validator_client::nyxd::{tx::Hash, AccountId, DeliverTx, Event, Fee, Tag, Tx use crate::coconut::State; use crate::support::storage::NymApiStorage; use async_trait::async_trait; -use coconut_dkg_common::dealer::{ - ContractDealing, DealerDetails, DealerDetailsResponse, DealerType, -}; -use coconut_dkg_common::event_attributes::{DKG_PROPOSAL_ID, NODE_INDEX}; -use coconut_dkg_common::types::{ - EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, TOTAL_DEALINGS, -}; -use coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use cw3::ProposalResponse; use cw4::MemberResponse; +use nym_coconut_dkg_common::dealer::{ + ContractDealing, DealerDetails, DealerDetailsResponse, DealerType, +}; +use nym_coconut_dkg_common::event_attributes::{DKG_PROPOSAL_ID, NODE_INDEX}; +use nym_coconut_dkg_common::types::{ + EncodedBTEPublicKeyWithProof, Epoch, EpochId, InitialReplacementData, TOTAL_DEALINGS, +}; +use nym_coconut_dkg_common::verification_key::{ContractVKShare, VerificationKeyShare}; use nym_contracts_common::dealings::ContractSafeBytes; use nym_crypto::asymmetric::{encryption, identity}; use nym_dkg::Threshold; @@ -399,10 +399,11 @@ impl super::client::Client for DummyClient { }, ); let proposal_id = OsRng.gen(); - let verify_vk_share_req = coconut_dkg_common::msg::ExecuteMsg::VerifyVerificationKeyShare { - owner: Addr::unchecked(self.validator_address.as_ref()), - resharing, - }; + let verify_vk_share_req = + nym_coconut_dkg_common::msg::ExecuteMsg::VerifyVerificationKeyShare { + owner: Addr::unchecked(self.validator_address.as_ref()), + resharing, + }; let verify_vk_share_msg = CosmosMsg::Wasm(WasmMsg::Execute { contract_addr: String::new(), msg: to_binary(&verify_vk_share_req).unwrap(), @@ -954,7 +955,7 @@ async fn verification_of_bandwidth_credential() { // Test the endpoint without any credential recorded in the Coconut Bandwidth Contract let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM); - let msg = coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { + let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { funds: funds.clone().into(), }; let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute { @@ -1050,7 +1051,7 @@ async fn verification_of_bandwidth_credential() { // Test the endpoint with a proposal that has a different value for the funds to be released // then what's in the credential let funds = Coin::new((voucher_value + 10) as u128, TEST_COIN_DENOM); - let msg = coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { + let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { funds: funds.clone().into(), }; let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute { @@ -1088,7 +1089,7 @@ async fn verification_of_bandwidth_credential() { // Test the endpoint with every dependency met let funds = Coin::new(voucher_value as u128, TEST_COIN_DENOM); - let msg = coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { + let msg = nym_coconut_bandwidth_contract_common::msg::ExecuteMsg::ReleaseFunds { funds: funds.clone().into(), }; let cosmos_msg = CosmosMsg::Wasm(WasmMsg::Execute { diff --git a/nym-api/src/network_monitor/mod.rs b/nym-api/src/network_monitor/mod.rs index 4e32c61f7b..25b6494da5 100644 --- a/nym-api/src/network_monitor/mod.rs +++ b/nym-api/src/network_monitor/mod.rs @@ -16,9 +16,9 @@ use crate::nym_contract_cache::cache::NymContractCache; use crate::storage::NymApiStorage; use crate::support::config::Config; use crate::support::nyxd; -use credential_storage::PersistentStorage; use futures::channel::mpsc; use gateway_client::bandwidth::BandwidthController; +use nym_credential_storage::PersistentStorage; use nym_crypto::asymmetric::{encryption, identity}; use nym_task::TaskManager; use std::sync::Arc; @@ -97,8 +97,10 @@ impl<'a> NetworkMonitorBuilder<'a> { let bandwidth_controller = { let client = self._nyxd_client.0.read().await; BandwidthController::new( - credential_storage::initialise_storage(self.config.get_credentials_database_path()) - .await, + nym_credential_storage::initialise_storage( + self.config.get_credentials_database_path(), + ) + .await, client.clone(), ) }; diff --git a/nym-api/src/network_monitor/monitor/sender.rs b/nym-api/src/network_monitor/monitor/sender.rs index 1a58db1cae..cf536a6322 100644 --- a/nym-api/src/network_monitor/monitor/sender.rs +++ b/nym-api/src/network_monitor/monitor/sender.rs @@ -6,7 +6,6 @@ use crate::network_monitor::monitor::gateway_clients_cache::{ }; use crate::network_monitor::monitor::gateways_pinger::GatewayPinger; use crate::network_monitor::monitor::receiver::{GatewayClientUpdate, GatewayClientUpdateSender}; -use credential_storage::PersistentStorage; use futures::channel::mpsc; use futures::stream::{self, FuturesUnordered, StreamExt}; use futures::task::Context; @@ -15,6 +14,7 @@ use gateway_client::error::GatewayClientError; use gateway_client::{AcknowledgementReceiver, GatewayClient, MixnetMessageReceiver}; use log::{debug, info, trace, warn}; use nym_config::defaults::REMAINING_BANDWIDTH_THRESHOLD; +use nym_credential_storage::PersistentStorage; use nym_crypto::asymmetric::identity::{self, PUBLIC_KEY_LENGTH}; use nym_sphinx::forwarding::packet::MixPacket; use nym_task::TaskClient; diff --git a/nym-api/src/support/nyxd/mod.rs b/nym-api/src/support/nyxd/mod.rs index 441684f58c..0686e5c9ef 100644 --- a/nym-api/src/support/nyxd/mod.rs +++ b/nym-api/src/support/nyxd/mod.rs @@ -6,15 +6,15 @@ use crate::epoch_operations::MixnodeToReward; use crate::support::config::Config; use anyhow::Result; use async_trait::async_trait; -use coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; -use coconut_dkg_common::types::InitialReplacementData; -use coconut_dkg_common::{ +use cw3::ProposalResponse; +use cw4::MemberResponse; +use nym_coconut_bandwidth_contract_common::spend_credential::SpendCredentialResponse; +use nym_coconut_dkg_common::types::InitialReplacementData; +use nym_coconut_dkg_common::{ dealer::{ContractDealing, DealerDetails, DealerDetailsResponse}, types::{EncodedBTEPublicKeyWithProof, Epoch, EpochId}, verification_key::{ContractVKShare, VerificationKeyShare}, }; -use cw3::ProposalResponse; -use cw4::MemberResponse; use nym_config::defaults::{ChainDetails, NymNetworkDetails, DEFAULT_NYM_API_PORT}; use nym_contracts_common::dealings::ContractSafeBytes; use nym_mixnet_contract_common::families::{Family, FamilyHead}; diff --git a/nym-connect/mobile/src-tauri/Cargo.lock b/nym-connect/mobile/src-tauri/Cargo.lock index a297ef8bf7..696e24bcb6 100644 --- a/nym-connect/mobile/src-tauri/Cargo.lock +++ b/nym-connect/mobile/src-tauri/Cargo.lock @@ -689,39 +689,6 @@ dependencies = [ "objc", ] -[[package]] -name = "coconut-bandwidth-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "multisig-contract-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-dkg-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "multisig-contract-common", - "nym-contracts-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-interface" -version = "0.1.0" -dependencies = [ - "bs58", - "getset", - "nymcoconut", - "serde", - "thiserror", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -948,17 +915,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "credential-storage" -version = "0.1.0" -dependencies = [ - "async-trait", - "log", - "sqlx 0.5.13", - "thiserror", - "tokio", -] - [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -1867,13 +1823,13 @@ name = "gateway-client" version = "0.1.0" dependencies = [ "async-trait", - "coconut-interface", - "credential-storage", "futures", "gateway-requests", "getrandom 0.2.8", "log", "mobile-storage", + "nym-coconut-interface", + "nym-credential-storage", "nym-credentials", "nym-crypto", "nym-network-defaults", @@ -1900,9 +1856,9 @@ name = "gateway-requests" version = "0.1.0" dependencies = [ "bs58", - "coconut-interface", "futures", "log", + "nym-coconut-interface", "nym-credentials", "nym-crypto", "nym-pemstore", @@ -2215,15 +2171,6 @@ dependencies = [ "subtle 2.4.1", ] -[[package]] -name = "group-contract-common" -version = "0.1.0" -dependencies = [ - "cw4", - "schemars", - "serde", -] - [[package]] name = "gtk" version = "0.16.2" @@ -3210,20 +3157,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "multisig-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "cw3", - "cw3-fixed-multisig", - "cw4", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -3401,10 +3334,10 @@ name = "nym-api-requests" version = "0.1.0" dependencies = [ "bs58", - "coconut-interface", "cosmrs", "cosmwasm-std", "getset", + "nym-coconut-interface", "nym-mixnet-contract-common", "schemars", "serde", @@ -3424,6 +3357,39 @@ dependencies = [ "vergen", ] +[[package]] +name = "nym-coconut-bandwidth-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-dkg-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "nym-contracts-common", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-interface" +version = "0.1.0" +dependencies = [ + "bs58", + "getset", + "nymcoconut", + "serde", + "thiserror", +] + [[package]] name = "nym-config" version = "0.1.0" @@ -3489,14 +3455,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nym-credential-storage" +version = "0.1.0" +dependencies = [ + "async-trait", + "log", + "sqlx 0.5.13", + "thiserror", + "tokio", +] + [[package]] name = "nym-credentials" version = "0.1.0" dependencies = [ "bls12_381 0.5.0", - "coconut-interface", "cosmrs", "nym-api-requests", + "nym-coconut-interface", "nym-crypto", "thiserror", "validator-client", @@ -3553,6 +3530,15 @@ dependencies = [ "syn", ] +[[package]] +name = "nym-group-contract-common" +version = "0.1.0" +dependencies = [ + "cw4", + "schemars", + "serde", +] + [[package]] name = "nym-mixnet-contract-common" version = "0.2.0" @@ -3570,6 +3556,20 @@ dependencies = [ "time 0.3.19", ] +[[package]] +name = "nym-multisig-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "cw3", + "cw3-fixed-multisig", + "cw4", + "schemars", + "serde", + "thiserror", +] + [[package]] name = "nym-network-defaults" version = "0.1.0" @@ -3629,7 +3629,6 @@ version = "1.1.12" dependencies = [ "clap", "client-core", - "coconut-interface", "dirs", "futures", "gateway-client", @@ -3638,6 +3637,7 @@ dependencies = [ "log", "mobile-storage", "nym-bin-common", + "nym-coconut-interface", "nym-config", "nym-credentials", "nym-crypto", @@ -6750,9 +6750,6 @@ dependencies = [ "async-trait", "base64 0.13.1", "bip39", - "coconut-bandwidth-contract-common", - "coconut-dkg-common", - "coconut-interface", "colored 2.0.0", "cosmrs", "cosmwasm-std", @@ -6760,15 +6757,18 @@ dependencies = [ "cw4", "flate2", "futures", - "group-contract-common", "itertools", "log", - "multisig-contract-common", "nym-api-requests", + "nym-coconut-bandwidth-contract-common", + "nym-coconut-dkg-common", + "nym-coconut-interface", "nym-config", "nym-contracts-common", "nym-execute", + "nym-group-contract-common", "nym-mixnet-contract-common", + "nym-multisig-contract-common", "nym-network-defaults", "nym-vesting-contract", "nym-vesting-contract-common", diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 368db82d22..d88f92b3ea 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -574,39 +574,6 @@ dependencies = [ "objc", ] -[[package]] -name = "coconut-bandwidth-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "multisig-contract-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-dkg-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "multisig-contract-common", - "nym-contracts-common", - "schemars", - "serde", -] - -[[package]] -name = "coconut-interface" -version = "0.1.0" -dependencies = [ - "bs58", - "getset", - "nymcoconut", - "serde", - "thiserror", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -1799,15 +1766,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "group-contract-common" -version = "0.1.0" -dependencies = [ - "cw4", - "schemars", - "serde", -] - [[package]] name = "gtk" version = "0.15.5" @@ -2576,20 +2534,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "multisig-contract-common" -version = "0.1.0" -dependencies = [ - "cosmwasm-std", - "cw-utils", - "cw3", - "cw3-fixed-multisig", - "cw4", - "schemars", - "serde", - "thiserror", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -2753,10 +2697,10 @@ name = "nym-api-requests" version = "0.1.0" dependencies = [ "bs58", - "coconut-interface", "cosmrs", "cosmwasm-std", "getset", + "nym-coconut-interface", "nym-mixnet-contract-common", "schemars", "serde", @@ -2775,6 +2719,39 @@ dependencies = [ "vergen", ] +[[package]] +name = "nym-coconut-bandwidth-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-dkg-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "nym-contracts-common", + "nym-multisig-contract-common", + "schemars", + "serde", +] + +[[package]] +name = "nym-coconut-interface" +version = "0.1.0" +dependencies = [ + "bs58", + "getset", + "nymcoconut", + "serde", + "thiserror", +] + [[package]] name = "nym-config" version = "0.1.0" @@ -2828,6 +2805,15 @@ dependencies = [ "syn", ] +[[package]] +name = "nym-group-contract-common" +version = "0.1.0" +dependencies = [ + "cw4", + "schemars", + "serde", +] + [[package]] name = "nym-mixnet-contract-common" version = "0.2.0" @@ -2846,6 +2832,20 @@ dependencies = [ "ts-rs", ] +[[package]] +name = "nym-multisig-contract-common" +version = "0.1.0" +dependencies = [ + "cosmwasm-std", + "cw-utils", + "cw3", + "cw3-fixed-multisig", + "cw4", + "schemars", + "serde", + "thiserror", +] + [[package]] name = "nym-network-defaults" version = "0.1.0" @@ -2870,12 +2870,12 @@ dependencies = [ name = "nym-types" version = "1.0.0" dependencies = [ - "coconut-interface", "cosmrs", "cosmwasm-std", "eyre", "itertools", "log", + "nym-coconut-interface", "nym-config", "nym-mixnet-contract-common", "nym-vesting-contract", @@ -2964,7 +2964,6 @@ dependencies = [ "base64 0.13.1", "bip39", "cfg-if", - "coconut-interface", "colored 2.0.0", "cosmrs", "cosmwasm-std", @@ -2976,6 +2975,7 @@ dependencies = [ "itertools", "k256", "log", + "nym-coconut-interface", "nym-config", "nym-mixnet-contract-common", "nym-types", @@ -5419,9 +5419,6 @@ dependencies = [ "async-trait", "base64 0.13.1", "bip39", - "coconut-bandwidth-contract-common", - "coconut-dkg-common", - "coconut-interface", "colored 2.0.0", "cosmrs", "cosmwasm-std", @@ -5429,15 +5426,18 @@ dependencies = [ "cw4", "flate2", "futures", - "group-contract-common", "itertools", "log", - "multisig-contract-common", "nym-api-requests", + "nym-coconut-bandwidth-contract-common", + "nym-coconut-dkg-common", + "nym-coconut-interface", "nym-config", "nym-contracts-common", "nym-execute", + "nym-group-contract-common", "nym-mixnet-contract-common", + "nym-multisig-contract-common", "nym-network-defaults", "nym-vesting-contract", "nym-vesting-contract-common", diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 8c89ab7428..406e9fb4c1 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -60,7 +60,7 @@ validator-client = { path = "../../common/client-libs/validator-client", feature nym-mixnet-contract-common = { path = "../../common/cosmwasm-smart-contracts/mixnet-contract" } nym-vesting-contract-common = { path = "../../common/cosmwasm-smart-contracts/vesting-contract" } nym-config = { path = "../../common/config" } -coconut-interface = { path = "../../common/coconut-interface" } +nym-coconut-interface = { path = "../../common/coconut-interface" } # Used for Type conversion, can be extracted but its a lot of work nym-vesting-contract = { path = "../../contracts/vesting" } nym-types = { path = "../../common/types" }