Merge 723f1c669f into merged_master (Bitcoin PR bitcoin/bitcoin#28218)

This commit is contained in:
Byron Hambly 2025-07-04 21:40:54 +02:00
commit f95cdcb6d6
14 changed files with 80 additions and 67 deletions

View file

@ -299,8 +299,9 @@ public:
{
return GuessVerificationProgress(WITH_LOCK(::cs_main, return chainman().ActiveChain().Tip()), chainman().GetParams().GetConsensus().nPowTargetSpacing);
}
bool isInitialBlockDownload() override {
return chainman().ActiveChainstate().IsInitialBlockDownload();
bool isInitialBlockDownload() override
{
return chainman().IsInitialBlockDownload();
}
bool isLoadingBlocks() override { return chainman().m_blockman.LoadingBlocks(); }
void setNetworkActive(bool active) override
@ -722,7 +723,7 @@ public:
bool isReadyToBroadcast() override { return !chainman().m_blockman.LoadingBlocks() && !isInitialBlockDownload(); }
bool isInitialBlockDownload() override
{
return chainman().ActiveChainstate().IsInitialBlockDownload();
return chainman().IsInitialBlockDownload();
}
bool shutdownRequested() override { return ShutdownRequested(); }
void initMessage(const std::string& message) override { ::uiInterface.InitMessage(message); }