mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-19 13:27:35 +02:00
Merge c243e08351 (Bitcoin PR bitcoin/bitcoin#24512)
This commit is contained in:
commit
07d701997b
18 changed files with 168 additions and 37 deletions
|
|
@ -192,7 +192,9 @@ static void SidechainScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& o
|
|||
CTxDestination address;
|
||||
|
||||
out.pushKV(prefix + "asm", ScriptToAsmStr(scriptPubKey));
|
||||
out.pushKV(prefix + "desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
|
||||
if (include_addresses) {
|
||||
out.pushKV(prefix + "desc", InferDescriptor(scriptPubKey, DUMMY_SIGNING_PROVIDER)->ToString());
|
||||
}
|
||||
if (include_hex) out.pushKV(prefix + "hex", HexStr(scriptPubKey));
|
||||
|
||||
std::vector<std::vector<unsigned char>> solns;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue