aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-11-11 11:57:51 -0500
committerAlex Morcos <morcos@chaincode.com>2017-01-04 12:09:33 -0500
commit84f7ab08d2e8e83a584d72fdf44f68b34baf8165 (patch)
treef5076b10d4afd783a5fb77f3a19aff1dab1fd9dd /src/validation.cpp
parent60ac00de854981333656d17c9b2ea2efd1efc436 (diff)
downloadbitcoin-84f7ab08d2e8e83a584d72fdf44f68b34baf8165.tar.xz
Remove member variable hadNoDependencies from CTxMemPoolEntry
Fee estimation can just check its own mapMemPoolTxs to determine the same information. Note that now fee estimation for block processing must happen before those transactions are removed, but this shoudl be a speedup.
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index 2783a313f7..a68763e489 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -693,7 +693,6 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
}
CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(),
- !IsInitialBlockDownload() && pool.HasNoInputsOf(tx),
inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
unsigned int nSize = entry.GetTxSize();
@@ -943,7 +942,7 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
pool.RemoveStaged(allConflicting, false);
// Store transaction in memory
- pool.addUnchecked(hash, entry, setAncestors, !IsInitialBlockDownload());
+ pool.addUnchecked(hash, entry, setAncestors, !IsInitialBlockDownload() && pool.HasNoInputsOf(tx));
// trim mempool and check if tx was trimmed
if (!fOverrideMempoolLimit) {