Validate parent hash in fast forward case

Author: avalkov

api/heimdallv2/milestone/milestone.pulsar.go

@@ -389,16 +389,24 @@ func (app *HeimdallApp) PreBlocker(ctx sdk.Context, req *abci.RequestFinalizeBlo
 	}
 
 	var lastEndBlock *uint64 = nil
+	var lastEndHash []byte
 	if hasMilestone {
 		lastMilestone, err := app.MilestoneKeeper.GetLastMilestone(ctx)
 		if err != nil {
 			logger.Error("Error occurred while fetching the last milestone", "error", err)
 			return nil, err
 		}
 		lastEndBlock = &lastMilestone.EndBlock
+		lastEndHash = lastMilestone.Hash
 	}
 
-	majorityMilestone, aggregatedProposers, proposer, err := milestoneAbci.GetMajorityMilestoneProposition(validatorSet, extVoteInfo, logger, lastEndBlock)
+	majorityMilestone, aggregatedProposers, proposer, err := milestoneAbci.GetMajorityMilestoneProposition(
+		validatorSet,
+		extVoteInfo,
+		logger,
+		lastEndBlock,
+		lastEndHash,
+	)
 	if err != nil {
 		logger.Error("Error occurred while getting majority milestone proposition", "error", err)
 		return nil, err
@@ -423,24 +431,18 @@ func (app *HeimdallApp) PreBlocker(ctx sdk.Context, req *abci.RequestFinalizeBlo
 
 		addMilestoneCtx, msCache := app.cacheTxContext(ctx)
 
-		if lastEndBlock != nil {
-			*lastEndBlock += 1
-		} else {
-			lastEndBlock = new(uint64)
-		}
-
 		logger.Debug("Adding milestone", "hashes",
 			strutil.HashesToString(majorityMilestone.BlockHashes),
 			"startBlock", majorityMilestone.StartBlockNumber,
-			"endBlock", *lastEndBlock,
+			"endBlock", majorityMilestone.StartBlockNumber+uint64(len(majorityMilestone.BlockHashes)-1),
 			"proposer", proposer,
 		)
 
 		if err := app.MilestoneKeeper.AddMilestone(addMilestoneCtx, milestoneTypes.Milestone{
 			Proposer:    proposer,
 			Hash:        majorityMilestone.BlockHashes[len(majorityMilestone.BlockHashes)-1],
 			StartBlock:  majorityMilestone.StartBlockNumber,
-			EndBlock:    *lastEndBlock,
+			EndBlock:    majorityMilestone.StartBlockNumber + uint64(len(majorityMilestone.BlockHashes)-1),
 			BorChainId:  params.ChainParams.BorChainId,
 			MilestoneId: common.Bytes2Hex(aggregatedProposers),
 			Timestamp:   uint64(ctx.BlockHeader().Time.Unix()),

app/abci.go

@@ -34,6 +34,7 @@ message MilestoneProposition {
 
   repeated bytes block_hashes = 1 [ (amino.dont_omitempty) = true ];
   uint64 start_block_number = 2 [ (amino.dont_omitempty) = true ];
+  bytes parent_hash = 3 [ (amino.dont_omitempty) = true ];
 }
 
 message Params {