diff options
| author | Matt Corallo <git@bluematt.me> | 2017-07-06 19:57:20 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2017-07-27 15:03:05 -0400 |
| commit | eda888e57352037ab2e60f6ef90098b3ce23a157 (patch) | |
| tree | d8e500283bc5ba0e68f2cd4c6a255e8e04ccfd20 /src/validation.h | |
| parent | 5cfdda2503c995cdd563b1a2a29162ac298d173d (diff) | |
| download | bitcoin-eda888e57352037ab2e60f6ef90098b3ce23a157.tar.xz | |
Fix some LoadChainTip-related init-order bugs.
* Move the writing of fTxIndex to LoadBlockIndex - this fixes a
bug introduced in d6af06d68aae985436cbc942f0d11078041d121b where
InitBlockIndex was writing to fTxIndex which had not yet been
checked (because LoadChainTip hadn't yet initialized the
chainActive, which would otherwise have resulted in
InitBlockIndex being a NOP), allowing you to modify -txindex
without reindex, potentially corrupting your chainstate!
* Rename InitBlockIndex to LoadGenesisBlock, which is now a more
natural name for it. Also check mapBlockIndex instead of
chainActive, fixing a bug where we'd write the genesis block out
on every start.
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/validation.h b/src/validation.h index a9f995abb8..3ce5023f0a 100644 --- a/src/validation.h +++ b/src/validation.h @@ -256,9 +256,10 @@ FILE* OpenBlockFile(const CDiskBlockPos &pos, bool fReadOnly = false); fs::path GetBlockPosFilename(const CDiskBlockPos &pos, const char *prefix); /** Import blocks from an external file */ bool LoadExternalBlockFile(const CChainParams& chainparams, FILE* fileIn, CDiskBlockPos *dbp = NULL); -/** Initialize a new block tree database + block data on disk */ -bool InitBlockIndex(const CChainParams& chainparams); -/** Load the block tree and coins database from disk */ +/** Ensures we have a genesis block in the block tree, possibly writing one to disk. */ +bool LoadGenesisBlock(const CChainParams& chainparams); +/** Load the block tree and coins database from disk, + * initializing state if we're running with -reindex. */ bool LoadBlockIndex(const CChainParams& chainparams); /** Update the chain tip based on database information. */ void LoadChainTip(const CChainParams& chainparams); |