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 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512)

Browse source
This commit is contained in:
James Dorfman 2023-05-31 06:23:55 +00:00
commit c134b5a012
13 changed files with 41 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/interfaces.cpp
View file

@ -725,12 +725,6 @@ public:
notifications.transactionAddedToMempool(entry.GetSharedTx(), 0 /* mempool_sequence */);
}
}
bool isTaprootActive() override
{
LOCK(::cs_main);
const CBlockIndex* tip = Assert(m_node.chainman)->ActiveChain().Tip();
return DeploymentActiveAfter(tip, Params().GetConsensus(), Consensus::DEPLOYMENT_TAPROOT);
}
// ELEMENTS
MempoolAcceptResult testPeginClaimAcceptance(const CTransactionRef tx) override {
LOCK(::cs_main);