Merge pull request #748 from jl777/jl777

Fix exceptions
This commit is contained in:
jl777
2018-07-10 03:24:03 -11:00
committed by GitHub

View File

@@ -1028,9 +1028,9 @@ int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_
{
if ( KOMODO_REWIND == 0 && (ASSETCHAINS_SYMBOL[0] == 0 || ASSETCHAINS_STAKED != 0) && (int64_t)tx.nLockTime >= LOCKTIME_THRESHOLD ) //1473793441 )
{
if ( txheight > 246748 )
if ( txheight > 246748 || ASSETCHAINS_STAKED != 0 )
{
if ( txheight < 247205 )
if ( txheight < 247205 && || ASSETCHAINS_STAKED == 0 )
cmptime -= 16000;
if ( (int64_t)tx.nLockTime < cmptime-KOMODO_MAXMEMPOOLTIME )
{