Merge branch 'master' into rate-limit-gateway

cmd/lotus-wallet/main.go

@@ -144,7 +144,7 @@ var runCmd = &cli.Command{
 			Hidden: true,
 		},
 	},
-	Description: "For setup instructions see 'lotus-wallet --help'",
+	Description: "Needs FULLNODE_API_INFO env-var to be set before running (see lotus-wallet --help for setup instructions)",
 	Action: func(cctx *cli.Context) error {
 		log.Info("Starting lotus wallet")
 

cmd/lotus-worker/main.go

@@ -313,7 +313,7 @@ var runCmd = &cli.Command{
 		}
 
 		if (workerType == sealtasks.WorkerSealing || cctx.IsSet("addpiece")) && cctx.Bool("addpiece") {
-			taskTypes = append(taskTypes, sealtasks.TTAddPiece)
+			taskTypes = append(taskTypes, sealtasks.TTAddPiece, sealtasks.TTDataCid)
 		}
 		if (workerType == sealtasks.WorkerSealing || cctx.IsSet("precommit1")) && cctx.Bool("precommit1") {
 			taskTypes = append(taskTypes, sealtasks.TTPreCommit1)

cmd/lotus-worker/tasks.go

@@ -23,6 +23,7 @@ var tasksCmd = &cli.Command{
 
 var allowSetting = map[sealtasks.TaskType]struct{}{
 	sealtasks.TTAddPiece:            {},
+	sealtasks.TTDataCid:             {},
 	sealtasks.TTPreCommit1:          {},
 	sealtasks.TTPreCommit2:          {},
 	sealtasks.TTCommit2:             {},