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

Merge d052f5e6b7 into merged_master (Bitcoin PR #16841)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-27 21:29:55 +00:00
commit 3ca887d480
12 changed files with 46 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/rpc/misc.cpp
View file

@ -708,7 +708,8 @@ UniValue tweakfedpegscript(const JSONRPCRequest& request)
CScript claim_script = CScript(scriptData.begin(), scriptData.end());
CScript tweaked_script = calculate_contract(fedpegscript, claim_script);
CTxDestination parent_addr(ScriptHash(GetScriptForWitness(tweaked_script)));
CScript redeem_script = GetScriptForDestination(WitnessV0ScriptHash(tweaked_script));
CTxDestination parent_addr{ScriptHash(redeem_script)};
UniValue ret(UniValue::VOBJ);
ret.pushKV("script", HexStr(tweaked_script));