From fee8930ddf472e657312b9460ef5188f7ac10c81 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Mon, 4 Aug 2014 01:14:29 +0100 Subject: [PATCH] Revert unneeded changes introduced as a side-effect AuxPoW. --- src/main.h | 2 +- src/txdb.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main.h b/src/main.h index 1e16ce8db..a26e261e8 100644 --- a/src/main.h +++ b/src/main.h @@ -953,7 +953,7 @@ public: ReadWriteAuxPow(s, auxpow, nType, this->nVersion, ser_action); ) - uint256 CalcBlockHash() const + uint256 GetBlockHash() const { CBlockHeader block; block.nVersion = nVersion; diff --git a/src/txdb.cpp b/src/txdb.cpp index da4474386..ec952b5fc 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -197,9 +197,8 @@ bool CBlockTreeDB::LoadBlockIndexGuts() leveldb::Iterator *pcursor = NewIterator(); CDataStream ssKeySet(SER_DISK, CLIENT_VERSION); - ssKeySet << boost::tuples::make_tuple('b', uint256(0), 'a'); // 'b' is the prefix for BlockIndex, 'a' sigifies the first part uint256 hash; - char cType; + ssKeySet << boost::tuples::make_tuple('b', uint256(0), 'a'); // 'b' is the prefix for BlockIndex, 'a' sigifies the first part pcursor->Seek(ssKeySet.str()); // Load mapBlockIndex @@ -208,10 +207,11 @@ bool CBlockTreeDB::LoadBlockIndexGuts() try { leveldb::Slice slKey = pcursor->key(); CDataStream ssKey(slKey.data(), slKey.data()+slKey.size(), SER_DISK, CLIENT_VERSION); - ssKey >> cType; - if (cType == 'b') { + char chType; + ssKey >> chType; + if (chType == 'b') { ssKey >> hash; - + leveldb::Slice slValue = pcursor->value(); CDataStream ssValue_immutable(slValue.data(), slValue.data()+slValue.size(), SER_DISK, CLIENT_VERSION); CDiskBlockIndex diskindex; @@ -219,15 +219,19 @@ bool CBlockTreeDB::LoadBlockIndexGuts() // Construct immutable parts of block index objecty CBlockIndex* pindexNew = InsertBlockIndex(hash); - assert(diskindex.CalcBlockHash() == *pindexNew->phashBlock); // paranoia check + assert(diskindex.GetBlockHash() == *pindexNew->phashBlock); // paranoia check pindexNew->pprev = InsertBlockIndex(diskindex.hashPrev); pindexNew->nHeight = diskindex.nHeight; + pindexNew->nFile = diskindex.nFile; + pindexNew->nDataPos = diskindex.nDataPos; + pindexNew->nUndoPos = diskindex.nUndoPos; pindexNew->nVersion = diskindex.nVersion; pindexNew->hashMerkleRoot = diskindex.hashMerkleRoot; pindexNew->nTime = diskindex.nTime; pindexNew->nBits = diskindex.nBits; pindexNew->nNonce = diskindex.nNonce; + pindexNew->nStatus = diskindex.nStatus; pindexNew->nTx = diskindex.nTx; // CheckIndex need phashBlock to be set