Merge branch 'dev' into duke

src/main.cpp

@@ -1948,7 +1948,17 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
             dFreeCount += nSize;
         }
         
+        fRejectAbsurdFee = false;
+
         if ( fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000 && nFees > nValueOut/19)
+        // Disable checks for absurd fees when adding to the mempool. Instead, this check is done
+        // when a user attempts to make a transaction with an absurd fee and only rejects absurd
+        // fees when OP_RETURN data is NOT being used. This means users making normal financial
+        // transactions (z2z) are protected from absurd fees, it is only users who are storing
+        // arbitrary data via a z2t transaction are allowed to (or potentially required) to pay high fees
+        // It would be nice to detect the use of OP_RETURN right here but it seems to only be known
+        // inside of IsStandard() inside of IsStandardTx() and we want to avoid doing expensive checks
+        // multiple times.
         {
             string errmsg = strprintf("absurdly high fees %s, %d > %d",
                                       hash.ToString(),
@@ -1956,7 +1966,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
             LogPrint("mempool", errmsg.c_str());
             return state.Error("AcceptToMemoryPool: " + errmsg);
         }
-//fprintf(stderr,"addmempool 6\n");
+        //fprintf(stderr,"addmempool 6\n");
 
         // Check against previous transactions
         // This is done last to help prevent CPU exhaustion denial-of-service attacks.