Merge pull request #2603 from sipa/nobestblock
Bugfix: if no bestblock record is present, do a -rescan
This commit is contained in:
commit
aa6b3061ee
1 changed files with 4 additions and 0 deletions
|
@ -987,6 +987,8 @@ bool AppInit2(boost::thread_group& threadGroup)
|
||||||
CBlockLocator locator;
|
CBlockLocator locator;
|
||||||
if (walletdb.ReadBestBlock(locator))
|
if (walletdb.ReadBestBlock(locator))
|
||||||
pindexRescan = locator.GetBlockIndex();
|
pindexRescan = locator.GetBlockIndex();
|
||||||
|
else
|
||||||
|
pindexRescan = pindexGenesisBlock;
|
||||||
}
|
}
|
||||||
if (pindexBest && pindexBest != pindexRescan)
|
if (pindexBest && pindexBest != pindexRescan)
|
||||||
{
|
{
|
||||||
|
@ -995,6 +997,8 @@ bool AppInit2(boost::thread_group& threadGroup)
|
||||||
nStart = GetTimeMillis();
|
nStart = GetTimeMillis();
|
||||||
pwalletMain->ScanForWalletTransactions(pindexRescan, true);
|
pwalletMain->ScanForWalletTransactions(pindexRescan, true);
|
||||||
printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart);
|
printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart);
|
||||||
|
pwalletMain->SetBestChain(CBlockLocator(pindexBest));
|
||||||
|
nWalletDBUpdated++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ********************************************************* Step 9: import blocks
|
// ********************************************************* Step 9: import blocks
|
||||||
|
|
Loading…
Add table
Reference in a new issue