aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKarl-Johan Alm <karljohan-alm@garage.co.jp>2020-08-17 14:38:21 +0900
committerKarl-Johan Alm <karljohan-alm@garage.co.jp>2020-08-18 19:24:39 +0900
commit7e31ea9fa0a59ced2293057acb14c71ec97db689 (patch)
treeb01b925d1d9f412d68a9d222e35f02108bd78b4a /src
parent9f77b821764dcaebc97a5ae76c3052936418308d (diff)
downloadbitcoin-7e31ea9fa0a59ced2293057acb14c71ec97db689.tar.xz
-maxapsfee: follow-up fixes
Co-authored-by: Jon Atack <jon@atack.com> Co-authored-by: Samuel Dobson <dobsonsa68@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ac03b3ca9c..c132a4be42 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3890,16 +3890,17 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain,
}
if (gArgs.IsArgSet("-maxapsfee")) {
+ const std::string max_aps_fee{gArgs.GetArg("-maxapsfee", "")};
CAmount n = 0;
- if (gArgs.GetArg("-maxapsfee", "") == "-1") {
+ if (max_aps_fee == "-1") {
n = -1;
- } else if (!ParseMoney(gArgs.GetArg("-maxapsfee", ""), n)) {
- error = AmountErrMsg("maxapsfee", gArgs.GetArg("-maxapsfee", ""));
+ } else if (!ParseMoney(max_aps_fee, n)) {
+ error = AmountErrMsg("maxapsfee", max_aps_fee);
return nullptr;
}
if (n > HIGH_APS_FEE) {
warnings.push_back(AmountHighWarn("-maxapsfee") + Untranslated(" ") +
- _("This is the maximum transaction fee you pay to prioritize partial spend avoidance over regular coin selection."));
+ _("This is the maximum transaction fee you pay (in addition to the normal fee) to prioritize partial spend avoidance over regular coin selection."));
}
walletInstance->m_max_aps_fee = n;
}