diff options
author | Satoshi Nakamoto <satoshin@gmx.com> | 2010-08-16 20:55:54 +0000 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-08-16 20:55:54 +0000 |
commit | 43deefa4355981e53f4fdfe9aa1c4003941e2a8e (patch) | |
tree | a82c4b6b1c3e145a80f5bdcb0daf2551d40107b1 | |
parent | 21ca2d833b85673c482803b1c382bbe948b2c44a (diff) | |
download | bitcoin-43deefa4355981e53f4fdfe9aa1c4003941e2a8e.tar.xz |
do an extra CheckBlock in ConnectBlock
-rw-r--r-- | db.cpp | 13 | ||||
-rw-r--r-- | main.cpp | 4 | ||||
-rw-r--r-- | serialize.h | 2 |
3 files changed, 6 insertions, 13 deletions
@@ -460,12 +460,9 @@ bool CTxDB::LoadBlockIndex() ReadBestInvalidWork(bnBestInvalidWork); // Verify blocks in the best chain - vector<CBlockIndex*> vChain; - vector<CBlockIndex*> vBad; CBlockIndex* pindexFork = NULL; for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev) { - vChain.push_back(pindex); CBlock block; if (!block.ReadFromDisk(pindex)) return error("LoadBlockIndex() : block.ReadFromDisk failed"); @@ -473,25 +470,17 @@ bool CTxDB::LoadBlockIndex() { printf("LoadBlockIndex() : *** found bad block at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str()); pindexFork = pindex->pprev; - vBad = vChain; } } if (pindexFork) { + // Reorg back to the fork 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); - - // Delete the bad chain - foreach(CBlockIndex* pindex, vBad) - { - txdb.EraseBlockIndex(pindex->GetBlockHash()); - mapBlockIndex.erase(pindex->GetBlockHash()); - delete pindex; - } } return true; @@ -1107,6 +1107,10 @@ bool CBlock::DisconnectBlock(CTxDB& txdb, CBlockIndex* pindex) bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) { + // Check it again in case a previous version let a bad block in + if (!CheckBlock()) + return false; + //// issue here: it doesn't know the version unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size()); diff --git a/serialize.h b/serialize.h index 4f3332ad62..d65fe71cb0 100644 --- a/serialize.h +++ b/serialize.h @@ -20,7 +20,7 @@ class CDataStream; class CAutoFile; static const int VERSION = 310; -static const char* pszSubVer = ".2"; +static const char* pszSubVer = ".3"; |