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

Use max-fee instead of gas-feecap

Browse Source
This commit is contained in:
He Weidong 2021-04-25 15:28:08 +08:00
parent e09cdc45a7
commit 7f6c942b81
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/lotus-miner/sectors.go
View File

@ -438,7 +438,7 @@ var sectorsCheckExpireCmd = &cli.Command{
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
api, nCloser, err := lcli.GetFullNodeAPI(cctx) fullApi, nCloser, err := lcli.GetFullNodeAPI(cctx)
if err != nil { if err != nil {
return err return err
} }
@ -451,18 +451,18 @@ var sectorsCheckExpireCmd = &cli.Command{
return err return err
} }
head, err := api.ChainHead(ctx) head, err := fullApi.ChainHead(ctx)
if err != nil { if err != nil {
return err return err
} }
currEpoch := head.Height() currEpoch := head.Height()
nv, err := api.StateNetworkVersion(ctx, types.EmptyTSK) nv, err := fullApi.StateNetworkVersion(ctx, types.EmptyTSK)
if err != nil { if err != nil {
return err return err
} }
sectors, err := api.StateMinerActiveSectors(ctx, maddr, types.EmptyTSK) sectors, err := fullApi.StateMinerActiveSectors(ctx, maddr, types.EmptyTSK)
n := 0 n := 0
for _, s := range sectors { for _, s := range sectors {
@ -613,18 +613,20 @@ var sectorsRenewCmd = &cli.Command{
Usage: "pass this flag to really renew sectors, otherwise will only print out json representation of parameters", Usage: "pass this flag to really renew sectors, otherwise will only print out json representation of parameters",
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "gas-feecap", Name: "max-fee",
Usage: "pass this flag to avoid message congestion", Usage: "use up to this amount of attoFIL for one message. pass this flag to avoid message congestion.",
Value: "0", Value: "0",
}, },
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
gfc, err := types.BigFromString(cctx.String("gas-feecap")) mf, err := types.BigFromString(cctx.String("max-fee"))
if err != nil { if err != nil {
return err return err
} }
api, nCloser, err := lcli.GetFullNodeAPI(cctx) spec := &api.MessageSendSpec{MaxFee: mf}
fullApi, nCloser, err := lcli.GetFullNodeAPI(cctx)
if err != nil { if err != nil {
return err return err
} }
@ -637,18 +639,18 @@ var sectorsRenewCmd = &cli.Command{
return err return err
} }
head, err := api.ChainHead(ctx) head, err := fullApi.ChainHead(ctx)
if err != nil { if err != nil {
return err return err
} }
currEpoch := head.Height() currEpoch := head.Height()
nv, err := api.StateNetworkVersion(ctx, types.EmptyTSK) nv, err := fullApi.StateNetworkVersion(ctx, types.EmptyTSK)
if err != nil { if err != nil {
return err return err
} }
activeSet, err := api.StateMinerActiveSectors(ctx, maddr, types.EmptyTSK) activeSet, err := fullApi.StateMinerActiveSectors(ctx, maddr, types.EmptyTSK)
if err != nil { if err != nil {
return err return err
} }
@ -658,12 +660,12 @@ var sectorsRenewCmd = &cli.Command{
activeSectorsInfo[info.SectorNumber] = info activeSectorsInfo[info.SectorNumber] = info
} }
mact, err := api.StateGetActor(ctx, maddr, types.EmptyTSK) mact, err := fullApi.StateGetActor(ctx, maddr, types.EmptyTSK)
if err != nil { if err != nil {
return err return err
} }
tbs := blockstore.NewTieredBstore(blockstore.NewAPIBlockstore(api), blockstore.NewMemory()) tbs := blockstore.NewTieredBstore(blockstore.NewAPIBlockstore(fullApi), blockstore.NewMemory())
mas, err := miner.Load(adt.WrapStore(ctx, cbor.NewCborStore(tbs)), mact) mas, err := miner.Load(adt.WrapStore(ctx, cbor.NewCborStore(tbs)), mact)
if err != nil { if err != nil {
return err return err
@ -818,7 +820,7 @@ var sectorsRenewCmd = &cli.Command{
return nil return nil
} }
mi, err := api.StateMinerInfo(ctx, maddr, types.EmptyTSK) mi, err := fullApi.StateMinerInfo(ctx, maddr, types.EmptyTSK)
if err != nil { if err != nil {
return xerrors.Errorf("getting miner info: %w", err) return xerrors.Errorf("getting miner info: %w", err)
} }
@ -858,14 +860,13 @@ var sectorsRenewCmd = &cli.Command{
return xerrors.Errorf("serializing params: %w", err) return xerrors.Errorf("serializing params: %w", err)
} }
smsg, err := api.MpoolPushMessage(ctx, &types.Message{ smsg, err := fullApi.MpoolPushMessage(ctx, &types.Message{
From: mi.Worker, From: mi.Worker,
To: maddr, To: maddr,
Method: miner.Methods.ExtendSectorExpiration, Method: miner.Methods.ExtendSectorExpiration,
Value: big.Zero(), Value: big.Zero(),
GasFeeCap: gfc,
Params: sp, Params: sp,
}, nil) }, spec)
if err != nil { if err != nil {
return xerrors.Errorf("mpool push message: %w", err) return xerrors.Errorf("mpool push message: %w", err)
} }