Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976)

This commit is contained in:
Andrew Poelstra 2020-11-06 15:20:12 +00:00
commit cb15f46946
9 changed files with 274 additions and 240 deletions

View file

@ -455,7 +455,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
if (g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL) == 0)
throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, PACKAGE_NAME " is not connected!");
if (IsInitialBlockDownload())
if (::ChainstateActive().IsInitialBlockDownload())
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, PACKAGE_NAME " is in initial sync and waiting for blocks...");
static unsigned int nTransactionsUpdatedLast;