File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ void OptionsModel::Init()
93
93
// Wallet
94
94
#ifdef ENABLE_WALLET
95
95
if (!settings.contains (" nTransactionFee" ))
96
- settings.setValue (" nTransactionFee" , 0 );
96
+ settings.setValue (" nTransactionFee" , DEFAULT_TRANSACTION_FEE );
97
97
nTransactionFee = settings.value (" nTransactionFee" ).toLongLong (); // if -paytxfee is set, this will be overridden later in init.cpp
98
98
if (mapArgs.count (" -paytxfee" ))
99
99
addOverriddenOption (" -paytxfee" );
Original file line number Diff line number Diff line change 6
6
#include " wallet.h"
7
7
8
8
#include " base58.h"
9
+ #include " checkpoints.h"
9
10
#include " coincontrol.h"
10
11
#include " net.h"
11
- #include " checkpoints.h"
12
12
13
13
#include < boost/algorithm/string/replace.hpp>
14
14
#include < openssl/rand.h>
15
15
16
16
using namespace std ;
17
17
18
18
// Settings
19
- int64_t nTransactionFee = 0 ;
19
+ int64_t nTransactionFee = DEFAULT_TRANSACTION_FEE ;
20
20
bool bSpendZeroConfChange = true ;
21
21
22
22
// ////////////////////////////////////////////////////////////////////////////
Original file line number Diff line number Diff line change 27
27
extern int64_t nTransactionFee;
28
28
extern bool bSpendZeroConfChange;
29
29
30
+ // -paytxfee default
31
+ static const int64_t DEFAULT_TRANSACTION_FEE = 0 ;
30
32
// -paytxfee will warn if called with a higher fee than this amount (in satoshis) per KB
31
33
static const int nHighTransactionFeeWarning = 0.01 * COIN;
32
34
You can’t perform that action at this time.
0 commit comments