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 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/bench/verify_script.cpp
View file

@ -34,7 +34,7 @@ static void VerifyScriptBench(benchmark::Bench& bench)
key.Set(vchKey.begin(), vchKey.end(), false);
CPubKey pubkey = key.GetPubKey();
uint160 pubkeyHash;
CHash160().Write(pubkey.begin(), pubkey.size()).Finalize(pubkeyHash.begin());
CHash160().Write(pubkey).Finalize(pubkeyHash);
// Script.
CScript scriptPubKey = CScript() << witnessversion << ToByteVector(pubkeyHash);