aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2015-11-23 20:32:36 +0100
committerMarcoFalke <falke.marco@gmail.com>2016-01-30 11:29:22 +0100
commitfa331db68bcc68e4c93fb45aaa30f911b0ecfe1a (patch)
treec2ac5176340e5b4a3a6fc1d1e28e60d0145c3858 /src/main.cpp
parent019280617aad7008e523e0bbe19cd76fd59d5e25 (diff)
downloadbitcoin-fa331db68bcc68e4c93fb45aaa30f911b0ecfe1a.tar.xz
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8beff9769a..76ad969c61 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,13 +75,11 @@ bool fCheckpointsEnabled = DEFAULT_CHECKPOINTS_ENABLED;
size_t nCoinCacheUsage = 5000 * 300;
uint64_t nPruneTarget = 0;
bool fAlerts = DEFAULT_ALERTS;
-/* If the tip is older than this (in seconds), the node is considered to be in initial block download.
- */
int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
bool fPermitReplacement = DEFAULT_PERMIT_REPLACEMENT;
-/** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
+CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
CTxMemPool mempool(::minRelayTxFee);
@@ -1004,10 +1002,10 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState &state, const C
dFreeCount += nSize;
}
- if (fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000)
+ if (fRejectAbsurdFee && nFees > maxTxFee)
return state.Invalid(false,
REJECT_HIGHFEE, "absurdly-high-fee",
- strprintf("%d > %d", nFees, ::minRelayTxFee.GetFee(nSize) * 10000));
+ strprintf("%d > %d", nFees, maxTxFee));
// Calculate in-mempool ancestors, up to a limit.
CTxMemPool::setEntries setAncestors;