@shapeshiftoss/unchained-client 10.1.2 → 10.2.0

package/dist/cosmossdk/parser/index.js

@@ -15,22 +15,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTransactionParser = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
-const logger_1 = require("@shapeshiftoss/logger");
 const bignumber_js_1 = require("bignumber.js");
 const types_1 = require("../../types");
 const utils_1 = require("../../utils");
 const utils_2 = require("./utils");
 __exportStar(require("./types"), exports);
-const logger = new logger_1.Logger({
-    namespace: ['unchained-client', 'cosmossdk', 'parser'],
-    level: process.env.LOG_LEVEL,
-});
-const assetIdByDenom = new Map([
-    ['uatom', caip_1.cosmosAssetId],
-    ['uosmo', caip_1.osmosisAssetId],
-    ['rune', caip_1.thorchainAssetId],
-]);
 class BaseTransactionParser {
     constructor(args) {
         this.chainId = args.chainId;
@@ -48,28 +37,9 @@ class BaseTransactionParser {
             transfers: [],
             txid: tx.txid,
         };
-        parsedTx.data = (0, utils_2.metaData)(tx.messages[0], this.assetId);
-        tx.messages.forEach(({ from = '', to = '', value, origin }) => {
+        tx.messages.forEach((msg, i) => {
             var _a;
-            const amount = new bignumber_js_1.BigNumber((_a = value === null || value === void 0 ? void 0 : value.amount) !== null && _a !== void 0 ? _a : 0);
-            const assetId = (() => {
-                if (!(value === null || value === void 0 ? void 0 : value.denom))
-                    return this.assetId;
-                if (assetIdByDenom.has(value.denom))
-                    return assetIdByDenom.get(value.denom);
-                const [assetNamespace, assetReference] = value.denom.split('/');
-                if (assetNamespace === 'ibc' && assetReference) {
-                    return (0, caip_1.toAssetId)({ chainId: this.chainId, assetNamespace, assetReference });
-                }
-                logger.warn(`unknown denom: ${value.denom}, defaulting to: ${this.assetId}`);
-                return this.assetId;
-            })();
-            if (from === address && amount.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, assetId, from, to, amount.toString(10));
-            }
-            if (to === address && amount.gt(0)) {
-                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, assetId, from, to, amount.toString(10));
-            }
+            const { from, to, value, origin } = msg;
             // We use origin for fees because some txs have a different from and origin addresses
             if (origin === address) {
                 // network fee
@@ -78,6 +48,18 @@ class BaseTransactionParser {
                     parsedTx.fee = { assetId: this.assetId, value: fees.toString(10) };
                 }
             }
+            const assetId = (0, utils_2.getAssetIdByDenom)(value === null || value === void 0 ? void 0 : value.denom, this.assetId);
+            if (!assetId)
+                return;
+            if (i === 0)
+                parsedTx.data = (0, utils_2.metaData)(msg, tx.events[String(i)], assetId);
+            const amount = new bignumber_js_1.BigNumber((_a = value === null || value === void 0 ? void 0 : value.amount) !== null && _a !== void 0 ? _a : 0);
+            if (from === address && amount.gt(0)) {
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Send, assetId, from, to, amount.toString(10));
+            }
+            if (to === address && amount.gt(0)) {
+                parsedTx.transfers = (0, utils_1.aggregateTransfer)(parsedTx.transfers, types_1.TransferType.Receive, assetId, from, to, amount.toString(10));
+            }
         });
         return parsedTx;
     }

package/dist/cosmossdk/parser/types.d.ts

@@ -1,16 +1,30 @@
 import { BaseTxMetadata, StandardTx } from '../../types';
 import * as cosmossdk from '../types';
 export declare type Tx = cosmossdk.Tx;
-export interface TxMetadata extends BaseTxMetadata {
-    parser: 'cosmos';
-    delegator?: string;
+export interface StakingMetadata extends BaseTxMetadata {
+    parser: 'staking';
+    delegator: string;
     sourceValidator?: string;
-    destinationValidator?: string;
-    assetId?: string;
-    value?: string;
-    ibcDestination?: string;
-    ibcSource?: string;
+    destinationValidator: string;
+    assetId: string;
+    value: string;
 }
+export interface IbcMetadata extends BaseTxMetadata {
+    parser: 'ibc';
+    ibcDestination: string;
+    ibcSource: string;
+    assetId: string;
+    value: string;
+}
+export interface SwapMetadata extends BaseTxMetadata {
+    parser: 'swap';
+    memo: string;
+}
+export interface LpMetadata extends BaseTxMetadata {
+    parser: 'lp';
+    pool: string;
+}
+export declare type TxMetadata = StakingMetadata | IbcMetadata | SwapMetadata | LpMetadata;
 export interface ParsedTx extends StandardTx {
     data?: TxMetadata;
 }

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

@@ -1,3 +1,5 @@
+import { AssetId } from '@shapeshiftoss/caip';
 import { Message } from '../types';
 import { TxMetadata } from './types';
-export declare const metaData: (msg: Message | undefined, assetId: string) => TxMetadata | undefined;
+export declare const getAssetIdByDenom: (denom: string, assetId: string) => AssetId | undefined;
+export declare const metaData: (msg: Message, event: Record<string, Record<string, string>>, assetId: string) => TxMetadata | undefined;

package/dist/cosmossdk/parser/utils.js

@@ -1,54 +1,101 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.metaData = void 0;
+exports.metaData = exports.getAssetIdByDenom = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
 const logger_1 = require("@shapeshiftoss/logger");
 const logger = new logger_1.Logger({
     namespace: ['unchained-client', 'cosmossdk', 'parser', 'utils'],
     level: process.env.LOG_LEVEL,
 });
-// TODO: break out metadata by parser category to allow more explicit metadata types and pull out chain specific logic to appropriate chain parser
-const metaData = (msg, assetId) => {
-    var _a, _b, _c, _d;
-    if (!msg)
-        return;
+const assetIdByDenom = new Map([
+    ['uatom', caip_1.cosmosAssetId],
+    ['uosmo', caip_1.osmosisAssetId],
+    ['rune', caip_1.thorchainAssetId],
+]);
+const getAssetIdByDenom = (denom, assetId) => {
+    if (assetIdByDenom.has(denom))
+        return assetIdByDenom.get(denom);
+    const { chainId } = (0, caip_1.fromAssetId)(assetId);
+    const [assetNamespace, assetReference] = denom.split('/');
+    if (assetNamespace === 'ibc' && assetReference) {
+        return (0, caip_1.toAssetId)({ chainId, assetNamespace, assetReference });
+    }
+    logger.warn(`unknown denom: ${denom}`);
+    return;
+};
+exports.getAssetIdByDenom = getAssetIdByDenom;
+const metaData = (msg, event, assetId) => {
+    var _a, _b, _c, _d, _e;
     switch (msg.type) {
         case 'delegate':
-        case 'begin_unbonding':
             return {
-                parser: 'cosmos',
+                parser: 'staking',
                 method: msg.type,
-                delegator: msg.from,
+                value: msg.value.amount,
+                assetId: (_a = (0, exports.getAssetIdByDenom)(msg.value.denom, assetId)) !== null && _a !== void 0 ? _a : '',
+                delegator: msg.origin,
                 destinationValidator: msg.to,
-                value: (_a = msg === null || msg === void 0 ? void 0 : msg.value) === null || _a === void 0 ? void 0 : _a.amount,
+            };
+        case 'begin_unbonding':
+            return {
+                parser: 'staking',
+                method: msg.type,
+                value: msg.value.amount,
+                assetId: (_b = (0, exports.getAssetIdByDenom)(msg.value.denom, assetId)) !== null && _b !== void 0 ? _b : '',
+                delegator: msg.origin,
+                destinationValidator: msg.from,
             };
         case 'begin_redelegate':
             return {
-                parser: 'cosmos',
+                parser: 'staking',
                 method: msg.type,
-                sourceValidator: msg.from,
+                value: msg.value.amount,
+                assetId: (_c = (0, exports.getAssetIdByDenom)(msg.value.denom, assetId)) !== null && _c !== void 0 ? _c : '',
                 delegator: msg.origin,
+                sourceValidator: msg.from,
                 destinationValidator: msg.to,
-                value: (_b = msg === null || msg === void 0 ? void 0 : msg.value) === null || _b === void 0 ? void 0 : _b.amount,
-                assetId,
             };
         case 'withdraw_delegator_reward':
             return {
-                parser: 'cosmos',
+                parser: 'staking',
                 method: msg.type,
+                value: msg.value.amount,
+                assetId: (_d = (0, exports.getAssetIdByDenom)(msg.value.denom, assetId)) !== null && _d !== void 0 ? _d : '',
+                delegator: msg.origin,
                 destinationValidator: msg.to,
-                value: (_c = msg === null || msg === void 0 ? void 0 : msg.value) === null || _c === void 0 ? void 0 : _c.amount,
-                assetId,
             };
         case 'transfer':
         case 'recv_packet':
             return {
-                parser: 'cosmos',
-                method: 'ibc_transfer',
+                parser: 'ibc',
+                method: msg.type,
+                value: msg.value.amount,
+                assetId: (_e = (0, exports.getAssetIdByDenom)(msg.value.denom, assetId)) !== null && _e !== void 0 ? _e : '',
+                ibcSource: msg.origin,
                 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,
             };
+        case 'deposit':
+            if (event['add_liquidity']) {
+                return {
+                    parser: 'lp',
+                    method: msg.type,
+                    pool: event['add_liquidity']['pool'],
+                };
+            }
+            return {
+                parser: 'swap',
+                method: msg.type,
+                memo: event['message']['memo'],
+            };
+        case 'outbound': {
+            const memo = event['outbound']['memo'];
+            const [type] = memo.split(':');
+            return {
+                parser: 'swap',
+                method: type.toLowerCase() || msg.type,
+                memo: event['outbound']['memo'],
+            };
+        }
         case 'swap_exact_amount_in':
             // TODO: parse applicable metadata
             return;

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

@@ -60,20 +60,20 @@ class Parser {
             parser: 'yearn',
         };
         switch (txSigHash) {
-            case this.supportedYearnFunctions.approveSigHash:
+            case this.supportedYearnFunctions.approveSigHash: {
                 if (decoded.args._spender !== constants_1.SHAPE_SHIFT_ROUTER_CONTRACT)
                     return;
-                return {
-                    data: {
-                        ...data,
-                        assetId: (0, caip_1.toAssetId)({
-                            chainId: this.chainId,
-                            assetNamespace: 'erc20',
-                            assetReference: tx.to,
-                        }),
-                        value: decoded.args._value.toString(),
-                    },
-                };
+                const value = decoded.args._value;
+                const assetId = (0, caip_1.toAssetId)({
+                    chainId: this.chainId,
+                    assetNamespace: 'erc20',
+                    assetReference: tx.to,
+                });
+                if (value.isZero()) {
+                    return { data: { ...data, assetId, method: 'revoke', value: value.toString() } };
+                }
+                return { data: { ...data, assetId, value: value.toString() } };
+            }
             case this.supportedShapeShiftFunctions.depositSigHash:
                 if (tx.to !== constants_1.SHAPE_SHIFT_ROUTER_CONTRACT)
                     return;

package/dist/evm/parser/erc20.js

@@ -37,8 +37,12 @@ class Parser {
             parser: 'erc20',
         };
         switch (txSigHash) {
-            case this.supportedFunctions.approveSigHash:
-                return { data: { ...data, value: (decoded === null || decoded === void 0 ? void 0 : decoded.args.amount).toString() } };
+            case this.supportedFunctions.approveSigHash: {
+                const value = decoded.args.amount;
+                if (value.isZero())
+                    return { data: { ...data, method: 'revoke', value: value.toString() } };
+                return { data: { ...data, value: value.toString() } };
+            }
             default:
                 return { data };
         }

package/dist/generated/cosmos/models/Message.d.ts

@@ -21,19 +21,19 @@ export interface Message {
      * @type {string}
      * @memberof Message
      */
-    from?: string;
+    from: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    origin?: string;
+    origin: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    to?: string;
+    to: string;
     /**
      *
      * @type {string}
@@ -45,7 +45,7 @@ export interface Message {
      * @type {Value}
      * @memberof Message
      */
-    value?: Value;
+    value: Value;
 }
 /**
  * Check if a given object implements the Message interface.

package/dist/generated/cosmos/models/Message.js

@@ -15,14 +15,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageToJSON = exports.MessageFromJSONTyped = exports.MessageFromJSON = exports.instanceOfMessage = void 0;
-const runtime_1 = require("../runtime");
 const Value_1 = require("./Value");
 /**
  * Check if a given object implements the Message interface.
  */
 function instanceOfMessage(value) {
     let isInstance = true;
+    isInstance = isInstance && "from" in value;
+    isInstance = isInstance && "origin" in value;
+    isInstance = isInstance && "to" in value;
     isInstance = isInstance && "type" in value;
+    isInstance = isInstance && "value" in value;
     return isInstance;
 }
 exports.instanceOfMessage = instanceOfMessage;
@@ -35,11 +38,11 @@ function MessageFromJSONTyped(json, ignoreDiscriminator) {
         return json;
     }
     return {
-        'from': !(0, runtime_1.exists)(json, 'from') ? undefined : json['from'],
-        'origin': !(0, runtime_1.exists)(json, 'origin') ? undefined : json['origin'],
-        'to': !(0, runtime_1.exists)(json, 'to') ? undefined : json['to'],
+        'from': json['from'],
+        'origin': json['origin'],
+        'to': json['to'],
         'type': json['type'],
-        'value': !(0, runtime_1.exists)(json, 'value') ? undefined : (0, Value_1.ValueFromJSON)(json['value']),
+        'value': (0, Value_1.ValueFromJSON)(json['value']),
     };
 }
 exports.MessageFromJSONTyped = MessageFromJSONTyped;

package/dist/generated/osmosis/models/Message.d.ts

@@ -21,19 +21,19 @@ export interface Message {
      * @type {string}
      * @memberof Message
      */
-    from?: string;
+    from: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    origin?: string;
+    origin: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    to?: string;
+    to: string;
     /**
      *
      * @type {string}
@@ -45,7 +45,7 @@ export interface Message {
      * @type {Value}
      * @memberof Message
      */
-    value?: Value;
+    value: Value;
 }
 /**
  * Check if a given object implements the Message interface.

package/dist/generated/osmosis/models/Message.js

@@ -15,14 +15,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageToJSON = exports.MessageFromJSONTyped = exports.MessageFromJSON = exports.instanceOfMessage = void 0;
-const runtime_1 = require("../runtime");
 const Value_1 = require("./Value");
 /**
  * Check if a given object implements the Message interface.
  */
 function instanceOfMessage(value) {
     let isInstance = true;
+    isInstance = isInstance && "from" in value;
+    isInstance = isInstance && "origin" in value;
+    isInstance = isInstance && "to" in value;
     isInstance = isInstance && "type" in value;
+    isInstance = isInstance && "value" in value;
     return isInstance;
 }
 exports.instanceOfMessage = instanceOfMessage;
@@ -35,11 +38,11 @@ function MessageFromJSONTyped(json, ignoreDiscriminator) {
         return json;
     }
     return {
-        'from': !(0, runtime_1.exists)(json, 'from') ? undefined : json['from'],
-        'origin': !(0, runtime_1.exists)(json, 'origin') ? undefined : json['origin'],
-        'to': !(0, runtime_1.exists)(json, 'to') ? undefined : json['to'],
+        'from': json['from'],
+        'origin': json['origin'],
+        'to': json['to'],
         'type': json['type'],
-        'value': !(0, runtime_1.exists)(json, 'value') ? undefined : (0, Value_1.ValueFromJSON)(json['value']),
+        'value': (0, Value_1.ValueFromJSON)(json['value']),
     };
 }
 exports.MessageFromJSONTyped = MessageFromJSONTyped;

package/dist/generated/thorchain/models/Message.d.ts

@@ -21,19 +21,19 @@ export interface Message {
      * @type {string}
      * @memberof Message
      */
-    from?: string;
+    from: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    origin?: string;
+    origin: string;
     /**
      *
      * @type {string}
      * @memberof Message
      */
-    to?: string;
+    to: string;
     /**
      *
      * @type {string}
@@ -45,7 +45,7 @@ export interface Message {
      * @type {Value}
      * @memberof Message
      */
-    value?: Value;
+    value: Value;
 }
 /**
  * Check if a given object implements the Message interface.

package/dist/generated/thorchain/models/Message.js

@@ -15,14 +15,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageToJSON = exports.MessageFromJSONTyped = exports.MessageFromJSON = exports.instanceOfMessage = void 0;
-const runtime_1 = require("../runtime");
 const Value_1 = require("./Value");
 /**
  * Check if a given object implements the Message interface.
  */
 function instanceOfMessage(value) {
     let isInstance = true;
+    isInstance = isInstance && "from" in value;
+    isInstance = isInstance && "origin" in value;
+    isInstance = isInstance && "to" in value;
     isInstance = isInstance && "type" in value;
+    isInstance = isInstance && "value" in value;
     return isInstance;
 }
 exports.instanceOfMessage = instanceOfMessage;
@@ -35,11 +38,11 @@ function MessageFromJSONTyped(json, ignoreDiscriminator) {
         return json;
     }
     return {
-        'from': !(0, runtime_1.exists)(json, 'from') ? undefined : json['from'],
-        'origin': !(0, runtime_1.exists)(json, 'origin') ? undefined : json['origin'],
-        'to': !(0, runtime_1.exists)(json, 'to') ? undefined : json['to'],
+        'from': json['from'],
+        'origin': json['origin'],
+        'to': json['to'],
         'type': json['type'],
-        'value': !(0, runtime_1.exists)(json, 'value') ? undefined : (0, Value_1.ValueFromJSON)(json['value']),
+        'value': (0, Value_1.ValueFromJSON)(json['value']),
     };
 }
 exports.MessageFromJSONTyped = MessageFromJSONTyped;

package/package.json

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