aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-09-12 12:35:35 -0400
committerAlex Morcos <morcos@chaincode.com>2017-09-12 12:35:35 -0400
commit04f78ab5b94424be9cdef86971b7a92de79effa4 (patch)
tree47c2749c8cb8bb471474275cb41218f257c6ddd4 /src/validation.cpp
parentfd849e1b039bcb5856aa705269437211194cdfee (diff)
downloadbitcoin-04f78ab5b94424be9cdef86971b7a92de79effa4.tar.xz
Do not reject based on mempool min fee when bypass_limits is set.
This should have always been the case, but we will correctly trim to size after a reorg which is when bypass_limits is set.
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index 6bfa80ea7c..347b847342 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -620,7 +620,7 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
strprintf("%d", nSigOpsCost));
CAmount mempoolRejectFee = pool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFee(nSize);
- if (mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) {
+ if (!bypass_limits && mempoolRejectFee > 0 && nModifiedFees < mempoolRejectFee) {
return state.DoS(0, false, REJECT_INSUFFICIENTFEE, "mempool min fee not met", false, strprintf("%d < %d", nFees, mempoolRejectFee));
}