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

Test

Browse Source
This commit is contained in:
jl777
2018-04-16 00:03:29 +03:00
parent 03e2210d24
commit 7466a33007
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

@@ -3747,13 +3747,13 @@ bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBloc
*ppindex = pindex; *ppindex = pindex;
if ( pindex != 0 && pindex->nStatus & BLOCK_FAILED_MASK ) if ( pindex != 0 && pindex->nStatus & BLOCK_FAILED_MASK )
{ {
komodo_reverify_blockcheck(state,pindex->nHeight,pindex); //komodo_reverify_blockcheck(state,pindex->nHeight,pindex);
if ( KOMODO_LONGESTCHAIN != 0 && pindex->nHeight > KOMODO_LONGESTCHAIN-100 ) //if ( KOMODO_LONGESTCHAIN != 0 && pindex->nHeight > KOMODO_LONGESTCHAIN-100 )
return state.Invalid(error("%s: block is marked invalid", __func__), 0, "duplicate"); return state.Invalid(error("%s: block is marked invalid", __func__), 0, "duplicate");
else //else
{ //{
pindex->nStatus &= ~BLOCK_FAILED_MASK; // pindex->nStatus &= ~BLOCK_FAILED_MASK;
} //}
} }
if ( pindex != 0 && IsInitialBlockDownload() == 0 ) // jl777 debug test if ( pindex != 0 && IsInitialBlockDownload() == 0 ) // jl777 debug test
{ {
@@ -3788,6 +3788,8 @@ bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBloc
return false; return false;
} }
} }
if ( *ppindex == 0 )
fprintf(stderr,"unexpected null *ppindex\n");
return true; return true;
} }
@@ -3809,7 +3811,10 @@ bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state, CBloc
if (!ContextualCheckBlockHeader(block, state, pindexPrev)) if (!ContextualCheckBlockHeader(block, state, pindexPrev))
return false; return false;
if (pindex == NULL) if (pindex == NULL)
pindex = AddToBlockIndex(block); {
if ( (pindex= AddToBlockIndex(block)) == 0 )
fprintf(stderr,"couldnt add to block index\n");
}
if (ppindex) if (ppindex)
*ppindex = pindex; *ppindex = pindex;
return true; return true;
@@ -3825,7 +3830,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
return false; return false;
if ( pindex == 0 ) if ( pindex == 0 )
{ {
//fprintf(stderr,"AcceptBlock error null pindex\n"); fprintf(stderr,"unexpected AcceptBlock error null pindex\n");
return false; return false;
} }
// 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