@shapeshiftoss/unchained-client 9.7.0 → 9.8.2

package/dist/cosmos/parser/index.js

@@ -31,7 +31,7 @@ class TransactionParser {
         };
         // 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 = [

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

@@ -60,29 +60,45 @@ 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
@@ -99,15 +115,26 @@ const virtualMessageFromEvents = (msg, events) => {
             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/evm/avalanche/parser/index.js

@@ -1,12 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionParser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const parser_1 = require("../../parser");
+const zrx = __importStar(require("../../parser/zrx"));
 class TransactionParser extends parser_1.BaseTransactionParser {
     constructor(args) {
         super(args);
         this.assetId = caip_1.avalancheAssetId;
+        this.registerParser(new zrx.Parser());
     }
 }
 exports.TransactionParser = TransactionParser;

package/dist/evm/ethereum/parser/constants.d.ts

@@ -1,6 +1,5 @@
 export declare const SHAPE_SHIFT_ROUTER_CONTRACT = "0x6a1e73f12018D8e5f966ce794aa2921941feB17E";
 export declare const UNI_V2_ROUTER_CONTRACT = "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D";
-export declare const ZRX_PROXY_CONTRACT = "0xDef1C0ded9bec7F1a1670819833240f027b25EfF";
 export declare const THOR_ROUTER_CONTRACT_MAINNET = "0xC145990E84155416144C532E31f89B840Ca8c2cE";
 export declare const THOR_ROUTER_CONTRACT_ROPSTEN = "0xefA28233838f46a80AaaC8c309077a9ba70D123A";
 export declare const FOXY_STAKING_CONTRACT = "0xee77aa3Fd23BbeBaf94386dD44b548e9a785ea4b";

package/dist/evm/ethereum/parser/constants.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COWSWAP_CONTRACT_MAINNET = exports.UNI_V2_FOX_STAKING_REWARDS_V3 = exports.WETH_CONTRACT_ROPSTEN = exports.WETH_CONTRACT_MAINNET = exports.FOXY_STAKING_CONTRACT = exports.THOR_ROUTER_CONTRACT_ROPSTEN = exports.THOR_ROUTER_CONTRACT_MAINNET = exports.ZRX_PROXY_CONTRACT = exports.UNI_V2_ROUTER_CONTRACT = exports.SHAPE_SHIFT_ROUTER_CONTRACT = void 0;
+exports.COWSWAP_CONTRACT_MAINNET = exports.UNI_V2_FOX_STAKING_REWARDS_V3 = exports.WETH_CONTRACT_ROPSTEN = exports.WETH_CONTRACT_MAINNET = exports.FOXY_STAKING_CONTRACT = exports.THOR_ROUTER_CONTRACT_ROPSTEN = exports.THOR_ROUTER_CONTRACT_MAINNET = exports.UNI_V2_ROUTER_CONTRACT = exports.SHAPE_SHIFT_ROUTER_CONTRACT = void 0;
 exports.SHAPE_SHIFT_ROUTER_CONTRACT = '0x6a1e73f12018D8e5f966ce794aa2921941feB17E';
 exports.UNI_V2_ROUTER_CONTRACT = '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D';
-exports.ZRX_PROXY_CONTRACT = '0xDef1C0ded9bec7F1a1670819833240f027b25EfF';
 exports.THOR_ROUTER_CONTRACT_MAINNET = '0xC145990E84155416144C532E31f89B840Ca8c2cE';
 exports.THOR_ROUTER_CONTRACT_ROPSTEN = '0xefA28233838f46a80AaaC8c309077a9ba70D123A';
 exports.FOXY_STAKING_CONTRACT = '0xee77aa3Fd23BbeBaf94386dD44b548e9a785ea4b';

package/dist/evm/ethereum/parser/index.js

@@ -26,13 +26,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionParser = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const parser_1 = require("../../parser");
+const zrx = __importStar(require("../../parser/zrx"));
 const cowswap = __importStar(require("./cowswap"));
 const foxy = __importStar(require("./foxy"));
 const thor = __importStar(require("./thor"));
 const uniV2 = __importStar(require("./uniV2"));
 const weth = __importStar(require("./weth"));
 const yearn = __importStar(require("./yearn"));
-const zrx = __importStar(require("./zrx"));
 class TransactionParser extends parser_1.BaseTransactionParser {
     constructor(args) {
         super(args);

package/dist/evm/ethereum/parser/thor.js

@@ -19,16 +19,16 @@ class Parser {
         };
         // TODO: Router contract can change, use /inbound_addresses endpoint to determine current router contract.
         // We will also need to know all past router contract addresses if we intend on using receive address as the means for detection
-        switch (args.chainId) {
-            case 'eip155:1':
-                this.routerContract = constants_1.THOR_ROUTER_CONTRACT_MAINNET;
-                break;
-            case 'eip155:3':
-                this.routerContract = constants_1.THOR_ROUTER_CONTRACT_ROPSTEN;
-                break;
-            default:
-                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
-        }
+        this.routerContract = (() => {
+            switch (args.chainId) {
+                case 'eip155:1':
+                    return constants_1.THOR_ROUTER_CONTRACT_MAINNET;
+                case 'eip155:3':
+                    return constants_1.THOR_ROUTER_CONTRACT_ROPSTEN;
+                default:
+                    throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+            }
+        })();
     }
     async parse(tx) {
         if (!(0, parser_1.txInteractsWithContract)(tx, this.routerContract))

package/dist/evm/ethereum/parser/uniV2.js

@@ -26,16 +26,16 @@ class Parser {
         };
         this.chainId = args.chainId;
         this.provider = args.provider;
-        switch (args.chainId) {
-            case 'eip155:1':
-                this.wethContract = constants_1.WETH_CONTRACT_MAINNET;
-                break;
-            case 'eip155:3':
-                this.wethContract = constants_1.WETH_CONTRACT_ROPSTEN;
-                break;
-            default:
-                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
-        }
+        this.wethContract = (() => {
+            switch (args.chainId) {
+                case 'eip155:1':
+                    return constants_1.WETH_CONTRACT_MAINNET;
+                case 'eip155:3':
+                    return constants_1.WETH_CONTRACT_ROPSTEN;
+                default:
+                    throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+            }
+        })();
     }
     async parseUniV2(tx) {
         if (!tx.inputData)

package/dist/evm/ethereum/parser/weth.js

@@ -19,16 +19,16 @@ class Parser {
         };
         this.chainId = args.chainId;
         this.provider = args.provider;
-        switch (args.chainId) {
-            case 'eip155:1':
-                this.wethContract = constants_1.WETH_CONTRACT_MAINNET;
-                break;
-            case 'eip155:3':
-                this.wethContract = constants_1.WETH_CONTRACT_ROPSTEN;
-                break;
-            default:
-                throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
-        }
+        this.wethContract = (() => {
+            switch (args.chainId) {
+                case 'eip155:1':
+                    return constants_1.WETH_CONTRACT_MAINNET;
+                case 'eip155:3':
+                    return constants_1.WETH_CONTRACT_ROPSTEN;
+                default:
+                    throw new Error('chainId is not supported. (supported chainIds: eip155:1, eip155:3)');
+            }
+        })();
     }
     async parse(tx) {
         if (!(0, parser_1.txInteractsWithContract)(tx, this.wethContract))

package/dist/evm/parser/constants.d.ts

@@ -0,0 +1 @@
+export declare const ZRX_PROXY_CONTRACT = "0xDef1C0ded9bec7F1a1670819833240f027b25EfF";

package/dist/evm/parser/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZRX_PROXY_CONTRACT = void 0;
+exports.ZRX_PROXY_CONTRACT = '0xDef1C0ded9bec7F1a1670819833240f027b25EfF';

package/dist/evm/{ethereum/parser → parser}/zrx.d.ts

@@ -1,5 +1,5 @@
-import { Tx } from '../../../generated/ethereum';
-import { SubParser, TxSpecific } from '../../parser';
+import { type Tx } from '../parser/types';
+import { type SubParser, type TxSpecific } from '.';
 export declare class Parser implements SubParser<Tx> {
     parse(tx: Tx): Promise<TxSpecific | undefined>;
 }

package/dist/evm/{ethereum/parser → parser}/zrx.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
-const types_1 = require("../../../types");
-const parser_1 = require("../../parser");
+const types_1 = require("../../types");
+const _1 = require(".");
 const constants_1 = require("./constants");
 class Parser {
     async parse(tx) {
-        if (!(0, parser_1.txInteractsWithContract)(tx, constants_1.ZRX_PROXY_CONTRACT))
+        if (!(0, _1.txInteractsWithContract)(tx, constants_1.ZRX_PROXY_CONTRACT))
             return;
         if (!(tx.tokenTransfers && tx.tokenTransfers.length))
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/unchained-client",
-  "version": "9.7.0",
+  "version": "9.8.2",
   "license": "MIT",
   "main": "dist/index.js",
   "source": "src/index.ts",