Add the option of emitting amino encoded json from the CLI

x/auth/client/cli/tx_multisign.go

@@ -51,6 +51,7 @@ recommended to set such parameters manually.
 
 	cmd.Flags().Bool(flagSigOnly, false, "Print only the generated signature, then exit")
 	cmd.Flags().String(flags.FlagOutputDocument, "", "The document will be written to the given file instead of STDOUT")
+	cmd.Flags().Bool(flagAmino, false, "Generate Amino encoded JSON suitable for submiting to the txs REST endpoint")
 	flags.AddTxFlagsToCmd(cmd)
 	cmd.Flags().String(flags.FlagChainID, "", "network chain ID")
 
@@ -146,11 +147,32 @@ func makeMultiSignCmd() func(cmd *cobra.Command, args []string) error {
 
 		sigOnly, _ := cmd.Flags().GetBool(flagSigOnly)
 
-		json, err := marshalSignatureJSON(txCfg, txBuilder, sigOnly)
+		aminoJSON, err := cmd.Flags().GetBool(flagAmino)
+
 		if err != nil {
 			return err
 		}
 
+		var json []byte
+
+		if aminoJSON {
+			stdTx, err := tx.ConvertTxToStdTx(clientCtx.LegacyAmino, txBuilder.GetTx())
+			if err != nil {
+				return err
+			}
+
+			json, err = clientCtx.LegacyAmino.MarshalJSON(stdTx)
+			if err != nil {
+				return err
+			}
+
+		} else {
+			json, err = marshalSignatureJSON(txCfg, txBuilder, sigOnly)
+			if err != nil {
+				return err
+			}
+		}
+
 		outputDoc, _ := cmd.Flags().GetString(flags.FlagOutputDocument)
 		if outputDoc == "" {
 			cmd.Printf("%s\n", json)

x/auth/client/cli/tx_sign.go

@@ -18,6 +18,7 @@ const (
 	flagMultisig = "multisig"
 	flagAppend   = "append"
 	flagSigOnly  = "signature-only"
+	flagAmino    = "amino"
 )
 
 // GetSignBatchCommand returns the transaction sign-batch command.
@@ -187,6 +188,7 @@ be generated via the 'multisign' command.
 	cmd.Flags().Bool(flagSigOnly, false, "Print only the generated signature, then exit")
 	cmd.Flags().String(flags.FlagOutputDocument, "", "The document will be written to the given file instead of STDOUT")
 	cmd.Flags().String(flags.FlagChainID, "", "The network chain ID")
+	cmd.Flags().Bool(flagAmino, false, "Generate Amino encoded JSON suitable for submiting to the txs REST endpoint")
 	cmd.MarkFlagRequired(flags.FlagFrom)
 	flags.AddTxFlagsToCmd(cmd)
 
@@ -257,11 +259,32 @@ func makeSignCmd() func(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		json, err := marshalSignatureJSON(txCfg, txBuilder, generateSignatureOnly)
+		aminoJSON, err := cmd.Flags().GetBool(flagAmino)
+
 		if err != nil {
 			return err
 		}
 
+		var json []byte
+
+		if aminoJSON {
+			stdTx, err := tx.ConvertTxToStdTx(clientCtx.LegacyAmino, txBuilder.GetTx())
+			if err != nil {
+				return err
+			}
+
+			json, err = clientCtx.LegacyAmino.MarshalJSON(stdTx)
+			if err != nil {
+				return err
+			}
+
+		} else {
+			json, err = marshalSignatureJSON(txCfg, txBuilder, generateSignatureOnly)
+			if err != nil {
+				return err
+			}
+		}
+
 		outputDoc, _ := cmd.Flags().GetString(flags.FlagOutputDocument)
 		if outputDoc == "" {
 			cmd.Printf("%s\n", json)