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

Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570)

Browse source
This commit is contained in:
Byron Hambly 2025-05-16 09:52:58 +02:00
commit e22e1b9509
11 changed files with 58 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -2612,7 +2612,7 @@ bool Chainstate::ConnectBlock(const CBlock& block, BlockValidationState& state,
if (fJustCheck)
return true;
if (!m_blockman.WriteUndoDataForBlock(blockundo, state, pindex, params)) {
if (!m_blockman.WriteUndoDataForBlock(blockundo, state, *pindex)) {
return false;
}
@ -4475,7 +4475,7 @@ bool Chainstate::AcceptBlock(const std::shared_ptr<const CBlock>& pblock, BlockV
// Write block to history file
if (fNewBlock) *fNewBlock = true;
try {
FlatFilePos blockPos{m_blockman.SaveBlockToDisk(block, pindex->nHeight, m_chain, m_chainman.GetParams(), dbp)};
FlatFilePos blockPos{m_blockman.SaveBlockToDisk(block, pindex->nHeight, m_chain, dbp)};
if (blockPos.IsNull()) {
state.Error(strprintf("%s: Failed to find position to write new block to disk", __func__));
return false;
@ -4893,7 +4893,7 @@ bool ChainstateManager::LoadBlockIndex()
// Load block index from databases
bool needs_init = fReindex;
if (!fReindex) {
bool ret = m_blockman.LoadBlockIndexDB(*this, GetConsensus());
bool ret{m_blockman.LoadBlockIndexDB(*this)};
if (!ret) return false;
m_blockman.ScanAndUnlinkAlreadyPrunedFiles();
@ -4997,7 +4997,7 @@ bool Chainstate::LoadGenesisBlock()
try {
const CBlock& block = params.GenesisBlock();
FlatFilePos blockPos{m_blockman.SaveBlockToDisk(block, 0, m_chain, params, nullptr)};
FlatFilePos blockPos{m_blockman.SaveBlockToDisk(block, 0, m_chain, nullptr)};
if (blockPos.IsNull()) {
return error("%s: writing genesis block to disk failed", __func__);
}