From 0ed9675be4a28b6240e10c0d3fdb81373bd56bbc Mon Sep 17 00:00:00 2001 From: Cozz Lovan Date: Sun, 2 Nov 2014 00:43:31 +0100 Subject: [PATCH] [Wallet] Add global boolean whether to send free transactions (default=true) --- src/wallet.cpp | 3 ++- src/wallet.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/wallet.cpp b/src/wallet.cpp index ec439c5a..1b8e387e 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -28,6 +28,7 @@ using namespace std; CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE); unsigned int nTxConfirmTarget = 1; bool bSpendZeroConfChange = true; +bool fSendFreeTransactions = true; /** * Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) @@ -1502,7 +1503,7 @@ bool CWallet::CreateTransaction(const vector >& vecSend, break; // Done, enough fee included. // Too big to send for free? Include more fee and try again: - if (nBytes > MAX_FREE_TRANSACTION_CREATE_SIZE) + if (!fSendFreeTransactions || nBytes > MAX_FREE_TRANSACTION_CREATE_SIZE) { nFeeRet = nFeeNeeded; continue; diff --git a/src/wallet.h b/src/wallet.h index b692ad05..ebe52d4a 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -32,6 +32,7 @@ extern CFeeRate payTxFee; extern unsigned int nTxConfirmTarget; extern bool bSpendZeroConfChange; +extern bool fSendFreeTransactions; //! -paytxfee default static const CAmount DEFAULT_TRANSACTION_FEE = 0;