[Mempool] Consistency check: nullifiers for notes spent in mempool txes

random-zebra · random-zebra · commit c74e86e695ed · 2020-11-11T14:38:16.000+01:00
are unspent in the coins view cache
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -662,6 +662,14 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const
             }
             i++;
         }
+        // sapling txes
+        if (tx.IsShieldedTx()) {
+            for (const SpendDescription& sd : tx.sapData->vShieldedSpend) {
+                SaplingMerkleTree tree;
+                assert(pcoins->GetSaplingAnchorAt(sd.anchor, tree));
+                assert(!pcoins->GetNullifier(sd.nullifier));
+            }
+        }
         assert(setParentCheck == GetMemPoolParents(it));
         // Check children against mapNextTx
         if (!fHasZerocoinSpends) {
@@ -718,7 +726,7 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const
         }
     }
     for (std::map<COutPoint, CInPoint>::const_iterator it = mapNextTx.begin(); it != mapNextTx.end(); it++) {
-        uint256 hash = it->second.ptx->GetHash();
+        const uint256& hash = it->second.ptx->GetHash();
         indexed_transaction_set::const_iterator it2 = mapTx.find(hash);
         const CTransaction& tx = it2->GetTx();
         assert(it2 != mapTx.end());

Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,14 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const`
`662`	`662`	`}`
`663`	`663`	`i++;`
`664`	`664`	`}`
	`665`	`+ // sapling txes`
	`666`	`+ if (tx.IsShieldedTx()) {`
	`667`	`+ for (const SpendDescription& sd : tx.sapData->vShieldedSpend) {`
	`668`	`+ SaplingMerkleTree tree;`
	`669`	`+ assert(pcoins->GetSaplingAnchorAt(sd.anchor, tree));`
	`670`	`+ assert(!pcoins->GetNullifier(sd.nullifier));`
	`671`	`+ }`
	`672`	`+ }`
`665`	`673`	`assert(setParentCheck == GetMemPoolParents(it));`
`666`	`674`	`// Check children against mapNextTx`
`667`	`675`	`if (!fHasZerocoinSpends) {`
`@@ -718,7 +726,7 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const`
`718`	`726`	`}`
`719`	`727`	`}`
`720`	`728`	`for (std::map<COutPoint, CInPoint>::const_iterator it = mapNextTx.begin(); it != mapNextTx.end(); it++) {`
`721`		`- uint256 hash = it->second.ptx->GetHash();`
	`729`	`+ const uint256& hash = it->second.ptx->GetHash();`
`722`	`730`	`indexed_transaction_set::const_iterator it2 = mapTx.find(hash);`
`723`	`731`	`const CTransaction& tx = it2->GetTx();`
`724`	`732`	`assert(it2 != mapTx.end());`