blocks-1,

verify block chain on load, so wouldn't have needed to delete blk*.dat, it would have done a reorg automatically

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@137 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 23 insertions, 0 deletions

diff --git a/db.cpp b/db.cpp
index 7116b0aa30..8134a9059c 100644
--- a/db.cpp
+++ b/db.cpp
@@ -459,6 +459,29 @@ bool CTxDB::LoadBlockIndex()
     // Load bnBestInvalidWork, OK if it doesn't exist

     ReadBestInvalidWork(bnBestInvalidWork);

 

+    // Verify blocks in the best chain

+    CBlockIndex* pindexFork = NULL;

+    for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev)

+    {

+        CBlock block;

+        if (!block.ReadFromDisk(pindex))

+            return error("LoadBlockIndex() : block.ReadFromDisk failed");

+        if (!block.CheckBlock())

+        {

+            printf("LoadBlockIndex() : *** found bad block at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());

+            pindexFork = pindex->pprev;

+        }

+    }

+    if (pindexFork)

+    {

+        printf("LoadBlockIndex() : *** moving best chain pointer back to block %d\n", pindexFork->nHeight);

+        CBlock block;

+        if (!block.ReadFromDisk(pindexFork))

+            return error("LoadBlockIndex() : block.ReadFromDisk failed");

+        CTxDB txdb;

+        block.SetBestChain(txdb, pindexFork);

+    }

+

     return true;

 }