From 55b00938b7114d5ee31b06fc4e0531675b8e9fab Mon Sep 17 00:00:00 2001
From: Daniel Wedul <github@wedul.com>
Date: Thu, 13 Jun 2024 08:13:44 -0600
Subject: [PATCH] fix: Properly parse json in the wait-tx command. (#20631)

---
 CHANGELOG.md     |  1 +
 client/rpc/tx.go | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c6f600c6695..d63f4ec8fca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -115,6 +115,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (server) [#18994](https://github.com/cosmos/cosmos-sdk/pull/18994) Update server context directly rather than a reference to a sub-object
 * [#19833](https://github.com/cosmos/cosmos-sdk/pull/19833) Fix some places in which we call Remove inside a Walk.
 * [#19851](https://github.com/cosmos/cosmos-sdk/pull/19851) Fix some places in which we call Remove inside a Walk (x/staking and x/gov).
+* [#20631](https://github.com/cosmos/cosmos-sdk/pull/20631) Fix json parsing in the wait-tx command.
 
 ### API Breaking Changes
 
diff --git a/client/rpc/tx.go b/client/rpc/tx.go
index 102d70ae3d6d..9bdce23bfbda 100644
--- a/client/rpc/tx.go
+++ b/client/rpc/tx.go
@@ -102,10 +102,10 @@ func WaitTxCmd() *cobra.Command {
 		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]sd q wait-tx [hash]
+$ %[1]s q wait-tx [hash]
 
 Or, by piping a "tx" command:
-$ %[1]sd tx [flags] | %[1]sd q wait-tx
+$ %[1]s tx [flags] | %[1]s q wait-tx
 `, version.AppName),
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -200,13 +200,21 @@ $ %[1]sd tx [flags] | %[1]sd q wait-tx
 }
 
 func parseHashFromInput(in []byte) ([]byte, error) {
-	var resultTx coretypes.ResultTx
-	if err := json.Unmarshal(in, &resultTx); err == nil {
+	// 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
-		return resultTx.Hash, nil
+		hash := strings.Trim(strings.TrimSpace(string(resultTx["txhash"])), `"`)
+		if len(hash) > 0 {
+			return hex.DecodeString(hash)
+		}
 	}
 
-	// try to parse the hash from the output of a tx command
+	// Try to find the txhash from yaml output.
 	lines := strings.Split(string(in), "\n")
 	for _, line := range lines {
 		if strings.HasPrefix(line, "txhash:") {