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

Merge pull request #366 from jl777/dev

Browse Source 
Dev
This commit is contained in:
jl777
2017-03-24 05:15:24 +02:00
committed by GitHub
parent aa17174ca3 129d39b037
commit 8f06490311
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo_bitcoind.h
View File

@@ -600,7 +600,7 @@ CBlockIndex *komodo_chainactive(int32_t height)
{
if ( height <= chainActive.Tip()->nHeight )
return(chainActive[height]);
else fprintf(stderr,"komodo_chainactive height %d > active.%d\n",height,chainActive.Tip()->nHeight);
// else fprintf(stderr,"komodo_chainactive height %d > active.%d\n",height,chainActive.Tip()->nHeight);
}
//fprintf(stderr,"komodo_chainactive null chainActive.Tip() height %d\n",height);
return(0);

6
src/main.cpp
View File

@@ -731,7 +731,7 @@ int32_t komodo_validate_interest(uint32_t *expiredp,const CTransaction& tx,int32
cmptime = prevblocktime + 600;
else
{
fprintf(stderr,"couldnt get cmptime for [%d] t%u\n",txheight,prevblocktime);
//fprintf(stderr,"couldnt get cmptime for [%d] t%u\n",txheight,prevblocktime);
return(-1);
}
/* uint32_t prevblocktime=0,cmptime=0,txheighttime=0,tiptime=0,locktime=0;
@@ -2888,7 +2888,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
if ( KOMODO_REWIND != 0 )
{
fprintf(stderr,"rewind start ht.%d\n",chainActive.Tip()->nHeight);
while ( chainActive.Tip()->nHeight > KOMODO_REWIND )
while ( KOMODO_REWIND > 0 && chainActive.Tip()->nHeight > KOMODO_REWIND )
{
if ( !DisconnectTip(state) )
{
@@ -2897,7 +2897,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
}
}
fprintf(stderr,"reached rewind.%d, best to do: ./komodo-cli stop\n",KOMODO_REWIND);
sleep(3600);
sleep(60);
KOMODO_REWIND = 0;
return(true);
}