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

Merge 34eb236258 into merged_master (Bitcoin PR #19326)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-27 00:39:12 +00:00
commit 54f2d85914
34 changed files with 122 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/script_tests.cpp
View file

@ -286,7 +286,7 @@ public:
CScript scriptPubKey = script;
if (wm == WitnessMode::PKH) {
uint160 hash;
CHash160().Write(&script[1], script.size() - 1).Finalize(hash.begin());
CHash160().Write(MakeSpan(script).subspan(1)).Finalize(hash);
script = CScript() << OP_DUP << OP_HASH160 << ToByteVector(hash) << OP_EQUALVERIFY << OP_CHECKSIG;
scriptPubKey = CScript() << witnessversion << ToByteVector(hash);
} else if (wm == WitnessMode::SH) {