Remove relay-only rounding

Remove rounding of transaction sizes when calculating fee minimums for relaying,
to simplify fee logic.

7 files changed, 32 insertions, 10 deletions

diff --git a/src/amount.cpp b/src/amount.cpp
index 176c0be85..aa6bf943e 100644
--- a/src/amount.cpp
+++ b/src/amount.cpp
@@ -30,6 +30,16 @@ CAmount CFeeRate::GetFee(size_t nBytes_) const
         nSize = nSize + 1000 - (nSize % 1000);
     }
 
+    return GetRelayFee(nSize);
+}
+
+// Dogecoin: Specifically for 1.14.4 we lower accepted relay fees by removing rounding,
+// in 1.14.5 we should unify the GetFee() functions again.
+CAmount CFeeRate::GetRelayFee(size_t nBytes_) const
+{
+    assert(nBytes_ <= uint64_t(std::numeric_limits<int64_t>::max()));
+    int64_t nSize = int64_t(nBytes_);
+
     CAmount nFee = nSatoshisPerK * nSize / 1000;
 
     if (nFee == 0 && nSize != 0) {
diff --git a/src/amount.h b/src/amount.h
index e6e503905..02d61fc9b 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -46,10 +46,14 @@ public:
     CFeeRate(const CAmount& nFeePaid, size_t nBytes);
     CFeeRate(const CFeeRate& other) { nSatoshisPerK = other.nSatoshisPerK; }
     /**
-     * Return the fee in satoshis for the given size in bytes.
+     * Return the wallet fee in koinus for the given size in bytes.
      */
     CAmount GetFee(size_t nBytes) const;
     /**
+     * Return the relay fee in koinus for the given size in bytes.
+     */
+    CAmount GetRelayFee(size_t nBytes) const;
+    /**
      * Return the fee in satoshis for a size of 1000 bytes
      */
     CAmount GetFeePerK() const { return GetFee(1000); }
diff --git a/src/dogecoin-fees.cpp b/src/dogecoin-fees.cpp
index c0542eb3c..890908ad6 100644
--- a/src/dogecoin-fees.cpp
+++ b/src/dogecoin-fees.cpp
@@ -46,7 +46,7 @@ CAmount GetDogecoinMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool
             return 0;
     }
 
-    CAmount nMinFee = ::minRelayTxFeeRate.GetFee(nBytes);
+    CAmount nMinFee = ::minRelayTxFeeRate.GetRelayFee(nBytes);
     nMinFee += GetDogecoinDustFee(tx.vout, ::minRelayTxFeeRate);
 
     if (fAllowFree)
diff --git a/src/miner.cpp b/src/miner.cpp
index 55a90b86f..c4ec82d6a 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -490,7 +490,7 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda
             packageSigOpsCost = modit->nSigOpCostWithAncestors;
         }
 
-        if (packageFees < blockMinFeeRate.GetFee(packageSize)) {
+        if (packageFees < blockMinFeeRate.GetRelayFee(packageSize)) {
             // Everything else we might consider has a lower fee rate
             return;
         }
diff --git a/src/test/amount_tests.cpp b/src/test/amount_tests.cpp
index 47e73ed38..80a6c3a6f 100644
--- a/src/test/amount_tests.cpp
+++ b/src/test/amount_tests.cpp
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK_EQUAL(feeRate.GetFee(1e5), 0);
 
     feeRate = CFeeRate(1000);
-    // Must always just return the arg
+    // Wallet fees are rounded up
     BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
     BOOST_CHECK_EQUAL(feeRate.GetFee(1), 1000);
     BOOST_CHECK_EQUAL(feeRate.GetFee(121), 1000);
@@ -27,6 +27,14 @@ BOOST_AUTO_TEST_CASE(GetFeeTest)
     BOOST_CHECK_EQUAL(feeRate.GetFee(1e3), 1000);
     BOOST_CHECK_EQUAL(feeRate.GetFee(9e3), 9000);
 
+    // Relay fees must always just return the arg
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(0), 0);
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(1), 1);
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(121), 121);
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(999), 999);
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(1e3), 1e3);
+    BOOST_CHECK_EQUAL(feeRate.GetRelayFee(9e3), 9e3);
+
     feeRate = CFeeRate(-1000);
     // Must always just return -1 * arg
     BOOST_CHECK_EQUAL(feeRate.GetFee(0), 0);
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index ba06a2ab7..3995d3096 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -121,7 +121,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
 
     // Calculate a fee on child transaction that will put the package just
     // below the block min tx fee (assuming 1 child tx of the same size).
-    CAmount feeToUse = blockMinFeeRate.GetFee(2*freeTxSize) - 1;
+    CAmount feeToUse = blockMinFeeRate.GetRelayFee(2*freeTxSize) - 1;
 
     tx.vin[0].prevout.hash = hashFreeTx;
     tx.vout[0].nValue = 5000000000LL - 1000 - 50000 - feeToUse;
@@ -158,7 +158,7 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
     // This tx can't be mined by itself
     tx.vin[0].prevout.hash = hashFreeTx2;
     tx.vout.resize(1);
-    feeToUse = blockMinFeeRate.GetFee(freeTxSize);
+    feeToUse = blockMinFeeRate.GetRelayFee(freeTxSize);
     tx.vout[0].nValue = 5000000000LL - 100000000 - feeToUse;
     uint256 hashLowFeeTx2 = tx.GetHash();
     mempool.addUnchecked(hashLowFeeTx2, entry.Fee(feeToUse).SpendsCoinbase(false).FromTx(tx));
diff --git a/src/validation.cpp b/src/validation.cpp
index 8fc4ef6c7..9a307c9d0 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -786,10 +786,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             return state.DoS(0, false, REJECT_NONSTANDARD, "bad-txns-too-many-sigops", false,
                 strprintf("%d", nSigOpsCost));
 
-        CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize);
+        CAmount mempoolRejectFee = pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetRelayFee(nSize);
         if (mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) {
             return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "mempool min fee not met", false, strprintf("%d < %d", nFees, mempoolRejectFee));
-        } else if (GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) && nModifiedFees < ::minRelayTxFeeRate.GetFee(nSize) && !AllowFree(entry.GetPriority(chainActive.Height() + 1))) {
+        } else if (GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) && nModifiedFees < ::minRelayTxFeeRate.GetRelayFee(nSize) && !AllowFree(entry.GetPriority(chainActive.Height() + 1))) {
             // Require that free transactions have sufficient priority to be mined in the next block.
             return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "insufficient priority");
         }
@@ -966,14 +966,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
             // Finally in addition to paying more fees than the conflicts the
             // new transaction must pay for its own bandwidth.
             CAmount nDeltaFees = nModifiedFees - nConflictingFees;
-            if (nDeltaFees < ::incrementalRelayFee.GetFee(nSize))
+            if (nDeltaFees < ::incrementalRelayFee.GetRelayFee(nSize))
             {
                 return state.DoS(0, false,
                         REJECT_INSUFFICIENTFEE, "insufficient fee", false,
                         strprintf("rejecting replacement %s, not enough additional fees to relay; %s < %s",
                               hash.ToString(),
                               FormatMoney(nDeltaFees),
-                              FormatMoney(::incrementalRelayFee.GetFee(nSize))));
+                              FormatMoney(::incrementalRelayFee.GetRelayFee(nSize))));
             }
         }