mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997)
This commit is contained in:
commit
b81762fcb2
3 changed files with 23 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue