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/main.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/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 793737422e..2bea277c01 100644 --- a/src/main.h +++ b/src/main.h @@ -281,7 +281,7 @@ void PruneAndFlush(); /** (try to) add transaction to memory pool **/ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree, - bool* pfMissingInputs, bool fOverrideMempoolLimit=false, bool fRejectAbsurdFee=false); + bool* pfMissingInputs, bool fOverrideMempoolLimit=false, const CAmount nAbsurdFee=0); /** Convert CValidationState to a human-readable message for logging */ std::string FormatStateMessage(const CValidationState &state); |