@@ -3485,21 +3485,28 @@ bool CWallet::ParameterInteraction()
34853485 if (GetArg (" -prune" , 0 ) && GetBoolArg (" -rescan" , false ))
34863486 return InitError (_ (" Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again." ));
34873487
3488+ if (::minRelayTxFee.GetFeePerK () > HIGH_TX_FEE_PER_KB)
3489+ InitWarning (AmountHighWarn (" -minrelaytxfee" ) + " " +
3490+ _ (" The wallet will avoid paying less than the minimum relay fee." ));
3491+
34883492 if (mapArgs.count (" -mintxfee" ))
34893493 {
34903494 CAmount n = 0 ;
3491- if (ParseMoney (mapArgs[" -mintxfee" ], n) && n > 0 )
3492- CWallet::minTxFee = CFeeRate (n);
3493- else
3495+ if (!ParseMoney (mapArgs[" -mintxfee" ], n))
34943496 return InitError (AmountErrMsg (" mintxfee" , mapArgs[" -mintxfee" ]));
3497+ if (n > HIGH_TX_FEE_PER_KB)
3498+ InitWarning (AmountHighWarn (" -mintxfee" ) + " " +
3499+ _ (" This is the minimum transaction fee you pay on every transaction." ));
3500+ CWallet::minTxFee = CFeeRate (n);
34953501 }
34963502 if (mapArgs.count (" -fallbackfee" ))
34973503 {
34983504 CAmount nFeePerK = 0 ;
34993505 if (!ParseMoney (mapArgs[" -fallbackfee" ], nFeePerK))
35003506 return InitError (strprintf (_ (" Invalid amount for -fallbackfee=<amount>: '%s'" ), mapArgs[" -fallbackfee" ]));
35013507 if (nFeePerK > HIGH_TX_FEE_PER_KB)
3502- InitWarning (_ (" -fallbackfee is set very high! This is the transaction fee you may pay when fee estimates are not available." ));
3508+ InitWarning (AmountHighWarn (" -fallbackfee" ) + " " +
3509+ _ (" This is the transaction fee you may pay when fee estimates are not available." ));
35033510 CWallet::fallbackFee = CFeeRate (nFeePerK);
35043511 }
35053512 if (mapArgs.count (" -paytxfee" ))
@@ -3508,7 +3515,9 @@ bool CWallet::ParameterInteraction()
35083515 if (!ParseMoney (mapArgs[" -paytxfee" ], nFeePerK))
35093516 return InitError (AmountErrMsg (" paytxfee" , mapArgs[" -paytxfee" ]));
35103517 if (nFeePerK > HIGH_TX_FEE_PER_KB)
3511- InitWarning (_ (" -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction." ));
3518+ InitWarning (AmountHighWarn (" -paytxfee" ) + " " +
3519+ _ (" This is the transaction fee you will pay if you send a transaction." ));
3520+
35123521 payTxFee = CFeeRate (nFeePerK, 1000 );
35133522 if (payTxFee < ::minRelayTxFee)
35143523 {
0 commit comments