Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465)

This commit is contained in:
Byron Hambly 2023-06-06 08:55:03 +00:00
commit f97b7f0c64
4 changed files with 33 additions and 15 deletions

View file

@ -727,7 +727,7 @@ public:
// ELEMENTS
MempoolAcceptResult testPeginClaimAcceptance(const CTransactionRef tx) override {
LOCK(::cs_main);
return ::AcceptToMemoryPool(*m_node.mempool, chainman().ActiveChainstate(), tx, GetTime(), false /* bypass_limits */, true /* test_accept */);
return ::AcceptToMemoryPool(chainman().ActiveChainstate(), tx, GetTime(), false /* bypass_limits */, true /* test_accept */);
}
CBlockIndex* getTip() override {
LOCK(::cs_main);