Revert interest changes

7 years ago · 1141b67821
3 changed files with 3 additions and 3 deletions
--- a/src/coins.cpp
+++ b/src/coins.cpp
@ -401,7 +401,7 @@ CAmount CCoinsViewCache::GetValueIn(int32_t nHeight,int64_t *interestp,const CTr
        value = GetOutputFor(tx.vin[i]).nValue;
        nResult += value;
 #ifdef KOMODO_ENABLE_INTEREST
-        if ( interestp != 0 && ASSETCHAINS_SYMBOL[0] == 0 && nHeight >= 60000 )
+        if ( ASSETCHAINS_SYMBOL[0] == 0 && nHeight >= 60000 )
        {
            if ( value >= 10*COIN )
            {
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1803,7 +1803,7 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins
            // Check for negative or overflow input values
            nValueIn += coins->vout[prevout.n].nValue;
 #ifdef KOMODO_ENABLE_INTEREST
-            if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.Tip() != 0 && chainActive.Tip()->nHeight >= 60000 && chainActive.Tip()->nHeight < 350000 )
+            if ( ASSETCHAINS_SYMBOL[0] == 0 && chainActive.Tip() != 0 && chainActive.Tip()->nHeight >= 60000 )
            {
                if ( coins->vout[prevout.n].nValue >= 10*COIN )
                {
--- a/src/miner.cpp
+++ b/src/miner.cpp
@ -335,7 +335,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
            if (!view.HaveInputs(tx))
                continue;

-            CAmount nTxFees = view.GetValueIn(chainActive.Tip()->nHeight,0,tx,chainActive.Tip()->nTime)-tx.GetValueOut();
+            CAmount nTxFees = view.GetValueIn(chainActive.Tip()->nHeight,&interest,tx,chainActive.Tip()->nTime)-tx.GetValueOut();

            nTxSigOps += GetP2SHSigOpCount(tx, view);
            if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)