GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge b0e5fbf6fa into merged_master (Bitcoin PR bitcoin/bitcoin#22156)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-25 12:45:27 +00:00
commit d4d5a35e7a
4 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/interfaces.cpp
View file

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