[Wallet] Add global boolean whether to send free transactions (default=true)
This commit is contained in:
parent
8c41853380
commit
0ed9675be4
2 changed files with 3 additions and 1 deletions
|
@ -28,6 +28,7 @@ using namespace std;
|
||||||
CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
|
CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
|
||||||
unsigned int nTxConfirmTarget = 1;
|
unsigned int nTxConfirmTarget = 1;
|
||||||
bool bSpendZeroConfChange = true;
|
bool bSpendZeroConfChange = true;
|
||||||
|
bool fSendFreeTransactions = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
|
* Fees smaller than this (in satoshi) are considered zero fee (for transaction creation)
|
||||||
|
@ -1502,7 +1503,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, CAmount> >& vecSend,
|
||||||
break; // Done, enough fee included.
|
break; // Done, enough fee included.
|
||||||
|
|
||||||
// Too big to send for free? Include more fee and try again:
|
// 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;
|
nFeeRet = nFeeNeeded;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
extern CFeeRate payTxFee;
|
extern CFeeRate payTxFee;
|
||||||
extern unsigned int nTxConfirmTarget;
|
extern unsigned int nTxConfirmTarget;
|
||||||
extern bool bSpendZeroConfChange;
|
extern bool bSpendZeroConfChange;
|
||||||
|
extern bool fSendFreeTransactions;
|
||||||
|
|
||||||
//! -paytxfee default
|
//! -paytxfee default
|
||||||
static const CAmount DEFAULT_TRANSACTION_FEE = 0;
|
static const CAmount DEFAULT_TRANSACTION_FEE = 0;
|
||||||
|
|
Loading…
Reference in a new issue