mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-14 12:43:40 +02:00
Merge a9f6428708 into merged_master (Bitcoin PR bitcoin/bitcoin#23003)
This commit is contained in:
commit
4ffc594d4a
2 changed files with 2 additions and 2 deletions
|
|
@ -699,7 +699,7 @@ public:
|
|||
notifications.transactionAddedToMempool(entry.GetSharedTx(), 0 /* mempool_sequence */);
|
||||
}
|
||||
}
|
||||
bool isTaprootActive() const override
|
||||
bool isTaprootActive() override
|
||||
{
|
||||
LOCK(::cs_main);
|
||||
const CBlockIndex* tip = Assert(m_node.chainman)->ActiveChain().Tip();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue