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 828bb776d2 into merged_master (Bitcoin PR #20750)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-24 17:22:15 +00:00
commit 4268df69bc
14 changed files with 115 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/interfaces.cpp
View file

@ -441,7 +441,7 @@ public:
bool checkFinalTx(const CTransaction& tx) override
{
LOCK(cs_main);
return CheckFinalTx(tx);
return CheckFinalTx(::ChainActive().Tip(), tx);
}
Optional<int> findLocatorFork(const CBlockLocator& locator) override
{
@ -661,7 +661,7 @@ public:
// ELEMENTS
MempoolAcceptResult testPeginClaimAcceptance(const CTransactionRef tx) override {
LOCK(::cs_main);
return ::AcceptToMemoryPool(*m_node.mempool, tx, false /* bypass_limits */, true /* test_accept */);
return ::AcceptToMemoryPool(::ChainstateActive(), *m_node.mempool, tx, false /* bypass_limits */, true /* test_accept */);
}
// end ELEMENTS
NodeContext& m_node;