Merge pull request #736 from filecoin-project/feat/params-v20

Params v20

cmd/lotus-bench/main.go

@@ -113,7 +113,7 @@ func main() {
 				}
 			}
 
-			if err := build.GetParams(true, false); err != nil {
+			if err := build.GetParams(sectorSize); err != nil {
 				return xerrors.Errorf("getting params: %w", err)
 			}
 			sb, err := sectorbuilder.New(cfg, mds)

cmd/lotus-seed/seed/seed.go

@@ -48,7 +48,7 @@ func PreSeal(maddr address.Address, ssize uint64, sectors int, sbroot string, pr
 		return nil, err
 	}
 
-	if err := build.GetParams(true, false); err != nil {
+	if err := build.GetParams(ssize); err != nil {
 		return nil, xerrors.Errorf("getting params: %w", err)
 	}
 

cmd/lotus-storage-miner/init.go

@@ -79,8 +79,10 @@ var initCmd = &cli.Command{
 	Action: func(cctx *cli.Context) error {
 		log.Info("Initializing lotus storage miner")
 
+		ssize := cctx.Uint64("sector-size")
+
 		log.Info("Checking proof parameters")
-		if err := build.GetParams(true, false); err != nil {
+		if err := build.GetParams(ssize); err != nil {
 			return xerrors.Errorf("fetching proof parameters: %w", err)
 		}
 
@@ -156,7 +158,7 @@ var initCmd = &cli.Command{
 			}
 
 			oldsb, err := sectorbuilder.New(&sectorbuilder.Config{
-				SectorSize:    1024,
+				SectorSize:    ssize,
 				WorkerThreads: 2,
 				SealedDir:     filepath.Join(pssb, "sealed"),
 				CacheDir:      filepath.Join(pssb, "cache"),
@@ -168,7 +170,7 @@ var initCmd = &cli.Command{
 			}
 
 			nsb, err := sectorbuilder.New(&sectorbuilder.Config{
-				SectorSize:    1024,
+				SectorSize:    ssize,
 				WorkerThreads: 2,
 				SealedDir:     filepath.Join(lr.Path(), "sealed"),
 				CacheDir:      filepath.Join(lr.Path(), "cache"),

cmd/lotus-storage-miner/run.go

@@ -45,10 +45,6 @@ var runCmd = &cli.Command{
 		},
 	},
 	Action: func(cctx *cli.Context) error {
-		if err := build.GetParams(true, false); err != nil {
-			return xerrors.Errorf("fetching proof parameters: %w", err)
-		}
-
 		if !cctx.Bool("enable-gpu-proving") {
 			os.Setenv("BELLMAN_NO_GPU", "true")
 		}

cmd/lotus/daemon.go

@@ -63,7 +63,7 @@ var DaemonCmd = &cli.Command{
 			return xerrors.Errorf("repo init error: %w", err)
 		}
 
-		if err := build.GetParams(false, false); err != nil {
+		if err := build.GetParams(0); err != nil {
 			return xerrors.Errorf("fetching proof parameters: %w", err)
 		}