Merge tag 'v0.20.0' into murali/update-fork

x/evm/client/cli/query.go

@@ -1,13 +1,21 @@
 package cli
 
 import (
+<<<<<<< HEAD
 	rpctypes "github.com/cerc-io/laconicd/rpc/types"
+=======
+	rpctypes "github.com/cerc-io/laconicd/rpc/types"
+>>>>>>> v0.20.0
 	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 
+<<<<<<< HEAD
 	"github.com/cerc-io/laconicd/x/evm/types"
+=======
+	"github.com/cerc-io/laconicd/x/evm/types"
+>>>>>>> v0.20.0
 )
 
 // GetQueryCmd returns the parent command for all x/bank CLi query commands.
@@ -31,7 +39,7 @@ func GetQueryCmd() *cobra.Command {
 // GetStorageCmd queries a key in an accounts storage
 func GetStorageCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "storage [address] [key]",
+		Use:   "storage ADDRESS KEY",
 		Short: "Gets storage for an account with a given key and height",
 		Long:  "Gets storage for an account with a given key and height. If the height is not provided, it will use the latest height from context.", //nolint:lll
 		Args:  cobra.ExactArgs(2),
@@ -71,7 +79,7 @@ func GetStorageCmd() *cobra.Command {
 // GetCodeCmd queries the code field of a given address
 func GetCodeCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "code [address]",
+		Use:   "code ADDRESS",
 		Short: "Gets code from an account",
 		Long:  "Gets code from an account. If the height is not provided, it will use the latest height from context.",
 		Args:  cobra.ExactArgs(1),

x/evm/client/cli/tx.go

@@ -12,8 +12,13 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
+<<<<<<< HEAD
 	rpctypes "github.com/cerc-io/laconicd/rpc/types"
 	"github.com/cerc-io/laconicd/x/evm/types"
+=======
+	rpctypes "github.com/cerc-io/laconicd/rpc/types"
+	"github.com/cerc-io/laconicd/x/evm/types"
+>>>>>>> v0.20.0
 )
 
 // GetTxCmd returns the transaction commands for this module
@@ -32,7 +37,7 @@ func GetTxCmd() *cobra.Command {
 // NewRawTxCmd command build cosmos transaction from raw ethereum transaction
 func NewRawTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "raw [tx-hex]",
+		Use:   "raw TX_HEX",
 		Short: "Build cosmos transaction from raw ethereum transaction",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {