Skip to content

Commit

Permalink
Refactor: Remove unused Mutex on DescriptorSecretKey inner field
Browse files Browse the repository at this point in the history
  • Loading branch information
@thunderbiscuit
thunderbiscuit committed Aug 18, 2023
1 parent 4ae169f commit b9b549a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 26 deletions.
17 changes: 8 additions & 9 deletions bdk-ffi/src/descriptor.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::ops::Deref;
use crate::{BdkError, DescriptorPublicKey, DescriptorSecretKey};
use bdk::bitcoin::secp256k1::Secp256k1;
use bdk::bitcoin::util::bip32::Fingerprint;
Expand Down Expand Up @@ -36,9 +35,9 @@ impl Descriptor {
keychain_kind: KeychainKind,
network: Network,
) -> Self {
let derivable_key = secret_key.inner_mutex.lock().unwrap();
let derivable_key = &secret_key.inner;

match derivable_key.deref() {
match derivable_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) =
Expand Down Expand Up @@ -87,9 +86,9 @@ impl Descriptor {
keychain_kind: KeychainKind,
network: Network,
) -> Self {
let derivable_key = secret_key.inner_mutex.lock().unwrap();
let derivable_key = &secret_key.inner;

match derivable_key.deref() {
match derivable_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) =
Expand Down Expand Up @@ -138,9 +137,9 @@ impl Descriptor {
keychain_kind: KeychainKind,
network: Network,
) -> Self {
let derivable_key = secret_key.inner_mutex.lock().unwrap();
let derivable_key = &secret_key.inner;

match derivable_key.deref() {
match derivable_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) =
Expand Down Expand Up @@ -189,9 +188,9 @@ impl Descriptor {
keychain_kind: KeychainKind,
network: Network,
) -> Self {
let derivable_key = secret_key.inner_mutex.lock().unwrap();
let derivable_key = &secret_key.inner;

match derivable_key.deref() {
match derivable_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let derivable_key = descriptor_x_key.xkey;
let (extended_descriptor, key_map, _) =
Expand Down
32 changes: 15 additions & 17 deletions bdk-ffi/src/keys.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,37 +66,35 @@ impl DerivationPath {

#[derive(Debug)]
pub(crate) struct DescriptorSecretKey {
pub(crate) inner_mutex: Mutex<BdkDescriptorSecretKey>,
pub(crate) inner: BdkDescriptorSecretKey,
}

impl DescriptorSecretKey {
pub(crate) fn new(network: Network, mnemonic: Arc<Mnemonic>, password: Option<String>) -> Self {
let mnemonic = mnemonic.inner.clone();
let xkey: ExtendedKey = (mnemonic, password).into_extended_key().unwrap();
let inner = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
let descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
origin: None,
xkey: xkey.into_xprv(network).unwrap(),
derivation_path: BdkDerivationPath::master(),
wildcard: bdk::descriptor::Wildcard::Unhardened,
});
Self {
inner_mutex: Mutex::new(inner),
}
Self { inner: descriptor_secret_key }
}

pub(crate) fn from_string(private_key: String) -> Result<Self, BdkError> {
let inner = BdkDescriptorSecretKey::from_str(private_key.as_str())
let descriptor_secret_key = BdkDescriptorSecretKey::from_str(private_key.as_str())
.map_err(|e| BdkError::Generic(e.to_string()))?;
Ok(Self {
inner_mutex: Mutex::new(inner),
inner: descriptor_secret_key,
})
}

pub(crate) fn derive(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
let secp = Secp256k1::new();
let descriptor_secret_key = self.inner_mutex.lock().unwrap();
let descriptor_secret_key = &self.inner;
let path = path.inner_mutex.lock().unwrap().deref().clone();
match descriptor_secret_key.deref() {
match descriptor_secret_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let derived_xprv = descriptor_x_key.xkey.derive_priv(&secp, &path)?;
let key_source = match descriptor_x_key.origin.clone() {
Expand All @@ -110,7 +108,7 @@ impl DescriptorSecretKey {
wildcard: descriptor_x_key.wildcard,
});
Ok(Arc::new(Self {
inner_mutex: Mutex::new(derived_descriptor_secret_key),
inner: derived_descriptor_secret_key,
}))
}
BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
Expand All @@ -120,19 +118,19 @@ impl DescriptorSecretKey {
}

pub(crate) fn extend(&self, path: Arc<DerivationPath>) -> Result<Arc<Self>, BdkError> {
let inner = self.inner_mutex.lock().unwrap();
let descriptor_secret_key = &self.inner;
let path = path.inner_mutex.lock().unwrap().deref().clone();
match inner.deref() {
match descriptor_secret_key {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
let extended_path = descriptor_x_key.derivation_path.extend(path);
let extended_inner = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
let extended_descriptor_secret_key = BdkDescriptorSecretKey::XPrv(DescriptorXKey {
origin: descriptor_x_key.origin.clone(),
xkey: descriptor_x_key.xkey,
derivation_path: extended_path,
wildcard: descriptor_x_key.wildcard,
});
Ok(Arc::new(Self {
inner_mutex: Mutex::new(extended_inner),
inner: extended_descriptor_secret_key,
}))
}
BdkDescriptorSecretKey::Single(_) => Err(BdkError::Generic(
Expand All @@ -143,15 +141,15 @@ impl DescriptorSecretKey {

pub(crate) fn as_public(&self) -> Arc<DescriptorPublicKey> {
let secp = Secp256k1::new();
let descriptor_public_key = self.inner_mutex.lock().unwrap().to_public(&secp).unwrap();
let descriptor_public_key = self.inner.to_public(&secp).unwrap();
Arc::new(DescriptorPublicKey {
inner: descriptor_public_key,
})
}

/// Get the private key as bytes.
pub(crate) fn secret_bytes(&self) -> Vec<u8> {
let inner = self.inner_mutex.lock().unwrap();
let inner = &self.inner;
let secret_bytes: Vec<u8> = match inner.deref() {
BdkDescriptorSecretKey::XPrv(descriptor_x_key) => {
descriptor_x_key.xkey.private_key.secret_bytes().to_vec()
Expand All @@ -165,7 +163,7 @@ impl DescriptorSecretKey {
}

pub(crate) fn as_string(&self) -> String {
self.inner_mutex.lock().unwrap().to_string()
self.inner.to_string()
}
}

Expand Down

0 comments on commit b9b549a

Please sign in to comment.