Decouple miner.o and txmempool.o from CTxUndo

random-zebra · random-zebra · commit 9703b0e4616e · 2020-07-15T16:41:45.000+02:00
[backports bitcoin/bitcoin@d7621cc]
diff --git a/src/main.cpp b/src/main.cpp
@@ -1726,6 +1726,12 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo& txund
     inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);
 }
 
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache &inputs, int nHeight)
+{
+    CTxUndo txundo;
+    UpdateCoins(tx, inputs, txundo, nHeight);
+}
+
 bool CScriptCheck::operator()()
 {
     const CScript& scriptSig = ptxTo->vin[nIn].scriptSig;
diff --git a/src/main.h b/src/main.h
@@ -284,7 +284,7 @@ CAmount GetMinRelayFee(const CTransaction& tx, const CTxMemPool& pool, unsigned
 bool CheckInputs(const CTransaction& tx, CValidationState& state, const CCoinsViewCache& view, bool fScriptChecks, unsigned int flags, bool cacheStore, std::vector<CScriptCheck>* pvChecks = NULL);
 
 /** Apply the effects of this transaction on the UTXO set represented by view */
-void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo& txundo, int nHeight);
+void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight);
 
 bool IsTransactionInChain(const uint256& txId, int& nHeightTx, CTransaction& tx);
 bool IsTransactionInChain(const uint256& txId, int& nHeightTx);
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -372,8 +372,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
             if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true))
                 continue;
 
-            CTxUndo txundo;
-            UpdateCoins(tx, view, txundo, nHeight);
+            UpdateCoins(tx, view, nHeight);
 
             // Added
             pblock->vtx.push_back(tx);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -662,9 +662,8 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const
             waitingOnDependants.push_back(&(*it));
         else {
             CValidationState state;
-            CTxUndo undo;
             assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));
-            UpdateCoins(tx, mempoolDuplicate, undo, 1000000);
+            UpdateCoins(tx, mempoolDuplicate, 1000000);
         }
     }
 
@@ -679,8 +678,7 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const
             assert(stepsSinceLastRemove < waitingOnDependants.size());
         } else {
             assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));
-            CTxUndo undo;
-            UpdateCoins(entry->GetTx(), mempoolDuplicate, undo, 1000000);
+            UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);
             stepsSinceLastRemove = 0;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1726,6 +1726,12 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo& txund`
`1726`	`1726`	`inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight);`
`1727`	`1727`	`}`
`1728`	`1728`
	`1729`	`+void UpdateCoins(const CTransaction& tx, CCoinsViewCache &inputs, int nHeight)`
	`1730`	`+{`
	`1731`	`+ CTxUndo txundo;`
	`1732`	`+ UpdateCoins(tx, inputs, txundo, nHeight);`
	`1733`	`+}`
	`1734`	`+`
`1729`	`1735`	`bool CScriptCheck::operator()()`
`1730`	`1736`	`{`
`1731`	`1737`	`const CScript& scriptSig = ptxTo->vin[nIn].scriptSig;`
Original file line number	Diff line number	Diff line change
`@@ -662,9 +662,8 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const`
`662`	`662`	`waitingOnDependants.push_back(&(*it));`
`663`	`663`	`else {`
`664`	`664`	`CValidationState state;`
`665`		`- CTxUndo undo;`
`666`	`665`	`assert(CheckInputs(tx, state, mempoolDuplicate, false, 0, false, NULL));`
`667`		`- UpdateCoins(tx, mempoolDuplicate, undo, 1000000);`
	`666`	`+ UpdateCoins(tx, mempoolDuplicate, 1000000);`
`668`	`667`	`}`
`669`	`668`	`}`
`670`	`669`
`@@ -679,8 +678,7 @@ void CTxMemPool::check(const CCoinsViewCache* pcoins) const`
`679`	`678`	`assert(stepsSinceLastRemove < waitingOnDependants.size());`
`680`	`679`	`} else {`
`681`	`680`	`assert(CheckInputs(entry->GetTx(), state, mempoolDuplicate, false, 0, false, NULL));`
`682`		`- CTxUndo undo;`
`683`		`- UpdateCoins(entry->GetTx(), mempoolDuplicate, undo, 1000000);`
	`681`	`+ UpdateCoins(entry->GetTx(), mempoolDuplicate, 1000000);`
`684`	`682`	`stepsSinceLastRemove = 0;`
`685`	`683`	`}`
`686`	`684`	`}`