feat: curio: Move boost proxy into the main binary (filecoin-project#…

…11783)

* feat: curio: Move boost proxy into the main binary

* curio: Command for generating market tokens

* curio boost rpc: Address review

* make docsgen-cli

cmd/curio/deps/deps.go

@@ -388,7 +388,7 @@ func GetConfig(cctx *cli.Context, db *harmonydb.DB) (*config.CurioConfig, error)
 		for _, k := range meta.Keys() {
 			have = append(have, strings.Join(k, " "))
 		}
-		log.Infow("Using layer", "layer", layer, "config", curioConfig)
+		log.Debugw("Using layer", "layer", layer, "config", curioConfig)
 	}
 	_ = have // FUTURE: verify that required fields are here.
 	// If config includes 3rd-party config, consider JSONSchema as a way that

cmd/curio/main.go

@@ -54,6 +54,7 @@ func main() {
 		webCmd,
 		guidedsetup.GuidedsetupCmd,
 		sealCmd,
+		marketCmd,
 	}
 
 	jaeger := tracing.SetupJaegerTracing("curio")

cmd/curio/market.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/urfave/cli/v2"
+	"golang.org/x/xerrors"
+
+	"github.com/filecoin-project/lotus/cmd/curio/deps"
+	"github.com/filecoin-project/lotus/curiosrc/market/lmrpc"
+)
+
+var marketCmd = &cli.Command{
+	Name: "market",
+	Subcommands: []*cli.Command{
+		marketRPCInfoCmd,
+	},
+}
+
+var marketRPCInfoCmd = &cli.Command{
+	Flags: []cli.Flag{
+		&cli.StringSliceFlag{
+			Name:  "layers",
+			Usage: "list of layers to be interpreted (atop defaults). Default: base",
+		},
+	},
+	Action: func(cctx *cli.Context) error {
+		db, err := deps.MakeDB(cctx)
+		if err != nil {
+			return err
+		}
+
+		cfg, err := deps.GetConfig(cctx, db)
+		if err != nil {
+			return xerrors.Errorf("get config: %w", err)
+		}
+
+		ts, err := lmrpc.MakeTokens(cfg)
+		if err != nil {
+			return xerrors.Errorf("make tokens: %w", err)
+		}
+
+		var addrTokens []struct {
+			Address string
+			Token   string
+		}
+
+		for address, s := range ts {
+			addrTokens = append(addrTokens, struct {
+				Address string
+				Token   string
+			}{
+				Address: address.String(),
+				Token:   s,
+			})
+		}
+
+		sort.Slice(addrTokens, func(i, j int) bool {
+			return addrTokens[i].Address < addrTokens[j].Address
+		})
+
+		for _, at := range addrTokens {
+			fmt.Printf("[lotus-miner/boost compatible] %s %s\n", at.Address, at.Token)
+		}
+
+		return nil
+	},
+	Name: "rpc-info",
+}

cmd/curio/run.go

@@ -10,12 +10,14 @@ import (
 	"github.com/urfave/cli/v2"
 	"go.opencensus.io/stats"
 	"go.opencensus.io/tag"
+	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/build"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/cmd/curio/deps"
 	"github.com/filecoin-project/lotus/cmd/curio/rpc"
 	"github.com/filecoin-project/lotus/cmd/curio/tasks"
+	"github.com/filecoin-project/lotus/curiosrc/market/lmrpc"
 	"github.com/filecoin-project/lotus/lib/ulimit"
 	"github.com/filecoin-project/lotus/metrics"
 	"github.com/filecoin-project/lotus/node"
@@ -133,6 +135,11 @@ var runCmd = &cli.Command{
 		if err != nil {
 			return err
 		}
+
+		if err := lmrpc.ServeCurioMarketRPCFromConfig(dependencies.DB, dependencies.Full, dependencies.Cfg); err != nil {
+			return xerrors.Errorf("starting market RPCs: %w", err)
+		}
+
 		finishCh := node.MonitorShutdown(shutdownChan) //node.ShutdownHandler{Component: "rpc server", StopFunc: rpcStopper},
 		//node.ShutdownHandler{Component: "curio", StopFunc: stop},