Merge remote-tracking branch 'origin/main' into feat/pdp

Author: magik6k

.github/image/Dockerfile

@@ -23,7 +23,7 @@ RUN git submodule update --init
 RUN go mod download
 
 # Stage 2: Install Lotus binary
-FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.32.1-devnet AS lotus-test
+FROM ghcr.io/filecoin-shipyard/lotus-containers:lotus-v1.32.2-devnet AS lotus-test
 
 # Stage 3: Build the final image
 FROM myoung34/github-runner AS curio-github-runner

Makefile

@@ -67,9 +67,12 @@ build/.update-modules:
 # Conditional execution block for Linux
 OS := $(shell uname)
 ifeq ($(OS), Linux)
-    $(eval CUDA_PATH := $(shell dirname $$(dirname $$(which nvcc))))
-    $(eval CUDA_LIB_PATH := $(CUDA_PATH)/lib64)
-    export LIBRARY_PATH := $(LIBRARY_PATH):$(CUDA_LIB_PATH)
+    NVCC_PATH := $(shell which nvcc 2>/dev/null)
+    ifneq ($(NVCC_PATH),)
+        $(eval CUDA_PATH := $(shell dirname $$(dirname $$(which nvcc))))
+        $(eval CUDA_LIB_PATH := $(CUDA_PATH)/lib64)
+        export LIBRARY_PATH := $(LIBRARY_PATH):$(CUDA_LIB_PATH)
+    endif
 endif
 
 ## MAIN BINARIES
@@ -276,7 +279,7 @@ build_lotus?=0
 curio_docker_user?=curio
 curio_base_image=$(curio_docker_user)/curio-all-in-one:latest-debug
 ffi_from_source?=0
-lotus_version?=v1.32.1
+lotus_version?=v1.32.2
 
 ifeq ($(build_lotus),1)
 # v1: building lotus image with provided lotus version

cmd/curio/tasks/tasks.go

@@ -245,9 +245,10 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps, shutdownChan chan
 
 	{
 		// Market tasks
+		var dm *storage_market.CurioStorageDealMarket
 		if cfg.Subsystems.EnableDealMarket {
 			// Main market poller should run on all nodes
-			dm := storage_market.NewCurioStorageDealMarket(miners, db, cfg, si, full, as)
+			dm = storage_market.NewCurioStorageDealMarket(miners, db, cfg, si, full, as)
 			err := dm.StartMarket(ctx)
 			if err != nil {
 				return nil, err
@@ -297,7 +298,7 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps, shutdownChan chan
 		activeTasks = append(activeTasks, ipniTask, indexingTask)
 
 		if cfg.HTTP.Enable {
-			err = cuhttp.StartHTTPServer(ctx, dependencies, &sdeps)
+			err = cuhttp.StartHTTPServer(ctx, dependencies, &sdeps, dm)
 			if err != nil {
 				return nil, xerrors.Errorf("failed to start the HTTP server: %w", err)
 			}

cmd/sptool/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/filecoin-project/curio/build"
 
 	"github.com/filecoin-project/lotus/cli/spcli"
+	cliutil "github.com/filecoin-project/lotus/cli/util"
 )
 
 var log = logging.Logger("sptool")
@@ -50,9 +51,18 @@ func main() {
 				Usage:    "miner actor to manage",
 				EnvVars:  []string{"SP_ADDRESS"},
 			},
+			&cli.BoolFlag{
+				Name:    "verbose",
+				Usage:   "enable verbose logging",
+				Aliases: []string{"vv"},
+			},
 		},
 		Before: func(cctx *cli.Context) error {
-			return logging.SetLogLevel("sptool", cctx.String("sptool"))
+			if cctx.IsSet("verbose") {
+				cliutil.IsVeryVerbose = true
+				return logging.SetLogLevel("sptool", "DEBUG")
+			}
+			return logging.SetLogLevel("sptool", "INFO")
 		},
 	}