incomplete basic UI code

Author: LexLuthr

Makefile

@@ -118,7 +118,7 @@ debug: build
 all: build 
 .PHONY: all
 
-build: curio sptool
+build: curio
 	@[[ $$(type -P "curio") ]] && echo "Caution: you have \
 an existing curio binary in your PATH. This may cause problems if you don't run 'sudo make install'" || true
 

cmd/curio/rpc/rpc.go

@@ -250,6 +250,7 @@ func (p *CurioAPI) LogSetLevel(ctx context.Context, subsystem, level string) err
 }
 
 func ListenAndServe(ctx context.Context, dependencies *deps.Deps, shutdownChan chan struct{}) error {
+	log.Errorf("ENTERED RPC SERVER")
 	fh := &paths.FetchHandler{Local: dependencies.LocalStore, PfHandler: &paths.DefaultPartialFileHandler{}}
 	remoteHandler := func(w http.ResponseWriter, r *http.Request) {
 		if !auth.HasPerm(r.Context(), nil, lapi.PermAdmin) {
@@ -261,6 +262,8 @@ func ListenAndServe(ctx context.Context, dependencies *deps.Deps, shutdownChan c
 		fh.ServeHTTP(w, r)
 	}
 
+	log.Errorf("CREATED STORAGE HANDLER")
+
 	var authVerify func(context.Context, string) ([]auth.Permission, error)
 	{
 		privateKey, err := base64.StdEncoding.DecodeString(dependencies.Cfg.Apis.StorageRPCSecret)

cmd/curio/run.go

@@ -130,6 +130,7 @@ var runCmd = &cli.Command{
 		}
 		defer taskEngine.GracefullyTerminate()
 
+		log.Infof("WILL START RPC SERVER NOW")
 		err = rpc.ListenAndServe(ctx, dependencies, shutdownChan) // Monitor for shutdown.
 		if err != nil {
 			return err

cmd/curio/tasks/tasks.go

@@ -27,11 +27,9 @@ import (
 	"github.com/filecoin-project/curio/lib/curiochain"
 	"github.com/filecoin-project/curio/lib/fastparamfetch"
 	"github.com/filecoin-project/curio/lib/ffi"
-	"github.com/filecoin-project/curio/lib/libp2p"
 	"github.com/filecoin-project/curio/lib/multictladdr"
 	"github.com/filecoin-project/curio/lib/paths"
 	"github.com/filecoin-project/curio/lib/slotmgr"
-	"github.com/filecoin-project/curio/market/mk12/libp2pimpl"
 	"github.com/filecoin-project/curio/tasks/gc"
 	"github.com/filecoin-project/curio/tasks/indexing"
 	"github.com/filecoin-project/curio/tasks/message"
@@ -223,15 +221,15 @@ func StartTasks(ctx context.Context, dependencies *deps.Deps) (*harmonytask.Task
 		dealFindTask := storage_market.NewFindDealTask(dm, db, full, &cfg.Market.StorageMarketConfig.MK12)
 		activeTasks = append(activeTasks, psdTask, dealFindTask)
 
-		p2pMap, err := libp2p.NewLibp2pHost(ctx, db, cfg)
-		if err != nil {
-			return nil, err
-		}
-
-		for _, h := range p2pMap {
-			dp := libp2pimpl.NewDealProvider(h, db, dm.MK12Handler, full)
-			go dp.Start(ctx)
-		}
+		//p2pMap, err := libp2p.NewLibp2pHost(ctx, db, cfg)
+		//if err != nil {
+		//	return nil, err
+		//}
+		//
+		//for _, h := range p2pMap {
+		//	dp := libp2pimpl.NewDealProvider(h, db, dm.MK12Handler, full)
+		//	go dp.Start(ctx)
+		//}
 
 		indexingTask := indexing.NewIndexingTask(db, sc, iStore, pp, cfg)
 		activeTasks = append(activeTasks, indexingTask)

docker/curio/entrypoint.sh

@@ -36,7 +36,8 @@ if [ ! -f $CURIO_REPO_PATH/.init.curio ]; then
 	echo Initiating a new Curio cluster ...
 	curio config new-cluster $newminer
 	echo Enabling market ...
-  curio config get seal | sed -e $'$a\\\n  BoostAdapters = ["'"$newminer"':'"$myip"':32100"]\n  EnableParkPiece = true' | curio config set --title seal
+  curio config get seal | sed -e $'$a\\\n  EnableParkPiece = true' | curio config set --title seal
+  curio config get base | sed -e 's/#Miners = \[\]/Miners = ["'"$newminer"'"]/g' | curio config set --title base
   touch $CURIO_REPO_PATH/.init.config
   fi
 

harmony/harmonydb/sql/20240730-market-migration.sql

@@ -22,7 +22,6 @@ CREATE TABLE market_mk12_deals (
 
     piece_cid TEXT NOT NULL,
     piece_size BIGINT NOT NULL,
-    length BIGINT DEFAULT NULL,
 
     fast_retrieval BOOLEAN NOT NULL,
     announce_to_ipni BOOLEAN NOT NULL,
@@ -41,7 +40,7 @@ CREATE TABLE market_mk12_deals (
 CREATE TABLE market_piece_metadata (
     piece_cid TEXT NOT NULL PRIMARY KEY,
 
-    version INT NOT NULL DEFAULT 2
+    version INT NOT NULL DEFAULT 2,
 
     created_at TIMESTAMPTZ  NOT NULL DEFAULT TIMEZONE('UTC', NOW()),
 
@@ -257,28 +256,32 @@ ALTER TABLE parked_piece_refs
 -- Table for old lotus market deals. This is just for deal
 -- which are still alive. It should not be used for any processing
 CREATE TABLE market_legacy_deals (
-    signed_proposal_cid TEXT,
-    sp_id BIGINT,
+    signed_proposal_cid TEXT  NOT NULL,
+    sp_id BIGINT  NOT NULL,
+    client_peer_id TEXT NOT NULL,
+
+    proposal_signature BYTEA  NOT NULL,
+    proposal jsonb  NOT NULL,
 
-    proposal_signature BYTEA,
-    proposal jsonb,
+    piece_cid TEXT  NOT NULL,
+    piece_size BIGINT  NOT NULL,
 
-    piece_cid TEXT,
-    piece_size BIGINT,
+    offline BOOLEAN  NOT NULL,
+    verified BOOLEAN  NOT NULL,
 
-    offline BOOLEAN,
-    verified BOOLEAN,
+    start_epoch BIGINT  NOT NULL,
+    end_epoch BIGINT  NOT NULL,
 
-    start_epoch BIGINT,
-    end_epoch BIGINT,
+    publish_cid TEXT  NOT NULL,
+    chain_deal_id BIGINT  NOT NULL,
 
-    publish_cid TEXT,
-    chain_deal_id BIGINT,
+    piece_cid TEXT NOT NULL,
+    piece_size BIGINT NOT NULL,
 
-    fast_retrieval BOOLEAN,
+    fast_retrieval BOOLEAN  NOT NULL,
 
-    created_at TIMESTAMPTZ,
-    sector_num BIGINT,
+    created_at TIMESTAMPTZ  NOT NULL,
+    sector_num BIGINT  NOT NULL,
 
     primary key (sp_id, piece_cid, signed_proposal_cid)
 );

market/mk12/types.go

@@ -265,7 +265,6 @@ type ProviderDealState struct {
 	// sector packing info
 	SectorID abi.SectorNumber
 	Offset   abi.PaddedPieceSize
-	Length   abi.PaddedPieceSize
 
 	// set if there's an error
 	Err string

tasks/storage-market/storage_market.go

@@ -52,7 +52,6 @@ type storageMarketAPI interface {
 }
 
 type CurioStorageDealMarket struct {
-	ctx         context.Context
 	cfg         *config.CurioConfig
 	db          *harmonydb.DB
 	pin         storageIngest.Ingester
@@ -96,7 +95,6 @@ func NewCurioStorageDealMarket(db *harmonydb.DB, cfg *config.CurioConfig, sc *ff
 	}
 
 	return &CurioStorageDealMarket{
-		ctx:    context.Background(),
 		cfg:    cfg,
 		db:     db,
 		api:    mapi,
@@ -136,7 +134,7 @@ func (d *CurioStorageDealMarket) StartMarket(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	d.runPoller(ctx)
+	go d.runPoller(ctx)
 
 	return nil
 
@@ -192,7 +190,7 @@ func (d *CurioStorageDealMarket) processMK12Deals(ctx context.Context) {
 									p.offline as offline,
 									p.raw_size as raw_size,
 									p.url as url,
-									p.url_headers as url_headers,
+									p.headers as headers,
 									p.commp_task_id as commp_task_id,
 									p.after_commp as after_commp,
 									p.psd_task_id as psd_task_id,