maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #585 from rnicoll/1.8-dev-cleaning

Browse source 
Revert unneeded changes introduced as a side-effect AuxPoW.
This commit is contained in:
langerhans 2014-08-04 18:52:04 +02:00
parent 3d1362fdb3 fee8930ddf
commit a61f92618a
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.h
View file

@ -953,7 +953,7 @@ public:
ReadWriteAuxPow(s, auxpow, nType, this->nVersion, ser_action);
)
uint256 CalcBlockHash() const
uint256 GetBlockHash() const
{
CBlockHeader block;
block.nVersion = nVersion;

16
src/txdb.cpp
View file

@ -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