Merge branch 'main' into feat/market

Author: LexLuthr

Makefile

@@ -24,6 +24,22 @@ BUILD_DEPS+=ffi-version-check
 
 .PHONY: ffi-version-check
 
+## BLST (from supraseal, but needed in curio)
+
+BLST_PATH:=extern/supra_seal/
+BLST_DEPS:=.install-blst
+BLST_DEPS:=$(addprefix $(BLST_PATH),$(BLST_DEPS))
+
+$(BLST_DEPS): build/.blst-install ;
+
+build/.blst-install: $(BLST_PATH)
+	bash scripts/build-blst.sh
+	@touch $@
+
+MODULES+=$(BLST_PATH)
+BUILD_DEPS+=build/.blst-install
+CLEAN+=build/.blst-install
+
 ## SUPRA-FFI
 
 ifeq ($(shell uname),Linux)
@@ -37,7 +53,7 @@ build/.supraseal-install: $(SUPRA_FFI_PATH)
 	cd $(SUPRA_FFI_PATH) && ./build.sh
 	@touch $@
 
-MODULES+=$(SUPRA_FFI_PATH)
+# MODULES+=$(SUPRA_FFI_PATH) -- already included in BLST_PATH
 CLEAN+=build/.supraseal-install
 endif
 

alertmanager/task_alert.go

@@ -19,6 +19,7 @@ import (
 	"github.com/filecoin-project/curio/harmony/harmonydb"
 	"github.com/filecoin-project/curio/harmony/harmonytask"
 	"github.com/filecoin-project/curio/harmony/resources"
+	"github.com/filecoin-project/curio/harmony/taskhelp"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -161,7 +162,7 @@ func (a *AlertTask) CanAccept(ids []harmonytask.TaskID, engine *harmonytask.Task
 
 func (a *AlertTask) TypeDetails() harmonytask.TaskTypeDetails {
 	return harmonytask.TaskTypeDetails{
-		Max:  1,
+		Max:  taskhelp.Max(1),
 		Name: "AlertManager",
 		Cost: resources.Resources{
 			Cpu: 1,

cmd/curio/main.go

@@ -64,6 +64,7 @@ func main() {
 		webCmd,
 		guidedsetup.GuidedsetupCmd,
 		sealCmd,
+		unsealCmd,
 		marketCmd,
 		fetchParamCmd,
 		ffiCmd,

cmd/curio/pipeline.go renamed to cmd/curio/seal.go

@@ -23,6 +23,7 @@ import (
 	"github.com/filecoin-project/curio/deps/config"
 	"github.com/filecoin-project/curio/harmony/harmonydb"
 	"github.com/filecoin-project/curio/harmony/harmonytask"
+	"github.com/filecoin-project/curio/harmony/taskhelp"
 	"github.com/filecoin-project/curio/lib/chainsched"
 	"github.com/filecoin-project/curio/lib/curiochain"
 	"github.com/filecoin-project/curio/lib/fastparamfetch"
@@ -37,10 +38,12 @@ import (
 	"github.com/filecoin-project/curio/tasks/message"
 	"github.com/filecoin-project/curio/tasks/metadata"
 	piece2 "github.com/filecoin-project/curio/tasks/piece"
+	"github.com/filecoin-project/curio/tasks/scrub"
 	"github.com/filecoin-project/curio/tasks/seal"
 	"github.com/filecoin-project/curio/tasks/sealsupra"
 	"github.com/filecoin-project/curio/tasks/snap"
 	storage_market "github.com/filecoin-project/curio/tasks/storage-market"
+	"github.com/filecoin-project/curio/tasks/unseal"
 	window2 "github.com/filecoin-project/curio/tasks/window"
 	"github.com/filecoin-project/curio/tasks/winning"
 
@@ -295,6 +298,11 @@ func addSealingTasks(
 	var addFinalize bool
 
 	// NOTE: Tasks with the LEAST priority are at the top
+	if cfg.Subsystems.EnableCommP {
+		scrubUnsealedTask := scrub.NewCommDCheckTask(db, slr)
+		activeTasks = append(activeTasks, scrubUnsealedTask)
+	}
+
 	if cfg.Subsystems.EnableBatchSeal {
 		slotMgr = slotmgr.NewSlotMgr()
 
@@ -313,8 +321,12 @@ func addSealingTasks(
 	}
 
 	if cfg.Subsystems.EnableSealSDR {
-		sdrTask := seal.NewSDRTask(full, db, sp, slr, cfg.Subsystems.SealSDRMaxTasks, cfg.Subsystems.SealSDRMinTasks)
-		activeTasks = append(activeTasks, sdrTask)
+		sdrMax := taskhelp.Max(cfg.Subsystems.SealSDRMaxTasks)
+
+		sdrTask := seal.NewSDRTask(full, db, sp, slr, sdrMax, cfg.Subsystems.SealSDRMinTasks)
+		keyTask := unseal.NewTaskUnsealSDR(slr, db, sdrMax, full)
+
+		activeTasks = append(activeTasks, sdrTask, keyTask)
 	}
 	if cfg.Subsystems.EnableSealSDRTrees {
 		treeDTask := seal.NewTreeDTask(sp, db, slr, cfg.Subsystems.SealSDRTreesMaxTasks)
@@ -340,6 +352,11 @@ func addSealingTasks(
 		moveStorageTask := seal.NewMoveStorageTask(sp, slr, db, cfg.Subsystems.MoveStorageMaxTasks)
 		moveStorageSnapTask := snap.NewMoveStorageTask(slr, db, cfg.Subsystems.MoveStorageMaxTasks)
 		activeTasks = append(activeTasks, moveStorageTask, moveStorageSnapTask)
+
+		if !cfg.Subsystems.NoUnsealedDecode {
+			unsealTask := unseal.NewTaskUnsealDecode(slr, db, cfg.Subsystems.MoveStorageMaxTasks, full)
+			activeTasks = append(activeTasks, unsealTask)
+		}
 	}
 	if cfg.Subsystems.EnableSendCommitMsg {
 		commitTask := seal.NewSubmitCommitTask(sp, db, full, sender, as, cfg)