aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardi Harborow <bardi_harborow@yahoo.com.au>2014-03-29 05:17:28 -0400
committerBardi Harborow <bardi_harborow@yahoo.com.au>2014-03-29 05:17:28 -0400
commitffeb47366df02b7f859ce3e64f2304967c837e8e (patch)
tree8f151f3d4a71dc033350dee92b9d4c3534f795ac /src
parent55027a8c85e373f8e7e750cc18e97308be31094b (diff)
Add nHighTransactionFeeWarning as per #3969.
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp2
-rw-r--r--src/wallet.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index cd06e0c204..6e6e4beed9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -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);
diff --git a/src/wallet.h b/src/wallet.h
index 487c258a20..ef02c90eda 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -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;