ModifyNewCoins saves database lookups

morcos · random-zebra · commit 1e88b7f3dee5 · 2020-07-31T02:43:54.000+02:00
When processing a new transaction, in addition to spending the Coins of
its txin's it creates a new Coins for its outputs.  The existing
ModifyCoins function will first make sure this Coins does not already
exist.  It can not exist due to BIP 30, but because of that the lookup
can't be cached and always has to go to the database.  Since we are
creating the coins to match the new tx anyway, there is no point in
checking if they exist first anyway.  However this should not be used
for coinbase tx's in order to preserve the historical behavior of
overwriting the two existing duplicate tx pairs.
diff --git a/src/coins.cpp b/src/coins.cpp
@@ -121,6 +121,16 @@ CCoinsModifier CCoinsViewCache::ModifyCoins(const uint256& txid)
     return CCoinsModifier(*this, ret.first, cachedCoinUsage);
 }
 
+CCoinsModifier CCoinsViewCache::ModifyNewCoins(const uint256 &txid)
+{
+    assert(!hasModifier);
+    std::pair<CCoinsMap::iterator, bool> ret = cacheCoins.insert(std::make_pair(txid, CCoinsCacheEntry()));
+    ret.first->second.coins.Clear();
+    ret.first->second.flags = CCoinsCacheEntry::FRESH;
+    ret.first->second.flags |= CCoinsCacheEntry::DIRTY;
+    return CCoinsModifier(*this, ret.first, 0);
+}
+
 const CCoins* CCoinsViewCache::AccessCoins(const uint256& txid) const
 {
     CCoinsMap::const_iterator it = FetchCoins(txid);
diff --git a/src/coins.h b/src/coins.h
@@ -424,6 +424,17 @@ class CCoinsViewCache : public CCoinsViewBacked
      */
     CCoinsModifier ModifyCoins(const uint256& txid);
 
+    /**
+     * Return a modifiable reference to a CCoins. Assumes that no entry with the given
+     * txid exists and creates a new one. This saves a database access in the case where
+     * the coins were to be wiped out by FromTx anyway.  This should not be called with
+     * the 2 historical coinbase duplicate pairs because the new coins are marked fresh, and
+     * in the event the duplicate coinbase was spent before a flush, the now pruned coins
+     * would not properly overwrite the first coinbase of the pair. Simultaneous modifications
+     * are not allowed.
+     */
+    CCoinsModifier ModifyNewCoins(const uint256 &txid);
+
     /**
      * Push the modifications applied to this cache to its base.
      * Failure to call this method before destruction will cause the changes to be forgotten.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1720,10 +1720,17 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo& txund
                 undo.nVersion = coins->nVersion;
             }
         }
+        // add outputs
+        inputs.ModifyNewCoins(tx.GetHash())->FromTx(tx, nHeight);
+    }
+    else {
+        // add outputs for coinbase tx
+        // In this case call the full ModifyCoins which will do a database
+        // lookup to be sure the coins do not already exist otherwise we do not
+        // know whether to mark them fresh or not.  We want the duplicate coinbases
+        // before BIP30 to still be properly overwritten.
+        inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);
     }
-
-    // add outputs
-    inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);
 }
 
 void UpdateCoins(const CTransaction& tx, CCoinsViewCache &inputs, int nHeight)

Original file line number	Diff line number	Diff line change
`@@ -1720,10 +1720,17 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo& txund`
`1720`	`1720`	`undo.nVersion = coins->nVersion;`
`1721`	`1721`	`}`
`1722`	`1722`	`}`
	`1723`	`+ // add outputs`
	`1724`	`+ inputs.ModifyNewCoins(tx.GetHash())->FromTx(tx, nHeight);`
	`1725`	`+ }`
	`1726`	`+ else {`
	`1727`	`+ // add outputs for coinbase tx`
	`1728`	`+ // In this case call the full ModifyCoins which will do a database`
	`1729`	`+ // lookup to be sure the coins do not already exist otherwise we do not`
	`1730`	`+ // know whether to mark them fresh or not. We want the duplicate coinbases`
	`1731`	`+ // before BIP30 to still be properly overwritten.`
	`1732`	`+ inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);`
`1723`	`1733`	`}`
`1724`		`-`
`1725`		`- // add outputs`
`1726`		`- inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);`
`1727`	`1734`	`}`
`1728`	`1735`
`1729`	`1736`	`void UpdateCoins(const CTransaction& tx, CCoinsViewCache &inputs, int nHeight)`