Move fPayAtLeastCustomFee function to CC

sipa · jonasschnelli · commit ecc7c82361d9 · 2015-11-30T14:09:04.000+01:00
diff --git a/src/coincontrol.h b/src/coincontrol.h
@@ -16,6 +16,8 @@ class CCoinControl
     bool fAllowOtherInputs;
     //! Includes watch only addresses which match the ISMINE_WATCH_SOLVABLE criteria
     bool fAllowWatchOnly;
+    //! Minimum absolute fee (not per kilobyte)
+    CAmount nMinimumTotalFee;
 
     CCoinControl()
     {
@@ -28,6 +30,7 @@ class CCoinControl
         fAllowOtherInputs = false;
         fAllowWatchOnly = false;
         setSelected.clear();
+        nMinimumTotalFee = 0;
     }
 
     bool HasSelected() const
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -41,7 +41,6 @@ CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
 unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
 bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
 bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;
-bool fPayAtLeastCustomFee = false;
 
 /**
  * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
@@ -2017,6 +2016,9 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                 }
 
                 CAmount nFeeNeeded = GetMinimumFee(nBytes, nTxConfirmTarget, mempool);
+                if (coinControl && nFeeNeeded > 0 && coinControl->nMinimumTotalFee > nFeeNeeded) {
+                    nFeeNeeded = coinControl->nMinimumTotalFee;
+                }
 
                 // If we made it here and we aren't even able to meet the relay fee on the next pass, give up
                 // because we must be at the maximum allowed fee.
@@ -2112,9 +2114,6 @@ CAmount CWallet::GetMinimumFee(unsigned int nTxBytes, unsigned int nConfirmTarge
 {
     // payTxFee is user-set "I want to pay this much"
     CAmount nFeeNeeded = payTxFee.GetFee(nTxBytes);
-    // user selected total at least (default=true)
-    if (fPayAtLeastCustomFee && nFeeNeeded > 0 && nFeeNeeded < payTxFee.GetFeePerK())
-        nFeeNeeded = payTxFee.GetFeePerK();
     // User didn't set: use -txconfirmtarget to estimate...
     if (nFeeNeeded == 0) {
         int estimateFoundTarget = nConfirmTarget;
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -35,7 +35,6 @@ extern CAmount maxTxFee;
 extern unsigned int nTxConfirmTarget;
 extern bool bSpendZeroConfChange;
 extern bool fSendFreeTransactions;
-extern bool fPayAtLeastCustomFee;
 
 static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
 //! -paytxfee default

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class CCoinControl`
`16`	`16`	`bool fAllowOtherInputs;`
`17`	`17`	`//! Includes watch only addresses which match the ISMINE_WATCH_SOLVABLE criteria`
`18`	`18`	`bool fAllowWatchOnly;`
	`19`	`+ //! Minimum absolute fee (not per kilobyte)`
	`20`	`+ CAmount nMinimumTotalFee;`
`19`	`21`
`20`	`22`	`CCoinControl()`
`21`	`23`	`{`
`@@ -28,6 +30,7 @@ class CCoinControl`
`28`	`30`	`fAllowOtherInputs = false;`
`29`	`31`	`fAllowWatchOnly = false;`
`30`	`32`	`setSelected.clear();`
	`33`	`+ nMinimumTotalFee = 0;`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`bool HasSelected() const`