GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e826b22da2 into merged_master (Bitcoin PR bitcoin/bitcoin#22275)

Browse source
This commit is contained in:
James Dorfman 2023-04-10 19:25:44 +00:00
commit ab7a42420a
8 changed files with 34 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/script_tests.cpp
View file

@ -1164,7 +1164,7 @@ SignatureData CombineSignatures(const CTxOut& txout, const CMutableTransaction&
SignatureData data;
data.MergeSignatureData(scriptSig1);
data.MergeSignatureData(scriptSig2);
ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(&tx, 0, txout.nValue), txout.scriptPubKey, data);
ProduceSignature(DUMMY_SIGNING_PROVIDER, MutableTransactionSignatureCreator(&tx, 0, txout.nValue, SIGHASH_DEFAULT), txout.scriptPubKey, data);
return data;
}