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

Merge rust-bitcoin/rust-bitcoin#1381: Minor improvements to Witness::get_tapscript commit 

865fd5ac90 Minor improvements to Witness::get_tapscript commit (sanket1729)

Pull request description:

ACKs for top commit:
  apoelstra:
    ACK 865fd5ac90
  Kixunil:
    ACK 865fd5ac90

Tree-SHA512: 88d6c02b5b5eeadadf662eebbb40143c2880f8c91a3b0025a81fd4c4a087fc389c4db9e41376936074a9d9545dce5414414517e1059366968ca6e40287b90d20
This commit is contained in:
Andrew Poelstra 2022-11-14 16:15:12 +00:00
parent 6ad0dbe8b1 865fd5ac90
commit ecb76320ab
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bitcoin/src/blockdata/witness.rs
View File

@ -16,6 +16,7 @@ use crate::sighash::EcdsaSighashType;
use crate::io::{self, Read, Write}; use crate::io::{self, Read, Write};
use crate::prelude::*; use crate::prelude::*;
use crate::VarInt; use crate::VarInt;
use crate::util::taproot::TAPROOT_ANNEX_PREFIX;
/// The Witness is the data used to unlock bitcoins since the [segwit upgrade](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki) /// The Witness is the data used to unlock bitcoins since the [segwit upgrade](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki)
/// ///
@ -302,7 +303,7 @@ impl Witness {
/// This does not guarantee that this represents a P2TR [`Witness`]. /// This does not guarantee that this represents a P2TR [`Witness`].
/// It merely gets the second to last or third to last element depending /// It merely gets the second to last or third to last element depending
/// on the first byte of the last element being equal to 0x50. /// on the first byte of the last element being equal to 0x50.
pub fn get_tapscript(&self) -> Option<&[u8]> { pub fn tapscript(&self) -> Option<&[u8]> {
let len = self.len(); let len = self.len();
self self
.last() .last()
@ -311,7 +312,7 @@ impl Witness {
// If there are at least two witness elements, and the first byte of // If there are at least two witness elements, and the first byte of
// the last element is 0x50, this last element is called annex a // the last element is 0x50, this last element is called annex a
// and is removed from the witness stack. // and is removed from the witness stack.
if len >= 2 && last_elem.first().filter(|&&v| v == 0x50).is_some() { if len >= 2 && last_elem.first() == Some(&TAPROOT_ANNEX_PREFIX) {
// account for the extra item removed from the end // account for the extra item removed from the end
3 3
} else { } else {
@ -602,8 +603,8 @@ mod test {
}; };
// With or without annex, the tapscript should be returned. // With or without annex, the tapscript should be returned.
assert_eq!(witness.get_tapscript(), Some(&tapscript[..])); assert_eq!(witness.tapscript(), Some(&tapscript[..]));
assert_eq!(witness_annex.get_tapscript(), Some(&tapscript[..])); assert_eq!(witness_annex.tapscript(), Some(&tapscript[..]));
} }
#[test] #[test]