diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index ff002afa0d..ebd757518b 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -21,7 +21,7 @@ x25519-dalek = { workspace = true, features = ["static_secrets"], optional = tru ed25519-dalek = { workspace = true, features = ["rand_core"], optional = true } rand = { workspace = true, optional = true } serde_bytes = { workspace = true, optional = true } -serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" } +serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] } subtle-encoding = { workspace = true, features = ["bech32-preview"] } thiserror = { workspace = true } zeroize = { workspace = true, optional = true, features = ["zeroize_derive"] } @@ -35,7 +35,7 @@ rand_chacha = { workspace = true } [features] default = ["sphinx"] -serde = ["serde_crate", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"] +serde = ["dep:serde", "serde_bytes", "ed25519-dalek/serde", "x25519-dalek/serde"] asymmetric = ["x25519-dalek", "ed25519-dalek", "zeroize"] hashing = ["blake3", "digest", "hkdf", "hmac", "generic-array"] symmetric = ["aes", "ctr", "cipher", "generic-array"] diff --git a/common/crypto/src/asymmetric/encryption/mod.rs b/common/crypto/src/asymmetric/encryption/mod.rs index cadb5437e4..7f501445b9 100644 --- a/common/crypto/src/asymmetric/encryption/mod.rs +++ b/common/crypto/src/asymmetric/encryption/mod.rs @@ -44,7 +44,6 @@ pub enum KeyRecoveryError { #[derive(Zeroize, ZeroizeOnDrop)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))] pub struct KeyPair { pub(crate) private_key: PrivateKey, diff --git a/common/crypto/src/asymmetric/identity/mod.rs b/common/crypto/src/asymmetric/identity/mod.rs index f65290f907..3536782e94 100644 --- a/common/crypto/src/asymmetric/identity/mod.rs +++ b/common/crypto/src/asymmetric/identity/mod.rs @@ -55,7 +55,6 @@ pub enum Ed25519RecoveryError { /// Keypair for usage in ed25519 EdDSA. #[derive(Debug, Zeroize, ZeroizeOnDrop)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))] pub struct KeyPair { private_key: PrivateKey, diff --git a/common/crypto/src/asymmetric/identity/serde_helpers.rs b/common/crypto/src/asymmetric/identity/serde_helpers.rs index 67f9dece70..927ca77ec7 100644 --- a/common/crypto/src/asymmetric/identity/serde_helpers.rs +++ b/common/crypto/src/asymmetric/identity/serde_helpers.rs @@ -5,7 +5,7 @@ use super::PublicKey; pub mod bs58_pubkey { use super::*; - use serde_crate::{Deserialize, Deserializer, Serializer}; + use serde::{Deserialize, Deserializer, Serializer}; pub fn serialize(key: &PublicKey, serializer: S) -> Result { serializer.serialize_str(&key.to_base58_string()) diff --git a/common/crypto/src/lib.rs b/common/crypto/src/lib.rs index 19aab595d4..4ab59949f0 100644 --- a/common/crypto/src/lib.rs +++ b/common/crypto/src/lib.rs @@ -28,6 +28,3 @@ pub use aes; pub use blake3; #[cfg(feature = "symmetric")] pub use ctr; - -#[cfg(feature = "serde")] -extern crate serde_crate as serde; diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml index 0392445c41..37b3b01519 100644 --- a/common/nymsphinx/acknowledgements/Cargo.toml +++ b/common/nymsphinx/acknowledgements/Cargo.toml @@ -9,7 +9,7 @@ repository = { workspace = true } [dependencies] rand = { workspace = true } -serde_crate = { version = "1.0", optional = true, default-features = false, features = ["derive"], package = "serde" } +serde = { version = "1.0", optional = true, default-features = false, features = ["derive"] } generic-array = { workspace = true, optional = true, features = ["serde"] } thiserror = { workspace = true } zeroize = { workspace = true } @@ -23,4 +23,4 @@ nym-sphinx-types = { path = "../types", features = ["sphinx"] } nym-topology = { path = "../../topology" } [features] -serde = ["serde_crate", "generic-array"] +serde = ["dep:serde", "generic-array"] diff --git a/common/nymsphinx/acknowledgements/src/key.rs b/common/nymsphinx/acknowledgements/src/key.rs index 869f713657..8ee996cd1d 100644 --- a/common/nymsphinx/acknowledgements/src/key.rs +++ b/common/nymsphinx/acknowledgements/src/key.rs @@ -9,10 +9,9 @@ use std::fmt::{self, Display, Formatter}; use zeroize::{Zeroize, ZeroizeOnDrop}; #[cfg(feature = "serde")] -use serde_crate::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "serde", serde(crate = "serde_crate"))] #[derive(Zeroize, ZeroizeOnDrop)] pub struct AckKey(CipherKey); diff --git a/contracts/coconut-bandwidth/Cargo.toml b/contracts/coconut-bandwidth/Cargo.toml index 86a6a1bbfb..b810e74105 100644 --- a/contracts/coconut-bandwidth/Cargo.toml +++ b/contracts/coconut-bandwidth/Cargo.toml @@ -26,4 +26,4 @@ serde = { version = "1.0.103", default-features = false, features = ["derive"] } thiserror = { workspace = true } [features] -schema-gen = ["nym-coconut-bandwidth-contract-common/schema", "cosmwasm-schema"] \ No newline at end of file +schema-gen = ["nym-coconut-bandwidth-contract-common/schema", "cosmwasm-schema"]