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, @@ -835,9 +836,10 @@ * A finalized block can not be reorged in any way. */ bool FinalizeBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex); + CBlockIndex *pindex) LOCKS_EXCLUDED(cs_main); bool UnwindBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex, bool invalidate); + CBlockIndex *pindex, bool invalidate) + LOCKS_EXCLUDED(cs_main); void ResetBlockFailureFlags(CBlockIndex *pindex) EXCLUSIVE_LOCKS_REQUIRED(cs_main); template @@ -918,11 +920,11 @@ /** Mark a block as invalid. */ bool InvalidateBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex); + CBlockIndex *pindex) LOCKS_EXCLUDED(cs_main); /** Park a block. */ bool ParkBlock(const Config &config, BlockValidationState &state, - CBlockIndex *pindex); + CBlockIndex *pindex) LOCKS_EXCLUDED(cs_main); /** Remove invalidity status from a block and its descendants. */ void ResetBlockFailureFlags(CBlockIndex *pindex)