@shapeshiftoss/unchained-client 9.8.1 → 9.9.0

package/dist/cosmos/parser/index.js

@@ -13,7 +13,7 @@ class TransactionParser {
             (_a = args === null || args === void 0 ? void 0 : args.assetId) !== null && _a !== void 0 ? _a : (0, caip_1.toAssetId)({
                 ...(0, caip_1.fromChainId)(this.chainId),
                 assetNamespace: 'slip44',
-                assetReference: caip_1.ASSET_REFERENCE.Cosmos
+                assetReference: caip_1.ASSET_REFERENCE.Cosmos,
             });
     }
     async parse(tx, address) {
@@ -27,11 +27,11 @@ class TransactionParser {
             confirmations: tx.confirmations,
             status: tx.confirmations > 0 ? types_1.TxStatus.Confirmed : types_1.TxStatus.Pending,
             transfers: [],
-            txid: tx.txid
+            txid: tx.txid,
         };
         // For simplicity and to limit scope we assume 1 message per transaction
         // This works ok enough for transactions we generate but way may want to improve in the future
-        const { from, to, data, value, origin } = (0, utils_1.valuesFromMsgEvents)(tx.messages[0], tx.events, this.assetId);
+        const { from, to, data, value, origin } = (0, utils_1.valuesFromMsgEvents)(tx.messages[0], tx.events, this.assetId, address);
         parsedTx.data = data;
         if (from === address && value.gt(0)) {
             parsedTx.transfers = [
@@ -41,8 +41,8 @@ class TransactionParser {
                     from,
                     to,
                     totalValue: value.toString(10),
-                    components: [{ value: value.toString(10) }]
-                }
+                    components: [{ value: value.toString(10) }],
+                },
             ];
         }
         if (to === address && value.gt(0)) {
@@ -53,8 +53,8 @@ class TransactionParser {
                     from,
                     to,
                     totalValue: value.toString(10),
-                    components: [{ value: value.toString(10) }]
-                }
+                    components: [{ value: value.toString(10) }],
+                },
             ];
         }
         // We use origin for fees because some txs have a different from and origin addresses

package/dist/cosmos/parser/utils.d.ts

@@ -1,9 +1,10 @@
+import { AssetId } from '@shapeshiftoss/caip';
 import BigNumber from 'bignumber.js';
 import { Event, Message } from '../../generated/cosmos';
 import { TxMetadata } from '../types';
 export declare const valuesFromMsgEvents: (msg: Message, events: {
     [key: string]: Event[];
-}, assetId: string) => {
+}, assetId: AssetId, address: string) => {
     from: string;
     to: string;
     value: BigNumber;

package/dist/cosmos/parser/utils.js

@@ -8,7 +8,7 @@ const logger_1 = require("@shapeshiftoss/logger");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const logger = new logger_1.Logger({
     namespace: ['client', 'cosmos', 'utils'],
-    level: process.env.LOG_LEVEL
+    level: process.env.LOG_LEVEL,
 });
 const metaData = (msg, assetId) => {
     var _a, _b, _c, _d;
@@ -22,7 +22,7 @@ const metaData = (msg, assetId) => {
                 method: msg.type,
                 delegator: msg.from,
                 destinationValidator: msg.to,
-                value: (_a = msg === null || msg === void 0 ? void 0 : msg.value) === null || _a === void 0 ? void 0 : _a.amount
+                value: (_a = msg === null || msg === void 0 ? void 0 : msg.value) === null || _a === void 0 ? void 0 : _a.amount,
             };
         case 'begin_redelegate':
             return {
@@ -32,7 +32,7 @@ const metaData = (msg, assetId) => {
                 delegator: msg.origin,
                 destinationValidator: msg.to,
                 value: (_b = msg === null || msg === void 0 ? void 0 : msg.value) === null || _b === void 0 ? void 0 : _b.amount,
-                assetId
+                assetId,
             };
         case 'withdraw_delegator_reward':
             return {
@@ -40,7 +40,7 @@ const metaData = (msg, assetId) => {
                 method: msg.type,
                 destinationValidator: msg.to,
                 value: (_c = msg === null || msg === void 0 ? void 0 : msg.value) === null || _c === void 0 ? void 0 : _c.amount,
-                assetId
+                assetId,
             };
         case 'ibc_send':
         case 'ibc_receive':
@@ -50,7 +50,7 @@ const metaData = (msg, assetId) => {
                 ibcDestination: msg.to,
                 ibcSource: msg.from,
                 assetId,
-                value: (_d = msg === null || msg === void 0 ? void 0 : msg.value) === null || _d === void 0 ? void 0 : _d.amount
+                value: (_d = msg === null || msg === void 0 ? void 0 : msg.value) === null || _d === void 0 ? void 0 : _d.amount,
             };
         // known message types with no applicable metadata
         case 'send':
@@ -60,32 +60,48 @@ const metaData = (msg, assetId) => {
             return;
     }
 };
-const virtualMessageFromEvents = (msg, events) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+const virtualMessageFromEvents = (msg, events, address) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     // ibc send tx indicated by events
     const ibcSendEventData = (_a = events[0]) === null || _a === void 0 ? void 0 : _a.find((event) => event.type === 'send_packet');
     // ibc receive tx indicated by events
-    const ibcRecvEventData = (_b = events[1]) === null || _b === void 0 ? void 0 : _b.find((event) => event.type === 'recv_packet');
+    const ibcReceivedData = Object.values(events).find((event) => event.some((subEvent) => subEvent.type === 'coin_received' &&
+        subEvent.attributes[0].key === 'receiver' &&
+        subEvent.attributes[0].value.toLowerCase() === address.toLowerCase()));
+    const ibcRecvEventData = ibcReceivedData === null || ibcReceivedData === void 0 ? void 0 : ibcReceivedData.find((event) => {
+        return event.type === 'recv_packet';
+    });
     // get rewards tx indicted by events
-    const rewardEventData = (_c = events[0]) === null || _c === void 0 ? void 0 : _c.find((event) => event.type === 'withdraw_rewards');
+    const rewardEventData = (_b = events[0]) === null || _b === void 0 ? void 0 : _b.find((event) => event.type === 'withdraw_rewards');
+    // Osmo swap tx. This works for now as a general cosmos-sdk parser
+    // Eventually may want an osmo parser on its own
+    const swapEventData = (_c = events[0]) === null || _c === void 0 ? void 0 : _c.find((event) => event.type === 'token_swapped');
     if (ibcSendEventData) {
         const parsedPacketData = JSON.parse((_e = (_d = ibcSendEventData === null || ibcSendEventData === void 0 ? void 0 : ibcSendEventData.attributes.find((attribute) => attribute.key === 'packet_data')) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '{}');
-        return {
-            type: 'ibc_send',
-            value: { amount: parsedPacketData.amount, denom: parsedPacketData.amount },
-            from: parsedPacketData.sender,
-            to: parsedPacketData.receiver,
-            origin: parsedPacketData.sender
-        };
+        // We dont support parsing ibc sends unless they are atom or osmo
+        if (parsedPacketData.denom === 'uatom' || parsedPacketData.denom === 'uosmo')
+            return {
+                type: 'ibc_send',
+                value: { amount: parsedPacketData.amount, denom: parsedPacketData.denom },
+                from: parsedPacketData.sender,
+                to: parsedPacketData.receiver,
+                origin: parsedPacketData.sender,
+            };
+        return;
     }
     else if (ibcRecvEventData) {
         const parsedPacketData = JSON.parse((_g = (_f = ibcRecvEventData === null || ibcRecvEventData === void 0 ? void 0 : ibcRecvEventData.attributes.find((attribute) => attribute.key === 'packet_data')) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : '{}');
+        // Osmosis IBC receives are showing up as osmosis. (Requires further debugging, probably during a swapper re-write)
+        // This hack ignores ibc deposits into osmosis
+        // Its fine because ibc assets only ephemerally exist on osmosis during a swap
+        if (parsedPacketData.receiver.startsWith('osmo'))
+            return;
         return {
             type: 'ibc_receive',
-            value: { amount: parsedPacketData.amount, denom: parsedPacketData.amount },
+            value: { amount: parsedPacketData.amount, denom: parsedPacketData.denom },
             from: parsedPacketData.sender,
             to: parsedPacketData.receiver,
-            origin: parsedPacketData.sender
+            origin: parsedPacketData.sender,
         };
     }
     else if (rewardEventData) {
@@ -96,18 +112,29 @@ const virtualMessageFromEvents = (msg, events) => {
             value: { amount: valueParsed !== null && valueParsed !== void 0 ? valueParsed : '', denom: 'uatom' },
             from: msg.from,
             to: msg.to,
-            origin: msg.origin
+            origin: msg.origin,
         };
     }
+    else if (swapEventData) {
+        const sender = (_k = swapEventData.attributes.find((attribute) => attribute.key === 'sender')) === null || _k === void 0 ? void 0 : _k.value;
+        const swapAmount = (_l = swapEventData.attributes.find((attribute) => attribute.key === 'tokens_out')) === null || _l === void 0 ? void 0 : _l.value;
+        const valueParsed = (_m = swapAmount === null || swapAmount === void 0 ? void 0 : swapAmount.slice(0, (swapAmount === null || swapAmount === void 0 ? void 0 : swapAmount.length) - 'uosmo'.length)) !== null && _m !== void 0 ? _m : '';
+        if (swapAmount === null || swapAmount === void 0 ? void 0 : swapAmount.includes('uosmo'))
+            return {
+                type: 'send',
+                value: { amount: valueParsed, denom: 'uosmo' },
+                to: sender,
+            };
+    }
     // no virtual message handled, but also no transaction message
     if (!msg) {
         logger.warn(`no transaction message found and unable to create virtual message from events: ${events}`);
     }
     return msg;
 };
-const valuesFromMsgEvents = (msg, events, assetId) => {
+const valuesFromMsgEvents = (msg, events, assetId, address) => {
     var _a, _b, _c, _d;
-    const virtualMsg = virtualMessageFromEvents(msg, events);
+    const virtualMsg = virtualMessageFromEvents(msg, events, address);
     const data = metaData(virtualMsg, assetId);
     const from = (_a = virtualMsg === null || virtualMsg === void 0 ? void 0 : virtualMsg.from) !== null && _a !== void 0 ? _a : '';
     const to = (_b = virtualMsg === null || virtualMsg === void 0 ? void 0 : virtualMsg.to) !== null && _b !== void 0 ? _b : '';

package/dist/cosmos/types.d.ts

@@ -1,5 +1,5 @@
-import { StandardTx, StandardTxMetadata } from '../types';
-export interface TxMetadata extends StandardTxMetadata {
+import { BaseTxMetadata, StandardTx } from '../types';
+export interface TxMetadata extends BaseTxMetadata {
     parser: 'cosmos';
     delegator?: string;
     sourceValidator?: string;