@xchainjs/xchain-thorchain 0.28.5 → 0.28.6

package/lib/index.js

@@ -10476,13 +10476,14 @@ class Client extends xchainClient.BaseXChainClient {
      * @returns {Tx} The transaction details of the given transaction id.
      */
     getTransactionData(txId, address) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             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');
+                const coinReceivedEvent = (_c = txResult.logs[0].events) === null || _c === void 0 ? void 0 : _c.find((event) => event.type === 'coin_received');
                 if (!transferEvent || !messageEvent) {
                     throw new Error('Invalid transaction data');
                 }
@@ -10505,14 +10506,14 @@ class Client extends xchainClient.BaseXChainClient {
                         .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
+                const fromAddress = ((_d = transferEvent.attributes.find((attr) => attr.key === 'sender')) === null || _d === void 0 ? void 0 : _d.value)
+                    ? (_e = transferEvent.attributes.find((attr) => attr.key === 'sender')) === null || _e === void 0 ? void 0 : _e.value
                     : address;
-                const memo = ((_e = txResult.tx) === null || _e === void 0 ? void 0 : _e.body) ? txResult.tx.body.memo.split(':') : '';
+                const memo = ((_f = txResult.tx) === null || _f === void 0 ? void 0 : _f.body) ? txResult.tx.body.memo.split(':') : '';
                 const toAddress = memo[2] ? memo[2] : '';
-                const toAsset = memo[1] ? xchainUtil.assetFromStringEx(memo[1]) : AssetRuneNative;
+                const toAsset = memo[1] && !coinReceivedEvent ? xchainUtil.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 typeString = (_g = messageEvent.attributes.find((attr) => attr.key === 'action')) === null || _g === void 0 ? void 0 : _g.value;
                 const hash = txResult.txhash;
                 if (assetString && hash && fromAddress && typeString) {
                     const fromAsset = assetString === 'RUNE' ? AssetRuneNative : xchainUtil.assetFromStringEx(assetString);