check strict

Signed-off-by: Naohiro Yoshida <[email protected]>

Author: Naohiro Yoshida

module/prover.go

@@ -237,6 +237,21 @@ func (pr *Prover) getForkParameters() []*ForkSpec {
 }
 
 func (pr *Prover) buildInitialState(dstHeader core.Header) (exported.ClientState, exported.ConsensusState, error) {
+
+	// Last ForkSpec must have height or CreateClient is less than fork spec timestamp
+	forkSpecs := pr.getForkParameters()
+	lastForkSpec := forkSpecs[len(forkSpecs)-1]
+	lastForkSpecTime := lastForkSpec.GetHeightOrTimestamp().(*ForkSpec_Timestamp)
+	if lastForkSpecTime != nil {
+		target, err := dstHeader.(*Header).Target()
+		if err != nil {
+			return nil, nil, err
+		}
+		if MilliTimestamp(target) >= lastForkSpecTime.Timestamp {
+			return nil, nil, fmt.Errorf("target timestamp is less than the last fork spec timestamp %d, %d", lastForkSpecTime.Timestamp, MilliTimestamp(target))
+		}
+	}
+
 	dstHeader, err := pr.withValidators(dstHeader.GetHeight().GetRevisionHeight(), dstHeader.(*Header).Headers)
 	if err != nil {
 		return nil, nil, err

module/setup.go

@@ -93,11 +93,11 @@ func setupHeadersForUpdate(
 	logger.Info("Must set boundary timestamp", "ts", nextForkBoundaryTs, "nextForkBoundaryHeightMinus1", nextForkBoundaryHeightMinus1)
 
 	firstUnsaved := trustedEpochHeight + skip
-	if firstUnsaved == savedLatestHeight {
+	if firstUnsaved <= savedLatestHeight {
 		firstUnsaved += skip
 	}
 
-	submittingHeights := makeSubmittingHeights(latestFinalizedHeight, firstUnsaved, nextForkBoundaryTs, nextForkBoundaryHeightMinus1)
+	submittingHeights := makeSubmittingHeights(latestFinalizedHeight, savedLatestHeight, firstUnsaved, nextForkBoundaryTs, nextForkBoundaryHeightMinus1)
 	logger.Debug("submitting heights", "heights", submittingHeights)
 
 	trustedHeight := clientStateLatestHeight.GetRevisionHeight()
@@ -141,7 +141,7 @@ func withTrustedHeight(targetHeaders []core.Header, clientStateLatestHeight expo
 	return targetHeaders
 }
 
-func makeSubmittingHeights(latestFinalizedHeight uint64, firstUnsaved uint64, nextForkBoundaryTs *uint64, nextForkBoundaryHeightMinus1 uint64) []uint64 {
+func makeSubmittingHeights(latestFinalizedHeight uint64, savedLatestHeight uint64, firstUnsaved uint64, nextForkBoundaryTs *uint64, nextForkBoundaryHeightMinus1 uint64) []uint64 {
 	var submittingHeights []uint64
 	if latestFinalizedHeight < firstUnsaved {
 		if nextForkBoundaryTs != nil && nextForkBoundaryHeightMinus1 < latestFinalizedHeight {
@@ -158,6 +158,10 @@ func makeSubmittingHeights(latestFinalizedHeight uint64, firstUnsaved uint64, ne
 					if temp[i-1] < nextForkBoundaryHeightMinus1 && nextForkBoundaryHeightMinus1 < epochCandidate {
 						submittingHeights = append(submittingHeights, nextForkBoundaryHeightMinus1)
 					}
+				} else if i == 0 {
+					if savedLatestHeight < nextForkBoundaryHeightMinus1 && nextForkBoundaryHeightMinus1 < epochCandidate {
+						submittingHeights = append(submittingHeights, nextForkBoundaryHeightMinus1)
+					}
 				}
 				submittingHeights = append(submittingHeights, epochCandidate)
 			}

module/setup_test.go

@@ -228,52 +228,56 @@ func (ts *SetupTestSuite) TestSuccess_setupHeadersForUpdate_withHFBoundary() {
 func (ts *SetupTestSuite) Test_makeSubmittingHeights() {
 	rq := ts.Require()
 	msec := uint64(0)
-	rq.Len(makeSubmittingHeights(10, 11, nil, 0), 0)
-	rq.Len(makeSubmittingHeights(10, 11, &msec, 11), 0)
-	rq.Len(makeSubmittingHeights(10, 11, &msec, 9), 1)
+	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.Equal(
+		[]uint64{99, 100, 200, 300, 400, 500},
+		makeSubmittingHeights(501, 0, 100, &msec, 99),
+	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 99),
+		makeSubmittingHeights(501, 101, 100, &msec, 99),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 100),
+		makeSubmittingHeights(501, 0, 100, &msec, 100),
 	)
 	rq.Equal(
 		[]uint64{100, 101, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 101),
+		makeSubmittingHeights(501, 0, 100, &msec, 101),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, nil, 101),
+		makeSubmittingHeights(501, 0, 100, nil, 101),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 201, 300, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 201),
+		makeSubmittingHeights(501, 0, 100, &msec, 201),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 301, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 301),
+		makeSubmittingHeights(501, 0, 100, &msec, 301),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 401, 500},
-		makeSubmittingHeights(501, 100, &msec, 401),
+		makeSubmittingHeights(501, 0, 100, &msec, 401),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, nil, 401),
+		makeSubmittingHeights(501, 0, 100, nil, 401),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(501, 100, &msec, 501),
+		makeSubmittingHeights(501, 0, 100, &msec, 501),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500, 501},
-		makeSubmittingHeights(502, 100, &msec, 501),
+		makeSubmittingHeights(502, 0, 100, &msec, 501),
 	)
 	rq.Equal(
 		[]uint64{100, 200, 300, 400, 500},
-		makeSubmittingHeights(502, 100, nil, 501),
+		makeSubmittingHeights(502, 0, 100, nil, 501),
 	)
 
 }