Merge branch 'fix-suggestedLowHash' into HEAD

someone235 · Mar 12, 2022 · bec32fc · bec32fc
2 parents df0e46a + cfc9d5a
commit bec32fc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/domain/consensus/processes/pruningmanager/pruningmanager.go b/domain/consensus/processes/pruningmanager/pruningmanager.go
@@ -1009,7 +1009,15 @@ func (pm *pruningManager) ExpectedHeaderPruningPoint(stagingArea *model.StagingA
 		}
 
 		if hasReachabilityData {
-			suggestedLowHash = selectedParentHeader.PruningPoint()
+			// nextPruningPointAndCandidateByBlockHash needs suggestedLowHash to be in the future of the pruning point because
+			// otherwise reachability selected chain data is unreliable.
+			isInFutureOfCurrentPruningPoint, err := pm.dagTopologyManager.IsAncestorOf(stagingArea, pruningPoint, selectedParentHeader.PruningPoint())
+			if err != nil {
+				return nil, err
+			}
+			if isInFutureOfCurrentPruningPoint {
+				suggestedLowHash = selectedParentHeader.PruningPoint()
+			}
 		}
 
 		nextOrCurrentPruningPoint, _, err = pm.nextPruningPointAndCandidateByBlockHash(stagingArea, blockHash, suggestedLowHash)