@sonarwatch/portfolio-plugins 0.14.45 → 0.14.47

package/src/plugins/orca/getWhirlpoolPositions.js

@@ -8,9 +8,6 @@ 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 });
 exports.getOrcaNftFetcher = exports.getWhirlpoolPositions = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
@@ -19,12 +16,12 @@ const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const whirlpool_1 = require("./structs/whirlpool");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
-const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
 const helpers_fees_1 = require("./helpers_fees");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 exports.getWhirlpoolPositions = getOrcaNftFetcher(constants_1.platformId, constants_1.whirlpoolProgram);
 function getOrcaNftFetcher(platformId, programId) {
     return (cache, nfts) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const client = (0, clients_1.getClientSolana)();
         const positionsProgramAddress = [];
         nfts.forEach((nft) => {
@@ -43,38 +40,28 @@ function getOrcaNftFetcher(platformId, programId) {
             if (pos)
                 whirlpoolAddresses.add(pos.whirlpool.toString());
         });
-        const allWhirlpoolsInfo = yield cache.getItems(Array.from(whirlpoolAddresses), {
-            prefix: constants_1.whirlpoolPrefix,
-            networkId: portfolio_core_1.NetworkId.solana,
-        });
-        const tokensMints = new Set();
+        const [allWhirlpoolsInfo, allWhirlpoolsStats] = yield Promise.all([
+            cache.getItems(Array.from(whirlpoolAddresses), {
+                prefix: constants_1.whirlpoolPrefix,
+                networkId: portfolio_core_1.NetworkId.solana,
+            }),
+            cache.getItems(Array.from(whirlpoolAddresses).map((a) => `${a}-stats`), {
+                prefix: constants_1.whirlpoolPrefix,
+                networkId: portfolio_core_1.NetworkId.solana,
+            }),
+        ]);
         const whirlpoolMap = new Map();
         allWhirlpoolsInfo.forEach((wInfo) => {
-            var _a, _b, _c;
             if (!wInfo)
                 return;
             if (whirlpoolAddresses.has(wInfo.pubkey.toString())) {
                 whirlpoolMap.set(wInfo.pubkey.toString(), wInfo);
-                tokensMints.add(wInfo.tokenMintA.toString());
-                tokensMints.add(wInfo.tokenMintB.toString());
-                if (!(0, helpers_fees_1.isRewardInitialized)(wInfo.rewardInfos[0])) {
-                    tokensMints.add((_a = wInfo.rewardInfos[0]) === null || _a === void 0 ? void 0 : _a.mint.toString());
-                }
-                if (!(0, helpers_fees_1.isRewardInitialized)(wInfo.rewardInfos[1])) {
-                    tokensMints.add((_b = wInfo.rewardInfos[1]) === null || _b === void 0 ? void 0 : _b.mint.toString());
-                }
-                if (!(0, helpers_fees_1.isRewardInitialized)(wInfo.rewardInfos[2])) {
-                    tokensMints.add((_c = wInfo.rewardInfos[2]) === null || _c === void 0 ? void 0 : _c.mint.toString());
-                }
             }
         });
         if (whirlpoolMap.size === 0)
             return [];
-        const [tokenPrices, tickArrays] = yield Promise.all([
-            cache.getTokenPricesAsMap([...tokensMints], portfolio_core_1.NetworkId.solana),
-            (0, helpers_fees_1.getTickArraysAsMap)(positionsInfo, whirlpoolMap),
-        ]);
-        const elements = [];
+        const tickArrays = yield (0, helpers_fees_1.getTickArraysAsMap)(positionsInfo, whirlpoolMap);
+        const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, platformId);
         for (let index = 0; index < positionsInfo.length; index++) {
             const positionInfo = positionsInfo[index];
             if (!positionInfo)
@@ -86,90 +73,45 @@ function getOrcaNftFetcher(platformId, programId) {
                 !whirlpoolInfo.tokenMintB ||
                 !whirlpoolInfo.tickCurrentIndex)
                 continue;
-            const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(positionInfo.liquidity, whirlpoolInfo.tickCurrentIndex, positionInfo.tickLowerIndex, positionInfo.tickUpperIndex, false);
-            const rewardAssets = [];
-            const tokenPriceA = tokenPrices.get(whirlpoolInfo.tokenMintA.toString());
-            if (!tokenPriceA)
-                continue;
-            const tokenPriceB = tokenPrices.get(whirlpoolInfo.tokenMintB.toString());
-            if (!tokenPriceB)
-                continue;
-            const assetTokenA = (0, tokenPriceToAssetToken_1.default)(whirlpoolInfo.tokenMintA.toString(), tokenAmountA.dividedBy(Math.pow(10, tokenPriceA.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceA);
-            const assetTokenB = (0, tokenPriceToAssetToken_1.default)(whirlpoolInfo.tokenMintB.toString(), tokenAmountB.dividedBy(Math.pow(10, tokenPriceB.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceB);
-            const tags = [];
-            if (tokenAmountA.isZero() || tokenAmountB.isZero())
-                tags.push('Out Of Range');
+            const element = elementRegistry.addElementConcentratedLiquidity();
+            const liquidity = element.setLiquidity({
+                addressA: whirlpoolInfo.tokenMintA,
+                addressB: whirlpoolInfo.tokenMintB,
+                liquidity: positionInfo.liquidity,
+                tickCurrentIndex: whirlpoolInfo.tickCurrentIndex,
+                tickLowerIndex: positionInfo.tickLowerIndex,
+                tickUpperIndex: positionInfo.tickUpperIndex,
+                currentSqrtPrice: whirlpoolInfo.sqrtPrice,
+                poolLiquidity: whirlpoolInfo.liquidity,
+                feeRate: (Number(whirlpoolInfo.feeRate) / 10000) *
+                    (1 - whirlpoolInfo.protocolFeeRate / 10000),
+                swapVolume24h: (_a = allWhirlpoolsStats.find((p) => (p === null || p === void 0 ? void 0 : p.address) === positionInfo.whirlpool.toString())) === null || _a === void 0 ? void 0 : _a.volumeUsdc24h,
+            });
             const feesAndRewards = (0, helpers_fees_1.calcFeesAndRewards)(whirlpoolInfo, positionInfo, tickArrays);
             if (feesAndRewards) {
-                if (feesAndRewards.feeOwedA.isGreaterThan(0)) {
-                    rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceA.address, feesAndRewards.feeOwedA
-                        .dividedBy(Math.pow(10, tokenPriceA.decimals))
-                        .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceA));
-                }
-                if (feesAndRewards.feeOwedB.isGreaterThan(0)) {
-                    rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceB.address, feesAndRewards.feeOwedB
-                        .dividedBy(Math.pow(10, tokenPriceB.decimals))
-                        .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceB));
-                }
-                if (feesAndRewards.rewardOwedA.isGreaterThan(0)) {
-                    const tokenPriceRewardA = tokenPrices.get(whirlpoolInfo.rewardInfos[0].mint.toString());
-                    if (tokenPriceRewardA) {
-                        rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardA.address, feesAndRewards.rewardOwedA
-                            .dividedBy(Math.pow(10, tokenPriceRewardA.decimals))
-                            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardA));
-                    }
-                }
-                if (feesAndRewards.rewardOwedB.isGreaterThan(0)) {
-                    const tokenPriceRewardB = tokenPrices.get(whirlpoolInfo.rewardInfos[1].mint.toString());
-                    if (tokenPriceRewardB) {
-                        rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardB.address, feesAndRewards.rewardOwedB
-                            .dividedBy(Math.pow(10, tokenPriceRewardB.decimals))
-                            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardB));
-                    }
-                }
-                if (feesAndRewards.rewardOwedC.isGreaterThan(0)) {
-                    const tokenPriceRewardC = tokenPrices.get(whirlpoolInfo.rewardInfos[2].mint.toString());
-                    if (tokenPriceRewardC) {
-                        rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceRewardC.address, feesAndRewards.rewardOwedC
-                            .dividedBy(Math.pow(10, tokenPriceRewardC.decimals))
-                            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceRewardC));
-                    }
-                }
+                liquidity.addRewardAsset({
+                    address: whirlpoolInfo.tokenMintA,
+                    amount: feesAndRewards.feeOwedA,
+                });
+                liquidity.addRewardAsset({
+                    address: whirlpoolInfo.tokenMintB,
+                    amount: feesAndRewards.feeOwedB,
+                });
+                liquidity.addRewardAsset({
+                    address: whirlpoolInfo.rewardInfos[0].mint,
+                    amount: feesAndRewards.rewardOwedA,
+                });
+                liquidity.addRewardAsset({
+                    address: whirlpoolInfo.rewardInfos[1].mint,
+                    amount: feesAndRewards.rewardOwedB,
+                });
+                liquidity.addRewardAsset({
+                    address: whirlpoolInfo.rewardInfos[2].mint,
+                    amount: feesAndRewards.rewardOwedC,
+                });
             }
-            if (!assetTokenA || !assetTokenB)
-                continue;
-            const assets = [assetTokenA, assetTokenB];
-            const assetsValue = (0, portfolio_core_1.getUsdValueSum)([
-                assetTokenA.value,
-                assetTokenB.value,
-            ]);
-            const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((a) => a.value));
-            const totalValue = (0, portfolio_core_1.getUsdValueSum)([assetsValue, rewardAssetsValue]);
-            if (totalValue === 0 || totalValue === null)
-                continue;
-            elements.push({
-                type: portfolio_core_1.PortfolioElementType.liquidity,
-                networkId: portfolio_core_1.NetworkId.solana,
-                platformId,
-                label: 'LiquidityPool',
-                name: 'Concentrated',
-                value: totalValue,
-                data: {
-                    liquidities: [
-                        {
-                            assets,
-                            assetsValue,
-                            rewardAssets,
-                            rewardAssetsValue,
-                            value: totalValue,
-                            yields: [],
-                        },
-                    ],
-                },
-                tags,
-            });
         }
-        return elements;
+        return elementRegistry.getElements(cache);
     });
 }
 exports.getOrcaNftFetcher = getOrcaNftFetcher;

package/src/plugins/orca/getWhirlpoolPositions.js.map

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

package/src/plugins/orca/index.js

@@ -7,7 +7,8 @@ exports.fetchers = exports.jobs = exports.platforms = void 0;
 const lpTokensJob_1 = __importDefault(require("./lpTokensJob"));
 const whirlpoolsJob_1 = __importDefault(require("./whirlpoolsJob"));
 const constants_1 = require("./constants");
+const whirlpoolsStatsJob_1 = __importDefault(require("./whirlpoolsStatsJob"));
 exports.platforms = [constants_1.platform, constants_1.orcaStakingPlatform];
-exports.jobs = [whirlpoolsJob_1.default, lpTokensJob_1.default];
+exports.jobs = [whirlpoolsJob_1.default, lpTokensJob_1.default, whirlpoolsStatsJob_1.default];
 exports.fetchers = [];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/index.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAGlC,oEAA2C;AAC3C,2CAA4D;AAE/C,QAAA,SAAS,GAAe,CAAC,oBAAQ,EAAE,+BAAmB,CAAC,CAAC;AACxD,QAAA,IAAI,GAAU,CAAC,uBAAY,EAAE,qBAAK,CAAC,CAAC;AACpC,QAAA,QAAQ,GAAc,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/index.ts"],"names":[],"mappings":";;;;;;AACA,gEAAkC;AAGlC,oEAA2C;AAC3C,2CAA4D;AAC5D,8EAAsD;AAEzC,QAAA,SAAS,GAAe,CAAC,oBAAQ,EAAE,+BAAmB,CAAC,CAAC;AACxD,QAAA,IAAI,GAAU,CAAC,uBAAY,EAAE,qBAAK,EAAE,4BAAkB,CAAC,CAAC;AACxD,QAAA,QAAQ,GAAc,EAAE,CAAC"}

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

@@ -0,0 +1,6 @@
+export type WhirlpoolStat = {
+    address: string;
+    volumeUsdc24h: string;
+    tvlUsdc: string;
+    feesUsdc24h: string;
+};

package/src/plugins/orca/types.js

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

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

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

package/src/plugins/orca/whirlpoolsStatsJob.d.ts

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

package/src/plugins/orca/whirlpoolsStatsJob.js

@@ -0,0 +1,51 @@
+"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 sleep_1 = __importDefault(require("../../utils/misc/sleep"));
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    let hasNextPage = true;
+    let cursor;
+    const cacheItems = [];
+    do {
+        const apiRes = yield axios_1.default.get(`https://stats-api.mainnet.orca.so/api/whirlpools?limit=1000&after=${cursor || ''}`);
+        apiRes.data.data.forEach((p) => {
+            cacheItems.push({
+                key: `${p.address}-stats`,
+                value: {
+                    address: p.address,
+                    volumeUsdc24h: p.volumeUsdc24h,
+                    tvlUsdc: p.tvlUsdc,
+                    feesUsdc24h: p.feesUsdc24h,
+                },
+            });
+        });
+        cursor = apiRes.data.meta.cursor.next;
+        hasNextPage = !!cursor;
+        yield (0, sleep_1.default)(1000);
+    } while (hasNextPage);
+    yield cache.setItems(cacheItems, {
+        prefix: constants_1.whirlpoolPrefix,
+        networkId: portfolio_core_1.NetworkId.solana,
+    });
+});
+const job = {
+    id: `${constants_1.platformId}-whirlpools-stats`,
+    executor,
+    label: 'normal',
+};
+exports.default = job;
+//# sourceMappingURL=whirlpoolsStatsJob.js.map

package/src/plugins/orca/whirlpoolsStatsJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"whirlpoolsStatsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/orca/whirlpoolsStatsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAG7C,2CAA0D;AAE1D,mEAA2C;AAY3C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,MAAiC,CAAC;IAEtC,MAAM,UAAU,GAA4C,EAAE,CAAC;IAE/D,GAAG,CAAC;QACF,MAAM,MAAM,GAAgC,MAAM,eAAK,CAAC,GAAG,CACzD,qEACE,MAAM,IAAI,EACZ,EAAE,CACH,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,UAAU,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,QAAQ;gBACzB,KAAK,EAAE;oBACL,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,aAAa,EAAE,CAAC,CAAC,aAAa;oBAC9B,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,WAAW,EAAE,CAAC,CAAC,WAAW;iBAC3B;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACtC,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;QAEvB,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;IACpB,CAAC,QAAQ,WAAW,EAAE;IAEtB,MAAM,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE;QAC/B,MAAM,EAAE,2BAAe;QACvB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,mBAAmB;IACpC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/raydium/getRaydiumCLMMPositions.js

@@ -8,20 +8,16 @@ 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 });
 exports.getRaydiumCLMMPositions = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
 const clmms_1 = require("./structs/clmms");
-const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
 const helpers_1 = require("./helpers");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 function getRaydiumCLMMPositions(cache, nfts) {
     return __awaiter(this, void 0, void 0, function* () {
         const client = (0, clients_1.getClientSolana)();
@@ -39,36 +35,18 @@ function getRaydiumCLMMPositions(cache, nfts) {
             return [];
         const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
         const poolStatesInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds);
-        const mints = new Set();
-        personalPositionsInfo.forEach((personalPositionInfo, index) => {
+        const tickArrays = yield Promise.all(personalPositionsInfo.map((personalPositionInfo, index) => {
             if (!personalPositionInfo)
-                return;
+                return [];
             const poolStateInfo = poolStatesInfo[index];
             if (!poolStateInfo)
-                return;
-            mints.add(poolStateInfo.tokenMint0.toString());
-            mints.add(poolStateInfo.tokenMint1.toString());
-            poolStateInfo.rewardInfos.forEach((ri) => {
-                if (ri.tokenMint.toString() !== '11111111111111111111111111111111') {
-                    mints.add(ri.tokenMint.toString());
-                }
-            });
-        });
-        const [tickArrays, tokenPrices] = yield Promise.all([
-            Promise.all(personalPositionsInfo.map((personalPositionInfo, index) => {
-                if (!personalPositionInfo)
-                    return [];
-                const poolStateInfo = poolStatesInfo[index];
-                if (!poolStateInfo)
-                    return [];
-                return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
-                    (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
-                    (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
-                ]);
-            })),
-            cache.getTokenPricesAsMap([...Array.from(mints)], portfolio_core_1.NetworkId.solana),
-        ]);
-        const elements = [];
+                return [];
+            return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
+                (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
+                (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
+            ]);
+        }));
+        const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
         for (let index = 0; index < personalPositionsInfo.length; index++) {
             const poolStateInfo = poolStatesInfo[index];
             if (!poolStateInfo)
@@ -80,75 +58,38 @@ function getRaydiumCLMMPositions(cache, nfts) {
                 !poolStateInfo.tokenMint1 ||
                 !poolStateInfo.tickCurrent)
                 continue;
-            const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(personalPositionInfo.liquidity, poolStateInfo.tickCurrent, personalPositionInfo.tickLowerIndex, personalPositionInfo.tickUpperIndex, false);
-            if (!tokenAmountA || !tokenAmountB)
-                continue;
-            const tokenPriceA = tokenPrices.get(poolStateInfo.tokenMint0.toString());
-            const tokenPriceB = tokenPrices.get(poolStateInfo.tokenMint1.toString());
-            if (!tokenPriceA || !tokenPriceB)
-                continue;
-            const assetTokenA = (0, tokenPriceToAssetToken_1.default)(tokenPriceA.address, tokenAmountA.dividedBy(Math.pow(10, tokenPriceA.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceA);
-            const assetTokenB = (0, tokenPriceToAssetToken_1.default)(tokenPriceB.address, tokenAmountB.dividedBy(Math.pow(10, tokenPriceB.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceB);
-            if (!assetTokenB ||
-                !assetTokenA ||
-                assetTokenB.value === null ||
-                assetTokenA.value === null)
-                continue;
-            const tags = [];
-            if (tokenAmountA.isZero() || tokenAmountB.isZero())
-                tags.push('Out Of Range');
-            const rewardAssets = [];
+            const element = elementRegistry.addElementConcentratedLiquidity();
+            const liquidity = element.setLiquidity({
+                addressA: poolStateInfo.tokenMint0,
+                addressB: poolStateInfo.tokenMint1,
+                liquidity: personalPositionInfo.liquidity,
+                tickCurrentIndex: poolStateInfo.tickCurrent,
+                tickLowerIndex: personalPositionInfo.tickLowerIndex,
+                tickUpperIndex: personalPositionInfo.tickUpperIndex,
+            });
             const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
             if (feesAndRewardsBalances) {
-                if (feesAndRewardsBalances.tokenFeeAmountA.isGreaterThan(0))
-                    rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceA.address, feesAndRewardsBalances.tokenFeeAmountA
-                        .dividedBy(Math.pow(10, tokenPriceA.decimals))
-                        .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceA));
-                if (feesAndRewardsBalances.tokenFeeAmountB.isGreaterThan(0))
-                    rewardAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPriceB.address, feesAndRewardsBalances.tokenFeeAmountB
-                        .dividedBy(Math.pow(10, tokenPriceB.decimals))
-                        .toNumber(), portfolio_core_1.NetworkId.solana, tokenPriceB));
+                liquidity.addRewardAsset({
+                    address: poolStateInfo.tokenMint0,
+                    amount: feesAndRewardsBalances.tokenFeeAmountA,
+                });
+                liquidity.addRewardAsset({
+                    address: poolStateInfo.tokenMint1,
+                    amount: feesAndRewardsBalances.tokenFeeAmountB,
+                });
                 feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
                     if (rewardBalance.isZero() ||
                         poolStateInfo.rewardInfos[i].tokenMint.toString() ===
                             '11111111111111111111111111111111')
                         return;
-                    const rewardTokenPrice = tokenPrices.get(poolStateInfo.rewardInfos[i].tokenMint.toString());
-                    if (!rewardTokenPrice)
-                        return;
-                    rewardAssets.push((0, tokenPriceToAssetToken_1.default)(poolStateInfo.rewardInfos[i].tokenMint.toString(), rewardBalance.dividedBy(Math.pow(10, rewardTokenPrice.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, rewardTokenPrice));
+                    liquidity.addRewardAsset({
+                        address: poolStateInfo.rewardInfos[i].tokenMint,
+                        amount: rewardBalance,
+                    });
                 });
             }
-            const assets = [assetTokenA, assetTokenB];
-            const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
-            const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((a) => a.value));
-            const value = (0, portfolio_core_1.getUsdValueSum)([...assets, ...rewardAssets].map((a) => a.value));
-            if (!value)
-                continue;
-            const liquidities = [
-                {
-                    assets,
-                    assetsValue,
-                    rewardAssets,
-                    rewardAssetsValue,
-                    value,
-                    yields: [],
-                },
-            ];
-            elements.push({
-                type: portfolio_core_1.PortfolioElementType.liquidity,
-                networkId: portfolio_core_1.NetworkId.solana,
-                platformId: constants_1.platformId,
-                label: 'LiquidityPool',
-                name: 'Concentrated',
-                value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((a) => a.value)),
-                data: {
-                    liquidities,
-                },
-                tags,
-            });
         }
-        return elements;
+        return elementRegistry.getElements(cache);
     });
 }
 exports.getRaydiumCLMMPositions = getRaydiumCLMMPositions;

package/src/plugins/raydium/getRaydiumCLMMPositions.js.map

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