Merge pull request #6927 from filecoin-project/wnezhenxiang/patch-3-fixed

PR #5109 + suggested fix
This commit is contained in:
ZenGround0 2021-07-29 00:53:40 -04:00 committed by GitHub
commit ee59479e25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -381,8 +381,8 @@ var MpoolReplaceCmd = &cli.Command{
Usage: "automatically reprice the specified message",
},
&cli.StringFlag{
Name: "max-fee",
Usage: "Spend up to X attoFIL for this message (applicable for auto mode)",
Name: "fee-limit",
Usage: "Spend up to X FIL for this message in units of FIL. Previously when flag was `max-fee` units were in attoFIL. Applicable for auto mode",
},
},
ArgsUsage: "<from nonce> | <message-cid>",
@ -457,13 +457,13 @@ var MpoolReplaceCmd = &cli.Command{
minRBF := messagepool.ComputeMinRBF(msg.GasPremium)
var mss *lapi.MessageSendSpec
if cctx.IsSet("max-fee") {
maxFee, err := types.BigFromString(cctx.String("max-fee"))
if cctx.IsSet("fee-limit") {
maxFee, err := types.ParseFIL(cctx.String("fee-limit"))
if err != nil {
return fmt.Errorf("parsing max-spend: %w", err)
}
mss = &lapi.MessageSendSpec{
MaxFee: maxFee,
MaxFee: abi.TokenAmount(maxFee),
}
}

View File

@ -1531,7 +1531,7 @@ OPTIONS:
--gas-premium value gas price for new message (pay to miner, attoFIL/GasUnit)
--gas-limit value gas limit for new message (GasUnit) (default: 0)
--auto automatically reprice the specified message (default: false)
--max-fee value Spend up to X attoFIL for this message (applicable for auto mode)
--fee-limit max-fee Spend up to X FIL for this message in units of FIL. Previously when flag was max-fee units were in attoFIL. Applicable for auto mode
--help, -h show help (default: false)
```