Merge remote-tracking branch 'origin/dev' into patch

app/protocol/flows/v4/blockrelay/ibd.go

@@ -66,6 +66,29 @@ func (flow *handleIBDFlow) start() error {
 }
 
 func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) error {
+	highHash := consensushashing.BlockHash(block)
+
+	// Temp code to avoid IBD from lagging nodes publishing their side-chain
+	virtualSelectedParent, err := flow.Domain().Consensus().GetVirtualSelectedParent()
+	if err == nil {
+		virtualSelectedParentHeader, err := flow.Domain().Consensus().GetBlockHeader(virtualSelectedParent)
+		if err == nil {
+			if virtualSelectedParentHeader.DAAScore() > block.Header.DAAScore()+2641 {
+				virtualDifficulty := difficulty.CalcWork(virtualSelectedParentHeader.Bits())
+				var virtualSub, difficultyMul big.Int
+				if difficultyMul.Mul(virtualDifficulty, big.NewInt(180)).
+					Cmp(virtualSub.Sub(virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())) < 0 {
+					log.Criticalf("Avoiding IBD triggered by relay %s because it is coming from " +
+						"a deep (%d DAA score depth) side-chain which has much lower blue work (%d, %d)",
+						highHash,
+						virtualSelectedParentHeader.DAAScore()-block.Header.DAAScore(),
+						virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())
+					return nil
+				}
+			}
+		}
+	}
+
 	wasIBDNotRunning := flow.TrySetIBDRunning(flow.peer)
 	if !wasIBDNotRunning {
 		log.Debugf("IBD is already running")
@@ -78,7 +101,6 @@ func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) er
 		flow.logIBDFinished(isFinishedSuccessfully)
 	}()
 
-	highHash := consensushashing.BlockHash(block)
 	log.Criticalf("IBD started with peer %s and highHash %s", flow.peer, highHash)
 	log.Criticalf("Syncing blocks up to %s", highHash)
 	log.Criticalf("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
@@ -88,29 +110,6 @@ func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) er
 	}
 	log.Criticalf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
 
-	if highestSharedBlockFound {
-		virtualSelectedParent, err := flow.Domain().Consensus().GetVirtualSelectedParent()
-		if err != nil {
-			return err
-		}
-		virtualSelectedParentHeader, err := flow.Domain().Consensus().GetBlockHeader(virtualSelectedParent)
-		if err != nil {
-			return err
-		}
-		if virtualSelectedParentHeader.DAAScore() > block.Header.DAAScore()+2641*3 {
-			virtualDifficulty := difficulty.CalcWork(virtualSelectedParentHeader.Bits())
-			var virtualSub, difficultyMul big.Int
-			if difficultyMul.Mul(virtualDifficulty, big.NewInt(180)).
-				Cmp(virtualSub.Sub(virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())) < 0 {
-				log.Criticalf("Stopped IBD because it is coming from a deep (%d DAA score depth) "+
-					"side-chain which split at %s and has lower blue work (%d, %d)",
-					virtualSelectedParentHeader.DAAScore()-block.Header.DAAScore(),
-					highestSharedBlockHash, virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())
-				return nil
-			}
-		}
-	}
-
 	shouldDownloadHeadersProof, shouldSync, err := flow.shouldSyncAndShouldDownloadHeadersProof(block, highestSharedBlockFound)
 	if err != nil {
 		return err

domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go

@@ -336,12 +336,12 @@ func (csm *consensusStateManager) boundedMergeBreakingParents(stagingArea *model
 		log.Debugf("Checking whether parent %s breaks the bounded merge set", parent)
 		isBadRedInPast := false
 		for _, badRedBlock := range badReds {
-			isBadRedInPast, err = csm.dagTopologyManager.IsAncestorOf(stagingArea, parent, badRedBlock)
+			isBadRedInPast, err = csm.dagTopologyManager.IsAncestorOf(stagingArea, badRedBlock, parent)
 			if err != nil {
 				return nil, err
 			}
 			if isBadRedInPast {
-				log.Debugf("Parent %s is an ancestor of bad red %s", parent, badRedBlock)
+				log.Debugf("Parent %s is a descendant of bad red %s", parent, badRedBlock)
 				break
 			}
 		}

infrastructure/network/netadapter/router/route.go

@@ -12,7 +12,7 @@ import (
 
 const (
 	// DefaultMaxMessages is the default capacity for a route with a capacity defined
-	DefaultMaxMessages = 100
+	DefaultMaxMessages = 1000
 )
 
 var (