mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge abbc17048a into merged_master (Elements PR #1432)
This commit is contained in:
commit
a41021b283
7 changed files with 69 additions and 60 deletions
|
|
@ -193,7 +193,7 @@ static void SidechainScriptPubKeyToJSON(const CScript& script, UniValue& out, bo
|
|||
|
||||
out.pushKV(prefix + "asm", ScriptToAsmStr(script));
|
||||
if (include_addresses) {
|
||||
out.pushKV("desc", InferDescriptor(script, provider ? *provider : DUMMY_SIGNING_PROVIDER)->ToString());
|
||||
out.pushKV(prefix + "desc", InferDescriptor(script, provider ? *provider : DUMMY_SIGNING_PROVIDER)->ToString());
|
||||
}
|
||||
if (include_hex) {
|
||||
out.pushKV(prefix + "hex", HexStr(script));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue