[DB] Also prune invalid/fraudulent/frozen outputs from the coins view

random-zebra · random-zebra · commit 0e7921e8e41e · 2020-10-03T15:06:33.000+02:00
diff --git a/src/coins.cpp b/src/coins.cpp
@@ -6,6 +6,7 @@
 #include "coins.h"
 
 #include "consensus/consensus.h"
+#include "invalid.h"
 #include "memusage.h"
 #include "random.h"
 
@@ -293,14 +294,16 @@ CAmount CCoinsViewCache::GetTotalAmount() const
     return nTotal;
 }
 
-void CCoinsViewCache::PruneZerocoinMints()
+void CCoinsViewCache::PruneInvalidEntries()
 {
+    // Prune zerocoin Mints and fraudulent/frozen outputs
     std::unique_ptr<CCoinsViewCursor> pcursor(Cursor());
     while (pcursor->Valid()) {
         COutPoint key;
         Coin coin;
-        if (pcursor->GetKey(key) && pcursor->GetValue(coin) && coin.out.IsZerocoinMint()) {
-            SpendCoin(key);
+        if (pcursor->GetKey(key) && pcursor->GetValue(coin)) {
+            if (coin.out.IsZerocoinMint() || invalid_out::ContainsOutPoint(key))
+                SpendCoin(key);
         }
         pcursor->Next();
     }
diff --git a/src/coins.h b/src/coins.h
@@ -296,9 +296,9 @@ class CCoinsViewCache : public CCoinsViewBacked
     CAmount GetTotalAmount() const;
 
     /*
-     * Prune zerocoin mints - do it once, after initialization
+     * Prune zerocoin mints and frozen outputs - do it once, after initialization
      */
-    void PruneZerocoinMints();
+    void PruneInvalidEntries();
 
 
 private:
diff --git a/src/init.cpp b/src/init.cpp
@@ -1565,8 +1565,8 @@ bool AppInit2()
                     // Do it only once, when removing money supply (key 'M') from the DB. Can be skipped in future versions.
                     int64_t nDummySupply;
                     if (fZerocoinActive && pblocktree->Read('M', nDummySupply)) {
-                        LogPrintf("Pruning zerocoin mints at height %d\n", chainHeight);
-                        pcoinsTip->PruneZerocoinMints();
+                        LogPrintf("Pruning zerocoin mints / invalid outs, at height %d\n", chainHeight);
+                        pcoinsTip->PruneInvalidEntries();
                         pblocktree->Erase('M');
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#include "coins.h"`
`7`	`7`
`8`	`8`	`#include "consensus/consensus.h"`
	`9`	`+#include "invalid.h"`
`9`	`10`	`#include "memusage.h"`
`10`	`11`	`#include "random.h"`
`11`	`12`
`@@ -293,14 +294,16 @@ CAmount CCoinsViewCache::GetTotalAmount() const`
`293`	`294`	`return nTotal;`
`294`	`295`	`}`
`295`	`296`
`296`		`-void CCoinsViewCache::PruneZerocoinMints()`
	`297`	`+void CCoinsViewCache::PruneInvalidEntries()`
`297`	`298`	`{`
	`299`	`+ // Prune zerocoin Mints and fraudulent/frozen outputs`
`298`	`300`	`std::unique_ptr<CCoinsViewCursor> pcursor(Cursor());`
`299`	`301`	`while (pcursor->Valid()) {`
`300`	`302`	`COutPoint key;`
`301`	`303`	`Coin coin;`
`302`		`- if (pcursor->GetKey(key) && pcursor->GetValue(coin) && coin.out.IsZerocoinMint()) {`
`303`		`- SpendCoin(key);`
	`304`	`+ if (pcursor->GetKey(key) && pcursor->GetValue(coin)) {`
	`305`	`+ if (coin.out.IsZerocoinMint() \|\| invalid_out::ContainsOutPoint(key))`
	`306`	`+ SpendCoin(key);`
`304`	`307`	`}`
`305`	`308`	`pcursor->Next();`
`306`	`309`	`}`