@xchainjs/xchain-thorchain 0.28.3 → 0.28.5

package/lib/client.d.ts

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

package/lib/index.esm.js

@@ -9870,8 +9870,12 @@ const getDepositTxDataFromLogs = (logs, address, senderAsset, receiverAsset) =>
                     newData.sender = value;
                 if (key === 'recipient')
                     newData.recipient = value;
-                if (key === 'amount')
-                    newData.amount = baseAmount(value.replace(/rune/, ''), RUNE_DECIMAL);
+                if (key === 'amount') {
+                    const amountAsset = value.match(/(\d+)(\D+)/);
+                    if (amountAsset) {
+                        newData.amount = baseAmount(parseInt(amountAsset[1]));
+                    }
+                }
                 return acc2;
             }, acc);
         }
@@ -10208,7 +10212,10 @@ class Client extends BaseXChainClient {
             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)));
+                const result = yield Promise.all(batch.map(({ hash }) => __awaiter(this, void 0, void 0, function* () {
+                    const data = yield this.getTransactionData(hash, address);
+                    return data;
+                })));
                 txs.push(...result);
                 delay(2000); // Delay to avoid 503 from ninerealms server
             }
@@ -10441,65 +10448,91 @@ class Client extends BaseXChainClient {
      * @returns {Tx} The transaction details of the given transaction id.
      */
     getTransactionData(txId, address) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.fetchTransaction(txId);
-            if (response) {
-                const txResult = response;
-                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 (action === 'send' || bond[0].type === 'bond') {
-                    const assetTo = AssetRuneNative;
-                    const txData = txResult && txResult.logs
-                        ? getDepositTxDataFromLogs(txResult.logs, `${senderAddress}`, senderAsset, assetTo)
+            const txResult = yield this.fetchTransaction(txId);
+            if (txResult && txResult.logs) {
+                // extract values from the response
+                const transferEvent = (_a = txResult.logs[0].events) === null || _a === void 0 ? void 0 : _a.find((event) => event.type === 'transfer');
+                const messageEvent = (_b = txResult.logs[0].events) === null || _b === void 0 ? void 0 : _b.find((event) => event.type === 'message');
+                if (!transferEvent || !messageEvent) {
+                    throw new Error('Invalid transaction data');
+                }
+                const attributeGroups = {};
+                for (const attr of transferEvent.attributes) {
+                    if (!attributeGroups[attr.key]) {
+                        attributeGroups[attr.key] = [];
+                    }
+                    attributeGroups[attr.key].push(attr.value);
+                }
+                const assetAmount = attributeGroups['amount'][1]
+                    ? attributeGroups['amount'][1].split(/(?<=\d)(?=\D)/).filter(Boolean)[0]
+                    : attributeGroups['amount'][0].split(/(?<=\d)(?=\D)/).filter(Boolean)[0];
+                const assetString = attributeGroups['amount'][1]
+                    ? attributeGroups['amount'][1]
+                        .split(/(?<=\d)(?=\D)/)
+                        .filter(Boolean)[1]
+                        .replace(/[a-z]/g, (letter) => letter.toUpperCase())
+                    : attributeGroups['amount'][0]
+                        .split(/(?<=\d)(?=\D)/)
+                        .filter(Boolean)[1]
+                        .replace(/[a-z]/g, (letter) => letter.toUpperCase());
+                const fromAddress = ((_c = transferEvent.attributes.find((attr) => attr.key === 'sender')) === null || _c === void 0 ? void 0 : _c.value)
+                    ? (_d = transferEvent.attributes.find((attr) => attr.key === 'sender')) === null || _d === void 0 ? void 0 : _d.value
+                    : address;
+                const memo = ((_e = txResult.tx) === null || _e === void 0 ? void 0 : _e.body) ? txResult.tx.body.memo.split(':') : '';
+                const toAddress = memo[2] ? memo[2] : '';
+                const toAsset = memo[1] ? assetFromStringEx(memo[1]) : AssetRuneNative;
+                const date = new Date(txResult.timestamp);
+                const typeString = (_f = messageEvent.attributes.find((attr) => attr.key === 'action')) === null || _f === void 0 ? void 0 : _f.value;
+                const hash = txResult.txhash;
+                if (assetString && hash && fromAddress && typeString) {
+                    const fromAsset = assetString === 'RUNE' ? AssetRuneNative : assetFromStringEx(assetString);
+                    const txData = txResult && txResult.raw_log
+                        ? getDepositTxDataFromLogs(txResult.logs, `${fromAddress}`, fromAsset, toAsset)
                         : 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,
+                    if (isAssetRuneNative(toAsset) || toAsset.synth) {
+                        const { from, to, type } = txData;
+                        const tx = {
+                            asset: fromAsset,
+                            from: from,
+                            to: to,
+                            date: date,
+                            type: type,
+                            hash: hash,
+                        };
+                        return tx;
+                    }
+                    else {
+                        const tx = {
+                            asset: fromAsset,
+                            from: [{ from: fromAddress, amount: baseAmount(assetAmount), asset: fromAsset }],
+                            to: [{ to: toAddress, amount: baseAmount(memo[3]), asset: toAsset }],
+                            date: date,
+                            type: TxType.Transfer,
+                            hash: hash,
+                        };
+                        return tx;
+                    }
+                }
+                else {
+                    const tx = {
+                        asset: {
+                            chain: '',
+                            symbol: '',
+                            ticker: '',
+                            synth: false,
+                        },
+                        from: [],
+                        to: [],
+                        date: new Date(),
+                        type: TxType.Transfer,
+                        hash: '',
                     };
+                    return tx;
                 }
-                // 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,
-                };
             }
             else {
                 return yield this.getTransactionDataThornode(txId);