Merge branch 'master' into feat/fvm

cmd/lotus-shed/diff.go

@@ -35,7 +35,7 @@ var diffStateTrees = &cli.Command{
 			return xerrors.Errorf("expected two state-tree roots")
 		}
 
-		argA := cctx.Args().Get(1)
+		argA := cctx.Args().Get(0)
 		rootA, err := cid.Parse(argA)
 		if err != nil {
 			return xerrors.Errorf("first state-tree root (%q) is not a CID: %w", argA, err)

cmd/lotus/daemon.go

@@ -119,9 +119,8 @@ var DaemonCmd = &cli.Command{
 			Usage: "halt the process after importing chain from file",
 		},
 		&cli.BoolFlag{
-			Name:   "lite",
-			Usage:  "start lotus in lite mode",
-			Hidden: true,
+			Name:  "lite",
+			Usage: "start lotus in lite mode",
 		},
 		&cli.StringFlag{
 			Name:  "pprof",