[Wallet] Add global boolean whether to pay at least the custom fee (default=true)

cozz · cozz · commit ed3e5e468c5b · 2014-11-19T16:04:53.000+01:00
diff --git a/src/wallet.cpp b/src/wallet.cpp
@@ -29,6 +29,7 @@ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
 unsigned int nTxConfirmTarget = 1;
 bool bSpendZeroConfChange = true;
 bool fSendFreeTransactions = true;
+bool fPayAtLeastCustomFee = true;
 
 /** 
  * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) 
@@ -1383,7 +1384,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
     {
         LOCK2(cs_main, cs_wallet);
         {
-            nFeeRet = payTxFee.GetFeePerK();
+            if (fPayAtLeastCustomFee)
+                nFeeRet = payTxFee.GetFeePerK();
+            else
+                nFeeRet = 0;
             while (true)
             {
                 txNew.vin.clear();
diff --git a/src/wallet.h b/src/wallet.h
@@ -33,6 +33,7 @@ extern CFeeRate payTxFee;
 extern unsigned int nTxConfirmTarget;
 extern bool bSpendZeroConfChange;
 extern bool fSendFreeTransactions;
+extern bool fPayAtLeastCustomFee;
 
 //! -paytxfee default
 static const CAmount DEFAULT_TRANSACTION_FEE = 0;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);`
`29`	`29`	`unsigned int nTxConfirmTarget = 1;`
`30`	`30`	`bool bSpendZeroConfChange = true;`
`31`	`31`	`bool fSendFreeTransactions = true;`
	`32`	`+bool fPayAtLeastCustomFee = true;`
`32`	`33`
`33`	`34`	`/**`
`34`	`35`	`* Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)`
`@@ -1383,7 +1384,10 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,`
`1383`	`1384`	`{`
`1384`	`1385`	`LOCK2(cs_main, cs_wallet);`
`1385`	`1386`	`{`
`1386`		`- nFeeRet = payTxFee.GetFeePerK();`
	`1387`	`+ if (fPayAtLeastCustomFee)`
	`1388`	`+ nFeeRet = payTxFee.GetFeePerK();`
	`1389`	`+ else`
	`1390`	`+ nFeeRet = 0;`
`1387`	`1391`	`while (true)`
`1388`	`1392`	`{`
`1389`	`1393`	`txNew.vin.clear();`