Check checkpoint only if highestSharedBlockFound

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

@@ -85,25 +85,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 highestSharedBlockFound {
-	if err != nil {
+		checkpoint, err := externalapi.NewDomainHashFromString("05ff0f2e1d201dcaee7c5e567cc2c1d42ca3cce9fefbd3b519dc68b5bb89d0b9")
-		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 err != nil {
 			return err
 		}
 
-		if !isInSelectedParentChainOf {
+		info, err := flow.Domain().Consensus().GetBlockInfo(checkpoint)
-			log.Criticalf("Stopped IBD because the checkpoint %s is not in the selected chain of %s", checkpoint, highestSharedBlockHash)
+		if err != nil {
-			return nil
+			return err
+		}
+
+		if info.Exists {
+			isInSelectedParentChainOf, err := flow.Domain().Consensus().IsInSelectedParentChainOf(checkpoint, highestSharedBlockHash)
+			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
+			}
 		}
 	}
 
@@ -329,7 +331,6 @@ func (flow *handleIBDFlow) syncPruningPointFutureHeaders(consensus externalapi.C
 		}
 	})
 
-	count := 0
 	for {
 		select {
 		case ibdBlocksMessage, ok := <-blockHeadersMessageChan:
@@ -346,26 +347,10 @@ func (flow *handleIBDFlow) syncPruningPointFutureHeaders(consensus externalapi.C
 				return nil
 			}
 			for _, header := range ibdBlocksMessage.BlockHeaders {
-				added, err := flow.processHeader(consensus, header)
+				_, err := flow.processHeader(consensus, header)
 				if err != nil {
 					return err
 				}
-
-				if added {
-					count++
-					log.Criticalf("LALA %d Accepted header %s DAA score %d blue score %d Arrived at %d ( %s ) timestamp %d ( %s ) diff %d ( %s )",
-						count,
-						header.BlockHash(),
-						header.DAAScore,
-						header.BlueScore,
-						time.Now().UnixMilli(),
-						time.Now(),
-						header.Timestamp.UnixMilliseconds(),
-						header.Timestamp,
-						time.Now().UnixMilli()-header.Timestamp.UnixMilliseconds(),
-						time.Millisecond*time.Duration(time.Now().UnixMilli()-header.Timestamp.UnixMilliseconds()),
-					)
-				}
 			}
 
 			lastReceivedHeader := ibdBlocksMessage.BlockHeaders[len(ibdBlocksMessage.BlockHeaders)-1]