@sonarwatch/portfolio-plugins 0.12.170 → 0.12.171

package/src/plugins/meteora/farmsFetcher.js

@@ -8,18 +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 constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
 const struct_1 = require("./struct");
-const tokenPriceToAssetTokens_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetTokens"));
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpers_1 = require("./helpers");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const farms = yield cache.getItem(constants_1.farmsKey, {
@@ -36,78 +32,33 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     });
     const farmingAccountsAddresses = (0, helpers_1.getStakingAccounts)(owner, farmsMint);
     const farmingAccounts = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.farmAccountStruct, farmingAccountsAddresses);
-    const neededMints = farmingAccounts
-        .map((fA, i) => {
-        if (!fA)
-            return [];
-        const farm = farms.at(i);
-        if (!farm)
-            return [];
-        return [farm.stakingMint, farm.rewardAMint, farm.rewardBMint];
-    })
-        .flat();
-    const tokenPrices = yield cache.getTokenPricesAsMap(neededMints, portfolio_core_1.NetworkId.solana);
-    const liquidities = [];
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const element = elementRegistry.addElementLiquidity({
+        label: 'Farming',
+    });
     for (const farmingAccount of farmingAccounts) {
         if (!farmingAccount)
             continue;
-        const rewardAssets = [];
-        const assets = [];
         const { balanceStaked, rewardAPerTokenPending, rewardBPerTokenPending } = farmingAccount;
         const farmInfo = farmsById.get(farmingAccount.pool.toString());
         if (!farmInfo)
             continue;
         const { stakingMint, rewardAMint, rewardBMint } = farmInfo;
-        const [poolTokenPrice, rewardATokenPrice, rewardBTokenPrice] = [
-            tokenPrices.get(stakingMint),
-            tokenPrices.get(rewardAMint),
-            tokenPrices.get(rewardBMint),
-        ];
-        if (!poolTokenPrice)
-            continue;
-        const amount = balanceStaked.dividedBy(Math.pow(10, poolTokenPrice.decimals));
-        assets.push(...(0, tokenPriceToAssetTokens_1.default)(poolTokenPrice.address, amount.toNumber(), portfolio_core_1.NetworkId.solana, poolTokenPrice));
-        if (rewardAPerTokenPending.isGreaterThan(0) && rewardATokenPrice) {
-            const rewardAmount = rewardAPerTokenPending
-                .dividedBy(Math.pow(10, rewardATokenPrice.decimals))
-                .toNumber();
-            rewardAssets.push((0, tokenPriceToAssetToken_1.default)(rewardAMint, rewardAmount, portfolio_core_1.NetworkId.solana, rewardATokenPrice));
-        }
-        if (rewardBPerTokenPending.isGreaterThan(0) && rewardBTokenPrice) {
-            const rewardAmount = rewardBPerTokenPending
-                .dividedBy(Math.pow(10, rewardBTokenPrice.decimals))
-                .toNumber();
-            rewardAssets.push((0, tokenPriceToAssetToken_1.default)(rewardBMint, rewardAmount, portfolio_core_1.NetworkId.solana, rewardBTokenPrice));
-        }
-        const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
-        const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((r) => r.value));
-        const value = (0, portfolio_core_1.getUsdValueSum)([assetsValue, rewardAssetsValue]);
-        if (value === 0)
-            continue;
-        const liquidity = {
-            value,
-            assets,
-            assetsValue,
-            rewardAssets,
-            rewardAssetsValue,
-            yields: [],
-        };
-        liquidities.push(liquidity);
+        const liquidity = element.addLiquidity();
+        liquidity.addAsset({
+            address: stakingMint,
+            amount: balanceStaked,
+        });
+        liquidity.addRewardAsset({
+            address: rewardAMint,
+            amount: rewardAPerTokenPending,
+        });
+        liquidity.addRewardAsset({
+            address: rewardBMint,
+            amount: rewardBPerTokenPending,
+        });
     }
-    if (liquidities.length === 0)
-        return [];
-    return [
-        {
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            type: portfolio_core_1.PortfolioElementType.liquidity,
-            label: 'Farming',
-            value: (0, portfolio_core_1.getUsdValueSum)(liquidities.map((l) => l.value)),
-            data: {
-                liquidities,
-            },
-        },
-    ];
+    return elementRegistry.dump(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-farms`,

package/src/plugins/meteora/farmsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/farmsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"farmsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/meteora/farmsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,2CAAmD;AACnD,iDAAsD;AACtD,+CAAmE;AACnE,qCAA6C;AAE7C,uCAA+C;AAC/C,gFAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IAEjC,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAkB,oBAAQ,EAAE;QAC3D,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;IACH,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAEtB,MAAM,SAAS,GAA+B,IAAI,GAAG,EAAE,CAAC;IACxD,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,IAAA,4BAAkB,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,MAAM,IAAA,sCAA6B,EACzD,MAAM,EACN,0BAAiB,EACjB,wBAAwB,CACzB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAAC;QAClD,KAAK,EAAE,SAAS;KACjB,CAAC,CAAC;IAEH,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,cAAc;YAAE,SAAS;QAE9B,MAAM,EAAE,aAAa,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GACrE,cAAc,CAAC;QACjB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QAE3D,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;QAEzC,SAAS,CAAC,QAAQ,CAAC;YACjB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QAEH,SAAS,CAAC,cAAc,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,sBAAsB;SAC/B,CAAC,CAAC;QAEH,SAAS,CAAC,cAAc,CAAC;YACvB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,sBAAsB;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,QAAQ;IACzB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/nxfinance/positionsFetcher.js

@@ -18,8 +18,8 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const solana_1 = require("../../utils/solana");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const helpers_1 = require("./helpers");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const marginAccountPublicKey = web3_js_1.PublicKey.findProgramAddressSync([
@@ -30,103 +30,55 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     const marginAccount = (yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceLeverageIdlItem, [marginAccountPublicKey]))[0];
     if (!marginAccount)
         return [];
-    const elements = [];
     const mints = new Set();
-    marginAccount.deposits.forEach((d) => mints.add((0, portfolio_core_1.formatTokenAddress)(d.tokenMint, portfolio_core_1.NetworkId.solana)));
-    marginAccount.loans.forEach((l) => mints.add((0, portfolio_core_1.formatTokenAddress)(l.tokenMint, portfolio_core_1.NetworkId.solana)));
+    marginAccount.deposits.forEach((d) => mints.add(d.tokenMint));
+    marginAccount.loans.forEach((l) => mints.add(l.tokenMint));
     const marginPoolsPublicKeys = [...mints].map((mint) => web3_js_1.PublicKey.findProgramAddressSync([
         web3_js_1.PublicKey.findProgramAddressSync([constants_1.ID.toBuffer()], constants_1.leverageFiProgramID)[0].toBuffer(),
         new web3_js_1.PublicKey(mint).toBuffer(),
     ], constants_1.leverageFiProgramID)[0]);
-    const [tokenPrices, marginPools] = yield Promise.all([
-        cache.getTokenPricesAsMap([...mints], portfolio_core_1.NetworkId.solana),
-        (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceLeverageIdlItem, marginPoolsPublicKeys),
-    ]);
-    // assets for Lend
-    const assets = [];
-    // assets for Leverage
-    const borrowedAssets = [];
-    const borrowedYields = [];
-    const suppliedAssets = [];
-    const suppliedYields = [];
-    const rewardAssets = [];
+    const marginPools = yield (0, solana_1.getAutoParsedMultipleAccountsInfo)(connection, constants_1.nxfinanceLeverageIdlItem, marginPoolsPublicKeys);
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const elementMultiple = elementRegistry.addElementMultiple({
+        label: 'Lending',
+        name: 'Fulcrum Lending Pool',
+    });
+    const elementBorrowlend = elementRegistry.addElementBorrowlend({
+        label: 'Leverage',
+        name: `JLP Leverage x${new bignumber_js_1.default(marginAccount.leverage)
+            .dividedBy(100)
+            .decimalPlaces(2)}`,
+    });
     marginAccount.deposits.forEach((deposit) => {
-        const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatTokenAddress)(deposit.tokenMint, portfolio_core_1.NetworkId.solana));
-        if (!tokenPrice)
-            return;
         const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint) === deposit.tokenMint);
         if (!marginPool)
             return;
         const supplyNoteRate = (0, helpers_1.getSupplyNoteRate)(marginPool);
-        const amount = new bignumber_js_1.default(deposit.depositNote)
-            .multipliedBy(supplyNoteRate)
-            .dividedBy(Math.pow(10, tokenPrice.decimals))
-            .toNumber();
-        if (amount > 0) {
-            const assetToken = (0, tokenPriceToAssetToken_1.default)(tokenPrice.address, amount, portfolio_core_1.NetworkId.solana, tokenPrice);
-            if (constants_1.leverageVaultsMints.includes(deposit.tokenMint)) {
-                suppliedAssets.push(assetToken);
-            }
-            else {
-                assets.push(assetToken);
-            }
+        const amount = new bignumber_js_1.default(deposit.depositNote).multipliedBy(supplyNoteRate);
+        const asset = {
+            address: deposit.tokenMint,
+            amount: amount,
+        };
+        if (constants_1.leverageVaultsMints.includes(deposit.tokenMint)) {
+            elementBorrowlend.addSuppliedAsset(asset);
+        }
+        else {
+            elementMultiple.addAsset(asset);
         }
     });
     marginAccount.loans.forEach((loan) => {
-        const tokenPrice = tokenPrices.get((0, portfolio_core_1.formatTokenAddress)(loan.tokenMint, portfolio_core_1.NetworkId.solana));
-        if (!tokenPrice)
-            return;
         const marginPool = marginPools.find((mp) => (mp === null || mp === void 0 ? void 0 : mp.tokenMint) === loan.tokenMint);
         if (!marginPool)
             return;
+        if (loan.loanNote === '0')
+            return;
         const borrowNoteRate = (0, helpers_1.getBorrowNoteRate)(marginPool);
-        borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, new bignumber_js_1.default(loan.loanNote)
-            .multipliedBy(borrowNoteRate)
-            .dividedBy(Math.pow(10, tokenPrice.decimals))
-            .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
-    });
-    if (assets.length > 0)
-        elements.push({
-            type: portfolio_core_1.PortfolioElementType.multiple,
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            label: 'Lending',
-            name: 'Fulcrum Lending Pool',
-            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
-            data: {
-                assets,
-            },
-        });
-    if (suppliedAssets.length > 0 || borrowedAssets.length > 0) {
-        const { borrowedValue, suppliedValue, rewardValue } = (0, portfolio_core_1.getElementLendingValues)({
-            suppliedAssets,
-            borrowedAssets,
-            rewardAssets,
+        elementBorrowlend.addBorrowedAsset({
+            address: loan.tokenMint,
+            amount: new bignumber_js_1.default(loan.loanNote).multipliedBy(borrowNoteRate),
         });
-        elements.push({
-            type: portfolio_core_1.PortfolioElementType.borrowlend,
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            label: 'Leverage',
-            name: `JLP Leverage x${new bignumber_js_1.default(marginAccount.leverage)
-                .dividedBy(100)
-                .decimalPlaces(2)}`,
-            value: suppliedValue,
-            data: {
-                borrowedAssets,
-                borrowedValue,
-                borrowedYields,
-                suppliedAssets,
-                suppliedValue,
-                suppliedYields,
-                rewardAssets,
-                rewardValue,
-                healthRatio: null,
-                value: suppliedValue,
-            },
-        });
-    }
-    return elements;
+    });
+    return elementRegistry.dump(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-positions`,

package/src/plugins/nxfinance/positionsFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/positionsFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/nxfinance/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DASoC;AACpC,6CAA4C;AAC5C,gEAAqC;AAErC,2CAMqB;AAErB,iDAAsD;AACtD,+CAAuE;AAEvE,uCAAiE;AACjE,gFAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IAErC,MAAM,sBAAsB,GAAG,mBAAS,CAAC,sBAAsB,CAC7D;QACE,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,cAAE,CAAC,QAAQ,EAAE,CAAC,EACf,+BAAmB,CACpB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACf,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;QAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;KACvB,EACD,+BAAmB,CACpB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,aAAa,GAAG,CACpB,MAAM,IAAA,0CAAiC,EACrC,UAAU,EACV,oCAAwB,EACxB,CAAC,sBAAsB,CAAC,CACzB,CACF,CAAC,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAE9B,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9D,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAE3D,MAAM,qBAAqB,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAC1C,CAAC,IAAI,EAAE,EAAE,CACP,mBAAS,CAAC,sBAAsB,CAC9B;QACE,mBAAS,CAAC,sBAAsB,CAC9B,CAAC,cAAE,CAAC,QAAQ,EAAE,CAAC,EACf,+BAAmB,CACpB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;QACf,IAAI,mBAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;KAC/B,EACD,+BAAmB,CACpB,CAAC,CAAC,CAAC,CACP,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,0CAAiC,EACzD,UAAU,EACV,oCAAwB,EACxB,qBAAqB,CACtB,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACzD,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,sBAAsB;KAC7B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,eAAe,CAAC,oBAAoB,CAAC;QAC7D,KAAK,EAAE,UAAU;QACjB,IAAI,EAAE,iBAAiB,IAAI,sBAAS,CAAC,aAAa,CAAC,QAAQ,CAAC;aACzD,SAAS,CAAC,GAAG,CAAC;aACd,aAAa,CAAC,CAAC,CAAC,EAAE;KACtB,CAAC,CAAC;IAEH,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACzC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS,MAAK,OAAO,CAAC,SAAS,CAC5C,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,cAAc,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,YAAY,CAC5D,cAAc,CACf,CAAC;QAEF,MAAM,KAAK,GAAG;YACZ,OAAO,EAAE,OAAO,CAAC,SAAS;YAC1B,MAAM,EAAE,MAAM;SACf,CAAC;QAEF,IAAI,+BAAmB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACpD,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CACjC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS,MAAK,IAAI,CAAC,SAAS,CACzC,CAAC;QACF,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG;YAAE,OAAO;QAElC,MAAM,cAAc,GAAG,IAAA,2BAAiB,EAAC,UAAU,CAAC,CAAC;QAErD,iBAAiB,CAAC,gBAAgB,CAAC;YACjC,OAAO,EAAE,IAAI,CAAC,SAAS;YACvB,MAAM,EAAE,IAAI,sBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,cAAc,CAAC;SAClE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/quarry/positionsFetcher.js

@@ -50,7 +50,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         mints.add(position.stakedTokenInfo.address);
         position.rewardsTokenInfo.forEach((rewardTokenInfo) => mints.add(rewardTokenInfo.address.toString()));
     });
-    const tokenPrices = yield cache.getTokenPricesAsMap([...mints], portfolio_core_1.NetworkId.solana);
+    const tokenPrices = yield cache.getTokenPricesAsMap(mints, portfolio_core_1.NetworkId.solana);
     const elements = [];
     positions.forEach((position) => {
         const { rewardsTokenInfo, rewardsBalance, primaryRewarder, stakedBalance, stakedTokenInfo, } = position;

package/src/plugins/quarry/positionsFetcher.js.map

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

package/src/plugins/raydium/farmsFetcher.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 });
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const constants_1 = require("./constants");
@@ -18,7 +15,7 @@ const clients_1 = require("../../utils/clients");
 const helpers_1 = require("./helpers");
 const solana_1 = require("../../utils/solana");
 const farmsJob_1 = require("./farmsJob");
-const tokenPriceToAssetTokens_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetTokens"));
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
     const userFarmAccountsPromises = farmsJob_1.userFarmConfigs.map((userFarmConfig) => (0, solana_1.getParsedProgramAccounts)(client, userFarmConfig.struct, userFarmConfig.programId, userFarmConfig.filters(owner)));
@@ -33,15 +30,14 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     farmsInfo.forEach((farmInfo) => farmInfo
         ? farmsInfoMap.set(farmInfo.account.pubkey.toString(), farmInfo)
         : undefined);
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
     const rayStakingPubkey = (0, helpers_1.getStakePubKey)(owner).toString();
-    const liquiditiesWithoutRewards = [];
-    const elementsWithRewards = [];
+    const uniqueElementForFarmsWithoutRewards = elementRegistry.addElementLiquidity({
+        label: 'Farming',
+    });
+    const liquidityOfUniqueElement = uniqueElementForFarmsWithoutRewards.addLiquidity();
     for (let i = 0; i < userFarmAccounts.length; i += 1) {
-        const rewardAssets = [];
-        const assets = [];
         const userFarmAccount = userFarmAccounts[i];
-        if (userFarmAccount.pubkey.toString() === rayStakingPubkey)
-            continue;
         const farmInfo = farmsInfoMap.get(userFarmAccount.poolId.toString());
         if (!farmInfo)
             continue;
@@ -49,81 +45,41 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         if (!lpTokenPrice)
             continue;
         const farmAccount = farmInfo.account;
-        // LP staked on Farm
-        const amount = userFarmAccount.depositBalance
-            .div(Math.pow(10, farmInfo.lpToken.decimals))
-            .toNumber();
-        if (amount > 0) {
-            const underlyingAssets = (0, tokenPriceToAssetTokens_1.default)(lpTokenPrice.address, amount, portfolio_core_1.NetworkId.solana, lpTokenPrice);
-            assets.push(...underlyingAssets);
-        }
+        const element = elementRegistry.addElementLiquidity({
+            label: userFarmAccount.pubkey.toString() === rayStakingPubkey
+                ? 'Staked'
+                : 'Farming',
+        });
+        const liquidity = element.addLiquidity();
         // Farm pending reward A
         if (farmInfo.rewardTokenA) {
-            const assetTokenA = (0, helpers_1.getPendingAssetToken)(userFarmAccount.depositBalance, userFarmAccount.rewardDebt, farmAccount.perShare, farmInfo.rewardTokenA, farmInfo.d);
-            if (assetTokenA.data.amount > 0) {
-                rewardAssets.push(assetTokenA);
-            }
+            liquidity.addRewardAsset((0, helpers_1.getPendingAssetParams)(userFarmAccount.depositBalance, userFarmAccount.rewardDebt, farmAccount.perShare, farmInfo.rewardTokenA, farmInfo.d));
         }
         // Farm pending reward B
         if (farmInfo.rewardTokenB &&
             farmAccount.perShareB &&
             userFarmAccount.rewardDebtB) {
-            const assetTokenB = (0, helpers_1.getPendingAssetToken)(userFarmAccount.depositBalance, userFarmAccount.rewardDebtB, farmAccount.perShareB, farmInfo.rewardTokenB, farmInfo.d);
-            if (assetTokenB.data.amount > 0) {
-                rewardAssets.push(assetTokenB);
-            }
+            liquidity.addRewardAsset((0, helpers_1.getPendingAssetParams)(userFarmAccount.depositBalance, userFarmAccount.rewardDebtB, farmAccount.perShareB, farmInfo.rewardTokenB, farmInfo.d));
         }
-        const assetsValue = (0, portfolio_core_1.getUsdValueSum)(assets.map((a) => a.value));
-        const rewardAssetsValue = (0, portfolio_core_1.getUsdValueSum)(rewardAssets.map((r) => r.value));
-        const value = (0, portfolio_core_1.getUsdValueSum)([assetsValue, rewardAssetsValue]);
-        if (value === 0)
-            continue;
-        if (rewardAssets.length === 0) {
-            liquiditiesWithoutRewards.push({
-                assets,
-                assetsValue,
-                rewardAssets: [],
-                rewardAssetsValue: null,
-                value: assetsValue,
-                yields: [],
+        // LP staked on Farm
+        const amount = userFarmAccount.depositBalance.div(Math.pow(10, farmInfo.lpToken.decimals));
+        if (liquidity.rewardAssets.length > 0 ||
+            userFarmAccount.pubkey.toString() === rayStakingPubkey) {
+            liquidity.addAsset({
+                address: lpTokenPrice.address,
+                amount,
+                alreadyShifted: true,
+            });
+        }
+        else {
+            liquidityOfUniqueElement.addAsset({
+                address: lpTokenPrice.address,
+                amount,
+                alreadyShifted: true,
             });
-            continue;
         }
-        const liquidityWithRewards = {
-            value,
-            assets,
-            assetsValue,
-            rewardAssets,
-            rewardAssetsValue,
-            yields: [],
-        };
-        elementsWithRewards.push({
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            type: portfolio_core_1.PortfolioElementType.liquidity,
-            label: 'Farming',
-            value: liquidityWithRewards.value,
-            data: {
-                liquidities: [liquidityWithRewards],
-            },
-        });
     }
-    if (liquiditiesWithoutRewards.length === 0 &&
-        elementsWithRewards.length === 0)
-        return [];
-    return [
-        ...elementsWithRewards,
-        {
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            type: portfolio_core_1.PortfolioElementType.liquidity,
-            label: 'Farming',
-            value: (0, portfolio_core_1.getUsdValueSum)(liquiditiesWithoutRewards.map((l) => l.value)),
-            data: {
-                liquidities: liquiditiesWithoutRewards,
-            },
-        },
-    ];
+    return elementRegistry.dump(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-farms`,

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

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

package/src/plugins/raydium/helpers.d.ts

@@ -1,9 +1,10 @@
 import BigNumber from 'bignumber.js';
 import BN from 'bn.js';
-import { PortfolioAssetCollectible, PortfolioAssetToken, TokenPrice, Yield } from '@sonarwatch/portfolio-core';
+import { PortfolioAssetCollectible, TokenPrice, Yield } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { PersonalPositionState, PoolState, TickArrayState } from './structs/clmms';
 import { ParsedAccount } from '../../utils/solana';
+import { PortfolioAssetParams } from '../../utils/elementbuilder/PortfolioAssetParams';
 export declare function isARaydiumPosition(nft: PortfolioAssetCollectible): boolean;
 export declare function raydiumTickToPriceX64(tick: number): BN;
 export declare function getRaydiumTokenAmountsFromLiquidity(sqrtPriceCurrentX64: BigNumber, sqrtPriceX64A: BigNumber, sqrtPriceX64B: BigNumber, liquidity: BigNumber, roundUp: boolean): {
@@ -12,7 +13,7 @@ export declare function getRaydiumTokenAmountsFromLiquidity(sqrtPriceCurrentX64:
 };
 export declare function getStakePubKey(owner: string): PublicKey;
 export declare function getFarmYield(rewardToken: TokenPrice, rewardPerBlock: BigNumber, tvl: number, slotsPerSec?: number): Yield;
-export declare function getPendingAssetToken(depositBalance: BigNumber, rewardDebt: BigNumber, perShare: BigNumber, rewardToken: TokenPrice, multiplier: number | BigNumber): PortfolioAssetToken;
+export declare function getPendingAssetParams(depositBalance: BigNumber, rewardDebt: BigNumber, perShare: BigNumber, rewardToken: TokenPrice, multiplier: number | BigNumber): PortfolioAssetParams;
 export declare const getTickArrayAddress: (programId: string, poolId: string, tickNumber: number, tickSpacing: number) => PublicKey;
 export declare const getFeesAndRewardsBalance: (personalPositionInfo: ParsedAccount<PersonalPositionState>, poolStateInfo: ParsedAccount<PoolState>, tickArrays: (ParsedAccount<TickArrayState> | null)[]) => {
     tokenFeeAmountA: BigNumber;

package/src/plugins/raydium/helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFeesAndRewardsBalance = exports.getTickArrayAddress = exports.getPendingAssetToken = exports.getFarmYield = exports.getStakePubKey = exports.getRaydiumTokenAmountsFromLiquidity = exports.raydiumTickToPriceX64 = exports.isARaydiumPosition = void 0;
+exports.getFeesAndRewardsBalance = exports.getTickArrayAddress = exports.getPendingAssetParams = exports.getFarmYield = exports.getStakePubKey = exports.getRaydiumTokenAmountsFromLiquidity = exports.raydiumTickToPriceX64 = exports.isARaydiumPosition = void 0;
 /* eslint-disable eqeqeq */
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable no-underscore-dangle */
@@ -14,7 +14,6 @@ const bn_js_1 = __importDefault(require("bn.js"));
 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 toBN_1 = require("../../utils/misc/toBN");
 function isARaydiumPosition(nft) {
     return nft.name === constants_1.positionsIdentifier;
@@ -195,16 +194,15 @@ function getFarmYield(rewardToken, rewardPerBlock, tvl, slotsPerSec = 2) {
     };
 }
 exports.getFarmYield = getFarmYield;
-function getPendingAssetToken(depositBalance, rewardDebt, perShare, rewardToken, multiplier) {
+function getPendingAssetParams(depositBalance, rewardDebt, perShare, rewardToken, multiplier) {
     const amount = depositBalance
         .times(perShare)
         .div(multiplier)
         .minus(rewardDebt)
-        .div(Math.pow(10, rewardToken.decimals))
-        .toNumber();
-    return (0, tokenPriceToAssetToken_1.default)(rewardToken.address, amount, portfolio_core_1.NetworkId.solana, rewardToken);
+        .div(Math.pow(10, rewardToken.decimals));
+    return { address: rewardToken.address, amount, alreadyShifted: true };
 }
-exports.getPendingAssetToken = getPendingAssetToken;
+exports.getPendingAssetParams = getPendingAssetParams;
 function getRewardGrowthInsideV2(tickCurrentIndex, tickLowerState, tickUpperState, rewardInfos) {
     const rewardGrowthsInside = [];
     for (let i = 0; i < rewardInfos.length; i++) {