aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorPhilip Kaufmann <[email protected]>2014-05-05 20:54:00 +0200
committerPhilip Kaufmann <[email protected]>2014-05-05 20:54:00 +0200
commit3e1cf9b6f68bac2456258ea7b12f2342c760a223 (patch)
tree409906225a7e32b7cda098ba62859fa5b8ceeb2f /src/wallet.cpp
parentMerge pull request #4120 (diff)
downloaddiscoin-3e1cf9b6f68bac2456258ea7b12f2342c760a223.tar.xz
discoin-3e1cf9b6f68bac2456258ea7b12f2342c760a223.zip
add DEFAULT_TRANSACTION_FEE constant in wallet
- as this is a shared Core/GUI setting, this makes it easier to keep them in sync (also no new includes are needed)
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 7cf236109..418720de9 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;
//////////////////////////////////////////////////////////////////////////////