Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413)

This commit is contained in:
James Dorfman 2023-06-01 18:51:42 +00:00
commit 72a90148c8
24 changed files with 125 additions and 124 deletions

View file

@ -171,7 +171,7 @@ static bool SignTaprootScript(const SigningProvider& provider, const BaseSignatu
// <xonly pubkey> OP_CHECKSIG
if (script.size() == 34 && script[33] == OP_CHECKSIG && script[0] == 0x20) {
XOnlyPubKey pubkey(MakeSpan(script).subspan(1, 32));
XOnlyPubKey pubkey{Span{script}.subspan(1, 32)};
std::vector<unsigned char> sig;
if (CreateTaprootScriptSig(creator, sigdata, provider, sig, pubkey, leaf_hash, sigversion)) {
result = Vector(std::move(sig));