Merge e7b0004b37 into merged_master (Bitcoin PR bitcoin/bitcoin#27596)

ELEMENTS TODO assumeutxo for liquidv1
This commit is contained in:
Byron Hambly 2025-08-05 15:49:03 +02:00
commit 7fc909ab98
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
43 changed files with 1606 additions and 294 deletions

View file

@ -435,9 +435,9 @@ public:
{
m_notifications->transactionRemovedFromMempool(tx, reason);
}
void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override
void BlockConnected(ChainstateRole role, const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override
{
m_notifications->blockConnected(kernel::MakeBlockInfo(index, block.get()));
m_notifications->blockConnected(role, kernel::MakeBlockInfo(index, block.get()));
}
void BlockDisconnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* index) override
{
@ -447,7 +447,9 @@ public:
{
m_notifications->updatedBlockTip();
}
void ChainStateFlushed(const CBlockLocator& locator) override { m_notifications->chainStateFlushed(locator); }
void ChainStateFlushed(ChainstateRole role, const CBlockLocator& locator) override {
m_notifications->chainStateFlushed(role, locator);
}
std::shared_ptr<Chain::Notifications> m_notifications;
};