GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes for Elements PR #1270

Browse source
This commit is contained in:
James Dorfman 2024-09-23 21:22:11 +00:00
parent 61b0543ba7
commit 413a175b53
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -2650,8 +2650,8 @@ bool CChainState::FlushStateToDisk(
}
int trim_height = 0;
if (pindexBestHeader && (uint64_t)pindexBestHeader->nHeight > node::nMustKeepFullHeaders) { // check first, to prevent underflow
trim_height = pindexBestHeader->nHeight - node::nMustKeepFullHeaders;
if (m_chainman.m_best_header && (uint64_t)m_chainman.m_best_header->nHeight > node::nMustKeepFullHeaders) { // check first, to prevent underflow
trim_height = m_chainman.m_best_header->nHeight - node::nMustKeepFullHeaders;
}
if (node::fTrimHeaders && trim_height > 0 && !ShutdownRequested()) {
static int nMinTrimHeight{0};
@ -2662,7 +2662,7 @@ bool CChainState::FlushStateToDisk(
(*it)->trim();
}
}
CBlockIndex* min_index = pindexBestHeader->GetAncestor(trim_height-1);
CBlockIndex* min_index = m_chainman.m_best_header->GetAncestor(trim_height-1);
// Handle any remaining untrimmed blocks that were too recent for trimming last time we flushed.
if (min_index) {
int nMaxTrimHeightRound = std::max(nMinTrimHeight, min_index->nHeight + 1);
@ -4610,7 +4610,7 @@ bool ChainstateManager::LoadBlockIndex()
// Load block index from databases
bool needs_init = fReindex;
if (!fReindex) {
bool ret = m_blockman.LoadBlockIndexDB(GetConsensus());
bool ret = m_blockman.LoadBlockIndexDB(*this, GetConsensus());
if (!ret) return false;
std::vector<CBlockIndex*> vSortedByHeight{m_blockman.GetAllBlockIndices()};