GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909)

Browse source
This commit is contained in:
James Dorfman 2024-08-01 17:28:15 +00:00
commit d4aa6eba2f
12 changed files with 104 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/node/interfaces.cpp
View file

@ -212,9 +212,10 @@ public:
bool getHeaderTip(int& height, int64_t& block_time) override
{
LOCK(::cs_main);
if (::pindexBestHeader) {
height = ::pindexBestHeader->nHeight;
block_time = ::pindexBestHeader->GetBlockTime();
auto best_header = chainman().m_best_header;
if (best_header) {
height = best_header->nHeight;
block_time = best_header->GetBlockTime();
return true;
}
return false;
@ -645,7 +646,7 @@ public:
bool havePruned() override
{
LOCK(cs_main);
return node::fHavePruned;
return m_node.chainman->m_blockman.m_have_pruned;
}
bool isReadyToBroadcast() override { return !node::fImporting && !node::fReindex && !isInitialBlockDownload(); }
bool isInitialBlockDownload() override {