diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-01-08 01:14:09 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-09-26 01:11:27 +0200 |
| commit | faef293cf311a1063b31f90b645cb491d0140930 (patch) | |
| tree | bd67b895fce33411eb8a99cb18311ed3a39033ca /src/init.cpp | |
| parent | 24f72e9f3fd0ce64b944c2a474786f06ed5fa0fd (diff) | |
| download | bitcoin-faef293cf311a1063b31f90b645cb491d0140930.tar.xz | |
[wallet] Add high transaction fee warnings
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/init.cpp b/src/init.cpp index 75182345ee..b20675dd9e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -951,10 +951,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (mapArgs.count("-minrelaytxfee")) { CAmount n = 0; - if (ParseMoney(mapArgs["-minrelaytxfee"], n) && n > 0) - ::minRelayTxFee = CFeeRate(n); - else + if (!ParseMoney(mapArgs["-minrelaytxfee"], n)) return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"])); + // High fee check is done afterward in CWallet::ParameterInteraction() + ::minRelayTxFee = CFeeRate(n); } fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard()); |