mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge a19563ac86 into merged_master (Bitcoin PR bitcoin/bitcoin#30316)
This commit is contained in:
commit
59a40df21e
5 changed files with 6 additions and 7 deletions
|
|
@ -2084,7 +2084,6 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptPackage(const Package& package,
|
|||
|
||||
MempoolAcceptResult AcceptToMemoryPool(Chainstate& active_chainstate, const CTransactionRef& tx,
|
||||
int64_t accept_time, bool bypass_limits, bool test_accept)
|
||||
EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
|
||||
{
|
||||
AssertLockHeld(::cs_main);
|
||||
const CChainParams& chainparams{active_chainstate.m_chainman.GetParams()};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue