diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 14:38:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 14:54:23 +0100 |
| commit | 4f4dc5ef7295e85531127cd08a822291e548b2f0 (patch) | |
| tree | 969a8496e18ea37ef69be7c6cef927d28074bf48 /src/main.h | |
| parent | 2cdbf28cf395b110fe9dcfa1d27a45dfcf4c6f2b (diff) | |
| parent | fad6244879be8b9916e85cff4ecdb4377dd62ee2 (diff) | |
| download | bitcoin-4f4dc5ef7295e85531127cd08a822291e548b2f0.tar.xz | |
Merge #7070: Move maxTxFee out of mempool
fad6244 ATMP: make nAbsurdFee const (MarcoFalke)
fa762d0 [wallet.h] Remove main.h include (MarcoFalke)
fa79db2 Move maxTxFee out of mempool (MarcoFalke)
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 f9145a1a79..4061daba3b 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); |