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

Merge pull request #363 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-03-24 04:40:26 +02:00
committed by GitHub
parent 816fac6a7a 7d1067177e
commit aa17174ca3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -2887,17 +2887,17 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
} }
if ( KOMODO_REWIND != 0 ) if ( KOMODO_REWIND != 0 )
{ {
fprintf(stderr,"rewind ht.%d\n",chainActive.Tip()->nHeight); fprintf(stderr,"rewind start ht.%d\n",chainActive.Tip()->nHeight);
while ( chainActive.Tip()->nHeight > KOMODO_REWIND ) while ( chainActive.Tip()->nHeight > KOMODO_REWIND )
{ {
if ( !DisconnectTip(state) ) if ( !DisconnectTip(state) )
{ {
InvalidateBlock(state,chainActive.Tip()); InvalidateBlock(state,chainActive.Tip());
return false; break;
} }
} }
fprintf(stderr,"reached rewind.%d, best to do: ./komodo-cli stop\n",KOMODO_REWIND); fprintf(stderr,"reached rewind.%d, best to do: ./komodo-cli stop\n",KOMODO_REWIND);
sleep(60); sleep(3600);
KOMODO_REWIND = 0; KOMODO_REWIND = 0;
return(true); return(true);
} }
@@ -3331,7 +3331,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
BOOST_FOREACH(const CTransaction& tx, block.vtx) BOOST_FOREACH(const CTransaction& tx, block.vtx)
{ {
uint32_t prevtime = 0; CBlockIndex *ptr; uint32_t prevtime = 0; CBlockIndex *ptr;
if ( height == chainActive.Tip()->nHeight+1 ) if ( chainActive.Tip() != 0 && height == chainActive.Tip()->nHeight+1 )
prevtime = chainActive.Tip()->nTime; prevtime = chainActive.Tip()->nTime;
else if ( pindex != 0 ) else if ( pindex != 0 )
{ {
@@ -3340,7 +3340,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
} }
if ( prevtime == 0 ) if ( prevtime == 0 )
{ {
if ( height > 0 && (ptr= chainActive[height-1]) ) if ( height > 0 && (ptr= chainActive[height-1]) != 0 )
prevtime = ptr->nTime; prevtime = ptr->nTime;
} }
if ( komodo_validate_interest(0,tx,height,prevtime) < 0 ) if ( komodo_validate_interest(0,tx,height,prevtime) < 0 )