deal with sector collateral for niporep #1086

Author: beeleelee

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

@@ -428,7 +428,7 @@ func (c CommitProcessor) ProcessNiPoRep(
 		}
 
 		if mcfg.Commitment.Prove.SendFund {
-			sc, err := getSectorCollateral(ctx, c.api, mid, p.ID.Number, tok)
+			sc, err := getSectorCollateralNiPoRep(ctx, c.api, mid, &p, tok, expire)
 			if err != nil {
 				plog.Errorf("get sector collateral for %d failed: %s\n", p.ID.Number, err)
 				failed[sectors[i].ID] = struct{}{}

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

@@ -117,3 +117,30 @@ func getSectorCollateral(
 
 	return collateral, nil
 }
+
+func getSectorCollateralNiPoRep(
+	ctx context.Context,
+	stateMgr SealingAPI,
+	mid abi.ActorID,
+	p *core.SectorState,
+	tok core.TipSetToken,
+	expire abi.ChainEpoch,
+) (abi.TokenAmount, error) {
+	maddr, err := address.NewIDAddress(uint64(mid))
+	if err != nil {
+		return big.Zero(), fmt.Errorf("invalid miner actor id: %w", err)
+	}
+
+	collateral, err := stateMgr.StateMinerInitialPledgeCollateral(ctx, maddr, miner.SectorPreCommitInfo{
+		Expiration:   expire,
+		SectorNumber: p.ID.Number,
+		SealProof:    p.SectorType,
+
+		SealedCID:     p.Pre.CommR,
+		SealRandEpoch: p.Ticket.Epoch,
+	}, tok)
+	if err != nil {
+		return big.Zero(), fmt.Errorf("getting initial pledge collateral: %w", err)
+	}
+	return collateral, nil
+}

damocles-worker/src/sealing/sealing_thread/planner/mod.rs

@@ -39,6 +39,7 @@ pub fn default_plan() -> &'static str {
     PLANNER_NAME_SEALER
 }
 
+use niporep::NiPoRepPlanner;
 use plan;
 
 use self::{
@@ -90,6 +91,9 @@ pub(crate) fn create_sealer(
         PLANNER_NAME_WDPOST => {
             Ok(Box::new(WdPostSealer::new(st.sealing_ctrl(ctx))))
         }
+        PLANNER_NAME_NIPOREP => {
+            Ok(Box::new(CommonSealer::<NiPoRepPlanner>::new(ctx, st)?))
+        }
         unknown => Err(anyhow!("unknown planner: {}", unknown)),
     }
 }