aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-01-19 16:17:38 -0500
committerAlex Morcos <morcos@chaincode.com>2017-01-19 20:31:29 -0500
commit5b158707f23a290c750a083c8f7d43915bcc48c5 (patch)
treef0b49236012d13a64793127aed5f29918dcabd9c /src/validation.cpp
parent82274c02ed2d82537dc55f008a29edb1bc09bbc4 (diff)
downloadbitcoin-5b158707f23a290c750a083c8f7d43915bcc48c5.tar.xz
Use incrementalRelayFee for BIP 125 replacement
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index bb13cbaadb..e605671e7d 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -898,14 +898,14 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
// Finally in addition to paying more fees than the conflicts the
// new transaction must pay for its own bandwidth.
CAmount nDeltaFees = nModifiedFees - nConflictingFees;
- if (nDeltaFees < ::minRelayTxFee.GetFee(nSize))
+ if (nDeltaFees < ::incrementalRelayFee.GetFee(nSize))
{
return state.DoS(0, false,
REJECT_INSUFFICIENTFEE, "insufficient fee", false,
strprintf("rejecting replacement %s, not enough additional fees to relay; %s < %s",
hash.ToString(),
FormatMoney(nDeltaFees),
- FormatMoney(::minRelayTxFee.GetFee(nSize))));
+ FormatMoney(::incrementalRelayFee.GetFee(nSize))));
}
}