Merge pull request #10280 from filecoin-project/asr/fix-shed

fix: shed: default to LOTUS_PATH for repo

cmd/lotus-shed/balances.go

@@ -454,9 +454,8 @@ var chainBalanceStateCmd = &cli.Command{
 	Description: "Produces a csv file of all account balances from a given stateroot",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name: "miner-info",
@@ -678,9 +677,8 @@ var chainPledgeCmd = &cli.Command{
 	Description: "Calculate sector pledge numbers",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	ArgsUsage: "[stateroot epoch]",

cmd/lotus-shed/datastore.go

@@ -41,11 +41,6 @@ var datastoreListCmd = &cli.Command{
 	Name:        "list",
 	Description: "list datastore keys",
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
 		&cli.StringFlag{
 			Name:  "repo-type",
 			Usage: "node type (FullNode, StorageMiner, Worker, Wallet)",
@@ -115,11 +110,6 @@ var datastoreGetCmd = &cli.Command{
 	Name:        "get",
 	Description: "list datastore keys",
 	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
 		&cli.StringFlag{
 			Name:  "repo-type",
 			Usage: "node type (FullNode, StorageMiner, Worker, Wallet)",
@@ -133,7 +123,7 @@ var datastoreGetCmd = &cli.Command{
 	},
 	ArgsUsage: "[namespace key]",
 	Action: func(cctx *cli.Context) error {
-		_ = logging.SetLogLevel("badger", "ERROR")
+		logging.SetLogLevel("badger", "ERROR") // nolint:errcheck
 
 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {

cmd/lotus-shed/deal-label.go

@@ -24,9 +24,8 @@ var dealLabelCmd = &cli.Command{
 	Usage: "Scrape state to report on how many deals have non UTF-8 labels",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/diff.go

@@ -33,9 +33,8 @@ var diffMinerStates = &cli.Command{
 	ArgsUsage: "<stateCidA> <stateCidB>",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/export-car.go

@@ -35,9 +35,8 @@ var exportCarCmd = &cli.Command{
 	Description: "Export a car from repo",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	ArgsUsage: "[outfile] [root cid]",

cmd/lotus-shed/export.go

@@ -42,9 +42,8 @@ var exportChainCmd = &cli.Command{
 	Description: "Export chain from repo (requires node to be offline)",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:  "tipset",
@@ -147,9 +146,8 @@ var exportRawCmd = &cli.Command{
 	Description: "Export raw blocks from repo (requires node to be offline)",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:  "car-size",

cmd/lotus-shed/fip-0036.go

@@ -58,6 +58,12 @@ var fip36PollCmd = &cli.Command{
 	Name:      "fip36poll",
 	Usage:     "Process the FIP0036 FilPoll result",
 	ArgsUsage: "[state root, votes]",
+	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:  "repo",
+			Value: "~/.lotus",
+		},
+	},
 	Subcommands: []*cli.Command{
 		finalResultCmd,
 	},
@@ -69,9 +75,8 @@ var finalResultCmd = &cli.Command{
 	ArgsUsage: "[state root] [height] [votes json]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 

cmd/lotus-shed/gas-estimation.go

@@ -42,9 +42,8 @@ var gasTraceCmd = &cli.Command{
 	ArgsUsage:   "[migratedStateRootCid networkVersion messageCid]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {
@@ -147,9 +146,8 @@ var replayOfflineCmd = &cli.Command{
 	ArgsUsage:   "[messageCid]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.Int64Flag{
 			Name:  "lookback-limit",

cmd/lotus-shed/import-car.go

@@ -19,13 +19,6 @@ import (
 var importCarCmd = &cli.Command{
 	Name:        "import-car",
 	Description: "Import a car file into node chain blockstore",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {
@@ -103,13 +96,6 @@ var importCarCmd = &cli.Command{
 var importObjectCmd = &cli.Command{
 	Name:  "import-obj",
 	Usage: "import a raw ipld object into your datastore",
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
 		r, err := repo.NewFS(cctx.String("repo"))
 		if err != nil {

cmd/lotus-shed/invariants.go

@@ -35,9 +35,8 @@ var invariantsCmd = &cli.Command{
 	ArgsUsage:   "[StateRootCid, height]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/keyinfo.go

@@ -146,14 +146,9 @@ var keyinfoImportCmd = &cli.Command{
    Examples
 
    env LOTUS_PATH=/var/lib/lotus lotus-shed keyinfo import libp2p-host.keyinfo`,
-	Flags: []cli.Flag{
-		&cli.StringFlag{
-			Name:    "repo",
-			Value:   "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
-		},
-	},
 	Action: func(cctx *cli.Context) error {
+		flagRepo := cctx.String("repo")
+
 		var input io.Reader
 		if cctx.NArg() == 0 {
 			input = os.Stdin
@@ -182,7 +177,7 @@ var keyinfoImportCmd = &cli.Command{
 			return err
 		}
 
-		fsrepo, err := repo.NewFS(cctx.String("repo"))
+		fsrepo, err := repo.NewFS(flagRepo)
 		if err != nil {
 			return err
 		}

cmd/lotus-shed/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	logging "github.com/ipfs/go-log/v2"
@@ -88,6 +89,19 @@ func main() {
 		Version:  build.UserVersion(),
 		Commands: local,
 		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "repo",
+				EnvVars: []string{"LOTUS_PATH"},
+				Hidden:  true,
+				Value:   "~/.lotus", // TODO: Consider XDG_DATA_HOME
+			},
+			&cli.StringFlag{
+				Name:    "miner-repo",
+				Aliases: []string{"storagerepo"},
+				EnvVars: []string{"LOTUS_MINER_PATH", "LOTUS_STORAGE_PATH"},
+				Value:   "~/.lotusminer", // TODO: Consider XDG_DATA_HOME
+				Usage:   fmt.Sprintf("Specify miner repo path. flag storagerepo and env LOTUS_STORAGE_PATH are DEPRECATION, will REMOVE SOON"),
+			},
 			&cli.StringFlag{
 				Name:  "log-level",
 				Value: "info",

cmd/lotus-shed/market.go

@@ -124,9 +124,8 @@ var marketExportDatastoreCmd = &cli.Command{
 	Description: "export markets datastore key/values to a file",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Usage: "path to the repo",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:  "backup-dir",
@@ -242,9 +241,8 @@ var marketImportDatastoreCmd = &cli.Command{
 	Description: "import markets datastore key/values from a backup file",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Usage: "path to the repo",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.StringFlag{
 			Name:     "backup-path",

cmd/lotus-shed/migrations.go

@@ -54,9 +54,8 @@ var migrationsCmd = &cli.Command{
 	ArgsUsage:   "[new network version, block to look back from]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name: "skip-pre-migration",

cmd/lotus-shed/miner-peerid.go

@@ -26,12 +26,10 @@ import (
 
 var minerPeeridCmd = &cli.Command{
 	Name:  "miner-peerid",
-	Usage: "Scrape state to find a miner based on peerid",
+	Usage: "Scrape state to find a miner based on peerid", Flags: []cli.Flag{
-	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/miner-types.go

@@ -28,12 +28,10 @@ import (
 
 var minerTypesCmd = &cli.Command{
 	Name:  "miner-types",
-	Usage: "Scrape state to report on how many miners of each WindowPoStProofType exist",
+	Usage: "Scrape state to report on how many miners of each WindowPoStProofType exist", Flags: []cli.Flag{
-	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/msig.go

@@ -43,9 +43,8 @@ var multisigGetAllCmd = &cli.Command{
 	ArgsUsage: "[state root]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {

cmd/lotus-shed/nonce-fix.go

@@ -17,6 +17,12 @@ import (
 var noncefix = &cli.Command{
 	Name: "noncefix",
 	Flags: []cli.Flag{
+		&cli.StringFlag{
+			Name:    "repo",
+			EnvVars: []string{"LOTUS_PATH"},
+			Hidden:  true,
+			Value:   "~/.lotus", // TODO: Consider XDG_DATA_HOME
+		},
 		&cli.Uint64Flag{
 			Name: "start",
 		},

cmd/lotus-shed/pruning.go

@@ -86,9 +86,8 @@ var stateTreePruneCmd = &cli.Command{
 	Description: "Deletes old state root data from local chainstore",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.Int64Flag{
 			Name:  "keep-from-lookback",

cmd/lotus-shed/splitstore.go

@@ -39,9 +39,8 @@ var splitstoreRollbackCmd = &cli.Command{
 	Description: "rollbacks a splitstore installation",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name:  "gc-coldstore",
@@ -130,9 +129,8 @@ var splitstoreClearCmd = &cli.Command{
 	Description: "clears a splitstore installation for restart from snapshot",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 		&cli.BoolFlag{
 			Name:  "keys-only",

cmd/lotus-shed/terminations.go

@@ -33,9 +33,8 @@ var terminationsCmd = &cli.Command{
 	ArgsUsage:   "[block to look back from] [lookback period (epochs)]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:    "repo",
+			Name:  "repo",
-			Value:   "~/.lotus",
+			Value: "~/.lotus",
-			EnvVars: []string{"LOTUS_PATH"},
 		},
 	},
 	Action: func(cctx *cli.Context) error {