Merge branch 'feat/sturdypost' into fix-sturdy-tests

node/builder_miner.go

@@ -121,8 +121,12 @@ func ConfigStorageMiner(c interface{}) Option {
 
 			// Mining / proving
 			Override(new(*slashfilter.SlashFilter), modules.NewSlashFilter),
-			Override(new(*miner.Miner), modules.SetupBlockProducer),
-			Override(new(gen.WinningPoStProver), storage.NewWinningPoStProver),
+
+			If(!cfg.Subsystems.DisableWinningPoSt,
+				Override(new(*miner.Miner), modules.SetupBlockProducer),
+				Override(new(gen.WinningPoStProver), storage.NewWinningPoStProver),
+			),
+
 			Override(PreflightChecksKey, modules.PreflightChecks),
 			Override(new(*sealing.Sealing), modules.SealingPipeline(cfg.Fees)),
 

node/config/doc_gen.go

@@ -977,6 +977,16 @@ This option will stop lotus-miner from performing any actions related
 to window post, including scheduling, submitting proofs, and recovering
 sectors.`,
 		},
+		{
+			Name: "DisableWinningPoSt",
+			Type: "bool",
+
+			Comment: `When winning post is disabled, the miner process will NOT attempt to mine
+blocks. This should only be set when there's an external process mining
+blocks on behalf of the miner.
+When disabled and no external block producers are configured, all potential
+block rewards will be missed!`,
+		},
 	},
 	"ProviderSubsystemsConfig": {
 		{
@@ -995,6 +1005,12 @@ sectors.`,
 			Name: "EnableWinningPost",
 			Type: "bool",
 
+			Comment: ``,
+		},
+		{
+			Name: "WinningPostMaxTasks",
+			Type: "int",
+
 			Comment: ``,
 		},
 	},

node/config/types.go

@@ -92,9 +92,10 @@ type JournalConfig struct {
 }
 
 type ProviderSubsystemsConfig struct {
-	EnableWindowPost   bool
-	WindowPostMaxTasks int
-	EnableWinningPost  bool
+	EnableWindowPost    bool
+	WindowPostMaxTasks  int
+	EnableWinningPost   bool
+	WinningPostMaxTasks int
 }
 
 type DAGStoreConfig struct {
@@ -161,6 +162,13 @@ type MinerSubsystemConfig struct {
 	//   to window post, including scheduling, submitting proofs, and recovering
 	//   sectors.
 	DisableWindowPoSt bool
+
+	// When winning post is disabled, the miner process will NOT attempt to mine
+	// blocks. This should only be set when there's an external process mining
+	// blocks on behalf of the miner.
+	// When disabled and no external block producers are configured, all potential
+	// block rewards will be missed!
+	DisableWinningPoSt bool
 }
 
 type DealmakingConfig struct {