mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #8814: [wallet, policy] ParameterInteraction: Don't allow 0 fee

Browse Source 
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan committed 2016-09-28 08:09:42 +02:00
2 parents fc4f4547b7 fa4bfb4819
commit 14b7b3fb9f
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/init.cpp
+1 -1
View File
@@ -951,7 +951,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (mapArgs.count("-minrelaytxfee"))
{
CAmount n = 0;
if (!ParseMoney(mapArgs["-minrelaytxfee"], n))
if (!ParseMoney(mapArgs["-minrelaytxfee"], n) || 0 == n)
return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));
// High fee check is done afterward in CWallet::ParameterInteraction()
::minRelayTxFee = CFeeRate(n);
src/wallet/wallet.cpp
+1 -1
View File
@@ -3492,7 +3492,7 @@ bool CWallet::ParameterInteraction()
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;
if (!ParseMoney(mapArgs["-mintxfee"], n))
if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
if (n > HIGH_TX_FEE_PER_KB)
InitWarning(AmountHighWarn("-mintxfee") + " " +