add a param to rpc method , let it support niporep #1086

Author: beeleelee

damocles-manager/core/api.go

@@ -51,7 +51,7 @@ type SealerAPI interface {
 
 	SubmitPersistedEx(ctx context.Context, sid abi.SectorID, instanceName string, isUpgrade bool) (bool, error)
 
-	WaitSeed(context.Context, abi.SectorID) (WaitSeedResp, error)
+	WaitSeed(context.Context, abi.SectorID, abi.RegisteredSealProof) (WaitSeedResp, error)
 
 	SubmitProof(context.Context, abi.SectorID, ProofOnChainInfo, bool) (SubmitProofResp, error)
 

damocles-manager/modules/impl/mock/sealer.go

@@ -117,7 +117,7 @@ func (s *Sealer) PollPreCommitState(ctx context.Context, sid abi.SectorID) (core
 	return s.commit.PreCommitState(ctx, sid)
 }
 
-func (s *Sealer) WaitSeed(ctx context.Context, sid abi.SectorID) (core.WaitSeedResp, error) {
+func (s *Sealer) WaitSeed(ctx context.Context, sid abi.SectorID, proofType abi.RegisteredSealProof) (core.WaitSeedResp, error) {
 	seed, err := s.rand.GetSeed(ctx, types.EmptyTSK, 0, sid.Miner)
 	if err != nil {
 		return core.WaitSeedResp{}, err

damocles-manager/modules/sealer/sealer.go

@@ -338,7 +338,7 @@ func (s *Sealer) SubmitPersistedEx(
 	return true, nil
 }
 
-func (s *Sealer) WaitSeed(ctx context.Context, sid abi.SectorID) (core.WaitSeedResp, error) {
+func (s *Sealer) WaitSeed(ctx context.Context, sid abi.SectorID, proofType abi.RegisteredSealProof) (core.WaitSeedResp, error) {
 	maddr, err := address.NewIDAddress(uint64(sid.Miner))
 	if err != nil {
 		return core.WaitSeedResp{}, err
@@ -348,29 +348,33 @@ func (s *Sealer) WaitSeed(ctx context.Context, sid abi.SectorID) (core.WaitSeedR
 	if err != nil {
 		return core.WaitSeedResp{}, err
 	}
-
 	tsk := ts.Key()
-	pci, err := s.capi.StateSectorPreCommitInfo(ctx, maddr, sid.Number, tsk)
-	if err != nil {
-		return core.WaitSeedResp{}, err
-	}
-	if pci == nil {
-		return core.WaitSeedResp{}, fmt.Errorf("precommit info not found on chain. sid: %s", util.FormatSectorID(sid))
-	}
-
 	curEpoch := ts.Height()
-	// TODO: remove this guard
+	var seedEpoch abi.ChainEpoch
+	if proofType.IsNonInteractive() {
+		seedEpoch = curEpoch - 1
+	} else {
 
-	seedEpoch := pci.PreCommitEpoch + policy.GetPreCommitChallengeDelay()
-	confEpoch := seedEpoch + policy.InteractivePoRepConfidence
-	if curEpoch < confEpoch {
-		return core.WaitSeedResp{
-			ShouldWait: true,
-			Delay:      int(confEpoch-curEpoch) * int(policy.NetParams.BlockDelaySecs),
-			Seed:       nil,
-		}, nil
-	}
+		pci, err := s.capi.StateSectorPreCommitInfo(ctx, maddr, sid.Number, tsk)
+		if err != nil {
+			return core.WaitSeedResp{}, err
+		}
+		if pci == nil {
+			return core.WaitSeedResp{}, fmt.Errorf("precommit info not found on chain. sid: %s", util.FormatSectorID(sid))
+		}
 
+		// TODO: remove this guard
+
+		seedEpoch = pci.PreCommitEpoch + policy.GetPreCommitChallengeDelay()
+		confEpoch := seedEpoch + policy.InteractivePoRepConfidence
+		if curEpoch < confEpoch {
+			return core.WaitSeedResp{
+				ShouldWait: true,
+				Delay:      int(confEpoch-curEpoch) * int(policy.NetParams.BlockDelaySecs),
+				Seed:       nil,
+			}, nil
+		}
+	}
 	seed, err := s.rand.GetSeed(ctx, tsk, seedEpoch, sid.Miner)
 	if err != nil {
 		return core.WaitSeedResp{}, err

damocles-worker/src/rpc/sealer/mod.rs

@@ -532,7 +532,7 @@ pub trait Sealer {
 
     /// api definition
     #[rpc(name = "Venus.WaitSeed")]
-    fn wait_seed(&self, id: SectorID) -> Result<WaitSeedResp>;
+    fn wait_seed(&self, id: SectorID, proof_type: SealProof) -> Result<WaitSeedResp>;
 
     /// api definition
     #[rpc(name = "Venus.SubmitProof")]

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

@@ -239,10 +239,11 @@ impl<'t> NiPoRep<'t> {
 
     fn handle_persistance_submitted(&self) -> Result<Event, Failure> {
         let sector_id = self.task.sector_id()?;
+        let proof_type = self.task.sector_proof_type()?;
 
         let seed = loop {
             let wait = call_rpc! {
-                self.task.rpc()=>wait_seed(sector_id.clone(), )
+                self.task.rpc()=>wait_seed(sector_id.clone(), proof_type.clone(),)
             }?;
 
             if let Some(seed) = wait.seed {

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

@@ -415,10 +415,11 @@ impl<'t> Sealer<'t> {
 
     fn handle_persistance_submitted(&self) -> Result<Event, Failure> {
         let sector_id = self.task.sector_id()?;
+        let proof_type = self.task.sector_proof_type()?;
 
         let seed = loop {
             let wait = call_rpc! {
-                self.task.rpc()=>wait_seed(sector_id.clone(), )
+                self.task.rpc()=>wait_seed(sector_id.clone(), proof_type.clone(),)
             }?;
 
             if let Some(seed) = wait.seed {