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 1

Merge e7b6272b30 into merged_master (Bitcoin PR bitcoin/bitcoin#24636)

Browse source
This commit is contained in:
James Dorfman 2024-01-17 21:22:02 +00:00 • committed by Byron Hambly
commit 5e7204072c
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core_write.cpp
View file

@ -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;