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

Merge 3b8e4070c8 into merged_master (Elements PR #958)

Browse source 
Conflicts due to change of error state formatting upstream.
This commit is contained in:
Andrew Poelstra 2021-03-26 00:21:11 +00:00
commit d89112072c
4 changed files with 53 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/blockchain.cpp
View file

@ -1459,6 +1459,8 @@ RPCHelpMan getblockchaininfo()
obj.pushKV("current_signblock_asm", ScriptToAsmStr(entry.m_signblockscript));
obj.pushKV("current_signblock_hex", HexStr(entry.m_signblockscript));
obj.pushKV("max_block_witness", (uint64_t)entry.m_signblock_witness_limit);
obj.pushKV("current_fedpeg_program", HexStr(entry.m_fedpeg_program));
obj.pushKV("current_fedpeg_script", HexStr(entry.m_fedpegscript));
UniValue arr(UniValue::VARR);
for (const auto& extension : entry.m_extension_space) {
arr.push_back(HexStr(extension));