a temp patch for fixing IBD issues for all side-chains

* Use the correct heuristic to avoid checking for next pruning point movement when not needed

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

@@ -13,7 +13,9 @@ import (
 	"github.com/kaspanet/kaspad/infrastructure/config"
 	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+	"github.com/kaspanet/kaspad/util/difficulty"
 	"github.com/pkg/errors"
+	"math/big"
 	"time"
 )
 
@@ -85,25 +87,27 @@ func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) er
 		return err
 	}
 	log.Criticalf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
-	checkpoint, err := externalapi.NewDomainHashFromString("05ff0f2e1d201dcaee7c5e567cc2c1d42ca3cce9fefbd3b519dc68b5bb89d0b9")
-	if err != nil {
-		return err
-	}
 
-	info, err := flow.Domain().Consensus().GetBlockInfo(checkpoint)
-	if err != nil {
-		return err
-	}
-
-	if info.Exists {
-		isInSelectedParentChainOf, err := flow.Domain().Consensus().IsInSelectedParentChainOf(checkpoint, highestSharedBlockHash)
+	if highestSharedBlockFound {
+		virtualSelectedParent, err := flow.Domain().Consensus().GetVirtualSelectedParent()
 		if err != nil {
 			return err
 		}
-
-		if !isInSelectedParentChainOf {
-			log.Criticalf("Stopped IBD because the checkpoint %s is not in the selected chain of %s", checkpoint, highestSharedBlockHash)
-			return nil
+		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
+			}
 		}
 	}
 

domain/consensus/processes/pruningmanager/pruningmanager.go

@@ -995,7 +995,13 @@ func (pm *pruningManager) ExpectedHeaderPruningPoint(stagingArea *model.StagingA
 		return nil, err
 	}
 
-	if hasPruningPointInItsSelectedChain && pm.finalityScore(ghostdagData.BlueScore()) > pm.finalityScore(selectedParentPruningPointHeader.BlueScore()+pm.pruningDepth) {
+	// Note: the pruning point from the POV of the current block is the first block in its chain that is in depth of pm.pruningDepth and
+	// its finality score is greater than the previous pruning point. This is why the diff between finalityScore(selectedParent.blueScore + 1) * finalityInterval
+	// and the current block blue score is less than pm.pruningDepth we can know for sure that this block didn't trigger a pruning point change.
+	minRequiredBlueScoreForNextPruningPoint := (pm.finalityScore(selectedParentPruningPointHeader.BlueScore()) + 1) * pm.finalityInterval
+
+	if hasPruningPointInItsSelectedChain &&
+		minRequiredBlueScoreForNextPruningPoint+pm.pruningDepth <= ghostdagData.BlueScore() {
 		var suggestedLowHash *externalapi.DomainHash
 		hasReachabilityData, err := pm.reachabilityDataStore.HasReachabilityData(pm.databaseContext, stagingArea, selectedParentHeader.PruningPoint())
 		if err != nil {