Merge #13012: [doc] Add comments for chainparams.h, validation.cpp
18326ae
[doc] Add comments for chainparams.h, validation.cpp (James O'Beirne)
Pull request description:
Added a few comments during a leisurely read through some of the validation code. If this kind of thing seems useful, I can add similar documentation for most of the `CChainState` interface.
Tree-SHA512: a4d9db60383a8ff02e74ac326ed88902eec1ee441e8cd4e1845bcf257072673c15974225288cebf0a633e76a3410f99e2206616b4694725a2a5b0d19c78327d6
This commit is contained in:
commit
d1e3c5e73c
2 changed files with 22 additions and 0 deletions
|
@ -25,6 +25,12 @@ struct CCheckpointData {
|
||||||
MapCheckpoints mapCheckpoints;
|
MapCheckpoints mapCheckpoints;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Holds various statistics on transactions within a chain. Used to estimate
|
||||||
|
* verification progress during chain sync.
|
||||||
|
*
|
||||||
|
* See also: CChainParams::TxData, GuessVerificationProgress.
|
||||||
|
*/
|
||||||
struct ChainTxData {
|
struct ChainTxData {
|
||||||
int64_t nTime;
|
int64_t nTime;
|
||||||
int64_t nTxCount;
|
int64_t nTxCount;
|
||||||
|
|
|
@ -154,6 +154,10 @@ public:
|
||||||
|
|
||||||
bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock);
|
bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If a block header hasn't already been seen, call CheckBlockHeader on it, ensure
|
||||||
|
* that it doesn't descend from an invalid block, and then add it to mapBlockIndex.
|
||||||
|
*/
|
||||||
bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex);
|
bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex);
|
||||||
bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock);
|
bool AcceptBlock(const std::shared_ptr<const CBlock>& pblock, CValidationState& state, const CChainParams& chainparams, CBlockIndex** ppindex, bool fRequested, const CDiskBlockPos* dbp, bool* fNewBlock);
|
||||||
|
|
||||||
|
@ -185,6 +189,11 @@ private:
|
||||||
CBlockIndex* AddToBlockIndex(const CBlockHeader& block);
|
CBlockIndex* AddToBlockIndex(const CBlockHeader& block);
|
||||||
/** Create a new block index entry for a given block hash */
|
/** Create a new block index entry for a given block hash */
|
||||||
CBlockIndex * InsertBlockIndex(const uint256& hash);
|
CBlockIndex * InsertBlockIndex(const uint256& hash);
|
||||||
|
/**
|
||||||
|
* Make various assertions about the state of the block index.
|
||||||
|
*
|
||||||
|
* By default this only executes fully when using the Regtest chain; see: fCheckBlockIndex.
|
||||||
|
*/
|
||||||
void CheckBlockIndex(const Consensus::Params& consensusParams);
|
void CheckBlockIndex(const Consensus::Params& consensusParams);
|
||||||
|
|
||||||
void InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state);
|
void InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state);
|
||||||
|
@ -2654,6 +2663,10 @@ static void NotifyHeaderTip() {
|
||||||
* Make the best chain active, in multiple steps. The result is either failure
|
* Make the best chain active, in multiple steps. The result is either failure
|
||||||
* or an activated best chain. pblock is either nullptr or a pointer to a block
|
* or an activated best chain. pblock is either nullptr or a pointer to a block
|
||||||
* that is already loaded (to avoid loading it again from disk).
|
* that is already loaded (to avoid loading it again from disk).
|
||||||
|
*
|
||||||
|
* ActivateBestChain is split into steps (see ActivateBestChainStep) so that
|
||||||
|
* we avoid holding cs_main for an extended period of time; the length of this
|
||||||
|
* call may be quite long during reindexing or a substantial reorg.
|
||||||
*/
|
*/
|
||||||
bool CChainState::ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock) {
|
bool CChainState::ActivateBestChain(CValidationState &state, const CChainParams& chainparams, std::shared_ptr<const CBlock> pblock) {
|
||||||
// Note that while we're often called here from ProcessNewBlock, this is
|
// Note that while we're often called here from ProcessNewBlock, this is
|
||||||
|
@ -3357,6 +3370,9 @@ bool CChainState::AcceptBlockHeader(const CBlockHeader& block, CValidationState&
|
||||||
if (!ContextualCheckBlockHeader(block, state, chainparams, pindexPrev, GetAdjustedTime()))
|
if (!ContextualCheckBlockHeader(block, state, chainparams, pindexPrev, GetAdjustedTime()))
|
||||||
return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
|
return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));
|
||||||
|
|
||||||
|
// If the previous block index isn't valid, determine if it descends from any block which
|
||||||
|
// has been found invalid (g_failed_blocks), then mark pindexPrev and any blocks
|
||||||
|
// between them as failed.
|
||||||
if (!pindexPrev->IsValid(BLOCK_VALID_SCRIPTS)) {
|
if (!pindexPrev->IsValid(BLOCK_VALID_SCRIPTS)) {
|
||||||
for (const CBlockIndex* failedit : m_failed_blocks) {
|
for (const CBlockIndex* failedit : m_failed_blocks) {
|
||||||
if (pindexPrev->GetAncestor(failedit->nHeight) == failedit) {
|
if (pindexPrev->GetAncestor(failedit->nHeight) == failedit) {
|
||||||
|
|
Loading…
Reference in a new issue