wip

src/txmempool.cpp

@@ -461,10 +461,10 @@ void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAnces
     nTransactionsUpdated++;
     totalTxSize += entry.GetTxSize();
     m_total_fee += entry.GetFee();
+    NewMempoolTransactionInfo tx_info = { entry.GetSharedTx(), entry.GetFee(), entry.GetTxSize(), validFeeEstimate };
     if (minerPolicyEstimator) {
-        minerPolicyEstimator->processTransaction(entry, validFeeEstimate);
+        minerPolicyEstimator->processTransaction(tx_info);
     }
-    GetMainSignals().MempoolAcceptNewTransaction(entry, validFeeEstimate);
     vTxHashes.emplace_back(tx.GetWitnessHash(), newit);
     newit->vTxHashesIdx = vTxHashes.size() - 1;
 
@@ -623,17 +623,6 @@ void CTxMemPool::removeConflicts(const CTransaction &tx)
 void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight)
 {
     AssertLockHeld(cs);
-    std::vector<const CTxMemPoolEntry*> entries;
-    for (const auto& tx : vtx)
-    {
-        uint256 hash = tx->GetHash();
-
-        indexed_transaction_set::iterator i = mapTx.find(hash);
-        if (i != mapTx.end())
-            entries.push_back(&*i);
-    }
-    // Before the txs in the new block have been removed from the mempool, update policy estimates
-    if (minerPolicyEstimator) {minerPolicyEstimator->processBlock(nBlockHeight, entries);}
     std::vector<CTransactionRef> txs_removed_for_block;
     for (const auto& tx : vtx)
     {
@@ -648,6 +637,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
         ClearPrioritisation(tx->GetHash());
     }
     GetMainSignals().MempoolBlockConnect(txs_removed_for_block, nBlockHeight);
+    if (minerPolicyEstimator) {
+        int size = minerPolicyEstimator->GetMapSize();
+        LogPrintf("size before calling is %s \n", size);
+    }
+    // Before the txs in the new block have been removed from the mempool, update policy estimates
+    if (minerPolicyEstimator) {minerPolicyEstimator->processBlock(nBlockHeight, txs_removed_for_block);}
     lastRollingFeeUpdate = GetTime();
     blockSinceLastRollingFeeBump = true;
 }