diff --git a/bitcoin/src/crypto/key.rs b/bitcoin/src/crypto/key.rs index 2b5bf86b2..b20c76a09 100644 --- a/bitcoin/src/crypto/key.rs +++ b/bitcoin/src/crypto/key.rs @@ -940,7 +940,7 @@ impl TapTweak for UntweakedPublicKey { secp: &Secp256k1, merkle_root: Option, ) -> (TweakedPublicKey, Parity) { - let tweak = TapTweakHash::from_key_and_tweak(self, merkle_root).to_scalar(); + let tweak = TapTweakHash::from_key_and_merkle_root(self, merkle_root).to_scalar(); let (output_key, parity) = self.add_tweak(secp, &tweak).expect("Tap tweak failed"); debug_assert!(self.tweak_add_check(secp, &output_key, parity, tweak)); @@ -970,7 +970,7 @@ impl TapTweak for UntweakedKeypair { merkle_root: Option, ) -> TweakedKeypair { let (pubkey, _parity) = XOnlyPublicKey::from_keypair(&self); - let tweak = TapTweakHash::from_key_and_tweak(pubkey, merkle_root).to_scalar(); + let tweak = TapTweakHash::from_key_and_merkle_root(pubkey, merkle_root).to_scalar(); let tweaked = self.add_xonly_tweak(secp, &tweak).expect("Tap tweak failed"); TweakedKeypair(tweaked) } diff --git a/bitcoin/src/crypto/sighash.rs b/bitcoin/src/crypto/sighash.rs index a8709ac2b..7cb92cd7e 100644 --- a/bitcoin/src/crypto/sighash.rs +++ b/bitcoin/src/crypto/sighash.rs @@ -2009,7 +2009,7 @@ mod tests { // tests let keypair = secp256k1::Keypair::from_secret_key(secp, &internal_priv_key); let (internal_key, _parity) = XOnlyPublicKey::from_keypair(&keypair); - let tweak = TapTweakHash::from_key_and_tweak(internal_key, merkle_root); + let tweak = TapTweakHash::from_key_and_merkle_root(internal_key, merkle_root); let tweaked_keypair = keypair.add_xonly_tweak(secp, &tweak.to_scalar()).unwrap(); let mut sig_msg = Vec::new(); cache diff --git a/bitcoin/src/taproot/mod.rs b/bitcoin/src/taproot/mod.rs index 0e9764f6b..723f61a87 100644 --- a/bitcoin/src/taproot/mod.rs +++ b/bitcoin/src/taproot/mod.rs @@ -95,9 +95,9 @@ impl From for TapNodeHash { } impl TapTweakHash { - /// Constructs a new BIP341 [`TapTweakHash`] from key and tweak. Produces `H_taptweak(P||R)` where + /// Constructs a new BIP341 [`TapTweakHash`] from key and Merkle root. Produces `H_taptweak(P||R)` where /// `P` is the internal key and `R` is the Merkle root. - pub fn from_key_and_tweak>( + pub fn from_key_and_merkle_root>( internal_key: K, merkle_root: Option, ) -> TapTweakHash { @@ -293,7 +293,7 @@ impl TaprootSpendInfo { /// Returns the `TapTweakHash` for this [`TaprootSpendInfo`] i.e., the tweak using `internal_key` /// and `merkle_root`. pub fn tap_tweak(&self) -> TapTweakHash { - TapTweakHash::from_key_and_tweak(self.internal_key, self.merkle_root) + TapTweakHash::from_key_and_merkle_root(self.internal_key, self.merkle_root) } /// Returns the internal key for this [`TaprootSpendInfo`]. @@ -1305,7 +1305,7 @@ impl + ?Sized> ControlBlock { } // compute the taptweak let tweak = - TapTweakHash::from_key_and_tweak(self.internal_key, Some(curr_hash)).to_scalar(); + TapTweakHash::from_key_and_merkle_root(self.internal_key, Some(curr_hash)).to_scalar(); self.internal_key.tweak_add_check(secp, &output_key, self.output_key_parity, tweak) } } @@ -2103,7 +2103,7 @@ mod test { .unwrap() .assume_checked(); - let tweak = TapTweakHash::from_key_and_tweak(internal_key, merkle_root); + let tweak = TapTweakHash::from_key_and_merkle_root(internal_key, merkle_root); let (output_key, _parity) = internal_key.tap_tweak(secp, merkle_root); let addr = Address::p2tr(secp, internal_key, merkle_root, KnownHrp::Mainnet); let spk = addr.script_pubkey();