Merge pull request #4505

d4d3fbd Do not flush the cache after every block outside of IBD (Pieter Wuille)

1 files changed, 6 insertions, 1 deletions

diff --git a/src/coins.cpp b/src/coins.cpp
index e76d8c7ef2..fe40911db7 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -111,7 +111,12 @@ bool CCoinsViewCache::SetCoins(const uint256 &txid, const CCoins &coins) {
 }
 
 bool CCoinsViewCache::HaveCoins(const uint256 &txid) {
-    return FetchCoins(txid) != cacheCoins.end();
+    CCoinsMap::iterator it = FetchCoins(txid);
+    // We're using vtx.empty() instead of IsPruned here for performance reasons,
+    // as we only care about the case where an transaction was replaced entirely
+    // in a reorganization (which wipes vout entirely, as opposed to spending
+    // which just cleans individual outputs).
+    return (it != cacheCoins.end() && !it->second.vout.empty());
 }
 
 uint256 CCoinsViewCache::GetBestBlock() {