frost/bdk
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle descriptor xkey origin

Browse Source
This commit is contained in:
davemo88
2021-03-11 17:39:02 -05:00
parent 9cf62ce874
commit 396ffb42f9
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/wallet/signer.rs
View File

@@ -92,7 +92,7 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::script::Builder as ScriptBuilder;
use bitcoin::hashes::{hash160, Hash};
use bitcoin::secp256k1::{Message, Secp256k1};
use bitcoin::util::bip32::{ExtendedPrivKey, Fingerprint};
use bitcoin::util::bip32::{ChildNumber, DerivationPath, ExtendedPrivKey, Fingerprint};
use bitcoin::util::{bip143, psbt};
use bitcoin::{PrivateKey, Script, SigHash, SigHashType};
@@ -206,7 +206,7 @@ impl Signer for DescriptorXKey<ExtendedPrivKey> {
return Err(SignerError::InputIndexOutOfRange);
}
let (public_key, deriv_path) = match psbt.inputs[input_index]
let (public_key, full_path) = match psbt.inputs[input_index]
.bip32_derivation
.iter()
.filter_map(|(pk, &(fingerprint, ref path))| {
@@ -222,7 +222,21 @@ impl Signer for DescriptorXKey<ExtendedPrivKey> {
None => return Ok(()),
};
let derived_key = self.xkey.derive_priv(&secp, &deriv_path).unwrap();
let derived_key = match self.origin.clone() {
Some((_fingerprint, path)) => {
let split_origin_path: Vec<&ChildNumber> = path.into_iter().collect();
let mut deriv_path = DerivationPath::default();
for (i, child) in full_path.into_iter().cloned().enumerate() {
match split_origin_path.get(i) {
Some(_) => continue,
None => deriv_path = deriv_path.extend(&[child]),
}
}
self.xkey.derive_priv(&secp, &deriv_path).unwrap()
}
None => self.xkey.derive_priv(&secp, &full_path).unwrap(),
};
if &derived_key.private_key.public_key(&secp) != public_key {
Err(SignerError::InvalidKey)
} else {