GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289)

Browse source
This commit is contained in:
Byron Hambly 2025-04-01 08:45:57 +02:00
commit 80b3fcae86
9 changed files with 123 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/node/interfaces.cpp
View file

@ -674,12 +674,9 @@ public:
LockPoints lp;
std::set<std::pair<uint256, COutPoint>> setPeginsSpent;
CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp, setPeginsSpent);
CTxMemPool::setEntries ancestors;
const CTxMemPool::Limits& limits{m_node.mempool->m_limits};
std::string unused_error_string;
LOCK(m_node.mempool->cs);
return m_node.mempool->CalculateMemPoolAncestors(
entry, ancestors, limits, unused_error_string);
return m_node.mempool->CalculateMemPoolAncestors(entry, limits).has_value();
}
CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override
{