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

Merge pull request #9364 from filecoin-project/asr/miner-init-fix

Browse Source 
fix: miner: init miner's with 32GiB sectors by default
This commit is contained in:
Aayush Rajasekaran 2022-09-23 13:07:21 -04:00 committed by GitHub
commit ba89d2ccac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/lotus-miner/init.go
View File

@ -90,7 +90,6 @@ var initCmd = &cli.Command{
&cli.StringFlag{ &cli.StringFlag{
Name: "sector-size", Name: "sector-size",
Usage: "specify sector size to use", Usage: "specify sector size to use",
Value: units.BytesSize(float64(abi.SectorSize(2048))),
}, },
&cli.StringSliceFlag{ &cli.StringSliceFlag{
Name: "pre-sealed-sectors", Name: "pre-sealed-sectors",
@ -129,11 +128,18 @@ var initCmd = &cli.Command{
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
log.Info("Initializing lotus miner") log.Info("Initializing lotus miner")
sectorSizeInt, err := units.RAMInBytes(cctx.String("sector-size")) ssize, err := abi.RegisteredSealProof_StackedDrg32GiBV1.SectorSize()
if err != nil { if err != nil {
return err return xerrors.Errorf("failed to calculate default sector size: %w", err)
}
if cctx.IsSet("sector-size") {
sectorSizeInt, err := units.RAMInBytes(cctx.String("sector-size"))
if err != nil {
return err
}
ssize = abi.SectorSize(sectorSizeInt)
} }
ssize := abi.SectorSize(sectorSizeInt)
gasPrice, err := types.BigFromString(cctx.String("gas-premium")) gasPrice, err := types.BigFromString(cctx.String("gas-premium"))
if err != nil { if err != nil {
@ -541,7 +547,7 @@ func storageMinerInit(ctx context.Context, cctx *cli.Context, api v1api.FullNode
addr = a addr = a
} else { } else {
a, err := createStorageMiner(ctx, api, peerid, gasPrice, cctx) a, err := createStorageMiner(ctx, api, ssize, peerid, gasPrice, cctx)
if err != nil { if err != nil {
return xerrors.Errorf("creating miner failed: %w", err) return xerrors.Errorf("creating miner failed: %w", err)
} }
@ -621,7 +627,7 @@ func configureStorageMiner(ctx context.Context, api v1api.FullNode, addr address
return nil return nil
} }
func createStorageMiner(ctx context.Context, api v1api.FullNode, peerid peer.ID, gasPrice types.BigInt, cctx *cli.Context) (address.Address, error) { func createStorageMiner(ctx context.Context, api v1api.FullNode, ssize abi.SectorSize, peerid peer.ID, gasPrice types.BigInt, cctx *cli.Context) (address.Address, error) {
var err error var err error
var owner address.Address var owner address.Address
if cctx.String("owner") != "" { if cctx.String("owner") != "" {
@ -633,11 +639,6 @@ func createStorageMiner(ctx context.Context, api v1api.FullNode, peerid peer.ID,
return address.Undef, err return address.Undef, err
} }
ssize, err := units.RAMInBytes(cctx.String("sector-size"))
if err != nil {
return address.Undef, fmt.Errorf("failed to parse sector size: %w", err)
}
worker := owner worker := owner
if cctx.String("worker") != "" { if cctx.String("worker") != "" {
worker, err = address.NewFromString(cctx.String("worker")) worker, err = address.NewFromString(cctx.String("worker"))
@ -712,7 +713,7 @@ func createStorageMiner(ctx context.Context, api v1api.FullNode, peerid peer.ID,
} }
// Note: the correct thing to do would be to call SealProofTypeFromSectorSize if actors version is v3 or later, but this still works // Note: the correct thing to do would be to call SealProofTypeFromSectorSize if actors version is v3 or later, but this still works
spt, err := miner.WindowPoStProofTypeFromSectorSize(abi.SectorSize(ssize)) spt, err := miner.WindowPoStProofTypeFromSectorSize(ssize)
if err != nil { if err != nil {
return address.Undef, xerrors.Errorf("getting post proof type: %w", err) return address.Undef, xerrors.Errorf("getting post proof type: %w", err)
} }

2
documentation/en/cli-lotus-miner.md
View File

@ -71,7 +71,7 @@ OPTIONS:
--create-worker-key create separate worker key (default: false) --create-worker-key create separate worker key (default: false)
--worker value, -w value worker key to use (overrides --create-worker-key) --worker value, -w value worker key to use (overrides --create-worker-key)
--owner value, -o value owner key to use --owner value, -o value owner key to use
--sector-size value specify sector size to use (default: "2KiB") --sector-size value specify sector size to use
--pre-sealed-sectors value specify set of presealed sectors for starting as a genesis miner (accepts multiple inputs) --pre-sealed-sectors value specify set of presealed sectors for starting as a genesis miner (accepts multiple inputs)
--pre-sealed-metadata value specify the metadata file for the presealed sectors --pre-sealed-metadata value specify the metadata file for the presealed sectors
--nosync don't check full-node sync status (default: false) --nosync don't check full-node sync status (default: false)