Wladimir J. van der Laan
11 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with
5 additions and
3 deletions
-
src/qt/optionsmodel.cpp
-
src/wallet.cpp
-
src/wallet.h
|
@ -93,7 +93,7 @@ void OptionsModel::Init() |
|
|
// Wallet
|
|
|
// Wallet
|
|
|
#ifdef ENABLE_WALLET |
|
|
#ifdef ENABLE_WALLET |
|
|
if (!settings.contains("nTransactionFee")) |
|
|
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
|
|
|
nTransactionFee = settings.value("nTransactionFee").toLongLong(); // if -paytxfee is set, this will be overridden later in init.cpp
|
|
|
if (mapArgs.count("-paytxfee")) |
|
|
if (mapArgs.count("-paytxfee")) |
|
|
addOverriddenOption("-paytxfee"); |
|
|
addOverriddenOption("-paytxfee"); |
|
|
|
@ -6,9 +6,9 @@ |
|
|
#include "wallet.h" |
|
|
#include "wallet.h" |
|
|
|
|
|
|
|
|
#include "base58.h" |
|
|
#include "base58.h" |
|
|
|
|
|
#include "checkpoints.h" |
|
|
#include "coincontrol.h" |
|
|
#include "coincontrol.h" |
|
|
#include "net.h" |
|
|
#include "net.h" |
|
|
#include "checkpoints.h" |
|
|
|
|
|
|
|
|
|
|
|
#include <boost/algorithm/string/replace.hpp> |
|
|
#include <boost/algorithm/string/replace.hpp> |
|
|
#include <openssl/rand.h> |
|
|
#include <openssl/rand.h> |
|
@ -16,7 +16,7 @@ |
|
|
using namespace std; |
|
|
using namespace std; |
|
|
|
|
|
|
|
|
// Settings
|
|
|
// Settings
|
|
|
int64_t nTransactionFee = 0; |
|
|
int64_t nTransactionFee = DEFAULT_TRANSACTION_FEE; |
|
|
bool bSpendZeroConfChange = true; |
|
|
bool bSpendZeroConfChange = true; |
|
|
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
@ -27,6 +27,8 @@ |
|
|
extern int64_t nTransactionFee; |
|
|
extern int64_t nTransactionFee; |
|
|
extern bool bSpendZeroConfChange; |
|
|
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
|
|
|
// -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB
|
|
|
static const int nHighTransactionFeeWarning = 0.01 * COIN; |
|
|
static const int nHighTransactionFeeWarning = 0.01 * COIN; |
|
|
|
|
|
|
|
|