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
2017-03-24 05:59:38 +02:00
parent 3afed2e718
commit 2f852a342c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@@ -723,17 +723,22 @@ int32_t komodo_validate_interest(uint32_t *expiredp,const CTransaction& tx,int32
if ( (pindex= mapBlockIndex[hashBlock]) != 0 ) if ( (pindex= mapBlockIndex[hashBlock]) != 0 )
{ {
txheight = pindex->nHeight; txheight = pindex->nHeight;
prevblocktime = pindex->nTime;
if ( (previndex= pindex->pprev) != 0 ) if ( (previndex= pindex->pprev) != 0 )
prevblocktime = previndex->nTime; prevblocktime = previndex->nTime;
} }
} }
if ( prevblocktime != 0 ) if ( prevblocktime == 0 )
cmptime = prevblocktime + 600;
else if ( txheight > 246748 )
{ {
//fprintf(stderr,"couldnt get cmptime for [%d] t%u\n",txheight,prevblocktime); if ( activeChain.Tip() != 0 && height == activeChain.Tip()->nHeight+1 )
return(-1); prevblocktime = activeChain.Tip()->nTime;
} else return(0); else
{
fprintf(stderr,"couldnt get prevblocktime for [%d]\n",txheight);
return(-1);
}
}
cmptime = prevblocktime + 600;
/* uint32_t prevblocktime=0,cmptime=0,txheighttime=0,tiptime=0,locktime=0; /* uint32_t prevblocktime=0,cmptime=0,txheighttime=0,tiptime=0,locktime=0;
prevblocktime = 0; prevblocktime = 0;
locktime = komodo_interest_args(&txheighttime,&txheight,&tiptime,&value,tx.GetHash(),0); locktime = komodo_interest_args(&txheighttime,&txheight,&tiptime,&value,tx.GetHash(),0);