Merge pull request #103 from hyperweb-io/fix-get-tx

fix tx response msg

Author: Zetazzz

networks/cosmos/src/query/rpc.ts

@@ -32,6 +32,7 @@ import { broadcast, createQueryRpc, getPrefix, sleep } from '@interchainjs/utils
 import { isBaseAccount } from '../utils';
 import { QueryAccountRequest, QueryAccountResponse } from '@interchainjs/cosmos-types/cosmos/auth/v1beta1/query';
 import { SimulateRequest, SimulateResponse } from '@interchainjs/cosmos-types/cosmos/tx/v1beta1/service';
+import { TxMsgData } from '@interchainjs/cosmos-types/cosmos/base/abci/v1beta1/abci';
 
 /**
  * client for cosmos rpc
@@ -173,8 +174,7 @@ export class RpcClient implements QueryClient {
     const json = await data.json();
     const tx: TxResponse = json['result'];
     if (!tx) return null;
-    const txRaw = TxRaw.decode(fromBase64(tx.tx));
-    const txBody = TxBody.decode(txRaw.bodyBytes);
+    const txMsgData = TxMsgData.decode(fromBase64(tx.tx_result.data) ?? new Uint8Array());
     return {
       height: tx.height,
       txIndex: tx.index,
@@ -183,7 +183,7 @@ export class RpcClient implements QueryClient {
       events: tx.tx_result.events,
       rawLog: tx.tx_result.log,
       tx: fromBase64(tx.tx),
-      msgResponses: txBody.messages,
+      msgResponses: txMsgData.msgResponses,
       gasUsed: BigInt(tx.tx_result.gas_used),
       gasWanted: BigInt(tx.tx_result.gas_wanted),
       data: tx.tx_result.data,
@@ -229,93 +229,92 @@ export class RpcClient implements QueryClient {
     );
 
     switch (mode) {
-    case 'broadcast_tx_async':
-      const { hash: hash1, ...rest1 } = resp as AsyncCometBroadcastResponse;
-      return {
-        hash: hash1,
-        add_tx: rest1,
-        origin: resp
-      };
-    case 'broadcast_tx_sync':
-      const { hash: hash2, ...rest2 } = resp as SyncCometBroadcastResponse;
-      return {
-        hash: hash2,
-        check_tx: rest2,
-        origin: resp
-      };
-    case 'broadcast_tx_commit':
-      if (useLegacyBroadcastTxCommit) {
-        const {
-          check_tx,
-          deliver_tx,
-          height,
-          hash: hash3,
-        } = resp as CommitCometBroadcastResponse;
-
+      case 'broadcast_tx_async':
+        const { hash: hash1, ...rest1 } = resp as AsyncCometBroadcastResponse;
+        return {
+          hash: hash1,
+          add_tx: rest1,
+          origin: resp
+        };
+      case 'broadcast_tx_sync':
+        const { hash: hash2, ...rest2 } = resp as SyncCometBroadcastResponse;
         return {
-          hash: hash3,
-          check_tx,
-          deliver_tx: { height, ...deliver_tx },
-          origin: {hash: hash3, height, ...deliver_tx }
+          hash: hash2,
+          check_tx: rest2,
+          origin: resp
         };
-      } else {
-        let timedOut = false;
-        const txPollTimeout = setTimeout(() => {
-          timedOut = true;
-        }, timeoutMs);
+      case 'broadcast_tx_commit':
+        if (useLegacyBroadcastTxCommit) {
+          const {
+            check_tx,
+            deliver_tx,
+            height,
+            hash: hash3,
+          } = resp as CommitCometBroadcastResponse;
 
-        const pollForTx = async (
-          txId: string
-        ): Promise<BroadcastResponse> => {
-          if (timedOut) {
-            throw new TimeoutError(
-              `Transaction with ID ${txId} was submitted but was not yet found on the chain. You might want to check later. There was a wait of ${
-                timeoutMs / 1000
-              } seconds.`,
-              txId
-            );
-          }
-          await sleep(pollIntervalMs);
-          const result = await this.getTx(txId);
+          return {
+            hash: hash3,
+            check_tx,
+            deliver_tx: { height, ...deliver_tx },
+            origin: { hash: hash3, height, ...deliver_tx }
+          };
+        } else {
+          let timedOut = false;
+          const txPollTimeout = setTimeout(() => {
+            timedOut = true;
+          }, timeoutMs);
 
-          return result
-            ? {
-              hash: resp.hash,
-              deliver_tx: {
-                code: result.code,
-                height: result.height.toString(),
-                txIndex: result.txIndex,
-                events: result.events,
-                rawLog: result.rawLog,
-                msgResponses: result.msgResponses,
-                gas_used: result.gasUsed.toString(),
-                gas_wanted: result.gasWanted.toString(),
-                data: result.data,
-                log: result.log,
-                info: result.info,
-              },
-              origin: result
+          const pollForTx = async (
+            txId: string
+          ): Promise<BroadcastResponse> => {
+            if (timedOut) {
+              throw new TimeoutError(
+                `Transaction with ID ${txId} was submitted but was not yet found on the chain. You might want to check later. There was a wait of ${timeoutMs / 1000
+                } seconds.`,
+                txId
+              );
             }
-            : pollForTx(txId);
-        };
+            await sleep(pollIntervalMs);
+            const result = await this.getTx(txId);
 
-        const transactionId = resp.hash.toUpperCase();
+            return result
+              ? {
+                hash: resp.hash,
+                deliver_tx: {
+                  code: result.code,
+                  height: result.height.toString(),
+                  txIndex: result.txIndex,
+                  events: result.events,
+                  rawLog: result.rawLog,
+                  msgResponses: result.msgResponses,
+                  gas_used: result.gasUsed.toString(),
+                  gas_wanted: result.gasWanted.toString(),
+                  data: result.data,
+                  log: result.log,
+                  info: result.info,
+                },
+                origin: result
+              }
+              : pollForTx(txId);
+          };
 
-        return new Promise((resolve, reject) =>
-          pollForTx(transactionId).then(
-            (value) => {
-              clearTimeout(txPollTimeout);
-              resolve(value);
-            },
-            (error) => {
-              clearTimeout(txPollTimeout);
-              reject(error);
-            }
-          )
-        );
-      }
-    default:
-      throw new Error(`Wrong method: ${mode}`);
+          const transactionId = resp.hash.toUpperCase();
+
+          return new Promise((resolve, reject) =>
+            pollForTx(transactionId).then(
+              (value) => {
+                clearTimeout(txPollTimeout);
+                resolve(value);
+              },
+              (error) => {
+                clearTimeout(txPollTimeout);
+                reject(error);
+              }
+            )
+          );
+        }
+      default:
+        throw new Error(`Wrong method: ${mode}`);
     }
   }
 }