diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2015-11-20 16:48:06 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-02-02 20:08:51 +0100 |
| commit | fa79db2641182b47b4077345d8261d28c4a87bf0 (patch) | |
| tree | c6ff08fcad0581a631a82b97835929ffef27b23c /src/wallet/wallet.h | |
| parent | fd13fe7ca01b6104ce591af2b90ee6951ccc5a16 (diff) | |
| download | bitcoin-fa79db2641182b47b4077345d8261d28c4a87bf0.tar.xz | |
Move maxTxFee out of mempool
Also, remove default values in CMerkleTx::AcceptToMemoryPool()
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 28d2f8a04f..c5b2771515 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -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; } |