zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Exclude RBF txs from fee estimation

This commit is contained in:
Alex Morcos 2017-01-11 11:25:18 -05:00
parent e2e624d9ce
commit de1ae324bf
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/validation.cpp
View File

@ -793,7 +793,8 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
// subsequent RemoveStaged() and addUnchecked() calls don't guarantee // subsequent RemoveStaged() and addUnchecked() calls don't guarantee
// mempool consistency for us. // mempool consistency for us.
LOCK(pool.cs); LOCK(pool.cs);
if (setConflicts.size()) const bool fReplacementTransaction = setConflicts.size();
if (fReplacementTransaction)
{ {
CFeeRate newFeeRate(nModifiedFees, nSize); CFeeRate newFeeRate(nModifiedFees, nSize);
set<uint256> setConflictsParents; set<uint256> setConflictsParents;
@ -954,10 +955,11 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
} }
pool.RemoveStaged(allConflicting, false); pool.RemoveStaged(allConflicting, false);
// This transaction should only count for fee estimation if // This transaction should only count for fee estimation if it isn't a
// the node is not behind and it is not dependent on any other // BIP 125 replacement transaction (may not be widely supported), the
// transactions in the mempool // node is not behind, and the transaction is not dependent on any other
bool validForFeeEstimation = IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx); // transactions in the mempool.
bool validForFeeEstimation = !fReplacementTransaction && IsCurrentForFeeEstimation() && pool.HasNoInputsOf(tx);
// Store transaction in memory // Store transaction in memory
pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation); pool.addUnchecked(hash, entry, setAncestors, validForFeeEstimation);