@sonarwatch/portfolio-plugins 0.11.97 → 0.11.98

package/src/plugins/scallop/spoolsMarketJob.js

@@ -13,12 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const sui_js_1 = require("@mysten/sui.js");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
+const getObject_1 = require("../../utils/sui/getObject");
 const client = (0, clients_1.getClientSui)();
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const address = yield cache.getItem(constants_1.addressKey, {
         prefix: constants_1.addressPrefix,
         networkId: portfolio_core_1.NetworkId.sui,
@@ -34,22 +35,14 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             continue;
         const { id: poolId, rewardPoolId } = detail;
         const [stakeObjectResponse, rewardObjectResponse] = yield Promise.all([
-            client.getObject({
-                id: poolId,
-                options: {
-                    showContent: true,
-                },
-            }),
-            client.getObject({
-                id: rewardPoolId,
-                options: {
-                    showContent: true,
-                },
-            }),
+            (0, getObject_1.getObject)(client, poolId),
+            (0, getObject_1.getObject)(client, rewardPoolId),
         ]);
         if (stakeObjectResponse.data && rewardObjectResponse.data) {
-            const stakeFields = (0, sui_js_1.getObjectFields)(stakeObjectResponse);
-            const rewardFields = (0, sui_js_1.getObjectFields)(rewardObjectResponse);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const stakeFields = (_a = stakeObjectResponse.data.content) === null || _a === void 0 ? void 0 : _a.fields;
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const rewardFields = (_b = rewardObjectResponse.data.content) === null || _b === void 0 ? void 0 : _b.fields;
             if (!stakeFields || !rewardFields)
                 continue;
             const staked = stakeFields['stakes'];

package/src/plugins/scallop/spoolsMarketJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"spoolsMarketJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/spoolsMarketJob.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spoolsMarketJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/scallop/spoolsMarketJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/scallop/types/coin.d.ts

@@ -1,4 +1,4 @@
-import { CoinMetadata } from '@mysten/sui.js';
+import { CoinMetadata } from '@mysten/sui.js/client';
 export declare const COIN_NAMES: readonly ["eth", "btc", "usdc", "usdt", "sui", "apt", "sol", "cetus"];
 export declare const MARKET_COIN_NAMES: readonly ["seth", "sbtc", "susdc", "susdt", "ssui", "sapt", "ssol", "scetus"];
 export declare const SUPPORTED_SPOOL_COIN_NAMES: readonly ["ssui", "susdc"];

package/src/plugins/scallop/types/market.d.ts

@@ -1,14 +1,13 @@
-import { ObjectContentFields } from '@mysten/sui.js';
 import BigNumber from 'bignumber.js';
 import { BasicField, IdField, WitTable } from './basic';
 export type BalanceSheet = {
-    [k in string]?: ObjectContentFields;
+    [k in string]?: any;
 };
 export type BorrowIndexes = {
-    [k in string]?: ObjectContentFields;
+    [k in string]?: any;
 };
 export type InterestModel = {
-    [k in string]?: ObjectContentFields;
+    [k in string]?: any;
 };
 export type InterestModelData = {
     base_borrow_rate_per_sec: {

package/src/plugins/scallop/types/market.js.map

@@ -1 +1 @@
-{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/scallop/types/market.ts"],"names":[],"mappings":";;AAuFA,MAAM,kBAAkB,GAAG;IACzB,qBAAqB;IACrB,iBAAiB;IACjB,kBAAkB;IAClB,IAAI;IACJ,iBAAiB;IACjB,UAAU;IACV,gBAAgB;IAChB,aAAa;IACb,OAAO;CACC,CAAC;AAEX,MAAM,YAAY,GAAG;IACnB,gBAAgB;IAChB,iBAAiB;IACjB,IAAI;IACJ,sBAAsB;IACtB,qBAAqB;CACb,CAAC"}
+{"version":3,"file":"market.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/scallop/types/market.ts"],"names":[],"mappings":";;AAsFA,MAAM,kBAAkB,GAAG;IACzB,qBAAqB;IACrB,iBAAiB;IACjB,kBAAkB;IAClB,IAAI;IACJ,iBAAiB;IACjB,UAAU;IACV,gBAAgB;IAChB,aAAa;IACb,OAAO;CACC,CAAC;AAEX,MAAM,YAAY,GAAG;IACnB,gBAAgB;IAChB,iBAAiB;IACjB,IAAI;IACJ,sBAAsB;IACtB,qBAAqB;CACb,CAAC"}

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/tokens/fetchers/sui-nfts.js

@@ -8,124 +8,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const sui_js_1 = require("@mysten/sui.js");
 const clients_1 = require("../../../utils/clients");
-const getFormattedCollectionNameAndId_1 = __importDefault(require("../../../utils/sui/getFormattedCollectionNameAndId"));
 const constants_1 = require("../constants");
 const constants_2 = require("../../../utils/sui/constants");
-const getMultipleObjectsSafe_1 = __importDefault(require("../../../utils/sui/getMultipleObjectsSafe"));
+const getOwnedObjects_1 = require("../../../utils/sui/getOwnedObjects");
+const getDynamicFields_1 = require("../../../utils/sui/getDynamicFields");
+const multiGetObjects_1 = require("../../../utils/sui/multiGetObjects");
 const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const client = (0, clients_1.getClientSui)();
+    const ownedObjects = yield (0, getOwnedObjects_1.getOwnedObjects)(client, owner, {
+        options: {
+            showDisplay: true,
+        },
+    });
+    if (ownedObjects.length === 0)
+        return [];
+    const nftObjects = [...ownedObjects.filter((o) => { var _a, _b; return (_b = (_a = o.data) === null || _a === void 0 ? void 0 : _a.display) === null || _b === void 0 ? void 0 : _b.data; })];
+    const obKioskObject = ownedObjects.find((o) => { var _a; return ((_a = o.data) === null || _a === void 0 ? void 0 : _a.type) === constants_2.obKioskStructType; });
+    if (obKioskObject) {
+        const kioskDynamicObjects = yield (0, getDynamicFields_1.getDynamicFields)(client, ((_a = obKioskObject === null || obKioskObject === void 0 ? void 0 : obKioskObject.data) === null || _a === void 0 ? void 0 : _a.content).fields.kiosk, true);
+        const ownerKioskObjects = yield (0, multiGetObjects_1.multiGetObjects)(client, kioskDynamicObjects.map((o) => o.objectId));
+        nftObjects.push(...ownerKioskObjects);
+    }
+    // TODO add Kiosk objects
     const assets = [];
-    let obKioskObjects;
-    let ownedNFTsObjects;
-    let cursor;
-    const kioskItemsAddresses = new Set();
-    do {
-        obKioskObjects = yield client.getOwnedObjects({
-            owner,
-            filter: {
-                StructType: constants_2.obKioskStructType,
-            },
-            options: {
-                showContent: true,
-            },
-            cursor,
-        });
-        cursor = obKioskObjects.nextCursor;
-        for (const obKioskObject of obKioskObjects.data) {
-            if (!obKioskObject.data || !obKioskObject.data.content)
-                continue;
-            const contentObject = obKioskObject.data.content;
-            if (!contentObject.fields.kiosk)
-                continue;
-            const dynamicFields = yield client.getDynamicFields({
-                parentId: contentObject.fields.kiosk,
-            });
-            if (dynamicFields.data.length === 0)
-                continue;
-            const dynamicObjects = dynamicFields.data.filter((field) => field.type === 'DynamicObject');
-            if (dynamicObjects.length !== 1 ||
-                dynamicObjects[0].name.type !== constants_2.kioskItemType)
-                continue;
-            kioskItemsAddresses.add(dynamicObjects[0].objectId);
+    nftObjects.forEach((object) => {
+        var _a, _b, _c;
+        if (!object.data)
+            return;
+        if (object.data.type === obKioskObject)
+            return;
+        const display = (_a = object.data.display) === null || _a === void 0 ? void 0 : _a.data;
+        const content = object.data.content;
+        let attributes;
+        if ((_b = content.fields.attributes) === null || _b === void 0 ? void 0 : _b.fields.map.fields.contents) {
+            attributes = (_c = content.fields.attributes) === null || _c === void 0 ? void 0 : _c.fields.map.fields.contents.map((c) => ({
+                trait_type: c.fields.key,
+                value: c.fields.value,
+            }));
         }
-    } while (obKioskObjects.hasNextPage);
-    let nftKioskObjects = yield (0, getMultipleObjectsSafe_1.default)(client, Array.from(kioskItemsAddresses), {
-        showContent: true,
-        showDisplay: true,
-        showType: true,
-        showOwner: true,
-    });
-    cursor = undefined;
-    do {
-        ownedNFTsObjects = yield client.getOwnedObjects({
-            owner,
-            options: {
-                showContent: true,
-                showType: true,
-                showDisplay: true,
-                showOwner: true,
+        assets.push({
+            networkId: portfolio_core_1.NetworkId.sui,
+            type: portfolio_core_1.PortfolioAssetType.collectible,
+            value: null,
+            attributes: {},
+            data: {
+                address: object.data.type,
+                amount: Number(content.fields.amount || 1),
+                price: null,
+                description: (display === null || display === void 0 ? void 0 : display.description) || content.fields.description,
+                imageUri: (display === null || display === void 0 ? void 0 : display.image_url) || content.fields.url,
+                name: (display === null || display === void 0 ? void 0 : display.name) || content.fields.name || content.fields.tick,
+                attributes,
             },
-            cursor,
         });
-        cursor = ownedNFTsObjects.nextCursor;
-        const ownedObjects = nftKioskObjects.length > 0
-            ? [...ownedNFTsObjects.data, ...nftKioskObjects]
-            : ownedNFTsObjects.data;
-        for (const ownedObject of ownedObjects) {
-            if (!ownedObject.data || !ownedObject.data.content)
-                continue;
-            const type = (0, sui_js_1.getObjectType)(ownedObject);
-            if (!type)
-                continue;
-            const object = ownedObject.data.content;
-            const display = (0, sui_js_1.getObjectDisplay)(ownedObject);
-            const displayData = display.data;
-            const metadatas = (0, sui_js_1.getObjectFields)(object);
-            if (displayData === null && metadatas === null)
-                continue;
-            const objectId = (0, sui_js_1.getObjectId)(ownedObject);
-            const { collectionName, collectionId } = (0, getFormattedCollectionNameAndId_1.default)(type);
-            let imageUri;
-            let name;
-            if (displayData && displayData.image_url) {
-                imageUri = displayData.image_url;
-                name = displayData.name;
-            }
-            else if (metadatas && (metadatas.image_url || metadatas.url)) {
-                imageUri = metadatas.image_url || metadatas.url;
-                name = metadatas.name;
-            }
-            else
-                continue;
-            assets.push({
-                networkId: portfolio_core_1.NetworkId.sui,
-                type: portfolio_core_1.PortfolioAssetType.collectible,
-                value: null,
-                attributes: {},
-                data: {
-                    address: objectId,
-                    amount: 1,
-                    price: null,
-                    imageUri,
-                    name,
-                    collection: {
-                        floorPrice: null,
-                        id: collectionId || '',
-                        name: collectionName || '',
-                    },
-                },
-            });
-            continue;
-        }
-        nftKioskObjects = [];
-    } while (ownedNFTsObjects.hasNextPage);
+    });
     if (assets.length === 0)
         return [];
     const element = {

package/src/plugins/tokens/fetchers/sui-nfts.js.map

@@ -1 +1 @@
-{"version":3,"file":"sui-nfts.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/sui-nfts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sui-nfts.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/sui-nfts.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAOoC;AAEpC,oDAAsD;AACtD,4CAAkD;AAClD,4DAAiE;AACjE,wEAAqE;AAIrE,0EAAuE;AACvE,wEAAqE;AAErE,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,EAAE;;IACxD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,MAAM,EAAE,KAAK,EAAE;QACxD,OAAO,EAAE;YACP,WAAW,EAAE,IAAI;SAClB;KACF,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACzC,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,OAAO,0CAAE,IAAI,CAAA,EAAA,CAAC,CAAC,CAAC;IAE1E,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CACrC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,IAAI,MAAK,6BAAiB,CAAA,EAAA,CAC1C,CAAC;IACF,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,mBAAmB,GAAG,MAAM,IAAA,mCAAgB,EAChD,MAAM,EACN,CAAC,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,0CAAE,OAAmC,CAAA,CAAC,MAAM,CAAC,KAAK,EACtE,IAAI,CACL,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,IAAA,iCAAe,EAC7C,MAAM,EACN,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC3C,CAAC;QACF,UAAU,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,CAAC;IACxC,CAAC;IAED,yBAAyB;IACzB,MAAM,MAAM,GAAgC,EAAE,CAAC;IAC/C,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;QAC5B,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,OAAO;QACzB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa;YAAE,OAAO;QAE/C,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAgC,CAAC;QAE7D,IAAI,UAA8C,CAAC;QACnD,IAAI,MAAA,OAAO,CAAC,MAAM,CAAC,UAAU,0CAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1D,UAAU,GAAG,MAAA,OAAO,CAAC,MAAM,CAAC,UAAU,0CAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CACpE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACN,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG;gBACxB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;aACtB,CAAC,CACH,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,CAAC;YACV,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,IAAI,EAAE,mCAAkB,CAAC,WAAW;YACpC,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,EAAE;YACd,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;gBACzB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;gBAC1C,KAAK,EAAE,IAAI;gBACX,WAAW,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,OAAO,CAAC,MAAM,CAAC,WAAW;gBAC/D,QAAQ,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,KAAI,OAAO,CAAC,MAAM,CAAC,GAAG;gBAClD,IAAI,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,KAAI,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI;gBACjE,UAAU;aACX;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACnC,MAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,qCAAoB,CAAC,QAAQ;QACnC,SAAS,EAAE,0BAAS,CAAC,GAAG;QACxB,UAAU,EAAE,8BAAkB,CAAC,EAAE;QACjC,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE,IAAI;QACX,IAAI,EAAE;YACJ,MAAM;SACP;KACF,CAAC;IACF,OAAO,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,8BAAkB,CAAC,EAAE,IAAI,0BAAS,CAAC,GAAG,EAAE;IAC/C,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/tokens/types.d.ts

@@ -33,51 +33,3 @@ export type Token = {
         index?: string;
     };
 };
-export type SuiNFTMetadata = {
-    attributes?: {
-        type: string;
-        fields: {
-            map: {
-                type: string;
-                fields: {
-                    contents: Attribute[];
-                };
-            };
-        };
-    };
-    id: {
-        id: string;
-    };
-    name: string;
-    description?: string;
-    url?: string;
-    image_url?: string;
-    index?: string;
-};
-export type Attribute = {
-    [key: number]: {
-        type: string;
-        fields: {
-            key: string;
-            value: string;
-        };
-    };
-};
-export type DisplayInfo = {
-    description: string;
-    image_url: string;
-    link: string;
-    name: string;
-};
-export type KioskContent = {
-    dataType: string;
-    type: string;
-    hasPublicTransfer: boolean;
-    fields: {
-        id: {
-            id: string;
-        };
-        kiosk: string;
-        owner: string;
-    };
-};

package/src/plugins/turbos/clmmsPositionsFetcher.js

@@ -13,17 +13,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
-const sui_js_1 = require("@mysten/sui.js");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
 const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helper_1 = require("./helper");
+const getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
+const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const client = (0, clients_1.getClientSui)();
-    const nftsPositionsRes = yield client.getOwnedObjects({
-        owner,
+    const nftsPositionsRes = yield (0, getOwnedObjects_1.getOwnedObjects)(client, owner, {
         options: {
             showType: true,
             showContent: true,
@@ -32,18 +33,20 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         },
         filter: { Package: constants_1.packageIdOriginal },
     });
-    if (!nftsPositionsRes.data)
+    if (nftsPositionsRes.length === 0)
         return [];
     const clmmPoolsIds = [];
     const clmmPositionsIds = [];
     const nftPositionByPositionId = new Map();
-    for (let i = 0; i < nftsPositionsRes.data.length; i++) {
-        const nftData = nftsPositionsRes.data[i].data;
+    for (let i = 0; i < nftsPositionsRes.length; i++) {
+        const nftData = nftsPositionsRes[i].data;
         if (!nftData)
             continue;
         if (nftData.type !== constants_1.clmmNftType)
             continue;
-        const nftPositionFields = (0, sui_js_1.getObjectFields)(nftData);
+        if (!nftData.content)
+            continue;
+        const nftPositionFields = nftData.content.fields;
         clmmPoolsIds.push(nftPositionFields.pool_id);
         clmmPositionsIds.push(nftPositionFields.position_id);
         nftPositionByPositionId.set(nftPositionFields.position_id, nftPositionFields);
@@ -60,19 +63,18 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             poolsById.set(pool.objectId, pool);
         }
     });
-    const clmmPositionsRes = yield client.multiGetObjects({
-        ids: clmmPositionsIds,
-        options: {
-            showType: true,
-            showContent: true,
-            showDisplay: true,
-            showOwner: true,
-        },
+    const clmmPositionsRes = yield (0, multiGetObjects_1.multiGetObjects)(client, clmmPositionsIds, {
+        showType: true,
+        showContent: true,
+        showDisplay: true,
+        showOwner: true,
     });
     const assets = [];
     let totalLiquidityValue = 0;
     for (let i = 0; i < clmmPositionsRes.length; i++) {
-        const clmmPosition = (0, sui_js_1.getObjectFields)(clmmPositionsRes[i]);
+        const clmmPosition = (_b = (_a = clmmPositionsRes[i].data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
+        if (!clmmPosition)
+            continue;
         const nftPosition = nftPositionByPositionId.get(clmmPosition.id.id);
         if (!nftPosition)
             continue;

package/src/plugins/turbos/clmmsPositionsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"clmmsPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/clmmsPositionsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"clmmsPositionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/clmmsPositionsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/turbos/helper.d.ts

@@ -1,8 +1,8 @@
-import { SuiObjectResponse } from '@mysten/sui.js';
-import { Bits, Pool, Types } from './types';
+import { Bits, Pool, PoolFields, Types } from './types';
+import { ObjectResponse } from '../../utils/sui/types';
 export declare function parsePoolType(type: string, length: 2): [string, string];
 export declare function parsePoolType(type: string, length: 3): Types;
 export declare function parsePoolType(type: string): string[];
-export declare function parsePool(pool: SuiObjectResponse): Pool;
+export declare function parsePool(pool: ObjectResponse<PoolFields>): Pool;
 export declare function formatForNative(coin: string): string;
 export declare function bitsToNumber(bits: Bits): number;

package/src/plugins/turbos/helper.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bitsToNumber = exports.formatForNative = exports.parsePool = exports.parsePoolType = void 0;
-const sui_js_1 = require("@mysten/sui.js");
 const helpers_1 = require("../cetus/helpers");
 function parsePoolType(type, length) {
     var _a;
@@ -13,9 +12,12 @@ function parsePoolType(type, length) {
 }
 exports.parsePoolType = parsePoolType;
 function parsePool(pool) {
-    const fields = (0, sui_js_1.getObjectFields)(pool);
-    const objectId = (0, sui_js_1.getObjectId)(pool);
-    const type = (0, sui_js_1.getObjectType)(pool);
+    var _a, _b, _c, _d, _e;
+    if (!((_a = pool.data) === null || _a === void 0 ? void 0 : _a.content))
+        throw new Error('turbos parsePool error');
+    const fields = (_c = (_b = pool.data) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.fields;
+    const objectId = (_d = pool.data) === null || _d === void 0 ? void 0 : _d.objectId;
+    const type = (_e = pool.data) === null || _e === void 0 ? void 0 : _e.type;
     return Object.assign(Object.assign({}, fields), { objectId,
         type, types: parsePoolType(type, 3) });
 }

package/src/plugins/turbos/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/helper.ts"],"names":[],"mappings":";;;AAAA,2CAKwB;AAExB,8CAA0C;AAK1C,SAAgB,aAAa,CAAC,IAAY,EAAE,MAAe;;IACzD,MAAM,KAAK,GAAG,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC,MAAM,CAAC,KAAI,EAAE,CAAC;IAEvE,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AARD,sCAQC;AACD,SAAgB,SAAS,CAAC,IAAuB;IAC/C,MAAM,MAAM,GAAG,IAAA,wBAAe,EAAC,IAAI,CAAe,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAE,CAAC;IAClC,uCACK,MAAM,KACT,QAAQ;QACR,IAAI,EACJ,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,IAC7B;AACJ,CAAC;AAVD,8BAUC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI;QACT,8EAA8E;QAC9E,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AALD,0CAKC;AAED,SAAgB,YAAY,CAAC,IAAU;IACrC,OAAO,IAAA,gBAAM,EAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAFD,oCAEC"}
+{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/helper.ts"],"names":[],"mappings":";;;AACA,8CAA0C;AAM1C,SAAgB,aAAa,CAAC,IAAY,EAAE,MAAe;;IACzD,MAAM,KAAK,GAAG,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC,MAAM,CAAC,KAAI,EAAE,CAAC;IAEvE,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AARD,sCAQC;AACD,SAAgB,SAAS,CAAC,IAAgC;;IACxD,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,CAAA;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC;IAC1C,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,CAAC;IACrC,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,CAAC;IAC7B,uCACK,MAAM,KACT,QAAQ;QACR,IAAI,EACJ,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,IAC7B;AACJ,CAAC;AAXD,8BAWC;AAED,SAAgB,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI;QACT,8EAA8E;QAC9E,CAAC,CAAC,eAAe;QACjB,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AALD,0CAKC;AAED,SAAgB,YAAY,CAAC,IAAU;IACrC,OAAO,IAAA,gBAAM,EAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAFD,oCAEC"}

package/src/plugins/turbos/poolsJob.js

@@ -12,31 +12,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const sui_js_1 = require("@mysten/sui.js");
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const helper_1 = require("./helper");
 const tokenPricesFromSqrt_1 = __importDefault(require("../../utils/clmm/tokenPricesFromSqrt"));
-const getDynamicFieldsSafe_1 = __importDefault(require("../../utils/sui/getDynamicFieldsSafe"));
-const getMultipleObjectsSafe_1 = __importDefault(require("../../utils/sui/getMultipleObjectsSafe"));
+const getDynamicFields_1 = require("../../utils/sui/getDynamicFields");
+const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSui)();
-    const poolFactories = yield (0, getDynamicFieldsSafe_1.default)(client, constants_1.poolTableId);
-    const poolFactoryIds = poolFactories.map(sui_js_1.getObjectId);
+    const poolFactories = yield (0, getDynamicFields_1.getDynamicFields)(client, constants_1.poolTableId);
+    const poolFactoryIds = poolFactories.map((p) => p.objectId);
     if (!poolFactoryIds.length)
         return;
-    const poolFactoryInfos = yield (0, getMultipleObjectsSafe_1.default)(client, poolFactoryIds, { showContent: true });
+    const poolFactoryInfos = yield (0, multiGetObjects_1.multiGetObjects)(client, poolFactoryIds, {
+        showContent: true,
+    });
     const poolIds = poolFactoryInfos.map((info) => {
-        const fields = (0, sui_js_1.getObjectFields)(info);
+        var _a, _b;
+        const fields = (_b = (_a = info.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
         return fields.value.fields.pool_id;
     });
     if (!poolIds.length)
         return;
-    const pools = yield (0, getMultipleObjectsSafe_1.default)(client, poolIds, {
-        showContent: true,
-    });
+    const pools = yield (0, multiGetObjects_1.multiGetObjects)(client, poolIds);
     const promises = [];
     for (const pool of pools) {
         const parsedPool = (0, helper_1.parsePool)(pool);

package/src/plugins/turbos/poolsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAA8D;AAC9D,+DAAuD;AACvD,gEAAqC;AAGrC,2CAAuE;AACvE,iDAAmD;AACnD,qCAAqC;AACrC,+FAA4E;AAC5E,gGAAwE;AACxE,oGAA+E;AAE/E,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,aAAa,GAAG,MAAM,IAAA,8BAAoB,EAAC,MAAM,EAAE,uBAAW,CAAC,CAAC;IACtE,MAAM,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,oBAAW,CAAC,CAAC;IACtD,IAAI,CAAC,cAAc,CAAC,MAAM;QAAE,OAAO;IAEnC,MAAM,gBAAgB,GAAG,MAAM,IAAA,gCAAyB,EACtD,MAAM,EACN,cAAc,EACd,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAC;IAEF,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC5C,MAAM,MAAM,GAAG,IAAA,wBAAe,EAAC,IAAI,CAOlC,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO;IAC5B,MAAM,KAAK,GAAG,MAAM,IAAA,gCAAyB,EAAC,MAAM,EAAE,OAAO,EAAE;QAC7D,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAC7B,IACE,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACzB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EACzB,CAAC;YACD,QAAQ,CAAC,IAAI,CACX,IAAA,6BAAwB,EACtB,KAAK,EACL,0BAAS,CAAC,GAAG,EACb,UAAU,CAAC,EAAE,CAAC,EAAE,EAChB,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAChC,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAChC,IAAI,sBAAS,CAAC,UAAU,CAAC,UAAU,CAAC,EACpC,KAAK,CAAC,CAAC,CAAC,EACR,KAAK,CAAC,CAAC,CAAC,CACT,CACF,CAAC;YACF,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,EAAE;gBAC7C,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"poolsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/turbos/poolsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AAGrC,2CAAuE;AACvE,iDAAmD;AACnD,qCAAqC;AACrC,+FAA4E;AAC5E,uEAAoE;AACpE,qEAAkE;AAGlE,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC9B,MAAM,aAAa,GAAG,MAAM,IAAA,mCAAgB,EAAC,MAAM,EAAE,uBAAW,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,CAAC,cAAc,CAAC,MAAM;QAAE,OAAO;IAEnC,MAAM,gBAAgB,GAAG,MAAM,IAAA,iCAAe,EAAC,MAAM,EAAE,cAAc,EAAE;QACrE,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAC5C,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAOlC,CAAC;QACF,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO;IAC5B,MAAM,KAAK,GAAG,MAAM,IAAA,iCAAe,EAAa,MAAM,EAAE,OAAO,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,UAAU,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;QAC7B,IACE,KAAK,CAAC,MAAM,GAAG,CAAC;YAChB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACzB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EACzB,CAAC;YACD,QAAQ,CAAC,IAAI,CACX,IAAA,6BAAwB,EACtB,KAAK,EACL,0BAAS,CAAC,GAAG,EACb,UAAU,CAAC,EAAE,CAAC,EAAE,EAChB,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAChC,IAAI,sBAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAChC,IAAI,sBAAS,CAAC,UAAU,CAAC,UAAU,CAAC,EACpC,KAAK,CAAC,CAAC,CAAC,EACR,KAAK,CAAC,CAAC,CAAC,CACT,CACF,CAAC;YACF,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,EAAE;gBAC7C,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}