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

Merge rust-bitcoin/rust-bitcoin#2269: Remove impossible InvalidParity error variant 

c7c553ebc0 Remove impossible InvalidParity error variant (Martin Habovstiak)

Pull request description:

  Since we do `& 1`, only 0 and 1 are possible values, so the error return there can never happen. I made this explicit by manually setting the parity.

  This is a rebase of Steven's change #2163 with a rewrite of `match` to not panic.

ACKs for top commit:
  tcharding:
    ACK c7c553ebc0
  apoelstra:
    ACK c7c553ebc0

Tree-SHA512: 5591fda686295f330b6da757a0052687eddec135ac947a2801343f1681bc4fd9f6cfb722ac1339ae6187a8784e7629b5f12cca32b33a81ffc8791b4407b29f85
This commit is contained in:
Andrew Poelstra 2023-12-10 14:30:01 +00:00
parent e235a80c59 c7c553ebc0
commit b81faab33d
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitcoin/src/taproot/mod.rs
View File

@ -1211,7 +1211,6 @@ impl ControlBlock {
/// # Errors /// # Errors
/// ///
/// - [`TaprootError::InvalidControlBlockSize`] if `sl` is not of size 1 + 32 + 32N for any N >= 0. /// - [`TaprootError::InvalidControlBlockSize`] if `sl` is not of size 1 + 32 + 32N for any N >= 0.
/// - [`TaprootError::InvalidParity`] if first byte of `sl` is not a valid output key parity.
/// - [`TaprootError::InvalidTaprootLeafVersion`] if first byte of `sl` is not a valid leaf version. /// - [`TaprootError::InvalidTaprootLeafVersion`] if first byte of `sl` is not a valid leaf version.
/// - [`TaprootError::InvalidInternalKey`] if internal key is invalid (first 32 bytes after the parity byte). /// - [`TaprootError::InvalidInternalKey`] if internal key is invalid (first 32 bytes after the parity byte).
/// - [`TaprootError::InvalidMerkleTreeDepth`] if merkle tree is too deep (more than 128 levels). /// - [`TaprootError::InvalidMerkleTreeDepth`] if merkle tree is too deep (more than 128 levels).
@ -1221,8 +1220,11 @@ impl ControlBlock {
{ {
return Err(TaprootError::InvalidControlBlockSize(sl.len())); return Err(TaprootError::InvalidControlBlockSize(sl.len()));
} }
let output_key_parity = let output_key_parity = match sl[0] & 1 {
secp256k1::Parity::from_i32((sl[0] & 1) as i32).map_err(TaprootError::InvalidParity)?; 0 => secp256k1::Parity::Even,
_ => secp256k1::Parity::Odd,
};
let leaf_version = LeafVersion::from_consensus(sl[0] & TAPROOT_LEAF_MASK)?; let leaf_version = LeafVersion::from_consensus(sl[0] & TAPROOT_LEAF_MASK)?;
let internal_key = UntweakedPublicKey::from_slice(&sl[1..TAPROOT_CONTROL_BASE_SIZE]) let internal_key = UntweakedPublicKey::from_slice(&sl[1..TAPROOT_CONTROL_BASE_SIZE])
.map_err(TaprootError::InvalidInternalKey)?; .map_err(TaprootError::InvalidInternalKey)?;
@ -1505,8 +1507,6 @@ pub enum TaprootError {
InvalidControlBlockSize(usize), InvalidControlBlockSize(usize),
/// Invalid taproot internal key. /// Invalid taproot internal key.
InvalidInternalKey(secp256k1::Error), InvalidInternalKey(secp256k1::Error),
/// Invalid parity for internal key.
InvalidParity(secp256k1::InvalidParityValue),
/// Empty tap tree. /// Empty tap tree.
EmptyTree, EmptyTree,
} }
@ -1537,7 +1537,6 @@ impl fmt::Display for TaprootError {
InvalidInternalKey(ref e) => { InvalidInternalKey(ref e) => {
write_err!(f, "invalid internal x-only key"; e) write_err!(f, "invalid internal x-only key"; e)
} }
InvalidParity(_) => write!(f, "invalid parity value for internal key"),
EmptyTree => write!(f, "Taproot Tree must contain at least one script"), EmptyTree => write!(f, "Taproot Tree must contain at least one script"),
} }
} }
@ -1554,7 +1553,6 @@ impl std::error::Error for TaprootError {
| InvalidMerkleTreeDepth(_) | InvalidMerkleTreeDepth(_)
| InvalidTaprootLeafVersion(_) | InvalidTaprootLeafVersion(_)
| InvalidControlBlockSize(_) | InvalidControlBlockSize(_)
| InvalidParity(_)
| EmptyTree => None, | EmptyTree => None,
} }
} }