diff --git a/src/validation.h b/src/validation.h --- a/src/validation.h +++ b/src/validation.h @@ -796,7 +796,8 @@ bool ActivateBestChain( const Config &config, BlockValidationState &state, - std::shared_ptr pblock = std::shared_ptr()); + std::shared_ptr pblock = std::shared_ptr()) + LOCKS_EXCLUDED(cs_main); /** * If a block header hasn't already been seen, call CheckBlockHeader on it, @@ -832,10 +833,12 @@ CBlockIndex *pindex) LOCKS_EXCLUDED(cs_main); /** Mark a block as invalid. */ bool InvalidateBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex) LOCKS_EXCLUDED(m_cs_chainstate); + CBlockIndex *pindex) + LOCKS_EXCLUDED(cs_main, m_cs_chainstate); /** Park a block. */ bool ParkBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex) LOCKS_EXCLUDED(m_cs_chainstate); + CBlockIndex *pindex) + LOCKS_EXCLUDED(cs_main, m_cs_chainstate); /** * Finalize a block. * A finalized block can not be reorged in any way. diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2767,7 +2767,7 @@ } } -static void LimitValidationInterfaceQueue() { +static void LimitValidationInterfaceQueue() LOCKS_EXCLUDED(cs_main) { AssertLockNotHeld(cs_main); if (GetMainSignals().CallbacksPending() > 10) {