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 3d223712d3 into merged_master (Bitcoin PR bitcoin/bitcoin#16795)

Browse source
This commit is contained in:
Byron Hambly 2023-06-28 16:06:22 +00:00
commit 62697be8d9
28 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core_write.cpp
View file

@ -9,6 +9,7 @@
#include <consensus/validation.h>
#include <issuance.h>
#include <key_io.h>
#include <script/descriptor.h>
#include <script/script.h>
#include <script/sign.h>
#include <script/standard.h>
@ -191,6 +192,7 @@ 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_hex) out.pushKV(prefix + "hex", HexStr(scriptPubKey));
std::vector<std::vector<unsigned char>> solns;