milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Fix clippy lint and formatting for `Xpriv::derive_xpriv` and `Xpriv::derive_xpub` calls

This commit is contained in:
Daniel Roberts 2025-06-17 14:37:23 -05:00
parent 9d4381c8fe
commit c7bdec14fb
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitcoin/examples/bip32.rs
View File

@ -46,7 +46,7 @@ fn main() {
// generate first receiving address at m/0/0
// manually creating indexes this time
let zero = ChildNumber::ZERO_NORMAL;
let public_key = xpub.derive_xpub(&secp, &[zero, zero]).unwrap().public_key;
let public_key = xpub.derive_xpub(&secp, [zero, zero]).unwrap().public_key;
let address = Address::p2wpkh(CompressedPublicKey(public_key), KnownHrp::Mainnet);
println!("First receiving address: {address}");
}

4
bitcoin/examples/ecdsa-psbt-simple.rs
View File

@ -67,7 +67,7 @@ fn get_external_address_xpriv<C: Signing>(
let external_index = ChildNumber::ZERO_NORMAL;
let idx = ChildNumber::from_normal_idx(index).expect("valid index number");
child_xpriv.derive_xpriv(secp, &[external_index, idx]).expect("only deriving two more steps")
child_xpriv.derive_xpriv(secp, [external_index, idx]).expect("only deriving two more steps")
}
// Derive the internal address xpriv.
@ -83,7 +83,7 @@ fn get_internal_address_xpriv<C: Signing>(
let internal_index = ChildNumber::ONE_NORMAL;
let idx = ChildNumber::from_normal_idx(index).expect("valid index number");
child_xpriv.derive_xpriv(secp, &[internal_index, idx]).expect("only deriving two more steps")
child_xpriv.derive_xpriv(secp, [internal_index, idx]).expect("only deriving two more steps")
}
// The address to send to.

2
bitcoin/examples/ecdsa-psbt.rs
View File

@ -260,7 +260,7 @@ impl WatchOnly {
secp: &Secp256k1<C>,
) -> Result<(CompressedPublicKey, Address, DerivationPath)> {
let path = [ChildNumber::ONE_NORMAL, ChildNumber::ZERO_NORMAL];
let derived = self.account_0_xpub.derive_xpub(secp, &path)?;
let derived = self.account_0_xpub.derive_xpub(secp, path)?;
let pk = derived.to_public_key();
let addr = Address::p2wpkh(pk, NETWORK);

4
bitcoin/examples/taproot-psbt-simple.rs
View File

@ -65,7 +65,7 @@ fn get_external_address_xpriv<C: Signing>(
let external_index = ChildNumber::ZERO_NORMAL;
let idx = ChildNumber::from_normal_idx(index).expect("valid index number");
child_xpriv.derive_xpriv(secp, &[external_index, idx]).expect("only deriving two more steps")
child_xpriv.derive_xpriv(secp, [external_index, idx]).expect("only deriving two more steps")
}
// Derive the internal address xpriv.
@ -81,7 +81,7 @@ fn get_internal_address_xpriv<C: Signing>(
let internal_index = ChildNumber::ONE_NORMAL;
let idx = ChildNumber::from_normal_idx(index).expect("valid index number");
child_xpriv.derive_xpriv(secp, &[internal_index, idx]).expect("only deriving two more steps")
child_xpriv.derive_xpriv(secp, [internal_index, idx]).expect("only deriving two more steps")
}
// Get the Taproot Key Origin.

11
bitcoin/examples/taproot-psbt.rs
View File

@ -298,7 +298,7 @@ fn generate_bip86_key_spend_tx(
.ok_or("missing Taproot key origin")?;
let secret_key =
master_xpriv.derive_xpriv(secp, &derivation_path)?.to_private_key().inner;
master_xpriv.derive_xpriv(secp, derivation_path)?.to_private_key().inner;
sign_psbt_taproot(
secret_key,
input.tap_internal_key.unwrap(),
@ -540,7 +540,7 @@ impl BenefactorWallet {
.ok_or("missing Taproot key origin")?;
let secret_key = self
.master_xpriv
.derive_xpriv(&self.secp, &derivation_path)
.derive_xpriv(&self.secp, derivation_path)
.expect("derivation path is short")
.to_private_key()
.inner;
@ -664,11 +664,8 @@ impl BeneficiaryWallet {
for (x_only_pubkey, (leaf_hashes, (_, derivation_path))) in
&psbt.inputs[0].tap_key_origins.clone()
{
let secret_key = self
.master_xpriv
.derive_xpriv(&self.secp, &derivation_path)?
.to_private_key()
.inner;
let secret_key =
self.master_xpriv.derive_xpriv(&self.secp, derivation_path)?.to_private_key().inner;
for lh in leaf_hashes {
let sighash_type = TapSighashType::All;
let hash = SighashCache::new(&unsigned_tx).taproot_script_spend_signature_hash(

2
bitcoin/src/psbt/mod.rs
View File

@ -814,7 +814,7 @@ impl GetKey for Xpriv {
KeyRequest::XOnlyPubkey(_) => Err(GetKeyError::NotSupported),
KeyRequest::Bip32((fingerprint, path)) => {
let key = if self.fingerprint(secp) == *fingerprint {
let k = self.derive_xpriv(secp, &path).map_err(GetKeyError::Bip32)?;
let k = self.derive_xpriv(secp, path).map_err(GetKeyError::Bip32)?;
Some(k.to_private_key())
} else if self.parent_fingerprint == *fingerprint
&& !path.is_empty()