refactor: split key wallet

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["dash", "hashes", "internals", "fuzz", "rpc-client", "rpc-json", "rpc-integration-test"]
+members = ["dash", "hashes", "internals", "fuzz", "rpc-client", "rpc-json", "rpc-integration-test", "key-wallet", "key-wallet-ffi"]
 resolver = "2"
 
 [workspace.package]

dash/Cargo.toml

@@ -23,7 +23,7 @@ default = [ "std", "secp-recovery", "bincode" ]
 base64 = [ "base64-compat" ]
 rand-std = ["secp256k1/rand"]
 rand = ["secp256k1/rand"]
-serde = ["actual-serde", "dashcore_hashes/serde", "secp256k1/serde"]
+serde = ["actual-serde", "dashcore_hashes/serde", "secp256k1/serde", "key-wallet/serde"]
 secp-lowmemory = ["secp256k1/lowmemory"]
 secp-recovery = ["secp256k1/recovery"]
 signer = ["secp-recovery", "rand", "base64"]
@@ -32,14 +32,14 @@ bls = ["blsful"]
 eddsa = ["ed25519-dalek"]
 quorum_validation = ["bls", "bls-signatures"]
 message_verification = ["bls"]
-bincode = [ "dep:bincode", "dashcore_hashes/bincode" ]
+bincode = [ "dep:bincode", "dep:bincode_derive", "dashcore_hashes/bincode" ]
 
 # At least one of std, no-std must be enabled.
 #
 # The no-std feature doesn't disable std - you need to turn off the std feature for that by disabling default.
 # Instead no-std enables additional features required for this crate to be usable without std.
 # As a result, both can be enabled without conflict.
-std = ["secp256k1/std", "dashcore_hashes/std", "bech32/std", "internals/std"]
+std = ["secp256k1/std", "dashcore_hashes/std", "bech32/std", "internals/std", "key-wallet/std"]
 no-std = ["core2", "dashcore_hashes/alloc", "dashcore_hashes/core2", "secp256k1/alloc"]
 
 [package.metadata.docs.rs]
@@ -51,6 +51,7 @@ internals = { path = "../internals", package = "dashcore-private" }
 bech32 = { version = "0.9.1", default-features = false }
 dashcore_hashes = { path = "../hashes", default-features = false }
 secp256k1 = { default-features = false, features = ["hashes"], version= "0.30.0" }
+key-wallet = { path = "../key-wallet", default-features = false, features = ["std"] }
 core2 = { version = "0.4.0", optional = true, features = ["alloc"], default-features = false }
 rustversion = { version="1.0.20"}
 # Do NOT use this as a feature! Use the `serde` feature instead.
@@ -62,6 +63,7 @@ hex_lit = "0.1.1"
 anyhow = { version= "1.0" }
 hex = { version= "0.4" }
 bincode = { version= "=2.0.0-rc.3", optional = true }
+bincode_derive = { version= "=2.0.0-rc.3", optional = true }
 bitflags = "2.9.0"
 blsful = { version = "3.0.0-pre8", optional = true }
 ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
@@ -79,9 +81,6 @@ bincode = { version= "=2.0.0-rc.3" }
 assert_matches = "1.5.0"
 dashcore = { path = ".", features = ["core-block-hash-use-x11", "message_verification", "quorum_validation", "signer"] }
 
-[[example]]
-name = "bip32"
-
 [[example]]
 name = "handshake"
 required-features = ["std"]

dash/src/lib.rs

@@ -103,13 +103,15 @@ pub mod amount;
 pub mod base58;
 pub mod bip152;
 pub mod bip158;
-pub mod bip32;
+// Re-export bip32 from key-wallet
+pub use key_wallet::bip32;
 pub mod blockdata;
 pub mod consensus;
 // Private until we either make this a crate or flatten it - still to be decided.
 pub mod bls_sig_utils;
 pub(crate) mod crypto;
-mod dip9;
+// Re-export dip9 from key-wallet
+use key_wallet::dip9;
 pub mod ephemerealdata;
 pub mod error;
 pub mod hash_types;

dash/src/psbt/map/global.rs

@@ -57,7 +57,7 @@ impl Map for PartiallySignedTransaction {
                 },
                 value: {
                     let mut ret = Vec::with_capacity(4 + derivation.len() * 4);
-                    ret.extend(fingerprint.as_bytes());
+                    ret.extend(fingerprint.to_bytes());
                     derivation.into_iter().for_each(|n| ret.extend(&u32::from(*n).to_le_bytes()));
                     ret
                 },

dash/src/psbt/mod.rs

@@ -12,6 +12,7 @@ use core::{cmp, fmt};
 use std::collections::{HashMap, HashSet};
 
 use crate::Amount;
+use crate::Network;
 use crate::bip32::{self, ExtendedPrivKey, ExtendedPubKey, KeySource};
 use crate::blockdata::script::ScriptBuf;
 use crate::blockdata::transaction::Transaction;
@@ -513,7 +514,16 @@ impl GetKey for ExtendedPrivKey {
             KeyRequest::Bip32((fingerprint, path)) => {
                 let key = if self.fingerprint(secp) == fingerprint {
                     let k = self.derive_priv(secp, &path)?;
-                    Some(k.to_priv())
+                    Some(PrivateKey {
+                        compressed: true,
+                        network: match k.network {
+                            key_wallet::Network::Dash => Network::Dash,
+                            key_wallet::Network::Testnet => Network::Testnet,
+                            key_wallet::Network::Regtest => Network::Regtest,
+                            key_wallet::Network::Devnet => Network::Devnet,
+                        },
+                        inner: k.private_key,
+                    })
                 } else {
                     None
                 };
@@ -547,7 +557,16 @@ impl GetKey for $set<ExtendedPrivKey> {
                 for xpriv in self.iter() {
                     if xpriv.parent_fingerprint == fingerprint {
                         let k = xpriv.derive_priv(secp, &path)?;
-                        return Ok(Some(k.to_priv()));
+                        return Ok(Some(PrivateKey {
+                            compressed: true,
+                            network: match k.network {
+                                key_wallet::Network::Dash => Network::Dash,
+                                key_wallet::Network::Testnet => Network::Testnet,
+                                key_wallet::Network::Regtest => Network::Regtest,
+                                key_wallet::Network::Devnet => Network::Devnet,
+                            },
+                            inner: k.private_key,
+                        }));
                     }
                 }
                 Ok(None)
@@ -582,7 +601,7 @@ impl_get_key_for_map!(BTreeMap);
 impl_get_key_for_map!(HashMap);
 
 /// Errors when getting a key.
-#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 #[non_exhaustive]
 pub enum GetKeyError {
     /// A bip32 error.
@@ -829,7 +848,6 @@ mod tests {
     use secp256k1::{All, SecretKey};
 
     use super::*;
-    use crate::Network::Dash;
     use crate::bip32::{ChildNumber, ExtendedPrivKey, ExtendedPubKey, KeySource};
     use crate::blockdata::script::ScriptBuf;
     use crate::blockdata::transaction::Transaction;
@@ -879,7 +897,8 @@ mod tests {
 
         let mut hd_keypaths: BTreeMap<secp256k1::PublicKey, KeySource> = Default::default();
 
-        let mut sk: ExtendedPrivKey = ExtendedPrivKey::new_master(Dash, &seed).unwrap();
+        let mut sk: ExtendedPrivKey =
+            ExtendedPrivKey::new_master(key_wallet::Network::Dash, &seed).unwrap();
 
         let fprint = sk.fingerprint(secp);
 

dash/tests/psbt.rs

@@ -131,7 +131,9 @@ fn build_extended_private_key() -> ExtendedPrivKey {
     let xpriv = ExtendedPrivKey::from_str(extended_private_key).unwrap();
 
     let sk = PrivateKey::from_wif(seed).unwrap();
-    let seeded = ExtendedPrivKey::new_master(NETWORK, &sk.inner.secret_bytes()).unwrap();
+    let seeded =
+        ExtendedPrivKey::new_master(key_wallet::Network::Testnet, &sk.inner.secret_bytes())
+            .unwrap();
     assert_eq!(xpriv, seeded);
 
     xpriv
@@ -326,8 +328,17 @@ fn parse_and_verify_keys(
 
         let path =
             derivation_path.into_derivation_path().expect("failed to convert derivation path");
-        let derived_priv =
-            ext_priv.derive_priv(secp, &path).expect("failed to derive ext priv key").to_priv();
+        let ext_derived = ext_priv.derive_priv(secp, &path).expect("failed to derive ext priv key");
+        let derived_priv = PrivateKey {
+            compressed: true,
+            network: match ext_derived.network {
+                key_wallet::Network::Dash => Network::Dash,
+                key_wallet::Network::Testnet => Network::Testnet,
+                key_wallet::Network::Regtest => Network::Regtest,
+                key_wallet::Network::Devnet => Network::Devnet,
+            },
+            inner: ext_derived.private_key,
+        };
         assert_eq!(wif_priv, derived_priv);
         let derived_pub = derived_priv.public_key(secp);
         key_map.insert(derived_pub, derived_priv);

key-wallet-ffi/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "key-wallet-ffi"
+version = "0.39.6"
+authors = ["The Dash Core Developers"]
+edition = "2021"
+description = "FFI bindings for key-wallet library"
+keywords = ["dash", "wallet", "ffi", "bindings"]
+readme = "README.md"
+license = "CC0-1.0"
+
+[lib]
+name = "key_wallet_ffi"
+crate-type = ["cdylib", "staticlib", "lib"]
+
+[features]
+default = []
+
+[dependencies]
+key-wallet = { path = "../key-wallet", default-features = false, features = ["std"] }
+bitcoin_hashes = "0.14.0"
+secp256k1 = { version = "0.30.0", features = ["global-context"] }
+uniffi = { version = "0.27", features = ["cli"] }
+thiserror = "1.0"
+
+[build-dependencies]
+uniffi = { version = "0.27", features = ["build"] }
+
+[dev-dependencies]
+uniffi = { version = "0.27", features = ["bindgen-tests"] }