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

Move maxTxFee out of mempool

Browse Source 
Also, remove default values in CMerkleTx::AcceptToMemoryPool()
This commit is contained in:
MarcoFalke
2015-11-20 16:48:06 +01:00
parent fd13fe7ca0
commit fa79db2641
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/wallet/wallet.h
View File

@@ -7,6 +7,7 @@
#define BITCOIN_WALLET_WALLET_H
#include "amount.h"
#include "main.h"
#include "streams.h"
#include "tinyformat.h"
#include "ui_interface.h"
@@ -204,8 +205,8 @@ 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);
/** Pass this transaction to the mempool. Fails if absolute fee exceeds absurd fee. */
bool AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee);
bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }
void setAbandoned() { hashBlock = ABANDON_HASH; }