diff options
| author | MarcoFalke <[email protected]> | 2019-02-08 14:41:19 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-02-08 14:41:25 -0500 |
| commit | 2945492424934fa360f86b116184ee8e34f19d0a (patch) | |
| tree | a0d8a0e1b329d4a6c3323db5cd91097abb223b94 /src/init.cpp | |
| parent | Merge #15314: [Doc] update release notes for changes up to cb35f1d (diff) | |
| parent | Move maxTxFee initialization to init.cpp (diff) | |
| download | discoin-2945492424934fa360f86b116184ee8e34f19d0a.tar.xz discoin-2945492424934fa360f86b116184ee8e34f19d0a.zip | |
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/init.cpp')
| -rw-r--r-- | src/init.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 8fcf94b49..e3d5c4953 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1098,6 +1098,22 @@ bool AppInitParameterInteraction() dustRelayFee = CFeeRate(n); } + // This is required by both the wallet and node + 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())); + } + } + fRequireStandard = !gArgs.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()); if (chainparams.RequireStandard() && !fRequireStandard) return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); |