Merge rust-bitcoin/rust-bitcoin#703: Return the correct `LeafVersion` when building a Taproot `ControlBlock`

0af5a433b6 Return the correct `LeafVersion` when building a Taproot `ControlBlock` (Alekos Filini)

Pull request description:

ACKs for top commit:
  sanket1729:
    ACK 0af5a433b6

Tree-SHA512: 6b887e86b32b070a2a42ba1a2309b094c36d5a0b0bbf7d4c49c4fd2d8d2b4a7b1d87da699f1bd5f7116926c590413609a292d900b55c27c6bdbadc408529999f
This commit is contained in:
sanket1729 2021-11-16 14:59:19 -08:00
commit df72500465
No known key found for this signature in database
GPG Key ID: 648FFB183E0870A2
1 changed files with 1 additions and 1 deletions

View File

@ -339,7 +339,7 @@ impl TaprootSpendInfo {
Some(ControlBlock { Some(ControlBlock {
internal_key: self.internal_key, internal_key: self.internal_key,
output_key_parity: self.output_key_parity, output_key_parity: self.output_key_parity,
leaf_version: LeafVersion::default(), leaf_version: script_ver.1,
merkle_branch: smallest.clone(), merkle_branch: smallest.clone(),
}) })
} }