GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a2a250c7d0 into merged_master (Bitcoin PR #19743)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-28 00:53:18 +00:00
commit ddd9b819bb
3 changed files with 62 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/wallet/wallet.cpp
View file

@ -4827,16 +4827,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;
}