diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-18 09:07:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-18 09:07:02 +0200 |
| commit | 26e08a16a6fb64b535d10f5d459183092deefa50 (patch) | |
| tree | 439366f5693efb1ac5d1225af68d23f5719a59e3 /src/wallet/wallet.cpp | |
| parent | a6d2e31e8bd50ec6c0b359a2fdb2b368be3f46c6 (diff) | |
| parent | 2457dc43acaa54a418eea27034912346b5e1e28a (diff) | |
| download | bitcoin-26e08a16a6fb64b535d10f5d459183092deefa50.tar.xz | |
Merge pull request #6126
2457dc4 Change default nTxConfirmTarget to 2 (Alex Morcos)
77ed59d wallet: Introduce constant for `-txconfirmtarget` default (Wladimir J. van der Laan)
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 0afdcd0011..3396a3a188 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -30,7 +30,7 @@ using namespace std; */ CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE); CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE; -unsigned int nTxConfirmTarget = 1; +unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET; bool bSpendZeroConfChange = true; bool fSendFreeTransactions = false; bool fPayAtLeastCustomFee = true; |