From 6d10c74c586441ffa7689c455739a706ef105efb Mon Sep 17 00:00:00 2001 From: Daniel Wedul Date: Tue, 11 Jun 2024 15:53:11 -0600 Subject: [PATCH] Fix the wait-tx command to properly parse the hash out of json. --- client/rpc/tx.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/client/rpc/tx.go b/client/rpc/tx.go index 94e9c5134254..9bdce23bfbda 100644 --- a/client/rpc/tx.go +++ b/client/rpc/tx.go @@ -200,13 +200,21 @@ $ %[1]s tx [flags] | %[1]s 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:") {