diff options
| author | Wladimir J. van der Laan <[email protected]> | 2016-09-26 13:55:04 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2016-09-26 13:57:10 +0200 |
| commit | ab0b411868e183106800717ba4cdbe25f76f3608 (patch) | |
| tree | cc214d764b8b5440bda6e3d07684a6b24267ce43 /src/init.cpp | |
| parent | Merge #8249: Enable (and check for) 64-bit ASLR on Windows (diff) | |
| parent | [wallet] Add high transaction fee warnings (diff) | |
| download | discoin-ab0b411868e183106800717ba4cdbe25f76f3608.tar.xz discoin-ab0b411868e183106800717ba4cdbe25f76f3608.zip | |
Merge #8486: [wallet] Add high transaction fee warnings
faef293 [wallet] Add high transaction fee warnings (MarcoFalke)
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 75182345e..b20675dd9 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()); |