aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-02-08 14:41:19 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-02-08 14:41:25 -0500
commit2945492424934fa360f86b116184ee8e34f19d0a (patch)
treea0d8a0e1b329d4a6c3323db5cd91097abb223b94 /src/wallet
parentd5dbb45bdf7d62257cf73c452f7d43727e3ae72b (diff)
parentdfbf117bbb82c76c8cb60dba73ae7d653e3b8348 (diff)
Merge #15357: rpc: Don't ignore `-maxtxfee` when wallet is disabled
dfbf117bbb Move maxTxFee initialization to init.cpp (Jordan Baczuk) Pull request description: Resolves #15355 Tree-SHA512: 6eafacc6a3b0589fb645b0080fd3c01598566df1bd7ee7929284853866a23493960fbd4d6f9c3417e192f8a21706d9f593197734f6189e046e4747991305a0b8
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/init.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
index 87cd264c3d..20d540c8db 100644
--- a/src/wallet/init.cpp
+++ b/src/wallet/init.cpp
@@ -127,21 +127,6 @@ bool WalletInit::ParameterInteraction() const
InitWarning(AmountHighWarn("-minrelaytxfee") + " " +
_("The wallet will avoid paying less than the minimum relay fee."));
- if (gArgs.IsArgSet("-maxtxfee"))
- {
- CAmount nMaxFee = 0;
- if (!ParseMoney(gArgs.GetArg("-maxtxfee", ""), nMaxFee))
- return InitError(AmountErrMsg("maxtxfee", gArgs.GetArg("-maxtxfee", "")));
- if (nMaxFee > HIGH_MAX_TX_FEE)
- InitWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
- maxTxFee = nMaxFee;
- if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
- {
- return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must be at least the minrelay fee of %s to prevent stuck transactions)"),
- gArgs.GetArg("-maxtxfee", ""), ::minRelayTxFee.ToString()));
- }
- }
-
return true;
}