@xchainjs/xchain-thorchain 0.27.7 → 0.27.9

package/lib/client.d.ts

@@ -167,6 +167,12 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
      * @returns {Tx} The transaction details of the given transaction id.
      */
     getTransactionData(txId: string, address: Address): Promise<Tx>;
+    /** This function is used when in bound or outbound tx is not of thorchain
+     *
+     * @param txId - transaction hash
+     * @returns - Tx object
+     */
+    private getTransactionDataThornode;
     /**
      * Get the transaction details of a given transaction id. (from /thorchain/txs/hash)
      *

package/lib/const.d.ts

@@ -1,17 +1,19 @@
-import { Asset, Chain } from '@xchainjs/xchain-util/lib';
+import { Asset } from '@xchainjs/xchain-util/lib';
 import { ExplorerUrls } from './types';
 export declare const DECIMAL = 8;
 export declare const DEFAULT_GAS_ADJUSTMENT = 2;
 export declare const DEFAULT_GAS_LIMIT_VALUE = "4000000";
 export declare const DEPOSIT_GAS_LIMIT_VALUE = "600000000";
-export declare const MAX_TX_COUNT = 100;
+export declare const MAX_TX_COUNT_PER_PAGE = 100;
+export declare const MAX_TX_COUNT_PER_FUNCTION_CALL = 500;
+export declare const MAX_PAGES_PER_FUNCTION_CALL = 15;
 export declare const RUNE_SYMBOL = "\u16B1";
 export declare const defaultExplorerUrls: ExplorerUrls;
 /**
  * Chain identifier for Thorchain
  *
  */
-export declare const THORChain: Chain;
+export declare const THORChain: "THOR";
 /**
  * Base "chain" asset for RUNE-67C on Binance test net.
  *

package/lib/index.esm.js

@@ -1,7 +1,7 @@
 import cosmosclient from '@cosmos-client/core';
 import { Network as Network$1, TxType, singleFee, FeeType, BaseXChainClient } from '@xchainjs/xchain-client';
 import { GAIAChain, CosmosSDKClient } from '@xchainjs/xchain-cosmos';
-import { assetToString, isSynthAsset, assetFromString, baseAmount, assetToBase, assetAmount } from '@xchainjs/xchain-util';
+import { assetToString, isSynthAsset, assetFromString, baseAmount, assetToBase, assetAmount, delay, assetFromStringEx } from '@xchainjs/xchain-util';
 import axios from 'axios';
 import { Network } from '@xchainjs/xchain-client/lib';
 import { decode } from 'bech32-buffer';
@@ -4269,7 +4269,9 @@ const DECIMAL = 8;
 const DEFAULT_GAS_ADJUSTMENT = 2;
 const DEFAULT_GAS_LIMIT_VALUE = '4000000';
 const DEPOSIT_GAS_LIMIT_VALUE = '600000000';
-const MAX_TX_COUNT = 100;
+const MAX_TX_COUNT_PER_PAGE = 100;
+const MAX_TX_COUNT_PER_FUNCTION_CALL = 500;
+const MAX_PAGES_PER_FUNCTION_CALL = 15;
 const RUNE_SYMBOL = 'ᚱ';
 const defaultExplorerUrls = {
     root: {
@@ -9757,7 +9759,7 @@ const registerSendCodecs = () => {
  * @param {Address} address - Address to get transaction data for
  * @returns {TxData} Parsed transaction data
  */
-const getDepositTxDataFromLogs = (logs, address) => {
+const getDepositTxDataFromLogs = (logs, address, senderAsset, receiverAsset) => {
     var _a;
     const events = (_a = logs[0]) === null || _a === void 0 ? void 0 : _a.events;
     if (!events) {
@@ -9784,7 +9786,7 @@ const getDepositTxDataFromLogs = (logs, address) => {
         // filter out txs which are not based on given address
         .filter(({ sender, recipient }) => sender === address || recipient === address)
         // transform `TransferData` -> `TxData`
-        .reduce((acc, { sender, recipient, amount }) => (Object.assign(Object.assign({}, acc), { from: [...acc.from, { amount, from: sender }], to: [...acc.to, { amount, to: recipient }] })), { from: [], to: [], type: TxType.Transfer });
+        .reduce((acc, { sender, recipient, amount }) => (Object.assign(Object.assign({}, acc), { from: [...acc.from, { amount, from: sender, asset: senderAsset }], to: [...acc.to, { amount, to: recipient, asset: receiverAsset }] })), { from: [], to: [], type: TxType.Transfer });
     return txData;
 };
 /**
@@ -10058,24 +10060,45 @@ class Client extends BaseXChainClient {
             const address = (params === null || params === void 0 ? void 0 : params.address) || this.getAddress();
             const txMinHeight = undefined;
             const txMaxHeight = undefined;
-            const txIncomingHistory = (yield this.cosmosClient.searchTxFromRPC({
-                rpcEndpoint: this.getClientUrl().rpc,
-                messageAction,
-                transferRecipient: address,
-                limit: MAX_TX_COUNT,
-                txMinHeight,
-                txMaxHeight,
-            })).txs;
-            const txOutgoingHistory = (yield this.cosmosClient.searchTxFromRPC({
-                rpcEndpoint: this.getClientUrl().rpc,
-                messageAction,
-                transferSender: address,
-                limit: MAX_TX_COUNT,
-                txMinHeight,
-                txMaxHeight,
-            })).txs;
-            let history = txIncomingHistory
-                .concat(txOutgoingHistory)
+            if (limit + offset > MAX_PAGES_PER_FUNCTION_CALL * MAX_TX_COUNT_PER_PAGE) {
+                throw Error(`limit plus offset can not be grater than ${MAX_PAGES_PER_FUNCTION_CALL * MAX_TX_COUNT_PER_PAGE}`);
+            }
+            if (limit > MAX_TX_COUNT_PER_FUNCTION_CALL) {
+                throw Error(`Maximum number of transaction per call is ${MAX_TX_COUNT_PER_FUNCTION_CALL}`);
+            }
+            const pagesNumber = Math.ceil((limit + offset) / MAX_TX_COUNT_PER_PAGE);
+            const promiseTotalTxIncomingHistory = [];
+            const promiseTotalTxOutgoingHistory = [];
+            for (let index = 1; index <= pagesNumber; index++) {
+                promiseTotalTxIncomingHistory.push(this.cosmosClient.searchTxFromRPC({
+                    rpcEndpoint: this.getClientUrl().rpc,
+                    messageAction,
+                    transferRecipient: address,
+                    page: index,
+                    limit: MAX_TX_COUNT_PER_PAGE,
+                    txMinHeight,
+                    txMaxHeight,
+                }));
+                promiseTotalTxOutgoingHistory.push(this.cosmosClient.searchTxFromRPC({
+                    rpcEndpoint: this.getClientUrl().rpc,
+                    messageAction,
+                    transferSender: address,
+                    page: index,
+                    limit: MAX_TX_COUNT_PER_PAGE,
+                    txMinHeight,
+                    txMaxHeight,
+                }));
+            }
+            const incomingSearchResult = yield Promise.all(promiseTotalTxIncomingHistory);
+            const outgoingSearchResult = yield Promise.all(promiseTotalTxOutgoingHistory);
+            const totalTxIncomingHistory = incomingSearchResult.reduce((allTxs, searchResult) => {
+                return [...allTxs, ...searchResult.txs];
+            }, []);
+            const totalTxOutgoingHistory = outgoingSearchResult.reduce((allTxs, searchResult) => {
+                return [...allTxs, ...searchResult.txs];
+            }, []);
+            let history = totalTxIncomingHistory
+                .concat(totalTxOutgoingHistory)
                 .sort((a, b) => {
                 if (a.height !== b.height)
                     return parseInt(b.height) > parseInt(a.height) ? 1 : -1;
@@ -10084,12 +10107,16 @@ class Client extends BaseXChainClient {
                 return 0;
             })
                 .reduce((acc, tx) => [...acc, ...(acc.length === 0 || acc[acc.length - 1].hash !== tx.hash ? [tx] : [])], [])
-                .filter((params === null || params === void 0 ? void 0 : params.filterFn) ? params.filterFn : (tx) => tx)
-                .filter((_, index) => index < MAX_TX_COUNT);
-            // get `total` before filtering txs out for pagination
-            const total = history.length;
+                .filter((params === null || params === void 0 ? void 0 : params.filterFn) ? params.filterFn : (tx) => tx);
             history = history.filter((_, index) => index >= offset && index < offset + limit);
-            const txs = yield Promise.all(history.map(({ hash }) => this.getTransactionData(hash, address)));
+            const total = history.length;
+            const txs = [];
+            for (let i = 0; i < history.length; i += 10) {
+                const batch = history.slice(i, i + 10);
+                const result = yield Promise.all(batch.map(({ hash }) => this.getTransactionData(hash, address)));
+                txs.push(...result);
+                delay(2000); // Delay to avoid 503 from ninerealms server
+            }
             return {
                 total,
                 txs,
@@ -10274,20 +10301,117 @@ class Client extends BaseXChainClient {
      * @returns {Tx} The transaction details of the given transaction id.
      */
     getTransactionData(txId, address) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const txResult = yield this.cosmosClient.txsHashGet(txId);
-            const txData = txResult && txResult.logs ? getDepositTxDataFromLogs(txResult.logs, address) : null;
-            if (!txResult || !txData)
-                throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
-            const { from, to, type } = txData;
-            return {
+            try {
+                const txResult = yield this.cosmosClient.txsHashGet(txId);
+                const bond = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'bond');
+                const transfer = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'transfer');
+                if (!transfer)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                const sender = (_a = transfer[0].attributes.find((attr) => attr.key === 'sender')) === null || _a === void 0 ? void 0 : _a.value;
+                const senderAmount = transfer[0].attributes.filter((attr) => attr.key === 'amount')[1].value;
+                const assetString = senderAmount.split(/(?<=\d)(?=[a-zA-Z])/);
+                const senderAsset = assetString[1] === 'rune' ? AssetRuneNative : assetFromStringEx(assetString[1]);
+                const senderAddress = sender ? sender : address;
+                const message = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'message');
+                const coinSpent = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'coin_spent');
+                if (!message || !coinSpent)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                const action = (_b = message[0].attributes.find((attr) => attr.key === 'action')) === null || _b === void 0 ? void 0 : _b.value;
+                if (!bond)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                // Rune only transactions
+                if (bond[0].type === 'bond' || action === 'send') {
+                    const assetTo = AssetRuneNative;
+                    const txData = txResult && txResult.logs
+                        ? getDepositTxDataFromLogs(txResult.logs, senderAddress, senderAsset, assetTo)
+                        : null;
+                    //console.log(JSON.stringify(txData, null, 2))
+                    if (!txData)
+                        throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
+                    const { from, to, type } = txData;
+                    return {
+                        hash: txId,
+                        asset: senderAsset,
+                        from,
+                        to,
+                        date: new Date(txResult.timestamp),
+                        type,
+                    };
+                }
+                // synths and other tx types
+                const messageBody = JSON.stringify((_c = txResult.tx) === null || _c === void 0 ? void 0 : _c.body.messages).split(':');
+                const assetTo = assetFromStringEx(messageBody[7]);
+                const txData = txResult && txResult.logs ? getDepositTxDataFromLogs(txResult.logs, senderAddress, senderAsset, assetTo) : null;
+                if (!txData)
+                    throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
+                const { from, to, type } = txData;
+                return {
+                    hash: txId,
+                    asset: senderAsset,
+                    from,
+                    to,
+                    date: new Date(txResult.timestamp),
+                    type,
+                };
+            }
+            catch (error) { }
+            return yield this.getTransactionDataThornode(txId);
+        });
+    }
+    /** This function is used when in bound or outbound tx is not of thorchain
+     *
+     * @param txId - transaction hash
+     * @returns - Tx object
+     */
+    getTransactionDataThornode(txId) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const txResult = JSON.stringify(yield this.thornodeAPIGet(`/tx/${txId}`));
+            const getTx = JSON.parse(txResult);
+            if (!getTx)
+                throw Error(`Could not return tx data`);
+            const senderAsset = assetFromStringEx(`${(_a = getTx.observed_tx) === null || _a === void 0 ? void 0 : _a.tx.coins[0].asset}`);
+            const fromAddress = `${getTx.observed_tx.tx.from_address}`;
+            const from = [
+                { from: fromAddress, amount: baseAmount((_b = getTx.observed_tx) === null || _b === void 0 ? void 0 : _b.tx.coins[0].amount), asset: senderAsset },
+            ];
+            const splitMemo = (_c = getTx.observed_tx.tx.memo) === null || _c === void 0 ? void 0 : _c.split(':');
+            if (!splitMemo)
+                throw Error(`Could not parse memo`);
+            let asset;
+            let amount;
+            if (splitMemo[0] === 'OUT') {
+                asset = assetFromStringEx(getTx.observed_tx.tx.coins[0].asset);
+                amount = getTx.observed_tx.tx.coins[0].amount;
+                const addressTo = getTx.observed_tx.tx.to_address ? getTx.observed_tx.tx.to_address : 'undefined';
+                const to = [{ to: addressTo, amount: baseAmount(amount, DECIMAL), asset: asset }];
+                const txData = {
+                    hash: txId,
+                    asset: senderAsset,
+                    from,
+                    to,
+                    date: new Date(),
+                    type: TxType.Transfer,
+                };
+                return txData;
+            }
+            asset = assetFromStringEx(splitMemo[1]);
+            const address = splitMemo[2];
+            amount = splitMemo[3];
+            const receiverAsset = asset;
+            const recieverAmount = amount;
+            const to = [{ to: address, amount: baseAmount(recieverAmount, DECIMAL), asset: receiverAsset }];
+            const txData = {
                 hash: txId,
-                asset: AssetRuneNative,
+                asset: senderAsset,
                 from,
                 to,
-                date: new Date(txResult.timestamp),
-                type,
+                date: new Date(),
+                type: TxType.Transfer,
             };
+            return txData;
         });
     }
     /**
@@ -10529,4 +10653,4 @@ const msgNativeTxFromJson = (value) => {
     return new MsgNativeTx(value.coins, value.memo, cosmosclient.AccAddress.fromString(value.signer));
 };
 
-export { AssetRune67C, AssetRuneB1A, AssetRuneERC20, AssetRuneERC20Testnet, AssetRuneNative, Client, DECIMAL, DEFAULT_GAS_ADJUSTMENT, DEFAULT_GAS_LIMIT_VALUE, DEPOSIT_GAS_LIMIT_VALUE, MAX_TX_COUNT, MsgNativeTx, RUNE_SYMBOL, THORChain, assetFromDenom, buildDepositTx, buildTransferTx, buildUnsignedTx, defaultExplorerUrls, getAccount, getBalance, getChainId, getDefaultFees, getDenom, getDepositTxDataFromLogs, getEstimatedGas, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getSequence, getTxType, isAssetRuneNative, isBroadcastSuccess, msgNativeTxFromJson, registerDepositCodecs, registerSendCodecs };
+export { AssetRune67C, AssetRuneB1A, AssetRuneERC20, AssetRuneERC20Testnet, AssetRuneNative, Client, DECIMAL, DEFAULT_GAS_ADJUSTMENT, DEFAULT_GAS_LIMIT_VALUE, DEPOSIT_GAS_LIMIT_VALUE, MAX_PAGES_PER_FUNCTION_CALL, MAX_TX_COUNT_PER_FUNCTION_CALL, MAX_TX_COUNT_PER_PAGE, MsgNativeTx, RUNE_SYMBOL, THORChain, assetFromDenom, buildDepositTx, buildTransferTx, buildUnsignedTx, defaultExplorerUrls, getAccount, getBalance, getChainId, getDefaultFees, getDenom, getDepositTxDataFromLogs, getEstimatedGas, getExplorerAddressUrl, getExplorerTxUrl, getExplorerUrl, getPrefix, getSequence, getTxType, isAssetRuneNative, isBroadcastSuccess, msgNativeTxFromJson, registerDepositCodecs, registerSendCodecs };

package/lib/index.js

@@ -4278,7 +4278,9 @@ const DECIMAL = 8;
 const DEFAULT_GAS_ADJUSTMENT = 2;
 const DEFAULT_GAS_LIMIT_VALUE = '4000000';
 const DEPOSIT_GAS_LIMIT_VALUE = '600000000';
-const MAX_TX_COUNT = 100;
+const MAX_TX_COUNT_PER_PAGE = 100;
+const MAX_TX_COUNT_PER_FUNCTION_CALL = 500;
+const MAX_PAGES_PER_FUNCTION_CALL = 15;
 const RUNE_SYMBOL = 'ᚱ';
 const defaultExplorerUrls = {
     root: {
@@ -9766,7 +9768,7 @@ const registerSendCodecs = () => {
  * @param {Address} address - Address to get transaction data for
  * @returns {TxData} Parsed transaction data
  */
-const getDepositTxDataFromLogs = (logs, address) => {
+const getDepositTxDataFromLogs = (logs, address, senderAsset, receiverAsset) => {
     var _a;
     const events = (_a = logs[0]) === null || _a === void 0 ? void 0 : _a.events;
     if (!events) {
@@ -9793,7 +9795,7 @@ const getDepositTxDataFromLogs = (logs, address) => {
         // filter out txs which are not based on given address
         .filter(({ sender, recipient }) => sender === address || recipient === address)
         // transform `TransferData` -> `TxData`
-        .reduce((acc, { sender, recipient, amount }) => (Object.assign(Object.assign({}, acc), { from: [...acc.from, { amount, from: sender }], to: [...acc.to, { amount, to: recipient }] })), { from: [], to: [], type: xchainClient.TxType.Transfer });
+        .reduce((acc, { sender, recipient, amount }) => (Object.assign(Object.assign({}, acc), { from: [...acc.from, { amount, from: sender, asset: senderAsset }], to: [...acc.to, { amount, to: recipient, asset: receiverAsset }] })), { from: [], to: [], type: xchainClient.TxType.Transfer });
     return txData;
 };
 /**
@@ -10067,24 +10069,45 @@ class Client extends xchainClient.BaseXChainClient {
             const address = (params === null || params === void 0 ? void 0 : params.address) || this.getAddress();
             const txMinHeight = undefined;
             const txMaxHeight = undefined;
-            const txIncomingHistory = (yield this.cosmosClient.searchTxFromRPC({
-                rpcEndpoint: this.getClientUrl().rpc,
-                messageAction,
-                transferRecipient: address,
-                limit: MAX_TX_COUNT,
-                txMinHeight,
-                txMaxHeight,
-            })).txs;
-            const txOutgoingHistory = (yield this.cosmosClient.searchTxFromRPC({
-                rpcEndpoint: this.getClientUrl().rpc,
-                messageAction,
-                transferSender: address,
-                limit: MAX_TX_COUNT,
-                txMinHeight,
-                txMaxHeight,
-            })).txs;
-            let history = txIncomingHistory
-                .concat(txOutgoingHistory)
+            if (limit + offset > MAX_PAGES_PER_FUNCTION_CALL * MAX_TX_COUNT_PER_PAGE) {
+                throw Error(`limit plus offset can not be grater than ${MAX_PAGES_PER_FUNCTION_CALL * MAX_TX_COUNT_PER_PAGE}`);
+            }
+            if (limit > MAX_TX_COUNT_PER_FUNCTION_CALL) {
+                throw Error(`Maximum number of transaction per call is ${MAX_TX_COUNT_PER_FUNCTION_CALL}`);
+            }
+            const pagesNumber = Math.ceil((limit + offset) / MAX_TX_COUNT_PER_PAGE);
+            const promiseTotalTxIncomingHistory = [];
+            const promiseTotalTxOutgoingHistory = [];
+            for (let index = 1; index <= pagesNumber; index++) {
+                promiseTotalTxIncomingHistory.push(this.cosmosClient.searchTxFromRPC({
+                    rpcEndpoint: this.getClientUrl().rpc,
+                    messageAction,
+                    transferRecipient: address,
+                    page: index,
+                    limit: MAX_TX_COUNT_PER_PAGE,
+                    txMinHeight,
+                    txMaxHeight,
+                }));
+                promiseTotalTxOutgoingHistory.push(this.cosmosClient.searchTxFromRPC({
+                    rpcEndpoint: this.getClientUrl().rpc,
+                    messageAction,
+                    transferSender: address,
+                    page: index,
+                    limit: MAX_TX_COUNT_PER_PAGE,
+                    txMinHeight,
+                    txMaxHeight,
+                }));
+            }
+            const incomingSearchResult = yield Promise.all(promiseTotalTxIncomingHistory);
+            const outgoingSearchResult = yield Promise.all(promiseTotalTxOutgoingHistory);
+            const totalTxIncomingHistory = incomingSearchResult.reduce((allTxs, searchResult) => {
+                return [...allTxs, ...searchResult.txs];
+            }, []);
+            const totalTxOutgoingHistory = outgoingSearchResult.reduce((allTxs, searchResult) => {
+                return [...allTxs, ...searchResult.txs];
+            }, []);
+            let history = totalTxIncomingHistory
+                .concat(totalTxOutgoingHistory)
                 .sort((a, b) => {
                 if (a.height !== b.height)
                     return parseInt(b.height) > parseInt(a.height) ? 1 : -1;
@@ -10093,12 +10116,16 @@ class Client extends xchainClient.BaseXChainClient {
                 return 0;
             })
                 .reduce((acc, tx) => [...acc, ...(acc.length === 0 || acc[acc.length - 1].hash !== tx.hash ? [tx] : [])], [])
-                .filter((params === null || params === void 0 ? void 0 : params.filterFn) ? params.filterFn : (tx) => tx)
-                .filter((_, index) => index < MAX_TX_COUNT);
-            // get `total` before filtering txs out for pagination
-            const total = history.length;
+                .filter((params === null || params === void 0 ? void 0 : params.filterFn) ? params.filterFn : (tx) => tx);
             history = history.filter((_, index) => index >= offset && index < offset + limit);
-            const txs = yield Promise.all(history.map(({ hash }) => this.getTransactionData(hash, address)));
+            const total = history.length;
+            const txs = [];
+            for (let i = 0; i < history.length; i += 10) {
+                const batch = history.slice(i, i + 10);
+                const result = yield Promise.all(batch.map(({ hash }) => this.getTransactionData(hash, address)));
+                txs.push(...result);
+                xchainUtil.delay(2000); // Delay to avoid 503 from ninerealms server
+            }
             return {
                 total,
                 txs,
@@ -10283,20 +10310,117 @@ class Client extends xchainClient.BaseXChainClient {
      * @returns {Tx} The transaction details of the given transaction id.
      */
     getTransactionData(txId, address) {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const txResult = yield this.cosmosClient.txsHashGet(txId);
-            const txData = txResult && txResult.logs ? getDepositTxDataFromLogs(txResult.logs, address) : null;
-            if (!txResult || !txData)
-                throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
-            const { from, to, type } = txData;
-            return {
+            try {
+                const txResult = yield this.cosmosClient.txsHashGet(txId);
+                const bond = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'bond');
+                const transfer = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'transfer');
+                if (!transfer)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                const sender = (_a = transfer[0].attributes.find((attr) => attr.key === 'sender')) === null || _a === void 0 ? void 0 : _a.value;
+                const senderAmount = transfer[0].attributes.filter((attr) => attr.key === 'amount')[1].value;
+                const assetString = senderAmount.split(/(?<=\d)(?=[a-zA-Z])/);
+                const senderAsset = assetString[1] === 'rune' ? AssetRuneNative : xchainUtil.assetFromStringEx(assetString[1]);
+                const senderAddress = sender ? sender : address;
+                const message = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'message');
+                const coinSpent = txResult.logs && txResult.logs[0].events.filter((i) => i.type === 'coin_spent');
+                if (!message || !coinSpent)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                const action = (_b = message[0].attributes.find((attr) => attr.key === 'action')) === null || _b === void 0 ? void 0 : _b.value;
+                if (!bond)
+                    throw new Error(`Failed to get transaction logs (tx-hash: ${txId})`);
+                // Rune only transactions
+                if (bond[0].type === 'bond' || action === 'send') {
+                    const assetTo = AssetRuneNative;
+                    const txData = txResult && txResult.logs
+                        ? getDepositTxDataFromLogs(txResult.logs, senderAddress, senderAsset, assetTo)
+                        : null;
+                    //console.log(JSON.stringify(txData, null, 2))
+                    if (!txData)
+                        throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
+                    const { from, to, type } = txData;
+                    return {
+                        hash: txId,
+                        asset: senderAsset,
+                        from,
+                        to,
+                        date: new Date(txResult.timestamp),
+                        type,
+                    };
+                }
+                // synths and other tx types
+                const messageBody = JSON.stringify((_c = txResult.tx) === null || _c === void 0 ? void 0 : _c.body.messages).split(':');
+                const assetTo = xchainUtil.assetFromStringEx(messageBody[7]);
+                const txData = txResult && txResult.logs ? getDepositTxDataFromLogs(txResult.logs, senderAddress, senderAsset, assetTo) : null;
+                if (!txData)
+                    throw new Error(`Failed to get transaction data (tx-hash: ${txId})`);
+                const { from, to, type } = txData;
+                return {
+                    hash: txId,
+                    asset: senderAsset,
+                    from,
+                    to,
+                    date: new Date(txResult.timestamp),
+                    type,
+                };
+            }
+            catch (error) { }
+            return yield this.getTransactionDataThornode(txId);
+        });
+    }
+    /** This function is used when in bound or outbound tx is not of thorchain
+     *
+     * @param txId - transaction hash
+     * @returns - Tx object
+     */
+    getTransactionDataThornode(txId) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const txResult = JSON.stringify(yield this.thornodeAPIGet(`/tx/${txId}`));
+            const getTx = JSON.parse(txResult);
+            if (!getTx)
+                throw Error(`Could not return tx data`);
+            const senderAsset = xchainUtil.assetFromStringEx(`${(_a = getTx.observed_tx) === null || _a === void 0 ? void 0 : _a.tx.coins[0].asset}`);
+            const fromAddress = `${getTx.observed_tx.tx.from_address}`;
+            const from = [
+                { from: fromAddress, amount: xchainUtil.baseAmount((_b = getTx.observed_tx) === null || _b === void 0 ? void 0 : _b.tx.coins[0].amount), asset: senderAsset },
+            ];
+            const splitMemo = (_c = getTx.observed_tx.tx.memo) === null || _c === void 0 ? void 0 : _c.split(':');
+            if (!splitMemo)
+                throw Error(`Could not parse memo`);
+            let asset;
+            let amount;
+            if (splitMemo[0] === 'OUT') {
+                asset = xchainUtil.assetFromStringEx(getTx.observed_tx.tx.coins[0].asset);
+                amount = getTx.observed_tx.tx.coins[0].amount;
+                const addressTo = getTx.observed_tx.tx.to_address ? getTx.observed_tx.tx.to_address : 'undefined';
+                const to = [{ to: addressTo, amount: xchainUtil.baseAmount(amount, DECIMAL), asset: asset }];
+                const txData = {
+                    hash: txId,
+                    asset: senderAsset,
+                    from,
+                    to,
+                    date: new Date(),
+                    type: xchainClient.TxType.Transfer,
+                };
+                return txData;
+            }
+            asset = xchainUtil.assetFromStringEx(splitMemo[1]);
+            const address = splitMemo[2];
+            amount = splitMemo[3];
+            const receiverAsset = asset;
+            const recieverAmount = amount;
+            const to = [{ to: address, amount: xchainUtil.baseAmount(recieverAmount, DECIMAL), asset: receiverAsset }];
+            const txData = {
                 hash: txId,
-                asset: AssetRuneNative,
+                asset: senderAsset,
                 from,
                 to,
-                date: new Date(txResult.timestamp),
-                type,
+                date: new Date(),
+                type: xchainClient.TxType.Transfer,
             };
+            return txData;
         });
     }
     /**
@@ -10548,7 +10672,9 @@ exports.DECIMAL = DECIMAL;
 exports.DEFAULT_GAS_ADJUSTMENT = DEFAULT_GAS_ADJUSTMENT;
 exports.DEFAULT_GAS_LIMIT_VALUE = DEFAULT_GAS_LIMIT_VALUE;
 exports.DEPOSIT_GAS_LIMIT_VALUE = DEPOSIT_GAS_LIMIT_VALUE;
-exports.MAX_TX_COUNT = MAX_TX_COUNT;
+exports.MAX_PAGES_PER_FUNCTION_CALL = MAX_PAGES_PER_FUNCTION_CALL;
+exports.MAX_TX_COUNT_PER_FUNCTION_CALL = MAX_TX_COUNT_PER_FUNCTION_CALL;
+exports.MAX_TX_COUNT_PER_PAGE = MAX_TX_COUNT_PER_PAGE;
 exports.MsgNativeTx = MsgNativeTx;
 exports.RUNE_SYMBOL = RUNE_SYMBOL;
 exports.THORChain = THORChain;

package/lib/types/client-types.d.ts

@@ -69,3 +69,24 @@ export declare type SimulateResponse = {
         gas_used: string;
     };
 };
+export declare type MessageSend = {
+    '@type': string;
+    from_address: string;
+    to_address: string;
+    amount: Amount;
+};
+export declare type Amount = {
+    denom: string;
+    amount: string;
+};
+export declare type MessageDeposit = {
+    '@type': string;
+    coins: Coins[];
+    memo: string;
+    signer: string;
+};
+export declare type Coins = {
+    asset: string;
+    amount: number;
+    decimals: number;
+};

package/lib/utils.d.ts

@@ -57,7 +57,7 @@ export declare const registerSendCodecs: () => void;
  * @param {Address} address - Address to get transaction data for
  * @returns {TxData} Parsed transaction data
  */
-export declare const getDepositTxDataFromLogs: (logs: TxLog[], address: Address) => TxData;
+export declare const getDepositTxDataFromLogs: (logs: TxLog[], address: Address, senderAsset?: Asset | undefined, receiverAsset?: Asset | undefined) => TxData;
 /**
  * Get the default fee.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "0.27.7",
+  "version": "0.27.9",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -36,11 +36,11 @@
   "devDependencies": {
     "@cosmos-client/core": "0.46.1",
     "@types/big.js": "^6.0.0",
-    "@xchainjs/xchain-binance": "^5.6.6",
+    "@xchainjs/xchain-binance": "^5.6.7",
     "@xchainjs/xchain-client": "^0.13.5",
-    "@xchainjs/xchain-cosmos": "^0.20.6",
+    "@xchainjs/xchain-cosmos": "^0.20.8",
     "@xchainjs/xchain-crypto": "^0.2.6",
-    "@xchainjs/xchain-ethereum": "^0.27.6",
+    "@xchainjs/xchain-ethereum": "^0.27.7",
     "@xchainjs/xchain-util": "^0.12.0",
     "axios": "^0.25.0",
     "bech32-buffer": "^0.2.0",
@@ -52,7 +52,7 @@
   "peerDependencies": {
     "@cosmos-client/core": "0.46.1",
     "@xchainjs/xchain-client": "^0.13.5",
-    "@xchainjs/xchain-cosmos": "^0.20.6",
+    "@xchainjs/xchain-cosmos": "^0.20.8",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.12.0",
     "axios": "^0.25.0",