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

Fix komodo_ensure

Browse Source
This commit is contained in:
jl777
2018-04-24 23:50:45 +03:00
parent e0ed9dca91
commit 12c4543d51
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main.cpp
View File

@@ -3893,12 +3893,8 @@ bool AcceptBlock(int32_t *futureblockp,CBlock& block, CValidationState& state, C
} }
if ( pindex == 0 ) if ( pindex == 0 )
{ {
*ppindex = pindex = AddToBlockIndex(block); LogPrintf("AcceptBlock null pindex error\n");
if ( pindex == 0 ) return false;
{
LogPrintf("AcceptBlock null pindex error\n");
return false;
}
} }
//fprintf(stderr,"acceptblockheader passed\n"); //fprintf(stderr,"acceptblockheader passed\n");
// Try to process all requested blocks that we don't have, but only // Try to process all requested blocks that we don't have, but only
@@ -3980,25 +3976,42 @@ void komodo_currentheight_set(int32_t height);
CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash) CBlockIndex *komodo_ensure(CBlock *pblock,uint256 hash)
{ {
CBlockIndex *pindex; CBlockIndex *pindex=0,*previndex=0;
BlockMap::iterator miSelf = mapBlockIndex.find(hash); BlockMap::iterator miSelf = mapBlockIndex.find(hash);
if ( miSelf != mapBlockIndex.end() ) if ( miSelf == mapBlockIndex.end() )
{ {
if ( (pindex= miSelf->second) == 0 ) // create pindex so first Accept block doesnt fail pindex = InsertBlockIndex(hash);
LogPrintf("autocreate pindex %s\n",hash.ToString().c_str());
}
if ( (miSelf= mapBlockIndex.find(hash)) != mapBlockIndex.end() )
{
if ( miSelf->second == 0 ) // create pindex so first Accept block doesnt fail
{ {
miSelf->second = AddToBlockIndex(*pblock); if ( pindex == 0 )
//fprintf(stderr,"Block header %s is already known, but without pindex -> ensured %p\n",hash.ToString().c_str(),miSelf->second); pindex = AddToBlockIndex(*pblock);
if ( pindex != 0 )
{
miSelf->second = pindex;
LogPrintf("Block header %s is already known, but without pindex -> ensured %p\n",hash.ToString().c_str(),miSelf->second);
} else LogPrintf("komodo_ensure unexpected null pindex\n");
} }
if ( hash != Params().GetConsensus().hashGenesisBlock ) if ( hash != Params().GetConsensus().hashGenesisBlock )
{ {
miSelf = mapBlockIndex.find(pblock->hashPrevBlock); miSelf = mapBlockIndex.find(pblock->hashPrevBlock);
if ( miSelf == mapBlockIndex.end() ) if ( miSelf == mapBlockIndex.end() )
previndex = InsertBlockIndex(pblock->hashPrevBlock);
if ( (miSelf= mapBlockIndex.find(pblock->hashPrevBlock)) != mapBlockIndex.end() )
{ {
miSelf->second = InsertBlockIndex(pblock->hashPrevBlock); if ( previndex == 0 )
LogPrintf("autocreate previndex %s\n",pblock->hashPrevBlock.ToString().c_str()); previndex = InsertBlockIndex(pblock->hashPrevBlock);
} if ( previndex != 0 )
{
miSelf->second = previndex;
LogPrintf("autocreate previndex %s\n",pblock->hashPrevBlock.ToString().c_str());
} else LogPrintf("komodo_ensure unexpected null previndex\n");
} else LogPrintf("komodo_ensure unexpected null miprev\n");
} }
} } else LogPrintf("komodo_ensure unexpected error creating pindex %s\n",hash.ToString().c_str());
} }
bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNode* pfrom, CBlock* pblock, bool fForceProcessing, CDiskBlockPos *dbp) bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNode* pfrom, CBlock* pblock, bool fForceProcessing, CDiskBlockPos *dbp)