mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge 459272d639 into merged_master (Bitcoin PR bitcoin/bitcoin#26152)
This commit is contained in:
commit
0aec781a49
14 changed files with 1087 additions and 350 deletions
|
|
@ -28,6 +28,7 @@
|
|||
#include <node/coin.h>
|
||||
#include <node/context.h>
|
||||
#include <node/interface_ui.h>
|
||||
#include <node/mini_miner.h>
|
||||
#include <node/transaction.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <policy/fees.h>
|
||||
|
|
@ -666,6 +667,26 @@ public:
|
|||
if (!m_node.mempool) return;
|
||||
m_node.mempool->GetTransactionAncestry(txid, ancestors, descendants, ancestorsize, ancestorfees);
|
||||
}
|
||||
|
||||
std::map<COutPoint, CAmount> CalculateIndividualBumpFees(const std::vector<COutPoint>& outpoints, const CFeeRate& target_feerate) override
|
||||
{
|
||||
if (!m_node.mempool) {
|
||||
std::map<COutPoint, CAmount> bump_fees;
|
||||
for (const auto& outpoint : outpoints) {
|
||||
bump_fees.emplace(std::make_pair(outpoint, 0));
|
||||
}
|
||||
return bump_fees;
|
||||
}
|
||||
return MiniMiner(*m_node.mempool, outpoints).CalculateBumpFees(target_feerate);
|
||||
}
|
||||
|
||||
std::optional<CAmount> CalculateCombinedBumpFee(const std::vector<COutPoint>& outpoints, const CFeeRate& target_feerate) override
|
||||
{
|
||||
if (!m_node.mempool) {
|
||||
return 0;
|
||||
}
|
||||
return MiniMiner(*m_node.mempool, outpoints).CalculateTotalBumpFees(target_feerate);
|
||||
}
|
||||
void getPackageLimits(unsigned int& limit_ancestor_count, unsigned int& limit_descendant_count) override
|
||||
{
|
||||
const CTxMemPool::Limits default_limits{};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue