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

Merge f3e8ef2ac5 into merged_master (Elements PR #799)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-14 16:52:01 +00:00
commit 433a5cf61e
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/blockchain.cpp
View file

@ -1309,6 +1309,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
" \"chainwork\": \"xxxx\" (string) total amount of work in active chain, in hexadecimal\n"
" \"size_on_disk\": xxxxxx, (numeric) the estimated size of the block and undo files on disk\n"
" \"pruned\": xx, (boolean) if the blocks are subject to pruning\n"
" \"current_params_root\": \"xxxx\", (string) the root of the currently active dynafed params in hex\n"
" \"signblock_asm\" : \"xxxx\", (string) ASM of sign block challenge data from genesis block.\n"
" \"signblock_hex\" : \"xxxx\", (string) Hex of sign block challenge data from genesis block.\n"
" \"current_signblock_asm\" : \"xxxx\", (string) ASM of sign block challenge data enforced on the next block.\n"
@ -1387,6 +1388,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
obj.pushKV("extension_space", arr);
} else {
const DynaFedParamEntry entry = ComputeNextBlockFullCurrentParameters(::ChainActive().Tip(), chainparams.GetConsensus());
obj.pushKV("current_params_root", entry.CalculateRoot().GetHex());
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);