Skip to content

Commit cfee93f

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26487: log: improve some validation log messages to include hashPrevBlock
ac410e6 log: improve some validation log messages to include hashPrevBlock (Skuli Dulfari) Pull request description: When there is an issue with a previous block the current log messages do not indicate hashPrevBlock. Adding it makes debugging easier. ACKs for top commit: stickies-v: ACK ac410e6 aureleoules: reACK ac410e6 theStack: ACK ac410e6 Tree-SHA512: d91481321f4474bb4fdf6ad55d1c897437b631b0a12308815c4ac5b053c8a76726e2d93f2aa0701e8cfd48fba7fad19ef5ffca3c67d3aa973dc593df806f1757
2 parents fb01af6 + ac410e6 commit cfee93f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/validation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3676,12 +3676,12 @@ bool ChainstateManager::AcceptBlockHeader(const CBlockHeader& block, BlockValida
36763676
CBlockIndex* pindexPrev = nullptr;
36773677
BlockMap::iterator mi{m_blockman.m_block_index.find(block.hashPrevBlock)};
36783678
if (mi == m_blockman.m_block_index.end()) {
3679-
LogPrint(BCLog::VALIDATION, "%s: %s prev block not found\n", __func__, hash.ToString());
3679+
LogPrint(BCLog::VALIDATION, "header %s has prev block not found: %s\n", hash.ToString(), block.hashPrevBlock.ToString());
36803680
return state.Invalid(BlockValidationResult::BLOCK_MISSING_PREV, "prev-blk-not-found");
36813681
}
36823682
pindexPrev = &((*mi).second);
36833683
if (pindexPrev->nStatus & BLOCK_FAILED_MASK) {
3684-
LogPrint(BCLog::VALIDATION, "%s: %s prev block invalid\n", __func__, hash.ToString());
3684+
LogPrint(BCLog::VALIDATION, "header %s has prev block invalid: %s\n", hash.ToString(), block.hashPrevBlock.ToString());
36853685
return state.Invalid(BlockValidationResult::BLOCK_INVALID_PREV, "bad-prevblk");
36863686
}
36873687
if (!ContextualCheckBlockHeader(block, state, m_blockman, *this, pindexPrev, m_options.adjusted_time_callback())) {
@@ -3722,7 +3722,7 @@ bool ChainstateManager::AcceptBlockHeader(const CBlockHeader& block, BlockValida
37223722
m_blockman.m_dirty_blockindex.insert(invalid_walk);
37233723
invalid_walk = invalid_walk->pprev;
37243724
}
3725-
LogPrint(BCLog::VALIDATION, "%s: %s prev block invalid\n", __func__, hash.ToString());
3725+
LogPrint(BCLog::VALIDATION, "header %s has prev block invalid: %s\n", hash.ToString(), block.hashPrevBlock.ToString());
37263726
return state.Invalid(BlockValidationResult::BLOCK_INVALID_PREV, "bad-prevblk");
37273727
}
37283728
}

0 commit comments

Comments
 (0)