fix: Properly parse json in the wait-tx command. (backport #20631)

CHANGELOG.md

@@ -42,6 +42,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ## Improvements
 
 * (x/authz,x/feegrant) [#20590](https://github.com/cosmos/cosmos-sdk/pull/20590) Provide updated keeper in depinject for authz and feegrant modules.
+* [#20631](https://github.com/cosmos/cosmos-sdk/pull/20631) Fix json parsing in the wait-tx command.
 
 ### Bug Fixes
 

client/rpc/tx.go

@@ -87,17 +87,31 @@
 // QueryEventForTxCmd returns a CLI command that subscribes to a WebSocket connection and waits for a transaction event with the given hash.
 func QueryEventForTxCmd() *cobra.Command {
 	cmd := &cobra.Command{
+<<<<<<< HEAD
 		Use:   "event-query-tx-for [hash]",
 		Short: "Query for a transaction by hash",
 		Long:  `Subscribes to a CometBFT WebSocket connection and waits for a transaction event with the given hash.`,
 		Args:  cobra.ExactArgs(1),
+=======
+		Use:     "wait-tx [hash]",
+		Aliases: []string{"event-query-tx-for"},
+		Short:   "Wait for a transaction to be included in a block",
+		Long:    `Subscribes to a CometBFT WebSocket connection and waits for a transaction event with the given hash.`,
+		Example: fmt.Sprintf(`By providing the transaction hash:
+$ %[1]s q wait-tx [hash]
+
+Or, by piping a "tx" command:
+$ %[1]s tx [flags] | %[1]s q wait-tx
+`, version.AppName),
+		Args: cobra.MaximumNArgs(1),
+>>>>>>> 55b00938b (fix: Properly parse json in the wait-tx command. (#20631))
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 			c, err := rpchttp.New(clientCtx.NodeURI, "/websocket")
 			if err != nil {
 				return err
 			}
 			if err := c.Start(); err != nil {
@@ -111,7 +125,7 @@
 			hash := args[0]
 			query := fmt.Sprintf("%s='%s' AND %s='%s'", tmtypes.EventTypeKey, tmtypes.EventTx, tmtypes.TxHashKey, hash)
 			const subscriber = "subscriber"
 			eventCh, err := c.Subscribe(ctx, subscriber, query)
 			if err != nil {
 				return fmt.Errorf("failed to subscribe to tx: %w", err)
 			}
@@ -138,3 +152,32 @@
 
 	return cmd
 }
+<<<<<<< HEAD
+=======
+
+func parseHashFromInput(in []byte) ([]byte, error) {
+	// The content of in is expected to be the result of a tx command which should be using GenerateOrBroadcastTxCLI.
+	// That outputs a sdk.TxResponse as either the json or yaml. As json, we can't unmarshal it back into that struct,
+	// though, because the height field ends up quoted which confuses json.Unmarshal (because it's for an int64 field).
+
+	// Try to find the txhash from json ouptut.
+	resultTx := make(map[string]json.RawMessage)
+	if err := json.Unmarshal(in, &resultTx); err == nil && len(resultTx["txhash"]) > 0 {
+		// input was JSON, return the hash
+		hash := strings.Trim(strings.TrimSpace(string(resultTx["txhash"])), `"`)
+		if len(hash) > 0 {
+			return hex.DecodeString(hash)
+		}
+	}
+
+	// Try to find the txhash from yaml output.
+	lines := strings.Split(string(in), "\n")
+	for _, line := range lines {
+		if strings.HasPrefix(line, "txhash:") {
+			hash := strings.TrimSpace(line[len("txhash:"):])
+			return hex.DecodeString(hash)
+		}
+	}
+	return nil, fmt.Errorf("txhash not found")
+}
+>>>>>>> 55b00938b (fix: Properly parse json in the wait-tx command. (#20631))