Page MenuHomePhabricator
Files F10615280

D7578.id23934.diff
No OneTemporary
Actions

D7578.id23934.diff
View Options

diff --git a/src/validation.h b/src/validation.h
--- a/src/validation.h
+++ b/src/validation.h
@@ -814,13 +814,18 @@
//! easily as opposed to referencing a global.
BlockManager &m_blockman;
+ /**
+ * The best finalized block.
+ * This block cannot be reorged in any way except by explicit user action.
+ */
+ const CBlockIndex *m_finalizedBlockIndex GUARDED_BY(cs_main) = nullptr;
+
public:
explicit CChainState(BlockManager &blockman) : m_blockman(blockman) {}
//! The current chain of blockheaders we consult and build on.
//! @see CChain, CBlockIndex.
CChain m_chain;
- CBlockIndex const *pindexFinalized = nullptr;
/**
* The set of all CBlockIndex entries with BLOCK_VALID_TRANSACTIONS (for
* itself and all ancestors) and as good as our current tip or better.
@@ -886,6 +891,7 @@
bool ParkBlock(const Config &config, BlockValidationState &state,
CBlockIndex *pindex)
LOCKS_EXCLUDED(cs_main, m_cs_chainstate);
+
/**
* Finalize a block.
* A finalized block can not be reorged in any way.
@@ -893,6 +899,9 @@
bool FinalizeBlock(const Config &config, BlockValidationState &state,
CBlockIndex *pindex)
LOCKS_EXCLUDED(cs_main, m_cs_chainstate);
+ /** Return the currently finalized block index. */
+ const CBlockIndex *finalizedBlockIndex() const;
+
void ResetBlockFailureFlags(CBlockIndex *pindex)
EXCLUSIVE_LOCKS_REQUIRED(cs_main);
template <typename F>
@@ -911,7 +920,7 @@
void PruneBlockIndexCandidates();
- void UnloadBlockIndex();
+ void UnloadBlockIndex() EXCLUSIVE_LOCKS_REQUIRED(cs_main);
/**
* Check whether we are doing an initial block download (synchronizing from
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -115,11 +115,6 @@
namespace {
CBlockIndex *pindexBestInvalid = nullptr;
CBlockIndex *pindexBestParked = nullptr;
-/**
- * The best finalized block.
- * This block cannot be reorged in any way except by explicit user action.
- */
-CBlockIndex const *&pindexFinalized = ::ChainstateActive().pindexFinalized;
RecursiveMutex cs_LastBlockFile;
std::vector<CBlockFileInfo> vinfoBlockFile;
@@ -940,7 +935,7 @@
// If the invalid chain found is supposed to be finalized, we need to move
// back the finalization point.
if (IsBlockFinalized(pindexNew)) {
- pindexFinalized = pindexNew->pprev;
+ m_finalizedBlockIndex = pindexNew->pprev;
}
LogPrintf("%s: invalid block=%s height=%d log2_work=%.8g date=%s\n",
@@ -2161,8 +2156,8 @@
}
// If the tip is finalized, then undo it.
- if (pindexFinalized == pindexDelete) {
- pindexFinalized = pindexDelete->pprev;
+ if (finalizedBlockIndex() == pindexDelete) {
+ m_finalizedBlockIndex = pindexDelete->pprev;
}
m_chain.SetTip(pindexDelete->pprev);
@@ -2263,7 +2258,8 @@
}
// Check that the request is consistent with current finalization.
- if (pindexFinalized && !AreOnTheSameFork(pindex, pindexFinalized)) {
+ if (finalizedBlockIndex() &&
+ !AreOnTheSameFork(pindex, finalizedBlockIndex())) {
LogPrintf("ERROR: %s: Trying to finalize block %s which conflicts with "
"already finalized block\n",
__func__, pindex->GetBlockHash().ToString());
@@ -2278,7 +2274,7 @@
}
// We have a new block to finalize.
- pindexFinalized = pindex;
+ m_finalizedBlockIndex = pindex;
return true;
}
@@ -2310,7 +2306,7 @@
// While our candidate is not eligible (finalization delay not expired), try
// the previous one.
- while (pindex && (pindex != pindexFinalized)) {
+ while (pindex && (pindex != ::ChainstateActive().finalizedBlockIndex())) {
// Check that the block to finalize is known for a long enough time.
// This test will ensure that an attacker could not cause a block to
// finalize by forking the chain with a depth > maxreorgdepth.
@@ -2480,11 +2476,12 @@
// If this block will cause a finalized block to be reorged, then we
// mark it as invalid.
- if (pindexFinalized && !AreOnTheSameFork(pindexNew, pindexFinalized)) {
+ if (finalizedBlockIndex() &&
+ !AreOnTheSameFork(pindexNew, finalizedBlockIndex())) {
LogPrintf("Mark block %s invalid because it forks prior to the "
"finalization point %d.\n",
pindexNew->GetBlockHash().ToString(),
- pindexFinalized->nHeight);
+ finalizedBlockIndex()->nHeight);
pindexNew->nStatus = pindexNew->nStatus.withFailed();
InvalidChainFound(pindexNew);
}
@@ -3222,6 +3219,11 @@
return UnwindBlock(config, state, pindexToInvalidate,
true /* invalidating */);
}
+/** Return the currently finalized block index. */
+const CBlockIndex *CChainState::finalizedBlockIndex() const {
+ AssertLockHeld(cs_main);
+ return m_finalizedBlockIndex;
+}
template <typename F>
bool CChainState::UpdateFlagsForBlock(CBlockIndex *pindexBase,
@@ -3284,8 +3286,9 @@
// In case we are reconsidering something before the finalization point,
// move the finalization point to the last common ancestor.
- if (pindexFinalized) {
- pindexFinalized = LastCommonAncestor(pindex, pindexFinalized);
+ if (finalizedBlockIndex()) {
+ m_finalizedBlockIndex =
+ LastCommonAncestor(pindex, finalizedBlockIndex());
}
UpdateFlags(
@@ -3331,14 +3334,14 @@
}
const CBlockIndex *GetFinalizedBlock() {
- AssertLockHeld(cs_main);
- return pindexFinalized;
+ return ::ChainstateActive().finalizedBlockIndex();
}
bool IsBlockFinalized(const CBlockIndex *pindex) {
AssertLockHeld(cs_main);
- return pindexFinalized &&
- pindexFinalized->GetAncestor(pindex->nHeight) == pindex;
+ auto finalizedBlockIndex = ::ChainstateActive().finalizedBlockIndex();
+ return finalizedBlockIndex &&
+ finalizedBlockIndex->GetAncestor(pindex->nHeight) == pindex;
}
CBlockIndex *BlockManager::AddToBlockIndex(const CBlockHeader &block) {
@@ -5016,6 +5019,9 @@
void CChainState::UnloadBlockIndex() {
nBlockSequenceId = 1;
setBlockIndexCandidates.clear();
+
+ // Do not point to CBlockIndex that has been free'd
+ m_finalizedBlockIndex = nullptr;
}
// May NOT be used after any connections are up as much
@@ -5025,7 +5031,6 @@
LOCK(cs_main);
::ChainActive().SetTip(nullptr);
g_blockman.Unload();
- pindexFinalized = nullptr;
pindexBestInvalid = nullptr;
pindexBestParked = nullptr;
pindexBestHeader = nullptr;

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 22, 10:03 (20 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4559230
Default Alt Text
D7578.id23934.diff (6 KB)

Event Timeline