diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-13 11:35:20 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-13 11:35:26 +0200 |
| commit | 37ac67816afbefe88806e0325b8d3719c411183e (patch) | |
| tree | 808efc8f2efb1baa8603fd7c172a9db9a077e0f8 /src/wallet/wallet.h | |
| parent | 39ac1ec6426447b924052c2da3f80e0220c308c3 (diff) | |
| parent | 86726d8680c3398c41e62924588c44f4a394367e (diff) | |
| download | bitcoin-37ac67816afbefe88806e0325b8d3719c411183e.tar.xz | |
Merge #8601: Add option to opt into full-RBF when sending funds (rebase, original by petertodd)
86726d8 Rename `-optintofullrbf` option to `-walletrbf` (Wladimir J. van der Laan)
05fa823 wallet: Add BIP125 comment for MAXINT-1/-2 behavior (Wladimir J. van der Laan)
152f45b Add option to opt into full-RBF when sending funds (Peter Todd)
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 7a771350cb..61aff6e45a 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -37,6 +37,7 @@ extern CFeeRate payTxFee; extern unsigned int nTxConfirmTarget; extern bool bSpendZeroConfChange; extern bool fSendFreeTransactions; +extern bool fWalletRbf; static const unsigned int DEFAULT_KEYPOOL_SIZE = 100; //! -paytxfee default @@ -53,6 +54,8 @@ static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true; static const bool DEFAULT_SEND_FREE_TRANSACTIONS = false; //! -txconfirmtarget default static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2; +//! -walletrbf default +static const bool DEFAULT_WALLET_RBF = false; //! Largest (in bytes) free transaction we're willing to create static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000; static const bool DEFAULT_WALLETBROADCAST = true; |