diff options
| author | Alex Morcos <[email protected]> | 2017-01-19 16:17:38 -0500 |
|---|---|---|
| committer | Alex Morcos <[email protected]> | 2017-01-19 20:31:29 -0500 |
| commit | 5b158707f23a290c750a083c8f7d43915bcc48c5 (patch) | |
| tree | f0b49236012d13a64793127aed5f29918dcabd9c /src/validation.cpp | |
| parent | Merge #9535: Split CNode::cs_vSend: message processing and message sending (diff) | |
| download | discoin-5b158707f23a290c750a083c8f7d43915bcc48c5.tar.xz discoin-5b158707f23a290c750a083c8f7d43915bcc48c5.zip | |
Use incrementalRelayFee for BIP 125 replacement
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index bb13cbaad..e605671e7 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)))); } } |