Merge branch 'v0.42-dev' into fix/rpc-key-wallet-defaults

Author: shumkov

key-wallet-ffi/Cargo.toml

@@ -20,7 +20,7 @@ eddsa = ["dashcore/eddsa", "key-wallet/eddsa"]
 bls = ["dashcore/bls", "key-wallet/bls"]
 
 [dependencies]
-key-wallet = { path = "../key-wallet", default-features = false, features = ["std", "manager"] }
+key-wallet = { path = "../key-wallet", features = ["manager"] }
 dashcore = { path = "../dash" }
 secp256k1 = { version = "0.30.0", features = ["global-context"] }
 tokio = { version = "1.32", features = ["rt-multi-thread", "sync"] }
@@ -31,6 +31,6 @@ hex = "0.4"
 cbindgen = "0.29"
 
 [dev-dependencies]
-key-wallet = { path = "../key-wallet", default-features = false, features = ["std", "manager", "test-utils"] }
+key-wallet = { path = "../key-wallet", features = ["manager", "test-utils"] }
 tempfile = "3.0"
 hex = "0.4"

key-wallet/Cargo.toml

@@ -9,8 +9,7 @@ readme = "README.md"
 license = "CC0-1.0"
 
 [features]
-default = ["std", "manager"]
-std = ["secp256k1/std", "bip39/std", "getrandom", "rand"]
+default = ["secp256k1/std", "bip39/std", "getrandom", "rand", "manager"]
 manager = ["dep:tokio"]
 parallel-filters = ["manager", "dep:rayon"]
 serde = ["dep:serde", "dep:serde_json", "dashcore_hashes/serde", "secp256k1/serde", "dashcore/serde"]

key-wallet/src/account/account_collection.rs

@@ -2,8 +2,8 @@
 //!
 //! This module provides a structured way to manage accounts by type.
 
-use alloc::collections::BTreeMap;
-use alloc::vec::Vec;
+use std::collections::BTreeMap;
+
 #[cfg(feature = "bincode")]
 use bincode_derive::{Decode, Encode};
 #[cfg(feature = "serde")]

key-wallet/src/account/account_trait.rs

@@ -7,7 +7,6 @@ use crate::bip32::DerivationPath;
 use crate::dip9::DerivationPathReference;
 use crate::error::Result;
 use crate::Network;
-use alloc::vec::Vec;
 
 /// Common trait for all account types
 pub trait AccountTrait {

key-wallet/src/account/bls_account.rs

@@ -9,7 +9,6 @@ use crate::derivation_bls_bip32::{ExtendedBLSPrivKey, ExtendedBLSPubKey};
 use crate::error::{Error, Result};
 use crate::managed_account::address_pool::AddressPoolType;
 use crate::{ChildNumber, DerivationPath, Network};
-use alloc::vec::Vec;
 use core::fmt;
 use dashcore::Address;
 

key-wallet/src/account/eddsa_account.rs

@@ -8,7 +8,6 @@ use crate::account::AccountType;
 use crate::derivation_slip10::{ExtendedEd25519PrivKey, ExtendedEd25519PubKey, VerifyingKey};
 use crate::error::{Error, Result};
 use crate::{ChildNumber, DerivationPath, Network};
-use alloc::vec::Vec;
 use core::fmt;
 use dashcore::Address;
 

key-wallet/src/bip32.rs

@@ -25,7 +25,6 @@ use core::default::Default;
 use core::fmt;
 use core::ops::Index;
 use core::str::FromStr;
-#[cfg(feature = "std")]
 use std::error;
 
 use dashcore_hashes::{hash160, sha512, Hash, HashEngine, Hmac, HmacEngine};
@@ -42,7 +41,6 @@ use crate::dip9::{
     IDENTITY_REGISTRATION_PATH_MAINNET, IDENTITY_REGISTRATION_PATH_TESTNET,
     IDENTITY_TOPUP_PATH_MAINNET, IDENTITY_TOPUP_PATH_TESTNET,
 };
-use alloc::{string::String, vec::Vec};
 use base58ck;
 #[cfg(feature = "bincode")]
 use bincode_derive::{Decode, Encode};
@@ -343,7 +341,6 @@ impl<'de> serde::Deserialize<'de> for Fingerprint {
 
 /// Extended private key
 #[derive(Copy, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Debug))]
 pub struct ExtendedPrivKey {
     /// The network this key is to be used on
     pub network: Network,
@@ -451,8 +448,6 @@ impl<'de> serde::Deserialize<'de> for ExtendedPrivKey {
     }
 }
 
-#[cfg(not(feature = "std"))]
-#[cfg_attr(docsrs, doc(cfg(not(feature = "std"))))]
 impl fmt::Debug for ExtendedPrivKey {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         f.debug_struct("ExtendedPrivKey")
@@ -1474,7 +1469,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
 impl error::Error for Error {
     fn cause(&self) -> Option<&dyn error::Error> {
         if let Error::Secp256k1(ref e) = *self {

key-wallet/src/bip38.rs

@@ -11,8 +11,6 @@
 //! - Prefix: 0x0142 for non-EC-multiply mode (base58 starts with "6P")
 //! - Prefix: 0x0143 for EC-multiply mode (base58 starts with "6P")
 
-use alloc::string::String;
-use alloc::vec::Vec;
 use core::fmt;
 
 use crate::error::{Error, Result};

key-wallet/src/derivation.rs

@@ -3,7 +3,6 @@
 //! This module provides key derivation functionality with a builder pattern
 //! for flexible path construction and derivation strategies.
 
-use alloc::vec::Vec;
 use secp256k1::Secp256k1;
 
 use crate::bip32::{ChildNumber, DerivationPath, ExtendedPrivKey, ExtendedPubKey};

key-wallet/src/derivation_bls_bip32.rs

@@ -10,11 +10,8 @@
 //! - Supports both hardened and non-hardened derivation
 
 use core::fmt;
-#[cfg(feature = "std")]
-use std::error;
-
-use alloc::string::String;
 use dashcore_hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
+use std::error;
 
 // NOTE: We use Bls12381G2Impl for BLS keys (48-byte public keys)
 use dashcore::blsful::{
@@ -64,7 +61,6 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
 impl error::Error for Error {}
 
 /// Extended BLS private key for HD derivation