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

Merge 8e1913ae02 into merged_master (Bitcoin PR #21062)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-22 22:39:50 +00:00
commit f250da483b
12 changed files with 142 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/interfaces.cpp
View file

@ -659,9 +659,9 @@ public:
}
}
// ELEMENTS
bool testPeginClaimAcceptance(TxValidationState& acceptState, const CTransactionRef tx) override {
MempoolAcceptResult testPeginClaimAcceptance(const CTransactionRef tx) override {
LOCK(::cs_main);
return ::AcceptToMemoryPool(*m_node.mempool, acceptState, tx, nullptr /* plTxnReplaced */, false /* bypass_limits */, true /* test_accept */);
return ::AcceptToMemoryPool(*m_node.mempool, tx, false /* bypass_limits */, true /* test_accept */);
}
// end ELEMENTS
NodeContext& m_node;