Browse Source

Merge pull request #3969

ffeb473 Add nHighTransactionFeeWarning as per #3969. (Bardi Harborow)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
b86ed6ff23
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      src/init.cpp
  2. 3
      src/wallet.h

2
src/init.cpp

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

3
src/wallet.h

@ -27,6 +27,9 @@
extern int64_t nTransactionFee; extern int64_t nTransactionFee;
extern bool bSpendZeroConfChange; 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 CAccountingEntry;
class CCoinControl; class CCoinControl;
class COutput; class COutput;

Loading…
Cancel
Save