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 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437)

Browse source
This commit is contained in:
Byron Hambly 2023-06-01 09:05:03 +00:00
commit 5a723e538b
4 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/interfaces.cpp
View file

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