fixup: bare hasher in txmempool

Author: domob1812

divi/src/txmempool.cpp

@@ -572,7 +572,7 @@ void CTxMemPool::remove(const CTransaction& origTx, std::list<CTransaction>& rem
     {
         LOCK(cs);
         const ActivationState as(chainActive.Tip());
-        const bool segwitLight = as.IsActive(Fork::SegwitLight);
+        const TransactionUtxoHasher utxoHasher;
         std::deque<uint256> txToRemove;
         txToRemove.push_back(origTx.GetHash());
         if (fRecursive && !mapTx.count(origTx.GetHash())) {
@@ -581,7 +581,7 @@ void CTxMemPool::remove(const CTransaction& origTx, std::list<CTransaction>& rem
             // happen during chain re-orgs if origTx isn't re-accepted into
             // the mempool for any reason.
             for (unsigned int i = 0; i < origTx.vout.size(); i++) {
-                auto it = mapNextTx.find(COutPoint(segwitLight ? origTx.GetBareTxid() : origTx.GetHash(), i));
+                auto it = mapNextTx.find(COutPoint(utxoHasher.GetUtxoHash(origTx), i));
                 if (it == mapNextTx.end())
                     continue;
                 txToRemove.push_back(it->second.ptx->GetHash());
@@ -595,7 +595,7 @@ void CTxMemPool::remove(const CTransaction& origTx, std::list<CTransaction>& rem
             const CTransaction& tx = mapTx[hash].GetTx();
             if (fRecursive) {
                 for (unsigned int i = 0; i < tx.vout.size(); i++) {
-                    auto it = mapNextTx.find(COutPoint(segwitLight ? tx.GetBareTxid() : tx.GetHash(), i));
+                    auto it = mapNextTx.find(COutPoint(utxoHasher.GetUtxoHash(tx), i));
                     if (it == mapNextTx.end())
                         continue;
                     txToRemove.push_back(it->second.ptx->GetHash());
@@ -797,9 +797,18 @@ bool CTxMemPool::lookupOutpoint(const uint256& hash, CTransaction& result) const
        mempool is not allowed in a time window "around" the fork, so that
        this should be good enough.  */
     const ActivationState as(chainActive.Tip());
-    return as.IsActive(Fork::SegwitLight)
-              ? lookupBareTxid(hash, result)
-              : lookup(hash, result);
+    const TransactionUtxoHasher utxoHasher;
+
+    /* The TransactionUtxoHasher can only tell us the txid to use once we
+       know the transaction already.  Thus we check both txid and bare txid
+       in our index; if one of them matches, we then cross-check with the
+       then-known transaction that it actually should hash to that UTXO.  */
+    if (lookup(hash, result) && utxoHasher.GetUtxoHash(result) == hash)
+        return true;
+    if (lookupBareTxid(hash, result) && utxoHasher.GetUtxoHash(result) == hash)
+        return true;
+
+    return false;
 }
 
 CFeeRate CTxMemPool::estimateFee(int nBlocks) const
@@ -890,11 +899,8 @@ bool CCoinsViewMemPool::GetCoins(const uint256& txid, CCoins& coins) const
 
 bool CCoinsViewMemPool::HaveCoins(const uint256& txid) const
 {
-    const ActivationState as(chainActive.Tip());
-    const bool segwitLight = as.IsActive(Fork::SegwitLight);
-    if (segwitLight && mempool.existsBareTxid(txid))
-        return true;
-    if (!segwitLight && mempool.exists(txid))
+    CTransaction dummy;
+    if (mempool.lookupOutpoint(txid, dummy))
         return true;
 
     return base->HaveCoins(txid);