Merge pull request #3969

ffeb473 Add nHighTransactionFeeWarning as per #3969. (Bardi Harborow)
This commit is contained in:
Wladimir J. van der Laan 2014-03-31 09:01:10 +02:00
commit b86ed6ff23
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 4 additions and 1 deletions

View file

@ -575,7 +575,7 @@ bool AppInit2(boost::thread_group& threadGroup)
{
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
if (nTransactionFee > 0.25 * COIN)
if (nTransactionFee > nHighTransactionFeeWarning)
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
}
bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);

View file

@ -27,6 +27,9 @@
extern int64_t nTransactionFee;
extern bool bSpendZeroConfChange;
// -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB
static const int nHighTransactionFeeWarning = 0.01 * COIN;
class CAccountingEntry;
class CCoinControl;
class COutput;