aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:14:48 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:34:57 +0100
commitcd7fa8bb437267db2502415e4fb035d60bda860c (patch)
treeebb78a41255c9c75f84b19eb59a985444848c093
parenta943bde6f067567e47c6e12b16c541bb1fea575a (diff)
Move `nTransactionFee` from main.cpp to wallet.cpp
Transaction fee is only used by the wallet. No need for it to be in main.cpp.
-rw-r--r--src/init.cpp2
-rw-r--r--src/main.cpp3
-rw-r--r--src/main.h3
-rw-r--r--src/qt/bitcoin.cpp1
-rw-r--r--src/qt/optionsmodel.cpp1
-rw-r--r--src/rpcmisc.cpp2
-rw-r--r--src/wallet.cpp2
-rw-r--r--src/wallet.h3
8 files changed, 8 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 40dd2d04cd..7b14ccbf13 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -534,6 +534,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
return InitError(strprintf(_("Invalid amount for -minrelaytxfee=<amount>: '%s'"), mapArgs["-minrelaytxfee"].c_str()));
}
+#ifdef ENABLE_WALLET
if (mapArgs.count("-paytxfee"))
{
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
@@ -542,7 +543,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
}
-#ifdef ENABLE_WALLET
strWalletFile = GetArg("-wallet", "wallet.dat");
#endif
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
diff --git a/src/main.cpp b/src/main.cpp
index d130e9705e..e3f9fdd843 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,9 +67,6 @@ CScript COINBASE_FLAGS;
const string strMessageMagic = "Bitcoin Signed Message:\n";
-// Settings
-int64_t nTransactionFee = 0;
-
// Internal stuff
namespace {
struct CBlockIndexWorkComparator
diff --git a/src/main.h b/src/main.h
index fd5e352cb6..f3f9acb639 100644
--- a/src/main.h
+++ b/src/main.h
@@ -96,9 +96,6 @@ extern bool fTxIndex;
extern unsigned int nCoinCacheSize;
extern bool fHaveGUI;
-// Settings
-extern int64_t nTransactionFee;
-
// Minimum disk space required - used in CheckDiskSpace()
static const uint64_t nMinDiskSpace = 52428800;
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 2b3bf3bfb5..b69a732a85 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -17,6 +17,7 @@
#include "main.h"
#include "ui_interface.h"
#include "util.h"
+#include "wallet.h"
#include <stdint.h>
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 15a873d2bd..363f432d62 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -14,6 +14,7 @@
#include "init.h"
#include "main.h"
#include "net.h"
+#include "wallet.h"
#include "walletdb.h"
#include <QSettings>
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 6cccc93c72..0a22b103c3 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -78,9 +78,7 @@ Value getinfo(const Array& params, bool fHelp)
obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize()));
}
-#endif
obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee)));
-#ifdef ENABLE_WALLET
if (pwalletMain && pwalletMain->IsCrypted())
obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime));
#endif
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 241e937b1b..f9adbf73b3 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -16,6 +16,8 @@
using namespace std;
+// Settings
+int64_t nTransactionFee = 0;
//////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/wallet.h b/src/wallet.h
index 90209122fd..8cd2e021e6 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -23,6 +23,9 @@
#include <utility>
#include <vector>
+// Settings
+extern int64_t nTransactionFee;
+
class CAccountingEntry;
class CCoinControl;
class COutput;