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

MarcoFalke · MarcoFalke · commit fa4bfb48193a · 2016-09-26T14:44:24.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -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);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -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") + " " +

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`951`	`951`	`if (mapArgs.count("-minrelaytxfee"))`
`952`	`952`	`{`
`953`	`953`	`CAmount n = 0;`
`954`		`- if (!ParseMoney(mapArgs["-minrelaytxfee"], n))`
	`954`	`+ if (!ParseMoney(mapArgs["-minrelaytxfee"], n) \|\| 0 == n)`
`955`	`955`	`return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));`
`956`	`956`	`// High fee check is done afterward in CWallet::ParameterInteraction()`
`957`	`957`	`::minRelayTxFee = CFeeRate(n);`
Original file line number	Diff line number	Diff line change
`@@ -3492,7 +3492,7 @@ bool CWallet::ParameterInteraction()`
`3492`	`3492`	`if (mapArgs.count("-mintxfee"))`
`3493`	`3493`	`{`
`3494`	`3494`	`CAmount n = 0;`
`3495`		`- if (!ParseMoney(mapArgs["-mintxfee"], n))`
	`3495`	`+ if (!ParseMoney(mapArgs["-mintxfee"], n) \|\| 0 == n)`
`3496`	`3496`	`return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));`
`3497`	`3497`	`if (n > HIGH_TX_FEE_PER_KB)`
`3498`	`3498`	`InitWarning(AmountHighWarn("-mintxfee") + " " +`