dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee

Browse Source 
fa331db68b
This commit is contained in:
lateminer
2018-01-13 01:30:21 +03:00
parent a4dc487b0e
commit 3d26f43eb0
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/wallet/wallet.cpp
View File

@@ -38,7 +38,6 @@ using namespace std;
CWallet* pwalletMain = NULL;
/** Transaction fee set by the user */
CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
bool fSendFreeTransactions = DEFAULT_SEND_FREE_TRANSACTIONS;

4
src/wallet/wallet.h
View File

@@ -32,7 +32,6 @@ extern CWallet* pwalletMain;
* Settings
*/
extern CFeeRate payTxFee;
extern CAmount maxTxFee;
extern CAmount nReserveBalance;
extern CAmount nMinimumInputValue;
extern unsigned int nTxConfirmTarget;
@@ -47,8 +46,6 @@ static const CAmount DEFAULT_TRANSACTION_FEE = 10000;
static const CAmount DEFAULT_FALLBACK_FEE = 10000;
//! -mintxfee default
static const CAmount DEFAULT_TRANSACTION_MINFEE = 10000;
//! -maxtxfee default
static const CAmount DEFAULT_TRANSACTION_MAXFEE = 1 * COIN;
//! minimum change amount
static const CAmount MIN_CHANGE = CENT;
//! Default for -spendzeroconfchange
@@ -215,6 +212,7 @@ public:
int GetDepthInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; }
int GetBlocksToMaturity() const;
/** Pass this transaction to the mempool. Fails if absolute fee exceeds maxTxFee. */
bool AcceptToMemoryPool(bool fLimitFree=true, bool fRejectAbsurdFee=true);
bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }