|
|
@ -3031,7 +3031,8 @@ bool CChainState::InvalidateBlock(BlockValidationState& state, const CChainParam
|
|
|
|
// transactions back to the mempool if disconnecting was successful,
|
|
|
|
// transactions back to the mempool if disconnecting was successful,
|
|
|
|
// and we're not doing a very deep invalidation (in which case
|
|
|
|
// and we're not doing a very deep invalidation (in which case
|
|
|
|
// keeping the mempool up to date is probably futile anyway).
|
|
|
|
// keeping the mempool up to date is probably futile anyway).
|
|
|
|
UpdateMempoolForReorg(::ChainstateActive(), m_mempool, disconnectpool, /* fAddToMempool = */ (++disconnected <= 10) && ret);
|
|
|
|
assert(std::addressof(::ChainstateActive()) == std::addressof(*this));
|
|
|
|
|
|
|
|
UpdateMempoolForReorg(*this, m_mempool, disconnectpool, /* fAddToMempool = */ (++disconnected <= 10) && ret);
|
|
|
|
if (!ret) return false;
|
|
|
|
if (!ret) return false;
|
|
|
|
assert(invalid_walk_tip->pprev == m_chain.Tip());
|
|
|
|
assert(invalid_walk_tip->pprev == m_chain.Tip());
|
|
|
|
|
|
|
|
|
|
|
|