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

add an auto flag to mpool replace

Browse Source
This commit is contained in:
whyrusleeping 2020-09-08 15:47:40 -07:00
parent b1d251e950
commit 8c0994e290
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cli/mpool.go
View File

@ -12,6 +12,7 @@ import (
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
lapi "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
) )
@ -293,6 +294,10 @@ var mpoolReplaceCmd = &cli.Command{
Name: "gas-limit", Name: "gas-limit",
Usage: "gas price for new message", Usage: "gas price for new message",
}, },
&cli.BoolFlag{
Name: "auto",
Usage: "automatically reprice the specified message",
},
}, },
ArgsUsage: "[from] [nonce]", ArgsUsage: "[from] [nonce]",
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
@ -342,15 +347,27 @@ var mpoolReplaceCmd = &cli.Command{
msg := found.Message msg := found.Message
msg.GasLimit = cctx.Int64("gas-limit") if cctx.Bool("auto") {
msg.GasPremium, err = types.BigFromString(cctx.String("gas-premium")) // msg.GasLimit = 0 // TODO: need to fix the way we estimate gas limits to account for the messages already being in the mempool
if err != nil { msg.GasFeeCap = abi.NewTokenAmount(0)
return fmt.Errorf("parsing gas-premium: %w", err) msg.GasPremium = abi.NewTokenAmount(0)
} retm, err := api.GasEstimateMessageGas(ctx, &msg, &lapi.MessageSendSpec{}, types.EmptyTSK)
// TODO: estimate fee cap here if err != nil {
msg.GasFeeCap, err = types.BigFromString(cctx.String("gas-feecap")) return fmt.Errorf("failed to estimate gas values: %w", err)
if err != nil { }
return fmt.Errorf("parsing gas-feecap: %w", err) msg.GasFeeCap = retm.GasFeeCap
msg.GasPremium = retm.GasPremium
} else {
msg.GasLimit = cctx.Int64("gas-limit")
msg.GasPremium, err = types.BigFromString(cctx.String("gas-premium"))
if err != nil {
return fmt.Errorf("parsing gas-premium: %w", err)
}
// TODO: estimate fee cap here
msg.GasFeeCap, err = types.BigFromString(cctx.String("gas-feecap"))
if err != nil {
return fmt.Errorf("parsing gas-feecap: %w", err)
}
} }
smsg, err := api.WalletSignMessage(ctx, msg.From, &msg) smsg, err := api.WalletSignMessage(ctx, msg.From, &msg)