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

Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042)

Browse source
This commit is contained in:
Tom Trevethan 2026-04-01 17:24:49 +01:00
commit 030ab66c70
56 changed files with 153 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/validation.cpp
View file

@ -3914,7 +3914,7 @@ bool Chainstate::ActivateBestChain(BlockValidationState& state, std::shared_ptr<
// chainstate past the snapshot base block.
if (WITH_LOCK(::cs_main, return m_disabled)) {
LogPrintf("m_disabled is set - this chainstate should not be in operation. "
"Please report this as a bug. %s\n", PACKAGE_BUGREPORT);
"Please report this as a bug. %s\n", CLIENT_BUGREPORT);
return false;
}
@ -4325,7 +4325,7 @@ void ChainstateManager::ReceivedBlockTransactions(const CBlock& block, CBlockInd
if (!Assume(pindexNew->m_chain_tx_count == 0 || pindexNew->m_chain_tx_count == prev_tx_sum(*pindexNew) ||
pindexNew == GetSnapshotBaseBlock())) {
LogWarning("Internal bug detected: block %d has unexpected m_chain_tx_count %i that should be %i (%s %s). Please report this issue here: %s\n",
pindexNew->nHeight, pindexNew->m_chain_tx_count, prev_tx_sum(*pindexNew), PACKAGE_NAME, FormatFullVersion(), PACKAGE_BUGREPORT);
pindexNew->nHeight, pindexNew->m_chain_tx_count, prev_tx_sum(*pindexNew), CLIENT_NAME, FormatFullVersion(), CLIENT_BUGREPORT);
pindexNew->m_chain_tx_count = 0;
}
pindexNew->nFile = pos.nFile;
@ -4353,7 +4353,7 @@ void ChainstateManager::ReceivedBlockTransactions(const CBlock& block, CBlockInd
// incorrect hardcoded AssumeutxoData::m_chain_tx_count value.
if (!Assume(pindex->m_chain_tx_count == 0 || pindex->m_chain_tx_count == prev_tx_sum(*pindex))) {
LogWarning("Internal bug detected: block %d has unexpected m_chain_tx_count %i that should be %i (%s %s). Please report this issue here: %s\n",
pindex->nHeight, pindex->m_chain_tx_count, prev_tx_sum(*pindex), PACKAGE_NAME, FormatFullVersion(), PACKAGE_BUGREPORT);
pindex->nHeight, pindex->m_chain_tx_count, prev_tx_sum(*pindex), CLIENT_NAME, FormatFullVersion(), CLIENT_BUGREPORT);
}
pindex->m_chain_tx_count = prev_tx_sum(*pindex);
pindex->nSequenceId = nBlockSequenceId++;
@ -6690,7 +6690,7 @@ SnapshotCompletionResult ChainstateManager::MaybeCompleteSnapshotValidation()
"Please report this incident to %s, including how you obtained the snapshot. "
"The invalid snapshot chainstate will be left on disk in case it is "
"helpful in diagnosing the issue that caused this error."),
PACKAGE_NAME, snapshot_tip_height, snapshot_base_height, snapshot_base_height, PACKAGE_BUGREPORT
CLIENT_NAME, snapshot_tip_height, snapshot_base_height, snapshot_base_height, CLIENT_BUGREPORT
);
LogError("[snapshot] !!! %s\n", user_error.original);