aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMurch <murch@murch.one>2023-06-01 18:00:48 -0400
committerMurch <murch@murch.one>2023-06-01 18:04:44 -0400
commit5d718f6913219d3ebe8394a17ddee81915e6f0ac (patch)
treefdea8ff094f5c91d1872d7e120c1be373516e450 /src
parent34ac3f438a268e83af6cd11e2981e5bc07f699c9 (diff)
Mitigate timeout in CalculateTotalBumpFees
The slow fuzz seed described in #27799 was just slower than expected, not an endless loop. Ensuring that every anscestor is only processed once speeds up the termination of the graph traversal. Fixes #27799
Diffstat (limited to 'src')
-rw-r--r--src/node/mini_miner.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/node/mini_miner.cpp b/src/node/mini_miner.cpp
index 71ae9d23c7..6f253eddfa 100644
--- a/src/node/mini_miner.cpp
+++ b/src/node/mini_miner.cpp
@@ -346,15 +346,20 @@ std::optional<CAmount> MiniMiner::CalculateTotalBumpFees(const CFeeRate& target_
to_process.insert(iter);
ancestors.insert(iter);
}
+
+ std::set<uint256> has_been_processed;
while (!to_process.empty()) {
auto iter = to_process.begin();
const CTransaction& tx = (*iter)->second.GetTx();
for (const auto& input : tx.vin) {
if (auto parent_it{m_entries_by_txid.find(input.prevout.hash)}; parent_it != m_entries_by_txid.end()) {
- to_process.insert(parent_it);
+ if (!has_been_processed.count(input.prevout.hash)) {
+ to_process.insert(parent_it);
+ }
ancestors.insert(parent_it);
}
}
+ has_been_processed.insert(tx.GetHash());
to_process.erase(iter);
}
const auto ancestor_package_size = std::accumulate(ancestors.cbegin(), ancestors.cend(), int64_t{0},