From 3959e9f32d40bbda1885dcbc42714af7c68ce3d2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 12 Nov 2016 12:10:15 -0300 Subject: [PATCH] test --- src/coins.cpp | 6 +++++- src/pow.cpp | 2 +- src/wallet/wallet.cpp | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/coins.cpp b/src/coins.cpp index 3388f7439..dc3880a2a 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -401,7 +401,11 @@ CAmount CCoinsViewCache::GetValueIn(int32_t nHeight,int64_t *interestp,const CTr #ifdef KOMODO_ENABLE_INTEREST if ( ASSETCHAINS_SYMBOL[0] == 0 && nHeight >= 60000 ) { - printf("nResult %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nResult/COIN,(double)interest/COIN,nHeight,tx.nLockTime,tiptime); + if ( interest != 0 ) + { + printf("nResult %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nResult/COIN,(double)interest/COIN,nHeight,tx.nLockTime,tiptime); + fprintf(stderr,"nResult %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nResult/COIN,(double)interest/COIN,nHeight,tx.nLockTime,tiptime); + } nResult += interest; } #endif diff --git a/src/pow.cpp b/src/pow.cpp index 98f219453..86118816d 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -127,7 +127,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in } if ( nonz == 0 ) return(true); // will come back via different path with pubkey set - if ( height > 65105 ) + if ( height > 65500 ) { if ( notaryid >= 0 ) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 2dc3e7b29..5c8ce5a9f 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2403,10 +2403,13 @@ bool CWallet::SelectCoins(const CAmount& nTargetValue, setnHeight+1 >= 60000 ) { - printf("nValueRet %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nValueRet/COIN,(double)interest/COIN,chainActive.Tip()->nHeight+1,out.tx->nLockTime,chainActive.Tip()->nTime); + if ( interest != 0 ) + { + printf("nValueRet %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nValueRet/COIN,(double)interest/COIN,chainActive.Tip()->nHeight+1,out.tx->nLockTime,chainActive.Tip()->nTime); + fprintf(stderr,"nValueRet %.8f += interest %.8f ht.%d lock.%u tip.%u\n",(double)nValueRet/COIN,(double)interest/COIN,chainActive.Tip()->nHeight+1,out.tx->nLockTime,chainActive.Tip()->nTime); + } nValueRet += interest; } - fprintf(stderr,"interest %llu from %llu lock.%u tip.%u\n",(long long)interest,(long long)out.tx->vout[out.i].nValue,out.tx->nLockTime,chainActive.Tip()->nTime); #endif setCoinsRet.insert(make_pair(out.tx, out.i)); }