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/init.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/init.cpp')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 3c3b3fb231..490ed6f54c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -333,7 +333,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet.dat") + " " + _("on startup")); strUsage += HelpMessageOpt("-sendfreetransactions", strprintf(_("Send transactions as zero-fee transactions if possible (default: %u)"), 0)); strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), 1)); - strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), 1)); + strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If paytxfee is not set, include enough fee so transactions begin confirmation on average within n blocks (default: %u)"), DEFAULT_TX_CONFIRM_TARGET)); strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees to use in a single wallet transaction; setting this too low may abort large transactions (default: %s)"), FormatMoney(maxTxFee))); strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format") + " " + _("on startup")); @@ -834,7 +834,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) mapArgs["-maxtxfee"], ::minRelayTxFee.ToString())); } } - nTxConfirmTarget = GetArg("-txconfirmtarget", 1); + nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET); bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", true); fSendFreeTransactions = GetBoolArg("-sendfreetransactions", false); |