Merge a9f6428708 into merged_master (Bitcoin PR bitcoin/bitcoin#23003)

This commit is contained in:
James Dorfman 2023-05-11 05:35:51 +00:00
commit 4ffc594d4a
2 changed files with 2 additions and 2 deletions

View file

@ -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();