From 04f78ab5b94424be9cdef86971b7a92de79effa4 Mon Sep 17 00:00:00 2001 From: Alex Morcos Date: Tue, 12 Sep 2017 12:35:35 -0400 Subject: 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. --- src/validation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/validation.cpp') 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)); } -- cgit v1.2.3