remove external usage of mempool conflict tracking

morcos · furszy · commit 76c72c6b01dc · 2021-01-28T20:52:02.000-03:00
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
@@ -415,7 +415,7 @@ BOOST_AUTO_TEST_CASE(MempoolAncestorIndexingTest)
     /* after tx6 is mined, tx7 should move up in the sort */
     std::vector<CTransactionRef> vtx;
     vtx.emplace_back(MakeTransactionRef(tx6));
-    pool.removeForBlock(vtx, 1, nullptr, false);
+    pool.removeForBlock(vtx, 1);
 
     sortedOrder.erase(sortedOrder.begin()+1);
     // Ties are broken by hash
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -368,13 +368,11 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
     nTransactionsUpdated += n;
 }
 
-
 bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate)
 {
     // Add to memory pool without checking anything.
     // Used by AcceptToMemoryPool(), which DOES do all the appropriate checks.
     LOCK(cs);
-
     indexed_transaction_set::iterator newit = mapTx.insert(entry).first;
     mapLinks.insert(make_pair(newit, TxLinks()));
 
@@ -606,7 +604,7 @@ void CTxMemPool::removeConflicts(const CTransaction& tx, std::vector<CTransactio
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
 void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                                std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)
+                                bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
@@ -623,7 +621,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             stage.insert(it);
             RemoveStaged(stage, true);
         }
-        removeConflicts(*tx, conflicts);
+        removeConflicts(*tx);
         ClearPrioritisation(tx->GetHash());
     }
     // After the txs in the new block have been removed from the mempool, update policy estimates
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -527,7 +527,7 @@ class CTxMemPool
     void removeWithAnchor(const uint256& invalidRoot);
     void removeConflicts(const CTransaction& tx, std::vector<CTransactionRef>* removed = nullptr);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                        std::vector<CTransactionRef>* conflicts = nullptr, bool fCurrentEstimate = true);
+                        bool fCurrentEstimate = true);
     void clear();
     void _clear();  // lock-free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2023,11 +2023,10 @@ static int64_t nTimeChainState = 0;
 static int64_t nTimePostConnect = 0;
 
 /**
- * Used to track conflicted transactions removed from mempool and transactions
- * applied to the UTXO state as a part of a single ActivateBestChainStep call.
+ * Used to track blocks whose transactions were applied to the UTXO state as a
+ * part of a single ActivateBestChainStep call.
  */
 struct ConnectTrace {
-    std::vector<CTransactionRef> txConflicted;
     std::vector<std::pair<CBlockIndex*, std::shared_ptr<const CBlock> > > blocksConnected;
 };
 
@@ -2092,7 +2091,7 @@ bool static ConnectTip(CValidationState& state, CBlockIndex* pindexNew, const st
     LogPrint(BCLog::BENCH, "  - Writing chainstate: %.2fms [%.2fs]\n", (nTime5 - nTime4) * 0.001, nTimeChainState * 0.000001);
 
     // Remove conflicting transactions from the mempool.
-    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, &connectTrace.txConflicted, !IsInitialBlockDownload());
+    mempool.removeForBlock(blockConnecting.vtx, pindexNew->nHeight, !IsInitialBlockDownload());
     // Update chainActive & related variables.
     UpdateTip(pindexNew);
     // Update MN manager cache
@@ -2305,10 +2304,6 @@ bool ActivateBestChain(CValidationState& state, std::shared_ptr<const CBlock> pb
             fInitialDownload = IsInitialBlockDownload();
 
             // throw all transactions though the signal-interface
-            for (const auto &tx : connectTrace.txConflicted) {
-                GetMainSignals().SyncTransaction(*tx, pindexNewTip, CMainSignals::SYNC_TRANSACTION_NOT_IN_BLOCK);
-            }
-            // ... and about transactions that got confirmed:
             for (const auto& pair : connectTrace.blocksConnected) {
                 assert(pair.second);
                 const CBlock& block = *(pair.second);

Original file line number	Diff line number	Diff line change
`@@ -368,13 +368,11 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)`
`368`	`368`	`nTransactionsUpdated += n;`
`369`	`369`	`}`
`370`	`370`
`371`		`-`
`372`	`371`	`bool CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate)`
`373`	`372`	`{`
`374`	`373`	`// Add to memory pool without checking anything.`
`375`	`374`	`// Used by AcceptToMemoryPool(), which DOES do all the appropriate checks.`
`376`	`375`	`LOCK(cs);`
`377`		`-`
`378`	`376`	`indexed_transaction_set::iterator newit = mapTx.insert(entry).first;`
`379`	`377`	`mapLinks.insert(make_pair(newit, TxLinks()));`
`380`	`378`
`@@ -606,7 +604,7 @@ void CTxMemPool::removeConflicts(const CTransaction& tx, std::vector<CTransactio`
`606`	`604`	`* Called when a block is connected. Removes from mempool and updates the miner fee estimator.`
`607`	`605`	`*/`
`608`	`606`	`void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,`
`609`		`- std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)`
	`607`	`+ bool fCurrentEstimate)`
`610`	`608`	`{`
`611`	`609`	`LOCK(cs);`
`612`	`610`	`std::vector<CTxMemPoolEntry> entries;`
`@@ -623,7 +621,7 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne`
`623`	`621`	`stage.insert(it);`
`624`	`622`	`RemoveStaged(stage, true);`
`625`	`623`	`}`
`626`		`- removeConflicts(*tx, conflicts);`
	`624`	`+ removeConflicts(*tx);`
`627`	`625`	`ClearPrioritisation(tx->GetHash());`
`628`	`626`	`}`
`629`	`627`	`// After the txs in the new block have been removed from the mempool, update policy estimates`