highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-05 20:49:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call RewindBlockIndex even if we're about to run -reindex-chainstate

Browse Source 
RewindBlockIndex works over both chainActive - disconnecting blocks
from the tip that need witness verification - and mapBlockIndex -
requiring redownload of blocks missing witness data.

It should never have been the case that the second half is skipped
if we're about to run -reindex-chainstate.
This commit is contained in:
Matt Corallo
2017-07-06 21:29:46 -04:00
parent b0f32497b8
commit ff3a21919d
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/init.cpp
View File

@@ -1452,7 +1452,10 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
assert(chainActive.Tip() != NULL);
}
if (!fReindex && chainActive.Tip() != NULL) {
if (!fReindex) {
// Note that RewindBlockIndex MUST run even if we're about to -reindex-chainstate.
// It both disconnects blocks based on chainActive, and drops block data in
// mapBlockIndex based on lack of available witness data.
uiInterface.InitMessage(_("Rewinding blocks..."));
if (!RewindBlockIndex(chainparams)) {
strLoadError = _("Unable to rewind the database to a pre-fork state. You will need to redownload the blockchain");