config knobs for RequireActivationSuccess

documentation/en/default-lotus-miner-config.toml

@@ -702,6 +702,30 @@
   # env var: LOTUS_SEALING_USESYNTHETICPOREP
   #UseSyntheticPoRep = false
 
+  # Whether to abort if any sector activation in a batch fails (newly sealed sectors, only with ProveCommitSectors3).
+  #
+  # type: bool
+  # env var: LOTUS_SEALING_REQUIREACTIVATIONSUCCESS
+  #RequireActivationSuccess = false
+
+  # Whether to abort if any piece activation notification returns a non-zero exit code (newly sealed sectors, only with ProveCommitSectors3).
+  #
+  # type: bool
+  # env var: LOTUS_SEALING_REQUIREACTIVATIONSUCCESSUPDATE
+  #RequireActivationSuccessUpdate = false
+
+  # Whether to abort if any sector activation in a batch fails (updating sectors, only with ProveReplicaUpdates3).
+  #
+  # type: bool
+  # env var: LOTUS_SEALING_REQUIRENOTIFICATIONSUCCESS
+  #RequireNotificationSuccess = false
+
+  # Whether to abort if any piece activation notification returns a non-zero exit code (updating sectors, only with ProveReplicaUpdates3).
+  #
+  # type: bool
+  # env var: LOTUS_SEALING_REQUIRENOTIFICATIONSUCCESSUPDATE
+  #RequireNotificationSuccessUpdate = false
+
 
 [Storage]
   # type: int

itests/direct_data_onboard_test.go

@@ -147,7 +147,10 @@ func TestOnboardMixedMarketDDO(t *testing.T) {
 		ctx       = context.Background()
 	)
 
-	client, miner, ens := kit.EnsembleMinimal(t, kit.ThroughRPC())
+	client, miner, ens := kit.EnsembleMinimal(t, kit.ThroughRPC(), kit.MutateSealingConfig(func(sc *config.SealingConfig) {
+		sc.RequireActivationSuccess = true
+		sc.RequireNotificationSuccess = true
+	}))
 	ens.InterconnectAll().BeginMiningMustPost(blocktime)
 
 	maddr, err := miner.ActorAddress(ctx)
@@ -157,6 +160,7 @@ func TestOnboardMixedMarketDDO(t *testing.T) {
 	require.NoError(t, err)
 
 	var pieces []abi.PieceInfo
+	var dealID abi.DealID
 
 	{
 		// market piece
@@ -200,7 +204,7 @@ func TestOnboardMixedMarketDDO(t *testing.T) {
 
 		res, err := market.DecodePublishStorageDealsReturn(r.Receipt.Return, nv)
 		require.NoError(t, err)
-		dealID := must.One(res.DealIDs())[0]
+		dealID = must.One(res.DealIDs())[0]
 
 		mcid := smsg.Cid()
 
@@ -269,6 +273,11 @@ func TestOnboardMixedMarketDDO(t *testing.T) {
 	si, err := miner.SectorsStatus(ctx, 2, false)
 	require.NoError(t, err)
 	require.Equal(t, expectCommD, *si.CommD)
+
+	ds, err := client.StateMarketStorageDeal(ctx, dealID, types.EmptyTSK)
+	require.NoError(t, err)
+
+	require.NotEqual(t, -1, ds.State.SectorStartEpoch)
 }
 
 func TestOnboardRawPieceSnap(t *testing.T) {
@@ -285,7 +294,7 @@ func TestOnboardRawPieceSnap(t *testing.T) {
 		sc.MakeCCSectorsAvailable = true
 		sc.AggregateCommits = false
 	}))
-	ens.InterconnectAll().BeginMining(blocktime)
+	ens.InterconnectAll().BeginMiningMustPost(blocktime)
 
 	miner.PledgeSectors(ctx, 1, 0, nil)
 	sl, err := miner.SectorsListNonGenesis(ctx)

node/config/types.go

@@ -487,6 +487,15 @@ type SealingConfig struct {
 
 	// UseSyntheticPoRep, when set to true, will reduce the amount of cache data held on disk after the completion of PreCommit 2 to 11GiB.
 	UseSyntheticPoRep bool
+
+	// Whether to abort if any sector activation in a batch fails (newly sealed sectors, only with ProveCommitSectors3).
+	RequireActivationSuccess bool
+	// Whether to abort if any piece activation notification returns a non-zero exit code (newly sealed sectors, only with ProveCommitSectors3).
+	RequireActivationSuccessUpdate bool
+	// Whether to abort if any sector activation in a batch fails (updating sectors, only with ProveReplicaUpdates3).
+	RequireNotificationSuccess bool
+	// Whether to abort if any piece activation notification returns a non-zero exit code (updating sectors, only with ProveReplicaUpdates3).
+	RequireNotificationSuccessUpdate bool
 }
 
 type SealerConfig struct {

node/modules/storageminer.go

@@ -1017,6 +1017,11 @@ func NewSetSealConfigFunc(r repo.LockedRepo) (dtypes.SetSealingConfigFunc, error
 				TerminateBatchWait:                     config.Duration(cfg.TerminateBatchWait),
 				MaxSectorProveCommitsSubmittedPerEpoch: cfg.MaxSectorProveCommitsSubmittedPerEpoch,
 				UseSyntheticPoRep:                      cfg.UseSyntheticPoRep,
+
+				RequireActivationSuccess:         cfg.RequireActivationSuccess,
+				RequireActivationSuccessUpdate:   cfg.RequireActivationSuccessUpdate,
+				RequireNotificationSuccess:       cfg.RequireNotificationSuccess,
+				RequireNotificationSuccessUpdate: cfg.RequireNotificationSuccessUpdate,
 			}
 			c.SetSealingConfig(newCfg)
 		})
@@ -1062,6 +1067,11 @@ func ToSealingConfig(dealmakingCfg config.DealmakingConfig, sealingCfg config.Se
 		TerminateBatchMin:  sealingCfg.TerminateBatchMin,
 		TerminateBatchWait: time.Duration(sealingCfg.TerminateBatchWait),
 		UseSyntheticPoRep:  sealingCfg.UseSyntheticPoRep,
+
+		RequireActivationSuccess:         sealingCfg.RequireActivationSuccess,
+		RequireActivationSuccessUpdate:   sealingCfg.RequireActivationSuccessUpdate,
+		RequireNotificationSuccess:       sealingCfg.RequireNotificationSuccess,
+		RequireNotificationSuccessUpdate: sealingCfg.RequireNotificationSuccessUpdate,
 	}
 }
 

storage/pipeline/commit_batch.go

@@ -337,7 +337,10 @@ func (b *CommitBatcher) processBatchV2(cfg sealiface.Config, sectors []abi.Secto
 		FailedSectors: map[abi.SectorNumber]string{},
 	}
 
-	params := miner.ProveCommitSectors3Params{}
+	params := miner.ProveCommitSectors3Params{
+		RequireActivationSuccess:   cfg.RequireActivationSuccess,
+		RequireNotificationSuccess: cfg.RequireNotificationSuccess,
+	}
 
 	infos := make([]proof.AggregateSealVerifyInfo, 0, total)
 	collateral := big.Zero()

storage/pipeline/sealiface/config.go

@@ -62,4 +62,9 @@ type Config struct {
 	TerminateBatchWait time.Duration
 
 	UseSyntheticPoRep bool
+
+	RequireActivationSuccess         bool
+	RequireActivationSuccessUpdate   bool
+	RequireNotificationSuccess       bool
+	RequireNotificationSuccessUpdate bool
 }

storage/pipeline/states_replica_update.go

@@ -193,8 +193,8 @@ func (m *Sealing) handleSubmitReplicaUpdate(ctx statemachine.Context, sector Sec
 			UpdateProofsType: updateProof,
 			//AggregateProof
 			//AggregateProofType
-			RequireActivationSuccess:   false, // todo??
-			RequireNotificationSuccess: false,
+			RequireActivationSuccess:   cfg.RequireActivationSuccessUpdate,
+			RequireNotificationSuccess: cfg.RequireNotificationSuccessUpdate,
 		}
 
 		enc := new(bytes.Buffer)