aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qt/optionsmodel.cpp2
-rw-r--r--src/wallet.cpp4
-rw-r--r--src/wallet.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 74c6b10ce2..d024af73c8 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -93,7 +93,7 @@ void OptionsModel::Init()
// Wallet
#ifdef ENABLE_WALLET
if (!settings.contains("nTransactionFee"))
- settings.setValue("nTransactionFee", 0);
+ settings.setValue("nTransactionFee", DEFAULT_TRANSACTION_FEE);
nTransactionFee = settings.value("nTransactionFee").toLongLong(); // if -paytxfee is set, this will be overridden later in init.cpp
if (mapArgs.count("-paytxfee"))
addOverriddenOption("-paytxfee");
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 7cf2361096..418720de93 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -6,9 +6,9 @@
#include "wallet.h"
#include "base58.h"
+#include "checkpoints.h"
#include "coincontrol.h"
#include "net.h"
-#include "checkpoints.h"
#include <boost/algorithm/string/replace.hpp>
#include <openssl/rand.h>
@@ -16,7 +16,7 @@
using namespace std;
// Settings
-int64_t nTransactionFee = 0;
+int64_t nTransactionFee = DEFAULT_TRANSACTION_FEE;
bool bSpendZeroConfChange = true;
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/wallet.h b/src/wallet.h
index 5fd56d0af6..b2c06d3f61 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -27,6 +27,8 @@
extern int64_t nTransactionFee;
extern bool bSpendZeroConfChange;
+// -paytxfee default
+static const int64_t DEFAULT_TRANSACTION_FEE = 0;
// -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB
static const int nHighTransactionFeeWarning = 0.01 * COIN;