Fixed paytxfee calculation

codeing-io · Oct 31, 2018 · b254146 · b254146
1 parent e4d2ada
commit b254146
Showing 1 changed file with 38 additions and 37 deletions.
diff --git a/src/core/init.cpp b/src/core/init.cpp
@@ -880,42 +880,6 @@ bool AppInit2(boost::thread_group& threadGroup,int OutputPipe)
     }
 
 #ifdef ENABLE_WALLET
-    if (mapArgs.count("-mintxfee"))
-    {
-        CAmount n = 0;
-        if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
-            CWallet::minTxFee = CFeeRate(n);
-        else
-            return InitError(strprintf(_("Invalid amount for -mintxfee=<amount>: '%s'"), mapArgs["-mintxfee"]));
-    }
-    if (mapArgs.count("-paytxfee"))
-    {
-        CAmount nFeePerK = 0;
-        if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
-            return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
-        if (nFeePerK > nHighTransactionFeeWarning)
-            InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
-        payTxFee = CFeeRate(nFeePerK, 1000);
-        if (payTxFee < ::minRelayTxFee)
-        {
-            return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
-                                       mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
-        }
-    }
-    if (mapArgs.count("-maxtxfee"))
-    {
-        CAmount nMaxFee = 0;
-        if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
-            return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maptxfee"]));
-        if (nMaxFee > nHighTransactionMaxFeeWarning)
-            InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction."));
-        maxTxFee = nMaxFee;
-        if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
-        {
-            return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
-                                       mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
-        }
-    }
     nTxConfirmTarget = GetArg("-txconfirmtarget", 1);
     bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
     fSendFreeTransactions = GetArg("-sendfreetransactions", false);
@@ -1791,7 +1755,44 @@ bool AppInit2(boost::thread_group& threadGroup,int OutputPipe)
     }
 /* MCHN END*/        
 
-
+        ::minRelayTxFee = CFeeRate(MIN_RELAY_TX_FEE); 
+        if (mapArgs.count("-mintxfee"))
+        {
+            CAmount n = 0;
+            if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
+                CWallet::minTxFee = CFeeRate(n);
+            else
+                return InitError(strprintf(_("Invalid amount for -mintxfee=<amount>: '%s'"), mapArgs["-mintxfee"]));
+        }
+        if (mapArgs.count("-paytxfee"))
+        {
+            CAmount nFeePerK = 0;
+            if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
+                return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
+            if (nFeePerK > nHighTransactionFeeWarning)
+                InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
+            payTxFee = CFeeRate(nFeePerK, 1000);
+            if (payTxFee < ::minRelayTxFee)
+            {
+                return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
+                                           mapArgs["-paytxfee"], ::minRelayTxFee.ToString()));
+            }
+        }
+        if (mapArgs.count("-maxtxfee"))
+        {
+            CAmount nMaxFee = 0;
+            if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
+                return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maptxfee"]));
+            if (nMaxFee > nHighTransactionMaxFeeWarning)
+                InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction."));
+            maxTxFee = nMaxFee;
+            if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
+            {
+                return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
+                                           mapArgs["-maxtxfee"], ::minRelayTxFee.ToString()));
+            }
+        }
+
 #endif // ENABLE_WALLET
     // ********************************************************* Step 6: network initialization