check

Signed-off-by: Naohiro Yoshida <naohiro.yoshida@datachain.jp>

Author: Naohiro Yoshida

module/setup.go

@@ -144,7 +144,7 @@ func withTrustedHeight(targetHeaders []core.Header, clientStateLatestHeight expo
 func makeSubmittingHeights(latestFinalizedHeight uint64, savedLatestHeight uint64, firstUnsaved uint64, nextForkBoundaryTs *uint64, nextForkBoundaryHeightMinus1 uint64) []uint64 {
 	var submittingHeights []uint64
 	if latestFinalizedHeight < firstUnsaved {
-		if nextForkBoundaryTs != nil && nextForkBoundaryHeightMinus1 < latestFinalizedHeight {
+		if nextForkBoundaryTs != nil && savedLatestHeight < nextForkBoundaryHeightMinus1 && nextForkBoundaryHeightMinus1 < latestFinalizedHeight {
 			submittingHeights = append(submittingHeights, nextForkBoundaryHeightMinus1)
 		}
 	} else {

module/setup_test.go

@@ -231,6 +231,7 @@ func (ts *SetupTestSuite) Test_makeSubmittingHeights() {
 	rq.Len(makeSubmittingHeights(10, 1, 11, nil, 0), 0)
 	rq.Len(makeSubmittingHeights(10, 1, 11, &msec, 11), 0)
 	rq.Len(makeSubmittingHeights(10, 1, 11, &msec, 9), 1)
+	rq.Len(makeSubmittingHeights(10, 9, 11, &msec, 9), 0)
 	rq.Equal(
 		[]uint64{99, 100, 200, 300, 400, 500},
 		makeSubmittingHeights(501, 0, 100, &msec, 99),