DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

oopps

Browse Source
This commit is contained in:
blackjok3r
2019-01-26 16:00:03 +08:00
parent 3da846ce85
commit 6d17cb5dec
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/txdb.cpp
View File

@@ -689,15 +689,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
pindexNew->nTx = diskindex.nTx; pindexNew->nTx = diskindex.nTx;
pindexNew->nSproutValue = diskindex.nSproutValue; pindexNew->nSproutValue = diskindex.nSproutValue;
pindexNew->nSaplingValue = diskindex.nSaplingValue; pindexNew->nSaplingValue = diskindex.nSaplingValue;
<<<<<<< HEAD
pindexNew->segid = diskindex.segid;
pindexNew->newcoins = diskindex.newcoins;
pindexNew->zfunds = diskindex.zfunds;
pindexNew->sproutfunds = diskindex.sproutfunds;
=======
//fprintf(stderr,"loadguts ht.%d\n",pindexNew->GetHeight()); //fprintf(stderr,"loadguts ht.%d\n",pindexNew->GetHeight());
>>>>>>> b778dbef8e85f3f95e36223beb41d4d51eb6072e
// Consistency checks // Consistency checks
auto header = pindexNew->GetBlockHeader(); auto header = pindexNew->GetBlockHeader();
if (header.GetHash() != pindexNew->GetBlockHash()) if (header.GetHash() != pindexNew->GetBlockHash())