aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/coincontrol.h
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-04-07 12:12:46 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-04-23 10:49:21 -0400
commitfac0db0ff8e72ca30a0da8a64fc1d115dd2d6f8c (patch)
treed12d25bb207858129003ef6c33956f6c8a3fcdcb /src/wallet/coincontrol.h
parentd5b2e98250f6b2a8b70d12893fee371f27fc4400 (diff)
downloadbitcoin-fac0db0ff8e72ca30a0da8a64fc1d115dd2d6f8c.tar.xz
wallet: Make fee settings non-static members
Diffstat (limited to 'src/wallet/coincontrol.h')
-rw-r--r--src/wallet/coincontrol.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/coincontrol.h b/src/wallet/coincontrol.h
index 52d6a291c9..2f08162ee4 100644
--- a/src/wallet/coincontrol.h
+++ b/src/wallet/coincontrol.h
@@ -26,12 +26,12 @@ public:
bool fAllowWatchOnly;
//! Override automatic min/max checks on fee, m_feerate must be set if true
bool fOverrideFeeRate;
- //! Override the default payTxFee if set
+ //! Override the wallet's m_pay_tx_fee if set
boost::optional<CFeeRate> m_feerate;
//! Override the default confirmation target if set
boost::optional<unsigned int> m_confirm_target;
- //! Signal BIP-125 replace by fee.
- bool signalRbf;
+ //! Override the wallet's m_signal_rbf if set
+ boost::optional<bool> m_signal_bip125_rbf;
//! Fee estimation mode to control arguments to estimateSmartFee
FeeEstimateMode m_fee_mode;
@@ -50,7 +50,7 @@ public:
m_feerate.reset();
fOverrideFeeRate = false;
m_confirm_target.reset();
- signalRbf = fWalletRbf;
+ m_signal_bip125_rbf.reset();
m_fee_mode = FeeEstimateMode::UNSET;
}