@xchainjs/xchain-thorchain 0.27.8 → 0.27.11

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)
      *
@@ -199,6 +205,7 @@ declare class Client extends BaseXChainClient implements ThorchainClient, XChain
         gasLimit?: BigNumber;
         sequence?: number;
     }): Promise<TxHash>;
+    broadcastTx(txHex: string): Promise<TxHash>;
     /**
      * Transfer without broadcast balances with MsgSend
      *

package/lib/const.d.ts

@@ -4,7 +4,9 @@ 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;
 /**

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,119 @@ 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 regex = /[a-zA-Z]+$/;
+                const match = senderAmount.match(regex);
+                const asset = match ? match[0] : null;
+                const senderAsset = asset === 'rune' ? AssetRuneNative : assetFromStringEx(`${asset}`);
+                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;
         });
     }
     /**
@@ -10448,6 +10574,11 @@ class Client extends BaseXChainClient {
             return txHash;
         });
     }
+    broadcastTx(txHex) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.getCosmosClient().broadcast(txHex);
+        });
+    }
     /**
      * Transfer without broadcast balances with MsgSend
      *
@@ -10529,4 +10660,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,119 @@ 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 regex = /[a-zA-Z]+$/;
+                const match = senderAmount.match(regex);
+                const asset = match ? match[0] : null;
+                const senderAsset = asset === 'rune' ? AssetRuneNative : xchainUtil.assetFromStringEx(`${asset}`);
+                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;
         });
     }
     /**
@@ -10457,6 +10583,11 @@ class Client extends xchainClient.BaseXChainClient {
             return txHash;
         });
     }
+    broadcastTx(txHex) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.getCosmosClient().broadcast(txHex);
+        });
+    }
     /**
      * Transfer without broadcast balances with MsgSend
      *
@@ -10548,7 +10679,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.8",
+  "version": "0.27.11",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -36,11 +36,9 @@
   "devDependencies": {
     "@cosmos-client/core": "0.46.1",
     "@types/big.js": "^6.0.0",
-    "@xchainjs/xchain-binance": "^5.6.6",
-    "@xchainjs/xchain-client": "^0.13.5",
-    "@xchainjs/xchain-cosmos": "^0.20.6",
+    "@xchainjs/xchain-client": "^0.13.7",
+    "@xchainjs/xchain-cosmos": "^0.20.9",
     "@xchainjs/xchain-crypto": "^0.2.6",
-    "@xchainjs/xchain-ethereum": "^0.27.6",
     "@xchainjs/xchain-util": "^0.12.0",
     "axios": "^0.25.0",
     "bech32-buffer": "^0.2.0",
@@ -51,8 +49,8 @@
   },
   "peerDependencies": {
     "@cosmos-client/core": "0.46.1",
-    "@xchainjs/xchain-client": "^0.13.5",
-    "@xchainjs/xchain-cosmos": "^0.20.6",
+    "@xchainjs/xchain-client": "^0.13.7",
+    "@xchainjs/xchain-cosmos": "^0.20.9",
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-util": "^0.12.0",
     "axios": "^0.25.0",

package/CHANGELOG.md

@@ -1,598 +0,0 @@
-# v.0.27.8 (2023-01-19)
-
-## Update
-
-- Type safety `THORChain`
-
-# v.0.27.7 (2022-12-27)
-
-## Add
-
-- Add `AssetRune67C`, `AssetRuneB1A`, `AssetRuneERC20`, `AssetRuneERC20Testnet`, `THORChain` and `AssetRuneNative` definitions
-
-## Update
-
-- Bump `xchain-client@13.5.0`
-
-## Update
-
-- Change `AssetETH`, `AssetBNB` and `GAIAChain` imports to its own `xchain-*` package
-
-# v.0.27.6 (2022-12-13)
-
-## Update
-
-- removed `customRequestHeaders`
-
-# v.0.27.5 (2022-12-12)
-
-## Update
-
-- Add optional `sequence` to `transfer` and `deposit` to override `sequence`
-- Add helpers `getAccount` and `getSequence` to `utils`
-
-# v.0.27.4 (2022-11-??)
-
-# v.0.27.3 (2022-11-24)
-
-## Update
-
-- Added `customRequestHeaders` to `BroadcastTxParams`
-- Bump `xchain-client`
-
-# v.0.27.2 (2022-11-08)
-
-## Update
-
-- changed chain-id-stagenet to `thorchain-stagenet-v2`
-
-# v.0.27.1 (2022-10-13)
-
-- added default `chainIds` in constructor
-- added default `explorerUrls` in constructor
-- Set Default network to `Network.Mainnet`
-
-## Update
-
-- Bumped `xchain-utils` & `xchain-client`
-
-# v0.27.0 (2022-10-07)
-
-## Breaking Changes
-
-- Removed `getDefaultClientUrl`
-- Removed `getChainIds`
-- Update `ThorchainClientParams` to make clientUrl required (not optional)
-
-# v.0.26.2 (2022-10-06)
-
-## Update
-
-- Bumped `xchain-utils` & `xchain-client`
-
-# v.0.26.1 (2022-09-29)
-
-## Update
-
-- bumped deps on xchain-utils & xchain-client
-
-# v.0.26.0 (2022-07-20)
-
-## Change
-
-- updated packages xchain-client & xchain-util
-
-# v0.25.3 (2022-07-01)
-
-## Update
-
-- Latest "xchain-cosmos@0.19.0"
-
-# v0.25.2 (2022-06-22)
-
-## Update
-
-- Latest `@cosmos-client/core@0.45.10`
-- Latest "xchain-cosmos@0.18.0"
-
-## Fix
-
-- Fix `setNetwork` to create new instance of SDK client
-
-# v0.25.1 (2022-06-17)
-
-## Fix
-
-- Remove estimation of gas in `transfer` and `deposit` (introduced by #564) in favour of using `DEFAULT_GAS_LIMIT_VALUE` or `DEPOSIT_GAS_LIMIT_VALUE` (both can be overridden by users in `transfer` or `deposit`)
-- Increase `DEPOSIT_GAS_LIMIT_VALUE` to `600000000` (before `500000000`)
-
-# v0.25.0 (2022-06-16)
-
-## Fix
-
-- Before sending a transaction, gas limits are estimated
-- Helper `getEstimatedGas`
-
-## Breaking changes
-
-- Client's `transferOffline` requires `fromAccountNumber` and `fromSequence`
-- Rename parameters in `transferOffline` to keep names in camel case (not snake case)
-- Rename `DEFAULT_GAS_VALUE` to `DEFAULT_GAS_LIMIT_VALUE`
-- Rename `DEPOSIT_GAS_VALUE` to `DEPOSIT_GAS_LIMIT_VALUE`
-
-# v0.24.1 (2022-04-23)
-
-## Fix
-
-- Increase `DEFAULT_GAS_VALUE` to `4000000` (before `3000000`)
-
-# v0.24.0 (2022-03-23)
-
-## Update
-
-- upgraded to "@cosmos-client/core": "0.45.1"
-- client now extend BaseXChainClient
-
-## Breaking Changes
-
-- `buildDepositTx` now returns `proto.cosmos.tx.v1beta1.TxBody` from `@cosmos-client/core`
-
-# v0.23.0 (2022-03-08)
-
-## Add
-
-- Helpers `getChainId` + `getChainIds`
-
-## Breaking change
-
-- `chainIds: ChainIds` is required to initialize `Client`
-
-## Fix
-
-- Request fees from THORChain and use `defaultFees` in case of server errors only
-- Fix `defaultFees` to be 0.02 RUNE
-
-# v0.22.2 (2022-02-17)
-
-## Fix
-
-- Request fees from THORChain and use `defaultFees` in case of server errors only
-- Fix `defaultFees` to be 0.02 RUNE
-
-# v0.22.1 (2022-02-16)
-
-## Fix
-
-- Increase limit for `DEFAULT_GAS_VALUE` from 2000000 to 3000000 to accommodate recent increases in gas used that go above the old limit
-
-# v0.22.0 (2022-02-06)
-
-## Add
-
-- Option to pass `ChainIds` into constructor
-- getter / setter for `chainId` in `Client`
-
-## Breaking change
-
-- `buildDepositTx` needs `chainId` to be passed - all params are set as object
-- Remove `enum ChainId` + `getChainId` + `isChainId` from `utils`
-
-# v0.21.2 (2022-02-04)
-
-## Fix
-
-- Use latest axios@0.25.0
-- xchain-client@0.11.1
-- @xchainjs/xchain-util@0.5.1
-- @xchainjs/xchain-cosmos@0.16.1
-
-# v.0.21.1 (2022-02-04)
-
-## Fix
-
-- Fix chain id for `testnet` #477
-
-## Add
-
-- Helper `isChainId`
-- `enum ChainId`
-
-# v.0.21.0 (2022-02-02)
-
-## Breaking change
-
-- Remove `getDenomWithChain`
-- Rename `getAsset` -> `assetFromDenom` (incl. fix to get synth asset properly)
-
-## Update
-
-- xchain-util@0.5.0
-- xchain-cosmos@0.16.0
-
-## Add
-
-- `isAssetNativeRune` helper
-- Add `TxOfflineParams` type
-
-## Fix
-
-- Fix synth notation in `transfer|transferOffline|deposit` #473
-
-# v0.20.1 (2022-01-11)
-
-## Fix
-
-- Get chain ID from THORNode before posting to deposit handler.
-
-# v.0.20.0 (2021-12-29)
-
-## Breaking change
-
-- Add stagenet environment handling for `Network` and `BaseXChainClient` to client
-
-# v.0.19.5 (2021-11-22)
-
-## Add
-
-- Provide `transferOffline` method
-
-# v.0.19.4 (2021-11-22)
-
-## Add
-
-- Provide `getPubKey` method to access public key
-
-## Change
-
-- Make `getPrivKey` method `public` to access private key
-
-# v.0.19.3 (2021-10-31)
-
-## Update
-
-- Use latest `xchain-cosmos@0.13.8` to use `sync` mode for broadcasting txs
-
-# v.0.19.2 (2021-09-27)
-
-## Fix
-
-- Increase `gas` to `500,000,000` (five hundred million)
-
-# v.0.19.1 (2021-09-26)
-
-## Fix
-
-- Increase `gas` to `30,000,000` (thirty million)
-
-# v.0.19.0 (2021-09-10)
-
-## Breaking change
-
-- Extract `buildDepositTx` from `Client` into `utils`
-
-## Add
-
-- Add `getBalance` to `utils`
-
-# v.0.18.0 (2021-09-08)
-
-## Add
-
-- Make `buildDepositTx` public and overrides its fee
-- Add `DEPOSIT_GAS_VALUE`
-
-## Breaking change
-
-- Remove `AssetRune` in favour of using `AssetRuneNative` of `xchain-util` only
-- Extract `getChainId` into `util` module
-
-# v.0.17.7 (2021-07-20)
-
-## Fix
-
-- cosmos 0.42.x has too many breaking changes that wren't caught in the last version, downgrade "cosmos-client": "0.39.2"
-
-# v.0.17.6 (2021-07-19)
-
-## Update
-
-- bumping peer dependency "cosmos-client": "0.39.2" -> "cosmos-client": "^0.42.7"
-
-# v.0.17.5 (2021-07-18)
-
-## Update
-
-- Updated rollupjs to include axios to enlable usage on node
-
-# v.0.17.4 (2021-07-14)
-
-### Fix
-
-- Bump `fee.gas to `25000000` (twenty five million) to try to avoid failing withdraw txs
-
-# v.0.17.3 (2021-07-07)
-
-## Update
-
-- Use latest `xchain-client@0.10.1` + `xchain-util@0.3.0`
-
-# v.0.17.2 (2021-07-05)
-
-## Fix
-
-- refactored client methods to use regular method syntax (not fat arrow) in order for bcall to super.xxx() to work properly
-
-# v.0.17.1 (2021-06-29)
-
-### Fix
-
-- Stick with `cosmos-client@0.39.2`
-
-### Add
-
-- Add examples to README
-
-# v.0.17.0 (2021-06-21)
-
-### Fix
-
-- Fix `to` / `from` addresses by parsing tx data from event logs
-
-### Breaking change
-
-- Remove deprecated `getTxDataFromResponse` helper
-
-# v.0.16.1 (2021-06-14)
-
-### Fix
-
-- Double `fee.gas to `20000000` (twenty million) to avoid failing withdraw transactions
-
-# v.0.16.0 (2021-06-08)
-
-### Breaking change
-
-- Use `viewblock` as default explorer
-- [types] Refactored structure of explorer urls (via `type ExplorerUrls`)
-- [types] Refactored `ExplorerUrl`
-- [client] Constructor accepts `ExplorerUrls`
-- [client] Removed `getExplorerNodeUrl` (use `getExplorerAddressUrl` instead)
-- [client] Extract `getDefaultClientUrl` into `utils`
-- [utils] Renamed `getDefaultExplorerUrlByNetwork` -> `getDefaultExplorerUrl`
-- [utils] Removed `getDefaultExplorerAddressUrl`, `getDefaultExplorerNodeUrl`, `getDefaultExplorerTxUrl`
-- [utils] Added `getExplorerTxUrl`, `getExplorerAddressUrl`, `getExplorerUrl` helpers
-
-# v.0.15.2 (2021-06-01)
-
-### Update
-
-- updated peer deps
-
-# v.0.15.0 (2021-05-17)
-
-### Breaking change
-
-- added support for HD wallets
-
-# v.0.14.0 (2021-05-05)
-
-### Breaking change
-
-- Latest @xchainjs/xchain-client@0.8.0
-- Latest @xchainjs/xchain-util@0.2.7
-
-# v.0.13.7 (2021-04-21)
-
-### Update
-
-- Export `MSG_SEND` `MSG_DEPOSIT` `MAX_COUNT`
-- Added `getCosmosClient()`
-- Extend `getTransactions` parameters with an optional `filterFn`
-
-# v.0.13.6 (2021-04-16)
-
-### Update
-
-- Set `fee.gas` to `10000000` (ten million) in `deposit` due to failing withdraw transactions
-
-# v.0.13.5 (2021-04-16)
-
-### Update
-
-- Set `fee.gas` to `1000000` (one million) in `deposit`
-
-# v.0.13.4 (2021-04-16)
-
-### Update
-
-- Set `fee.gas` to `auto` in `deposit`
-- Try sending `deposit` tx up to 3x
-- Updates `DEFAULT_GAS_VALUE` to `2000000`
-
-# v.0.13.3 (2021-04-12)
-
-### Breaking changes
-
-- Change `/addresses` to `/address` for explorer url.
-
-### Update
-
-- Add util helpers for explorer urls.
-
-# v.0.13.2 (2021-04-01)
-
-### Update
-
-- Updates `getDefaultClientUrl` to use new mainnet endpoints
-
-# v.0.13.1 (2021-03-18)
-
-### Fix
-
-- Changed `getDefaultExplorerUrl` to return valid urls
-
-# v.0.13.0 (2021-03-02)
-
-### Breaking change
-
-- replace `find`, `findIndex`
-- Update @xchainjs/xchain-client package to 0.7.0
-- Update @xchainjs/xchain-cosmos package to 0.11.0
-
-# v.0.12.0 (2021-02-24)
-
-### Breaking change
-
-- Update @xchainjs/xchain-client package to 0.6.0
-- Update @xchainjs/xchain-cosmos package to 0.10.0
-- Update `getBalance`
-
-# v.0.11.1 (2021-02-24)
-
-### Breaking change
-
-- Update @xchainjs/xchain-cosmos package to 0.9.0
-
-### Fix
-
-- Fix `getTransactions` - sort transactions from latest
-- Fix `DECIMAL`
-
-# v.0.11.0 (2021-02-19)
-
-### Breaking change
-
-- Update @xchainjs/xchain-client package to 0.5.0
-
-### Update
-
-- Add `Service Providers` section in README.md
-
-### Fix
-
-- Fix `peerDependencies`
-
-# v.0.10.1 (2021-02-05)
-
-### Update
-
-- Update `getTransactions` to support incoming transactions
-
-### Breaking change
-
-- Update @xchainjs/xchain-client package to 0.4.0
-- Update @xchainjs/xchain-crypto package to 0.2.3
-
-# v.0.10.0 (2021-02-03)
-
-### Breaking changes
-
-- Change `getTransactions` to use tendermint rpc. (transaction query from the latest ones.)
-
-# v.0.9.3 (2021-02-02)
-
-### Update
-
-- Add `getExplorerNodeUrl`
-
-# v.0.9.2 (2021-01-30)
-
-- Clear lib folder on build
-
-# v.0.9.1 (2021-01-26)
-
-### Fix
-
-- Fix `deposit`. Use `/thorchain/deposit` to build a deposit transaction.
-
-# v.0.9.0 (2021-01-15)
-
-### Breaking change
-
-- Move `getPrefix` to util
-
-# v.0.8.0 (2021-01-13)
-
-### Breaking change
-
-- change MsgNativeTx.fromJson
-
-# v.0.7.1 (2021-01-06)
-
-### Fix
-
-- Fix getTransactions pagination issue #168
-
-### Update
-
-- Update comments for documentation
-
-# v.0.7.0 (2020-12-28)
-
-### Breaking change
-
-- Extract `getDefaultFees` from `Client` to `utils` #157
-
-# v.0.6.2 (2020-12-23)
-
-### Update
-
-- Use latest xchain-client@0.2.1
-
-### Fix
-
-- Fix invalid assets comparison #151
-
-### Breaking change
-
-- Remove `validateAddress` from `ThorchainClient` #149
-
-# v.0.6.1 (2020-12-18)
-
-### Update
-
-- Add `setClientUrl`
-- Add `getDefaultClientUrl`
-- Add `getClientUrlByNetwork`
-
-### Fix
-
-- Fix client url for multichain testnet (`https://testnet.thornode.thorchain.info`)
-
-# v.0.6.0 (2020-12-16)
-
-### Update
-
-- Set the latest multi-chain node
-- Update `getTransactionData`, `getTransactions`
-- Update `transfer` (for `MsgSend`)
-- Update `deposit` (for `MsgNativeTx`)
-
-# v.0.5.0 (2020-12-11)
-
-### Update
-
-- Update dependencies
-- Add `getDefaultFees`
-
-# v.0.4.2 (2020-11-23)
-
-### Fix
-
-- Fix import of `cosmos/codec`
-
-### Update
-
-- Use latest `@xchainjs/cosmos@0.4.2`
-
-# v.0.4.1 (2020-11-23)
-
-### Update
-
-- Update to latest `@xchainjs/*` packages and other dependencies
-
-# v.0.4.0 (2020-11-20)
-
-### Breaking change
-
-- Update @xchainjs/xchain-crypto package to 0.2.0, deprecating old keystores