set deadline for niporep sectors #1086

Author: beeleelee

damocles-manager/modules/config.go

@@ -591,6 +591,8 @@ type MinerSealingConfig struct {
 	RequireNotificationSuccessUpdate bool
 
 	UseSyntheticPoRep bool
+
+	SealingSectorDeadlineDelayNi uint64
 }
 
 func defaultMinerSealingConfig() MinerSealingConfig {
@@ -611,6 +613,8 @@ func defaultMinerSealingConfig() MinerSealingConfig {
 		RequireNotificationSuccessUpdate: false,
 
 		UseSyntheticPoRep: false,
+
+		SealingSectorDeadlineDelayNi: 6,
 	}
 }
 

damocles-manager/modules/impl/commitmgr/commit_processor.go

@@ -467,12 +467,19 @@ func (c CommitProcessor) ProcessNiPoRep(
 	sort.Slice(actInfos, func(i, j int) bool {
 		return actInfos[i].SealingNumber < actInfos[j].SealingNumber
 	})
+	deadline, err := getProvingDeadline(ctx, c.api, mid, tok)
+	if err != nil {
+		return fmt.Errorf("get miner proving deadline for %d: %w", mid, err)
+	}
+
+	// avoid to use current or next deadline
+	deadline = (deadline + mcfg.Sealing.SealingSectorDeadlineDelayNi) % miner.WPoStPeriodDeadlines
 
 	params := &miner14.ProveCommitSectorsNIParams{
 		Sectors:                  actInfos,
 		SealProofType:            sectorsMap[infos[0].Number].SectorType,
 		AggregateProofType:       arp,
-		ProvingDeadline:          7,
+		ProvingDeadline:          deadline,
 		RequireActivationSuccess: true,
 	}
 

damocles-manager/modules/impl/commitmgr/params.go

@@ -144,3 +144,21 @@ func getSectorCollateralNiPoRep(
 	}
 	return collateral, nil
 }
+
+func getProvingDeadline(
+	ctx context.Context,
+	stateMgr SealingAPI,
+	mid abi.ActorID,
+	tok core.TipSetToken,
+) (uint64, error) {
+	maddr, err := address.NewIDAddress(uint64(mid))
+	if err != nil {
+		return 0, fmt.Errorf("invalid miner actor id: %w", err)
+	}
+
+	info, err := stateMgr.StateMinerProvingDeadline(ctx, maddr, tok)
+	if err != nil {
+		return 0, fmt.Errorf("getting miner proving deadline: %w", err)
+	}
+	return info.Index, nil
+}