Merge db283a6b6f into merged_master (Bitcoin PR bitcoin/bitcoin#27255)

This commit is contained in:
Byron Hambly 2025-08-06 20:17:04 +02:00
commit d24651b7c4
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
14 changed files with 1424 additions and 546 deletions

View file

@ -405,6 +405,7 @@ void PSBTInput::FillSignatureData(SignatureData& sigdata) const
}
for (const auto& [pubkey, leaf_origin] : m_tap_bip32_paths) {
sigdata.taproot_misc_pubkeys.emplace(pubkey, leaf_origin);
sigdata.tap_pubkeys.emplace(Hash160(pubkey), pubkey);
}
for (const auto& [hash, preimage] : ripemd160_preimages) {
sigdata.ripemd160_preimages.emplace(std::vector<unsigned char>(hash.begin(), hash.end()), preimage);
@ -554,6 +555,7 @@ void PSBTOutput::FillSignatureData(SignatureData& sigdata) const
}
for (const auto& [pubkey, leaf_origin] : m_tap_bip32_paths) {
sigdata.taproot_misc_pubkeys.emplace(pubkey, leaf_origin);
sigdata.tap_pubkeys.emplace(Hash160(pubkey), pubkey);
}
}