cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Rename to import-snapshot, require more than finality for state export

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Jakub Sztandera 2020-09-02 15:47:18 +02:00 committed by Łukasz Magiera
parent 528e39fcb3
commit 59f765f7be
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/chain.go
View File

@ -876,7 +876,10 @@ var chainExportCmd = &cli.Command{
return fmt.Errorf("must specify filename to export chain to") return fmt.Errorf("must specify filename to export chain to")
} }
rsrs := cctx.Int64("recent-stateroots") rsrs := abi.ChainEpoch(cctx.Int64("recent-stateroots"))
if cctx.IsSet("recent-stateroots") && rsrs < build.Finality {
return fmt.Errorf("\"recent-stateroots\" has to be greater than %d", build.Finality)
}
fi, err := os.Create(cctx.Args().First()) fi, err := os.Create(cctx.Args().First())
if err != nil { if err != nil {
@ -894,7 +897,7 @@ var chainExportCmd = &cli.Command{
return err return err
} }
stream, err := api.ChainExport(ctx, abi.ChainEpoch(rsrs), ts.Key()) stream, err := api.ChainExport(ctx, rsrs, ts.Key())
if err != nil { if err != nil {
return err return err
} }

8
cmd/lotus/daemon.go
View File

@ -100,10 +100,10 @@ var DaemonCmd = &cli.Command{
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "import-chain", Name: "import-chain",
Usage: "on first run, load chain from given file", Usage: "on first run, load chain from given file and validate",
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "snapshot", Name: "import-snapshot",
Usage: "import chain state from a given chain export file", Usage: "import chain state from a given chain export file",
}, },
&cli.BoolFlag{ &cli.BoolFlag{
@ -195,10 +195,10 @@ var DaemonCmd = &cli.Command{
} }
chainfile := cctx.String("import-chain") chainfile := cctx.String("import-chain")
snapshot := cctx.String("snapshot") snapshot := cctx.String("import-snapshot")
if chainfile != "" || snapshot != "" { if chainfile != "" || snapshot != "" {
if chainfile != "" && snapshot != "" { if chainfile != "" && snapshot != "" {
return fmt.Errorf("cannot specify both 'snapshot' and 'import-chain'") return fmt.Errorf("cannot specify both 'import-snapshot' and 'import-chain'")
} }
var issnapshot bool var issnapshot bool
if chainfile == "" { if chainfile == "" {