Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997)

This commit is contained in:
Byron Hambly 2024-10-17 10:15:38 +02:00
commit b81762fcb2
3 changed files with 23 additions and 3 deletions

View file

@ -776,6 +776,11 @@ public:
notifications.transactionAddedToMempool(entry.GetSharedTx(), 0 /* mempool_sequence */);
}
}
bool hasAssumedValidChain() override
{
return Assert(m_node.chainman)->IsSnapshotActive();
}
// ELEMENTS
MempoolAcceptResult testPeginClaimAcceptance(const CTransactionRef tx) override {
LOCK(::cs_main);
@ -792,6 +797,7 @@ public:
return TestBlockValidity(state, chainparams, m_node.chainman->ActiveChainstate(), block, pindexPrev, GetAdjustedTime, fCheckPOW, fCheckMerkleRoot);
}
// end ELEMENTS
NodeContext& m_node;
};
} // namespace