Merge 0e42c1b6c5 into merged_master (Bitcoin PR bitcoin/bitcoin#30648)

This commit is contained in:
Tom Trevethan 2026-03-13 01:24:00 +00:00
commit 0e665b62d8
4 changed files with 8 additions and 3 deletions

View file

@ -7,6 +7,7 @@
#include <chain.h>
#include <chainparams.h>
#include <chainparamsbase.h>
#include <common/system.h>
#include <consensus/amount.h>
#include <consensus/consensus.h>
@ -443,7 +444,7 @@ static RPCHelpMan getmininginfo()
{RPCResult::Type::NUM, "difficulty", /*optional=*/true, "The current difficulty"},
{RPCResult::Type::NUM, "networkhashps", /*optional=*/true, "The network hashes per second"},
{RPCResult::Type::NUM, "pooledtx", "The size of the mempool"},
{RPCResult::Type::STR, "chain", "current network name (main, test, testnet4, signet, regtest)"},
{RPCResult::Type::STR, "chain", "current network name (" LIST_CHAIN_NAMES ")"},
(IsDeprecatedRPCEnabled("warnings") ?
RPCResult{RPCResult::Type::STR, "warnings", "any network and blockchain warnings (DEPRECATED)"} :
RPCResult{RPCResult::Type::ARR, "warnings", "any network and blockchain warnings (run with `-deprecatedrpc=warnings` to return the latest warning as a single string)",