diff options
| author | Jordan Baczuk <[email protected]> | 2019-02-08 07:06:44 -0700 |
|---|---|---|
| committer | Jordan Baczuk <[email protected]> | 2019-02-08 07:06:44 -0700 |
| commit | dfbf117bbb82c76c8cb60dba73ae7d653e3b8348 (patch) | |
| tree | 2c113386868e4113fbd36e9b694f34dc943abcf0 /src/init.cpp | |
| parent | Merge #15354: doc: Add missing bitcoin-wallet tool manpages (diff) | |
| download | discoin-dfbf117bbb82c76c8cb60dba73ae7d653e3b8348.tar.xz discoin-dfbf117bbb82c76c8cb60dba73ae7d653e3b8348.zip | |
Move maxTxFee initialization to init.cpp
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())); |