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

Code style fixups to taproot key functions

This commit is contained in:
Dr Maxim Orlovsky 2022-01-13 17:40:46 +01:00
parent 7514f2ca18
commit 6364ebd927
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blockdata/script.rs
View File

@ -344,9 +344,6 @@ impl Script {
} }
/// Generates P2TR for key spending path for a known [`TweakedPublicKey`]. /// Generates P2TR for key spending path for a known [`TweakedPublicKey`].
///
/// NB: Make sure that the used key is indeed tweaked (for instance, it comes from `rawtr`
/// descriptor content); otherwise please use [`Script::new_v1_p2tr`] method.
pub fn new_v1_p2tr_tweaked(output_key: TweakedPublicKey) -> Script { pub fn new_v1_p2tr_tweaked(output_key: TweakedPublicKey) -> Script {
Script::new_witness_program(WitnessVersion::V1, &output_key.serialize()) Script::new_witness_program(WitnessVersion::V1, &output_key.serialize())
} }
@ -414,7 +411,7 @@ impl Script {
#[inline] #[inline]
fn witness_version(&self) -> Option<WitnessVersion> { fn witness_version(&self) -> Option<WitnessVersion> {
WitnessVersion::from_opcode(self.0[0].into()).ok() self.0.get(0).and_then(|opcode| WitnessVersion::from_opcode(opcodes::All::from(*opcode)).ok())
} }
/// Checks whether a script pubkey is a p2sh output /// Checks whether a script pubkey is a p2sh output

7
src/util/schnorr.rs
View File

@ -128,12 +128,11 @@ impl TapTweak for UntweakedKeyPair {
/// ///
/// # Returns /// # Returns
/// The tweaked key and its parity. /// The tweaked key and its parity.
fn tap_tweak<C: Verification>(self, secp: &Secp256k1<C>, merkle_root: Option<TapBranchHash>) -> TweakedKeyPair { fn tap_tweak<C: Verification>(mut self, secp: &Secp256k1<C>, merkle_root: Option<TapBranchHash>) -> TweakedKeyPair {
let pubkey = XOnlyPublicKey::from_keypair(&self); let pubkey = XOnlyPublicKey::from_keypair(&self);
let tweak_value = TapTweakHash::from_key_and_tweak(pubkey, merkle_root).into_inner(); let tweak_value = TapTweakHash::from_key_and_tweak(pubkey, merkle_root).into_inner();
let mut output_key = self.clone(); self.tweak_add_assign(&secp, &tweak_value).expect("Tap tweak failed");
output_key.tweak_add_assign(&secp, &tweak_value).expect("Tap tweak failed"); TweakedKeyPair(self)
TweakedKeyPair(output_key)
} }
fn dangerous_assume_tweaked(self) -> TweakedKeyPair { fn dangerous_assume_tweaked(self) -> TweakedKeyPair {