cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Problem: feemarket's query cli has redundant height parameter (#1230)

Browse Source
This commit is contained in:
yihuang 2022-08-10 14:51:39 +08:00 committed by GitHub
parent e70d8fcb56
commit b3242ea982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -55,6 +55,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (feemarket) [\#1165](https://github.com/evmos/ethermint/pull/1165) Add hint in specs about different gas terminology for gas in Cosmos and Ethereum. * (feemarket) [\#1165](https://github.com/evmos/ethermint/pull/1165) Add hint in specs about different gas terminology for gas in Cosmos and Ethereum.
* (cli) [#1226](https://github.com/evmos/ethermint/pull/1226) Add custom app db backend flag. * (cli) [#1226](https://github.com/evmos/ethermint/pull/1226) Add custom app db backend flag.
* (cli) [#1230](https://github.com/evmos/ethermint/pull/1230) Remove redundant positional height parameter from feemarket's query cli.
### Bug Fixes ### Bug Fixes

41
x/feemarket/client/cli/query.go
View File

@ -1,16 +1,10 @@
package cli package cli
import ( import (
"context"
"fmt"
"strconv"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"google.golang.org/grpc/metadata"
"github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/flags"
grpctypes "github.com/cosmos/cosmos-sdk/types/grpc"
"github.com/evmos/ethermint/x/feemarket/types" "github.com/evmos/ethermint/x/feemarket/types"
) )
@ -36,27 +30,20 @@ func GetQueryCmd() *cobra.Command {
// GetBlockGasCmd queries the gas used in a block // GetBlockGasCmd queries the gas used in a block
func GetBlockGasCmd() *cobra.Command { func GetBlockGasCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "block-gas [height]", Use: "block-gas",
Short: "Get the block gas used at a given block height", Short: "Get the block gas used at a given block height",
Long: `Get the block gas used at a given block height. Long: `Get the block gas used at a given block height.
If the height is not provided, it will use the latest height from context`, If the height is not provided, it will use the latest height from context`,
Args: cobra.RangeArgs(0, 1), Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientQueryContext(cmd) clientCtx, err := client.GetClientQueryContext(cmd)
if err != nil { if err != nil {
return err return err
} }
ctx := cmd.Context()
if len(args) == 1 {
ctx, err = getContextHeight(ctx, args[0])
if err != nil {
return err
}
}
queryClient := types.NewQueryClient(clientCtx) queryClient := types.NewQueryClient(clientCtx)
ctx := cmd.Context()
res, err := queryClient.BlockGas(ctx, &types.QueryBlockGasRequest{}) res, err := queryClient.BlockGas(ctx, &types.QueryBlockGasRequest{})
if err != nil { if err != nil {
return err return err
@ -101,27 +88,20 @@ func GetParamsCmd() *cobra.Command {
// GetBaseFeeCmd queries the base fee at a given height // GetBaseFeeCmd queries the base fee at a given height
func GetBaseFeeCmd() *cobra.Command { func GetBaseFeeCmd() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "base-fee [height]", Use: "base-fee",
Short: "Get the base fee amount at a given block height", Short: "Get the base fee amount at a given block height",
Long: `Get the base fee amount at a given block height. Long: `Get the base fee amount at a given block height.
If the height is not provided, it will use the latest height from context.`, If the height is not provided, it will use the latest height from context.`,
Args: cobra.RangeArgs(0, 1), Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientQueryContext(cmd) clientCtx, err := client.GetClientQueryContext(cmd)
if err != nil { if err != nil {
return err return err
} }
ctx := cmd.Context()
if len(args) == 1 {
ctx, err = getContextHeight(ctx, args[0])
if err != nil {
return err
}
}
queryClient := types.NewQueryClient(clientCtx) queryClient := types.NewQueryClient(clientCtx)
ctx := cmd.Context()
res, err := queryClient.BaseFee(ctx, &types.QueryBaseFeeRequest{}) res, err := queryClient.BaseFee(ctx, &types.QueryBaseFeeRequest{})
if err != nil { if err != nil {
return err return err
@ -134,12 +114,3 @@ If the height is not provided, it will use the latest height from context.`,
flags.AddQueryFlagsToCmd(cmd) flags.AddQueryFlagsToCmd(cmd)
return cmd return cmd
} }
func getContextHeight(ctx context.Context, height string) (context.Context, error) {
_, err := strconv.ParseInt(height, 10, 64)
if err != nil {
return ctx, fmt.Errorf("invalid height: %w", err)
}
return metadata.AppendToOutgoingContext(ctx, grpctypes.GRPCBlockHeightHeader, height), nil
}