Move 'nTransactionFee' to wallet.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 59a38a6..69bc3f7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,7 +74,6 @@ CScript COINBASE_FLAGS;
 const string strMessageMagic = "NovaCoin Signed Message:\n";
 
 // Settings
-int64_t nTransactionFee = MIN_TX_FEE;
 int64_t nMinimumInputValue = MIN_TXOUT_AMOUNT;
 
 // Ping and address broadcast intervals

diff --git a/src/main.h b/src/main.h
index 22beb5d..77e1137 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -87,7 +87,6 @@ extern uint32_t nNetworkID;
 extern std::map<uint256, CBlock*> mapOrphanBlocks;
 
 // Settings
-extern int64_t nTransactionFee;
 extern int64_t nMinimumInputValue;
 extern bool fUseFastIndex;
 extern int nScriptCheckThreads;

diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index bf0fda2..e1ef171 100644 (file)
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -3,7 +3,7 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "main.h"
+#include "wallet.h"
 #include "bitcoinrpc.h"
 #include <boost/filesystem.hpp>
 #include <boost/iostreams/device/file.hpp>

diff --git a/src/wallet.cpp b/src/wallet.cpp
index dc5d1d0..8a406fd 100644 (file)
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -20,7 +20,11 @@
 #include "main.h"
 
 using namespace std;
+
+//Settings
+
 extern int64_t nReserveBalance;
+int64_t nTransactionFee = MIN_TX_FEE;
 
 //////////////////////////////////////////////////////////////////////////////
 //

diff --git a/src/wallet.h b/src/wallet.h
index 7cc7004..fbcd5c1 100644 (file)
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -7,8 +7,7 @@
 
 #include <string>
 #include <vector>
-
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "main.h"
 #include "key.h"
@@ -21,12 +20,16 @@
 
 extern bool fWalletUnlockMintOnly;
 extern bool fConfChange;
+
 class CAccountingEntry;
 class CWalletTx;
 class CReserveKey;
 class COutput;
 class CCoinControl;
 
+//Settings
+extern int64_t nTransactionFee;
+
 // Set of selected transactions
 typedef std::set<std::pair<const CWalletTx*,unsigned int> > CoinsSet;