@sonarwatch/portfolio-plugins 0.14.45 → 0.14.46

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [0.14.46](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.45...plugins-0.14.46) (2024-11-28)
+
+
+
 ## [0.14.45](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.44...plugins-0.14.45) (2024-11-25)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.14.45",
+  "version": "0.14.46",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "peerDependencies": {

package/src/plugins/cetus/clmmsFetcher.js

@@ -8,16 +8,11 @@ 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 bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const helpers_1 = require("./helpers");
-const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
 const getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const getPools_1 = require("./getPools");
@@ -86,19 +81,18 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             return;
         const fees = allFees[i];
         const rewards = allRewards[i];
-        const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(clmmPosition.liquidity), pool.current_tick_index, clmmPosition.tick_lower_index, clmmPosition.tick_upper_index, false);
-        const element = elementRegistry.addElementLiquidity({
-            label: 'LiquidityPool',
-            tags: ['Concentrated'],
-        });
-        const liquidity = element.addLiquidity();
-        liquidity.addAsset({
-            address: pool.coinTypeA,
-            amount: tokenAmountA,
-        });
-        liquidity.addAsset({
-            address: pool.coinTypeB,
-            amount: tokenAmountB,
+        const element = elementRegistry.addElementConcentratedLiquidity();
+        const liquidity = element.setLiquidity({
+            addressA: pool.coinTypeA,
+            addressB: pool.coinTypeB,
+            liquidity: clmmPosition.liquidity,
+            tickCurrentIndex: pool.current_tick_index,
+            tickLowerIndex: clmmPosition.tick_lower_index,
+            tickUpperIndex: clmmPosition.tick_upper_index,
+            poolLiquidity: pool.liquidity,
+            currentSqrtPrice: pool.current_sqrt_price,
+            feeRate: Number(pool.fee_rate) / 10000,
+            swapVolume24h: pool.vol_in_usd_24h,
         });
         liquidity.addRewardAsset({
             address: pool.coinTypeA,
@@ -114,8 +108,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 amount: rewarderAmountOwed.amount_owed,
             });
         });
-        if (tokenAmountA.isZero() || tokenAmountB.isZero())
-            element.addTag('Out Of Range');
     });
     return elementRegistry.getElements(cache);
 });

package/src/plugins/cetus/clmmsFetcher.js.map

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

package/src/plugins/cetus/getPools.d.ts

@@ -1,3 +1,3 @@
-import { Pool } from './types';
+import { Pool, PoolStat } from './types';
 import { Cache } from '../../Cache';
-export declare const getPools: (poolIds: string[], cache: Cache) => Promise<(Pool | null)[]>;
+export declare const getPools: (poolIds: string[], cache: Cache) => Promise<((Pool & PoolStat) | null)[]>;

package/src/plugins/cetus/getPools.js

@@ -20,27 +20,40 @@ const helpers_1 = require("./helpers");
 const getPools = (poolIds, cache) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const pools = [];
-    const cachedPools = yield cache.getItems(poolIds, {
-        prefix: constants_1.clmmPoolsPrefix,
-        networkId: portfolio_core_1.NetworkId.sui,
-    });
+    const [cachedPools, cachedPoolsStats] = yield Promise.all([
+        cache.getItems(poolIds, {
+            prefix: constants_1.clmmPoolsPrefix,
+            networkId: portfolio_core_1.NetworkId.sui,
+        }),
+        cache.getItems(poolIds, {
+            prefix: `${constants_1.clmmPoolsPrefix}-stats`,
+            networkId: portfolio_core_1.NetworkId.sui,
+        }),
+    ]);
     const client = (0, clients_1.getClientSui)();
     for (const poolId of poolIds) {
         const i = poolIds.indexOf(poolId);
         const cachedPool = cachedPools[i];
+        const cachedPoolStat = cachedPoolsStats[i];
+        let pool;
         if (cachedPool) {
-            pools.push(cachedPool);
+            pool = cachedPool;
         }
         else {
             const poolObject = yield (0, getObject_1.getObject)(client, poolId);
-            const pool = (0, helpers_1.getPoolFromObject)(poolObject);
+            pool = (0, helpers_1.getPoolFromObject)(poolObject);
             if (((_a = poolObject.data) === null || _a === void 0 ? void 0 : _a.objectId) !== poolId || !pool) {
-                pools.push(null);
+                pool = null;
             }
             yield cache.setItem(poolId, pool, {
                 prefix: constants_1.clmmPoolsPrefix,
                 networkId: portfolio_core_1.NetworkId.sui,
             });
+        }
+        if (pool && cachedPoolStat) {
+            pools.push(Object.assign(Object.assign({}, pool), cachedPoolStat));
+        }
+        else {
             pools.push(pool);
         }
     }

package/src/plugins/cetus/getPools.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPools.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/getPools.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAA8C;AAE9C,iDAAmD;AACnD,yDAAsD;AACtD,uCAA8C;AAE9C,4CAA4C;AAC5C,sDAAsD;AAC/C,MAAM,QAAQ,GAAG,CACtB,OAAiB,EACjB,KAAY,EACc,EAAE;;IAC5B,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAO,OAAO,EAAE;QACtD,MAAM,EAAE,2BAAe;QACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAS,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;YAE3C,IAAI,CAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,QAAQ,MAAK,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAED,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE;gBAChC,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAnCW,QAAA,QAAQ,YAmCnB"}
+{"version":3,"file":"getPools.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/getPools.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAAuD;AAEvD,2CAA8C;AAE9C,iDAAmD;AACnD,yDAAsD;AACtD,uCAA8C;AAE9C,4CAA4C;AAC5C,sDAAsD;AAC/C,MAAM,QAAQ,GAAG,CACtB,OAAiB,EACjB,KAAY,EAC2B,EAAE;;IACzC,MAAM,KAAK,GAAG,EAAE,CAAC;IAEjB,MAAM,CAAC,WAAW,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxD,KAAK,CAAC,QAAQ,CAAO,OAAO,EAAE;YAC5B,MAAM,EAAE,2BAAe;YACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;SACzB,CAAC;QACF,KAAK,CAAC,QAAQ,CAAW,OAAO,EAAE;YAChC,MAAM,EAAE,GAAG,2BAAe,QAAQ;YAClC,SAAS,EAAE,0BAAS,CAAC,GAAG;SACzB,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAE3C,IAAI,IAAI,CAAC;QAET,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,GAAG,UAAU,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAS,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnD,IAAI,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;YAErC,IAAI,CAAA,MAAA,UAAU,CAAC,IAAI,0CAAE,QAAQ,MAAK,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClD,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;YAED,MAAM,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE;gBAChC,MAAM,EAAE,2BAAe;gBACvB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,IAAI,IAAI,cAAc,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,iCAAM,IAAI,GAAK,cAAc,EAAG,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC;AAlDW,QAAA,QAAQ,YAkDnB"}

package/src/plugins/cetus/index.js

@@ -11,8 +11,9 @@ const vaultsJob_1 = __importDefault(require("./vaultsJob"));
 const farmsFetcher_1 = __importDefault(require("./farmsFetcher"));
 const limitFetcher_1 = __importDefault(require("./limitFetcher"));
 const dcaFetcher_1 = __importDefault(require("./dcaFetcher"));
+const poolsStatsJob_1 = __importDefault(require("./poolsStatsJob"));
 exports.platforms = [constants_1.platform];
-exports.jobs = [poolsJob_1.default, vaultsJob_1.default];
+exports.jobs = [poolsJob_1.default, poolsStatsJob_1.default, vaultsJob_1.default];
 exports.fetchers = [
     clmmsFetcher_1.default,
     farmsFetcher_1.default,

package/src/plugins/cetus/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/index.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAClC,kEAAiD;AACjD,2CAAuC;AACvC,4DAAoC;AACpC,kEAA0C;AAC1C,kEAA0C;AAC1C,8DAAsC;AAEzB,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,kBAAQ,EAAE,mBAAS,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAc;IACjC,sBAAmB;IACnB,sBAAY;IACZ,sBAAY;IACZ,oBAAU;CACX,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/index.ts"],"names":[],"mappings":";;;;;;AAGA,0DAAkC;AAClC,kEAAiD;AACjD,2CAAuC;AACvC,4DAAoC;AACpC,kEAA0C;AAC1C,kEAA0C;AAC1C,8DAAsC;AACtC,oEAA4C;AAE/B,QAAA,SAAS,GAAe,CAAC,oBAAQ,CAAC,CAAC;AACnC,QAAA,IAAI,GAAU,CAAC,kBAAQ,EAAE,uBAAa,EAAE,mBAAS,CAAC,CAAC;AACnD,QAAA,QAAQ,GAAc;IACjC,sBAAmB;IACnB,sBAAY;IACZ,sBAAY;IACZ,oBAAU;CACX,CAAC"}

package/src/plugins/cetus/poolsStatsJob.d.ts

@@ -0,0 +1,3 @@
+import { Job } from '../../Job';
+declare const job: Job;
+export default job;

package/src/plugins/cetus/poolsStatsJob.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 axios_1 = __importDefault(require("axios"));
+const constants_1 = require("./constants");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiRes = yield axios_1.default.get(`https://api-sui.cetus.zone/v2/sui/swap/count`);
+    const cacheItems = [];
+    apiRes.data.data.pools.forEach((p) => {
+        cacheItems.push({
+            key: p.swap_account,
+            value: {
+                vol_in_usd: p.vol_in_usd,
+                apr_24h: p.apr_24h,
+                apr_7day: p.apr_7day,
+                apr_30day: p.apr_30day,
+                vol_in_usd_24h: p.vol_in_usd_24h,
+            },
+        });
+    });
+    // always use getPools helper to retrieve cetus pools
+    yield cache.setItems(cacheItems, {
+        prefix: `${constants_1.clmmPoolsPrefix}-stats`,
+        networkId: portfolio_core_1.NetworkId.sui,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-pools-stats`,
+    executor,
+    label: 'normal',
+};
+exports.default = job;
+//# sourceMappingURL=poolsStatsJob.js.map

package/src/plugins/cetus/poolsStatsJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"poolsStatsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/poolsStatsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAG7C,2CAA0D;AAG1D,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAWP,MAAM,eAAK,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAErE,MAAM,UAAU,GAAuC,EAAE,CAAC;IAE1D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACnC,UAAU,CAAC,IAAI,CAAC;YACd,GAAG,EAAE,CAAC,CAAC,YAAY;YACnB,KAAK,EAAE;gBACL,UAAU,EAAE,CAAC,CAAC,UAAU;gBACxB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,SAAS,EAAE,CAAC,CAAC,SAAS;gBACtB,cAAc,EAAE,CAAC,CAAC,cAAc;aACjC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,qDAAqD;IACrD,MAAM,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC/B,MAAM,EAAE,GAAG,2BAAe,QAAQ;QAClC,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,cAAc;IAC/B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -34,6 +34,13 @@ export type Pool = {
     uri: string;
     name: string;
 } & PoolImmutables;
+export type PoolStat = {
+    vol_in_usd?: string;
+    vol_in_usd_24h?: string;
+    apr_24h?: string;
+    apr_7day?: string;
+    apr_30day?: string;
+};
 export type SuiStructTag = {
     full_address: string;
     source_address: string;

package/src/plugins/cetus/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/types.ts"],"names":[],"mappings":";;;AAyDA,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;IACnB,6CAAyB,CAAA;AAC3B,CAAC,EAJW,kBAAkB,kCAAlB,kBAAkB,QAI7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/cetus/types.ts"],"names":[],"mappings":";;;AAiEA,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,yCAAqB,CAAA;IACrB,uCAAmB,CAAA;IACnB,6CAAyB,CAAA;AAC3B,CAAC,EAJW,kBAAkB,kCAAlB,kBAAkB,QAI7B"}

package/src/plugins/coinmarketcap/constants.d.ts

@@ -1,11 +1,5 @@
-import { NetworkIdType, Platform } from '@sonarwatch/portfolio-core';
+import { Platform } from '@sonarwatch/portfolio-core';
+import { CmcToken } from './types';
 export declare const platformId = "coinmarketcap";
 export declare const platform: Platform;
-export declare const cmcTokens: {
-    slug: string;
-    tokens: {
-        mint: string;
-        decimals: number;
-        networkId: NetworkIdType;
-    }[];
-}[];
+export declare const cmcTokens: CmcToken[];

package/src/plugins/coinmarketcap/constants.js

@@ -8,10 +8,6 @@ exports.platformId = 'coinmarketcap';
 exports.platform = {
     id: exports.platformId,
     name: 'CoinMarketCap',
-    image: 'https://sonar.watch/img/platforms/coinmarketcap.webp',
-    // defiLlamaId: 'pyth-network', // from https://defillama.com/docs/api
-    website: 'https://coinmarketcap.com/',
-    // twitter: 'https://twitter.com/PythNetwork',
 };
 exports.cmcTokens = [
     {
@@ -84,5 +80,25 @@ exports.cmcTokens = [
             },
         ],
     },
+    {
+        slug: 'bonk1',
+        tokens: [
+            {
+                mint: 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263',
+                decimals: 5,
+                networkId: portfolio_core_1.NetworkId.solana,
+            },
+        ],
+    },
+    {
+        slug: 'dogwifhat',
+        tokens: [
+            {
+                mint: 'EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm',
+                decimals: 6,
+                networkId: portfolio_core_1.NetworkId.solana,
+            },
+        ],
+    },
 ];
 //# sourceMappingURL=constants.js.map

package/src/plugins/coinmarketcap/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/coinmarketcap/constants.ts"],"names":[],"mappings":";;;AAAA,+DAWoC;AACpC,yDAKmC;AACnC,+CAAwE;AAE3D,QAAA,UAAU,GAAG,eAAe,CAAC;AAC7B,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,eAAe;IACrB,KAAK,EAAE,sDAAsD;IAC7D,sEAAsE;IACtE,OAAO,EAAE,4BAA4B;IACrC,8CAA8C;CAC/C,CAAC;AAEW,QAAA,SAAS,GAGhB;IACJ;QACE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,oCAAmB;gBACzB,QAAQ,EAAE,qCAAoB;gBAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;YACD;gBACE,IAAI,EAAE,2CAA0B;gBAChC,QAAQ,EAAE,qCAAoB;gBAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,iCAAgB;gBACtB,QAAQ,EAAE,kCAAiB;gBAC3B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE,kCAAiB;gBAC3B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;SACF;KACF;IACD;QACE,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,mCAAkB;gBACxB,QAAQ,EAAE,oCAAmB;gBAC7B,SAAS,EAAE,0BAAS,CAAC,KAAK;aAC3B;SACF;KACF;IACD;QACE,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,wBAAY;gBAClB,QAAQ,EAAE,4BAAgB;gBAC1B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,uBAAW;gBACjB,QAAQ,EAAE,2BAAe;gBACzB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,uBAAc;gBACpB,QAAQ,EAAE,2BAAkB;gBAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,8CAA8C;gBACpD,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;CACF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/coinmarketcap/constants.ts"],"names":[],"mappings":";;;AAAA,+DAUoC;AACpC,yDAKmC;AACnC,+CAAwE;AAG3D,QAAA,UAAU,GAAG,eAAe,CAAC;AAC7B,QAAA,QAAQ,GAAa;IAChC,EAAE,EAAE,kBAAU;IACd,IAAI,EAAE,eAAe;CACtB,CAAC;AAEW,QAAA,SAAS,GAAe;IACnC;QACE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,oCAAmB;gBACzB,QAAQ,EAAE,qCAAoB;gBAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;YACD;gBACE,IAAI,EAAE,2CAA0B;gBAChC,QAAQ,EAAE,qCAAoB;gBAC9B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,KAAK;QACX,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,iCAAgB;gBACtB,QAAQ,EAAE,kCAAiB;gBAC3B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,eAAe;gBACrB,QAAQ,EAAE,kCAAiB;gBAC3B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;SACF;KACF;IACD;QACE,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,mCAAkB;gBACxB,QAAQ,EAAE,oCAAmB;gBAC7B,SAAS,EAAE,0BAAS,CAAC,KAAK;aAC3B;SACF;KACF;IACD;QACE,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,wBAAY;gBAClB,QAAQ,EAAE,4BAAgB;gBAC1B,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,uBAAW;gBACjB,QAAQ,EAAE,2BAAe;gBACzB,SAAS,EAAE,0BAAS,CAAC,GAAG;aACzB;YACD;gBACE,IAAI,EAAE,uBAAc;gBACpB,QAAQ,EAAE,2BAAkB;gBAC5B,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,8CAA8C;gBACpD,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,OAAO;QACb,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,8CAA8C;gBACpD,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;IACD;QACE,IAAI,EAAE,WAAW;QACjB,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,8CAA8C;gBACpD,QAAQ,EAAE,CAAC;gBACX,SAAS,EAAE,0BAAS,CAAC,MAAM;aAC5B;SACF;KACF;CACF,CAAC"}

package/src/plugins/coinmarketcap/pricingJob.js

@@ -16,19 +16,21 @@ const axios_1 = __importDefault(require("axios"));
 const constants_1 = require("../tokens/constants");
 const constants_2 = require("./constants");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!process.env['PORTFOLIO_CMC_API_KEY'])
+        throw Error('PORTFOLIO_CMC_API_KEY is not defined');
     const url = `https://pro-api.coinmarketcap.com/v2/cryptocurrency/quotes/latest?slug=${constants_2.cmcTokens
         .map((t) => t.slug)
-        .join(',')}&CMC_PRO_API_KEY=${'86388059-e077-420d-8512-74496d323918'}`;
-    const quotesRes = yield axios_1.default.get(url).catch(() => null);
+        .join(',')}&CMC_PRO_API_KEY=${process.env['PORTFOLIO_CMC_API_KEY']}`;
+    const quotesRes = yield axios_1.default.get(url);
     const sources = [];
-    Object.values((quotesRes === null || quotesRes === void 0 ? void 0 : quotesRes.data.data) || {}).forEach((coin) => {
+    Object.values(quotesRes.data.data || {}).forEach((coin) => {
         const tokenConf = constants_2.cmcTokens.find((t) => t.slug === coin.slug);
         if (!tokenConf)
             return;
         tokenConf.tokens.forEach((token) => {
             sources.push({
                 address: token.mint,
-                id: `coinmarketcap-${coin.slug}`,
+                id: `${constants_2.platformId}-${coin.slug}`,
                 decimals: token.decimals,
                 networkId: token.networkId,
                 platformId: constants_1.walletTokensPlatform.id,
@@ -43,7 +45,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_2.platformId}-pricing`,
     executor,
-    label: 'realtime',
+    label: 'coingecko',
 };
 exports.default = job;
 //# sourceMappingURL=pricingJob.js.map

package/src/plugins/coinmarketcap/pricingJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/coinmarketcap/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,mDAA2D;AAG3D,2CAAoD;AAEpD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,0EAA0E,qBAAS;SAC5F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,oBAAoB,sCAAsC,EAAE,CAAC;IAEzE,MAAM,SAAS,GAWH,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,MAAM,CAAC,MAAM,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,IAAI,KAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACzD,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,EAAE,EAAE,iBAAiB,IAAI,CAAC,IAAI,EAAE;gBAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,UAAU,EAAE,gCAAoB,CAAC,EAAE;gBACnC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK;gBAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,UAAU;CAClB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"pricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/coinmarketcap/pricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,kDAA6C;AAC7C,mDAA2D;AAG3D,2CAAoD;AAGpD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;QACvC,MAAM,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAEtD,MAAM,GAAG,GAAG,0EAA0E,qBAAS;SAC5F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,oBAAoB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAAE,CAAC;IAEvE,MAAM,SAAS,GAA6B,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEjE,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,OAAO,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,KAAK,CAAC,IAAI;gBACnB,EAAE,EAAE,GAAG,sBAAU,IAAI,IAAI,CAAC,IAAI,EAAE;gBAChC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,UAAU,EAAE,gCAAoB,CAAC,EAAE;gBACnC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK;gBAC3B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,QAAQ;IACR,KAAK,EAAE,WAAW;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

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

@@ -0,0 +1,21 @@
+import { NetworkIdType } from '@sonarwatch/portfolio-core';
+export type QuotesRes = {
+    data: {
+        [key: string]: {
+            slug: string;
+            quote: {
+                USD: {
+                    price: number;
+                };
+            };
+        };
+    };
+};
+export type CmcToken = {
+    slug: string;
+    tokens: {
+        mint: string;
+        decimals: number;
+        networkId: NetworkIdType;
+    }[];
+};

package/src/plugins/coinmarketcap/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/src/plugins/coinmarketcap/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/coinmarketcap/types.ts"],"names":[],"mappings":""}

package/src/plugins/flowx/stakingPoolV3Fetcher.js

@@ -8,19 +8,14 @@ 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 bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
-const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
 const bitsToNumber_1 = require("../../utils/sui/bitsToNumber");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSui)();
     const positions = yield (0, getOwnedObjects_1.getOwnedObjects)(client, owner, {
@@ -41,11 +36,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         if ((_f = (_e = position.data) === null || _e === void 0 ? void 0 : _e.content) === null || _f === void 0 ? void 0 : _f.fields.pool_id)
             poolsIds.add((_h = (_g = position.data) === null || _g === void 0 ? void 0 : _g.content) === null || _h === void 0 ? void 0 : _h.fields.pool_id);
     });
-    const [tokenPrices, pools] = yield Promise.all([
-        cache.getTokenPricesAsMap(mints, portfolio_core_1.NetworkId.sui),
-        (0, multiGetObjects_1.multiGetObjects)(client, Array.from(poolsIds.values())),
-    ]);
-    const liquidities = [];
+    const pools = yield (0, multiGetObjects_1.multiGetObjects)(client, Array.from(poolsIds.values()));
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.sui, constants_1.platformId);
     positions.forEach((position) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         if (!((_b = (_a = position.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields.liquidity))
@@ -55,41 +47,17 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const pool = pools.find((p) => { var _a, _b, _c; return ((_a = p.data) === null || _a === void 0 ? void 0 : _a.objectId) === ((_c = (_b = position.data) === null || _b === void 0 ? void 0 : _b.content) === null || _c === void 0 ? void 0 : _c.fields.pool_id); });
         if (!((_f = (_e = pool === null || pool === void 0 ? void 0 : pool.data) === null || _e === void 0 ? void 0 : _e.content) === null || _f === void 0 ? void 0 : _f.fields))
             return;
-        const tokenPriceX = tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(position.data.content.fields.coin_type_x.fields.name));
-        const tokenPriceY = tokenPrices.get((0, portfolio_core_1.formatMoveTokenAddress)(position.data.content.fields.coin_type_y.fields.name));
-        if (!tokenPriceX || !tokenPriceY)
-            return;
-        const tokenAmounts = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default((_h = (_g = position.data) === null || _g === void 0 ? void 0 : _g.content) === null || _h === void 0 ? void 0 : _h.fields.liquidity), (0, bitsToNumber_1.bitsToNumber)((_k = (_j = pool === null || pool === void 0 ? void 0 : pool.data) === null || _j === void 0 ? void 0 : _j.content) === null || _k === void 0 ? void 0 : _k.fields.tick_index.fields.bits), (0, bitsToNumber_1.bitsToNumber)((_m = (_l = position.data) === null || _l === void 0 ? void 0 : _l.content) === null || _m === void 0 ? void 0 : _m.fields.tick_lower_index.fields.bits), (0, bitsToNumber_1.bitsToNumber)((_p = (_o = position.data) === null || _o === void 0 ? void 0 : _o.content) === null || _p === void 0 ? void 0 : _p.fields.tick_upper_index.fields.bits), false);
-        const assetX = (0, tokenPriceToAssetToken_1.default)(tokenPriceX.address, tokenAmounts.tokenAmountA
-            .dividedBy(Math.pow(10, tokenPriceX.decimals))
-            .toNumber(), portfolio_core_1.NetworkId.sui, tokenPriceX);
-        const assetY = (0, tokenPriceToAssetToken_1.default)(tokenPriceY.address, tokenAmounts.tokenAmountB
-            .dividedBy(Math.pow(10, tokenPriceY.decimals))
-            .toNumber(), portfolio_core_1.NetworkId.sui, tokenPriceY);
-        const value = (0, portfolio_core_1.getUsdValueSum)([assetX.value, assetY.value]);
-        liquidities.push({
-            assets: [assetX, assetY],
-            assetsValue: value,
-            rewardAssets: [],
-            rewardAssetsValue: null,
-            value,
-            yields: [],
+        const element = elementRegistry.addElementConcentratedLiquidity();
+        element.setLiquidity({
+            addressA: position.data.content.fields.coin_type_x.fields.name,
+            addressB: position.data.content.fields.coin_type_y.fields.name,
+            liquidity: (_h = (_g = position.data) === null || _g === void 0 ? void 0 : _g.content) === null || _h === void 0 ? void 0 : _h.fields.liquidity,
+            tickCurrentIndex: (0, bitsToNumber_1.bitsToNumber)((_k = (_j = pool === null || pool === void 0 ? void 0 : pool.data) === null || _j === void 0 ? void 0 : _j.content) === null || _k === void 0 ? void 0 : _k.fields.tick_index.fields.bits),
+            tickLowerIndex: (0, bitsToNumber_1.bitsToNumber)((_m = (_l = position.data) === null || _l === void 0 ? void 0 : _l.content) === null || _m === void 0 ? void 0 : _m.fields.tick_lower_index.fields.bits),
+            tickUpperIndex: (0, bitsToNumber_1.bitsToNumber)((_p = (_o = position.data) === null || _o === void 0 ? void 0 : _o.content) === null || _p === void 0 ? void 0 : _p.fields.tick_upper_index.fields.bits),
         });
     });
-    if (liquidities.length === 0)
-        return [];
-    return [
-        {
-            type: portfolio_core_1.PortfolioElementType.liquidity,
-            networkId: portfolio_core_1.NetworkId.sui,
-            platformId: constants_1.platformId,
-            label: 'LiquidityPool',
-            value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((a) => a.value)),
-            data: {
-                liquidities,
-            },
-        },
-    ];
+    return elementRegistry.getElements(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-staking-pool-v3`,

package/src/plugins/flowx/stakingPoolV3Fetcher.js.map

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

package/src/plugins/kriya/clmmsFetcher.js

@@ -8,15 +8,10 @@ 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 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 getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
 const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
@@ -39,8 +34,12 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         return [];
     const poolsIds = clmmPositions.map((position) => position.pool_id);
     const poolsById = new Map();
-    const poolsObjects = yield (0, multiGetObjects_1.multiGetObjects)(client, [
-        ...new Set(poolsIds),
+    const [poolsObjects, poolsStats] = yield Promise.all([
+        (0, multiGetObjects_1.multiGetObjects)(client, [...new Set(poolsIds)]),
+        cache.getItem(constants_1.farmsStatsInfoKey, {
+            prefix: constants_1.platformId,
+            networkId: portfolio_core_1.NetworkId.sui,
+        }),
     ]);
     poolsObjects.forEach((poolObj) => {
         var _a, _b, _c, _d;
@@ -50,25 +49,23 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.sui, constants_1.platformId);
     clmmPositions.forEach((clmmPosition) => {
+        var _a;
         const pool = poolsById.get(clmmPosition.pool_id);
         if (!pool)
             return;
-        const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(clmmPosition.liquidity), (0, bitsToNumber_1.bitsToNumber)(pool.tick_index.fields.bits), (0, bitsToNumber_1.bitsToNumber)(clmmPosition.tick_lower_index.fields.bits), (0, bitsToNumber_1.bitsToNumber)(clmmPosition.tick_upper_index.fields.bits), false);
-        const element = elementRegistry.addElementLiquidity({
-            label: 'LiquidityPool',
-            tags: ['Concentrated'],
-        });
-        const liquidity = element.addLiquidity();
-        liquidity.addAsset({
-            address: pool.type_x.fields.name,
-            amount: tokenAmountA,
-        });
-        liquidity.addAsset({
-            address: pool.type_y.fields.name,
-            amount: tokenAmountB,
+        const element = elementRegistry.addElementConcentratedLiquidity();
+        element.setLiquidity({
+            addressA: pool.type_x.fields.name,
+            addressB: pool.type_y.fields.name,
+            liquidity: clmmPosition.liquidity,
+            tickCurrentIndex: (0, bitsToNumber_1.bitsToNumber)(pool.tick_index.fields.bits),
+            tickLowerIndex: (0, bitsToNumber_1.bitsToNumber)(clmmPosition.tick_lower_index.fields.bits),
+            tickUpperIndex: (0, bitsToNumber_1.bitsToNumber)(clmmPosition.tick_upper_index.fields.bits),
+            currentSqrtPrice: pool.sqrt_price,
+            poolLiquidity: pool.liquidity,
+            feeRate: Number(pool.swap_fee_rate) / 10000,
+            swapVolume24h: (_a = (poolsStats || []).find((p) => p.pool_id === clmmPosition.pool_id)) === null || _a === void 0 ? void 0 : _a.volume_24h,
         });
-        if (tokenAmountA.isZero() || tokenAmountB.isZero())
-            element.addTag('Out Of Range');
     });
     return elementRegistry.getElements(cache);
 });

package/src/plugins/kriya/clmmsFetcher.js.map

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