diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-05 14:14:23 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-01-05 14:22:19 -0800 |
| commit | f646275b90b1de93bc62b4c4d045d75ac0b96eee (patch) | |
| tree | b1f229965f653f28945bdd091fbd899e2af38506 /src/bench | |
| parent | c252685aa5867631e9a5ef07ccae7c7c25cae8ff (diff) | |
| parent | 44b64b933dec10f5ffcd7f34e7bf5e4ed97f671e (diff) | |
| download | bitcoin-f646275b90b1de93bc62b4c4d045d75ac0b96eee.tar.xz | |
Merge #9138: Improve fee estimation
44b64b9 Fix edge case with stale fee estimates (Alex Morcos)
78ae62d Add clarifying comments to fee estimation (Alex Morcos)
5fe0f47 Add extra logging to processBlock in fee estimation. (Alex Morcos)
dc008c4 Add IsCurrentForFeeEstimatation (Alex Morcos)
ebafdca Pass pointers to existing CTxMemPoolEntries to fee estimation (Alex Morcos)
d825838 Always update fee estimates on new blocks. (Alex Morcos)
6f06b26 rename bool to validFeeEstimate (Alex Morcos)
84f7ab0 Remove member variable hadNoDependencies from CTxMemPoolEntry (Alex Morcos)
60ac00d Don't track transactions at all during IBD. (Alex Morcos)
4df4479 Remove extraneous LogPrint from fee estimation (Alex Morcos)
Diffstat (limited to 'src/bench')
| -rw-r--r-- | src/bench/mempool_eviction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bench/mempool_eviction.cpp b/src/bench/mempool_eviction.cpp index d04c036841..5790d51a82 100644 --- a/src/bench/mempool_eviction.cpp +++ b/src/bench/mempool_eviction.cpp @@ -18,7 +18,7 @@ static void AddTx(const CTransaction& tx, const CAmount& nFee, CTxMemPool& pool) unsigned int sigOpCost = 4; LockPoints lp; pool.addUnchecked(tx.GetHash(), CTxMemPoolEntry( - MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, pool.HasNoInputsOf(tx), + MakeTransactionRef(tx), nFee, nTime, dPriority, nHeight, tx.GetValueOut(), spendsCoinbase, sigOpCost, lp)); } |