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)
This commit is contained in:
parent
49d701e7aa
commit
4f519b0dac
|
@ -95,7 +95,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");
|
||||
|
|
|
@ -7,9 +7,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>
|
||||
|
@ -17,7 +17,7 @@
|
|||
using namespace std;
|
||||
|
||||
// Settings
|
||||
int64_t nTransactionFee = 0;
|
||||
int64_t nTransactionFee = DEFAULT_TRANSACTION_FEE;
|
||||
bool bSpendZeroConfChange = true;
|
||||
static std::vector<CKeyID> vChangeAddresses;
|
||||
|
||||
|
|
|
@ -28,6 +28,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 = 25 * COIN;
|
||||
|
||||
|
|
Loading…
Reference in a new issue