aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2016-11-11 11:17:59 -0500
committerAlex Morcos <morcos@chaincode.com>2017-01-04 12:05:05 -0500
commit60ac00de854981333656d17c9b2ea2efd1efc436 (patch)
treea336a7da4b7201e1f51ffecca39f5a8eb99e38ad /src/validation.cpp
parent4df44794c9f71d47648e858385d37eae6d0a9db3 (diff)
downloadbitcoin-60ac00de854981333656d17c9b2ea2efd1efc436.tar.xz
Don't track transactions at all during IBD.
This was an oversight, where blocks and mempool tracking were ignored during IBD, but transactions that arrived during IBD but were included in blocks after IBD were not ignored.
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index bc14c1d8c6..2783a313f7 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -692,7 +692,9 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState& state, const C
}
}
- CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(), pool.HasNoInputsOf(tx), inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
+ CTxMemPoolEntry entry(ptx, nFees, nAcceptTime, dPriority, chainActive.Height(),
+ !IsInitialBlockDownload() && pool.HasNoInputsOf(tx),
+ inChainInputValue, fSpendsCoinbase, nSigOpsCost, lp);
unsigned int nSize = entry.GetTxSize();
// Check that the transaction doesn't have an excessive number of