From 1f93227a84a54397699ca40d889f98913e4d5868 Mon Sep 17 00:00:00 2001 From: Suhas Daftuar Date: Thu, 28 Sep 2023 17:55:16 -0400 Subject: [PATCH] Remove dependency on cached ancestor data in mini-miner --- src/node/mini_miner.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node/mini_miner.cpp b/src/node/mini_miner.cpp index a1c2edcb7bb..b70c7503b6d 100644 --- a/src/node/mini_miner.cpp +++ b/src/node/mini_miner.cpp @@ -74,12 +74,13 @@ MiniMiner::MiniMiner(const CTxMemPool& mempool, const std::vector& ou // Add every entry to m_entries_by_txid and m_entries, except the ones that will be replaced. for (const auto& txiter : cluster) { if (!m_to_be_replaced.count(txiter->GetTx().GetHash())) { + auto [ancestor_count, ancestor_size, ancestor_fee] = mempool.CalculateAncestorData(*txiter); auto [mapiter, success] = m_entries_by_txid.emplace(txiter->GetTx().GetHash(), MiniMinerMempoolEntry{/*tx_in=*/txiter->GetSharedTx(), /*vsize_self=*/txiter->GetTxSize(), - /*vsize_ancestor=*/txiter->GetSizeWithAncestors(), + /*vsize_ancestor=*/int64_t(ancestor_size), /*fee_self=*/txiter->GetModifiedFee(), - /*fee_ancestor=*/txiter->GetModFeesWithAncestors()}); + /*fee_ancestor=*/ancestor_fee}); m_entries.push_back(mapiter); } else { auto outpoints_it = m_requested_outpoints_by_txid.find(txiter->GetTx().GetHash());