-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge PR #5427: Remove code duplication in x/auth/client/cli
- Loading branch information
1 parent
b314b85
commit 3c82b66
Showing
3 changed files
with
32 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,98 +1,54 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/base64" | ||
| "encoding/hex" | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| "github.com/tendermint/go-amino" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/client/context" | ||
| "github.com/cosmos/cosmos-sdk/client/flags" | ||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| "github.com/cosmos/cosmos-sdk/version" | ||
| "github.com/cosmos/cosmos-sdk/x/auth/types" | ||
| authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" | ||
| ) | ||
|
|
||
| const flagHex = "hex" | ||
|
|
||
| // GetDecodeCommand returns the decode command to take Amino-serialized bytes | ||
| // and turn it into a JSONified transaction. | ||
| func GetDecodeCommand(codec *amino.Codec) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "decode [amino-byte-string]", | ||
| Short: "Decode an amino-encoded transaction string", | ||
| Short: "Decode an amino-encoded transaction string.", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) (err error) { | ||
| cliCtx := context.NewCLIContext().WithCodec(codec) | ||
|
|
||
| txBytes, err := base64.StdEncoding.DecodeString(args[0]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var stdTx authtypes.StdTx | ||
| err = cliCtx.Codec.UnmarshalBinaryLengthPrefixed(txBytes, &stdTx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return cliCtx.PrintOutput(stdTx) | ||
| }, | ||
| RunE: runDecodeTxString(codec), | ||
| } | ||
|
|
||
| cmd.Flags().BoolP(flagHex, "x", false, "Treat input as hexadecimal instead of base64") | ||
| return flags.PostCommands(cmd)[0] | ||
| } | ||
|
|
||
| // GetDecodeTxCmd - returns the command to decode a tx from hex or base64 | ||
| func GetDecodeTxCmd(cdc *codec.Codec) *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "decode-tx [tx]", | ||
| Short: "Decode a tx from hex or base64", | ||
| Long: fmt.Sprintf(`Decode a tx from hex, base64. | ||
| Example: | ||
| $ %s tx decode-tx TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz | ||
| `, version.ClientName), | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
|
|
||
| txString := args[0] | ||
|
|
||
| // try hex, then base64 | ||
| txBytes, err := hex.DecodeString(txString) | ||
| if err != nil { | ||
| var err2 error | ||
| txBytes, err2 = base64.StdEncoding.DecodeString(txString) | ||
| if err2 != nil { | ||
| return fmt.Errorf(`expected hex or base64. Got errors: | ||
| hex: %v, | ||
| base64: %v | ||
| `, err, err2) | ||
| } | ||
| } | ||
|
|
||
| var tx = types.StdTx{} | ||
|
|
||
| err = cdc.UnmarshalBinaryLengthPrefixed(txBytes, &tx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| bz, err := cdc.MarshalJSON(tx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| buf := bytes.NewBuffer([]byte{}) | ||
| if err = json.Indent(buf, bz, "", " "); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fmt.Println(buf.String()) | ||
| return nil | ||
| }, | ||
| func runDecodeTxString(codec *amino.Codec) func(cmd *cobra.Command, args []string) (err error) { | ||
| return func(cmd *cobra.Command, args []string) (err error) { | ||
| cliCtx := context.NewCLIContext().WithCodec(codec).WithOutput(cmd.OutOrStdout()) | ||
| var txBytes []byte | ||
|
|
||
| if viper.GetBool(flagHex) { | ||
| txBytes, err = hex.DecodeString(args[0]) | ||
| } else { | ||
| txBytes, err = base64.StdEncoding.DecodeString(args[0]) | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var stdTx authtypes.StdTx | ||
| err = cliCtx.Codec.UnmarshalBinaryLengthPrefixed(txBytes, &stdTx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return cliCtx.PrintOutput(stdTx) | ||
| } | ||
| } |