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

Test

Browse Source
This commit is contained in:
jl777
2017-03-24 00:08:11 +02:00
parent c2123afed9
commit b575c4fb7b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@@ -710,11 +710,11 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
int32_t komodo_validate_interest(uint32_t *expiredp,const CTransaction& tx,int32_t txheightarg) int32_t komodo_validate_interest(uint32_t *expiredp,const CTransaction& tx,int32_t txheightarg)
{ {
int32_t i,txheight=0; uint32_t prevblocktime,cmptime,txheighttime,tiptime=0,locktime; uint64_t value=0; CBlockIndex *prev; int32_t i,txheight=0; uint32_t prevblocktime=0,cmptime=0,txheighttime=0,tiptime=0,locktime=0; uint64_t value=0; CBlockIndex *prev;
if ( ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD )//1473793441 ) if ( ASSETCHAINS_SYMBOL[0] == 0 && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD )//1473793441 )
{ {
prevblocktime = 0;
locktime = komodo_interest_args(&txheighttime,&txheight,&tiptime,&value,tx.GetHash(),0); locktime = komodo_interest_args(&txheighttime,&txheight,&tiptime,&value,tx.GetHash(),0);
/*prevblocktime = 0;
if ( (txheight= txheightarg) == 0 ) if ( (txheight= txheightarg) == 0 )
txheight = chainActive.Tip()->nHeight + 1; txheight = chainActive.Tip()->nHeight + 1;
if ( (prev= komodo_chainactive(txheight-1)) != 0 ) if ( (prev= komodo_chainactive(txheight-1)) != 0 )
@@ -739,7 +739,9 @@ int32_t komodo_validate_interest(uint32_t *expiredp,const CTransaction& tx,int32
if ( tiptime != 0 && tiptime < cmptime ) if ( tiptime != 0 && tiptime < cmptime )
cmptime = tiptime; cmptime = tiptime;
if ( locktime != 0 && prevblocktime != 0 && prevblocktime < cmptime ) if ( locktime != 0 && prevblocktime != 0 && prevblocktime < cmptime )
cmptime = prevblocktime; cmptime = prevblocktime;*/
if ( (prev= komodo_chainactive(txheight-1)) != 0 )
cmptime = prev->nTime + 600;
if ( cmptime >= 1490159171 - 24*3600 ) if ( cmptime >= 1490159171 - 24*3600 )
{ {
if ( cmptime != 0 && (int64_t)tx.nLockTime < cmptime-3600 ) if ( cmptime != 0 && (int64_t)tx.nLockTime < cmptime-3600 )