Merge e60804f121 into merged_master (Bitcoin PR bitcoin/bitcoin#29524)

This commit is contained in:
Byron Hambly 2025-12-04 15:19:11 +02:00
commit b640af0021
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
2 changed files with 23 additions and 2 deletions

View file

@ -4787,7 +4787,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
const CBlockIndex* prev_block{WITH_LOCK(m_chainman.GetMutex(), return m_chainman.m_blockman.LookupBlockIndex(pblock->hashPrevBlock))};
if (IsBlockMutated(/*block=*/*pblock,
// Check for possible mutation if it connects to something we know so we can check for DEPLOYMENT_SEGWIT being active
if (prev_block && IsBlockMutated(/*block=*/*pblock,
/*check_witness_root=*/DeploymentActiveAfter(prev_block, m_chainman, Consensus::DEPLOYMENT_SEGWIT))) {
LogDebug(BCLog::NET, "Received mutated block from peer=%d\n", peer->m_id);
Misbehaving(*peer, 100, "mutated block");