@sonarwatch/portfolio-plugins 0.14.10 → 0.14.12

package/src/plugins/kriya/{types.d.ts → types/vaults.d.ts}

@@ -1,9 +1,5 @@
-import { ID } from '../../utils/sui/structs/id';
-export type VaultInfo = {
-    id: string;
-    underlyingPool: string;
-    tokenType: string;
-};
+import { ID } from '../../../utils/sui/structs/id';
+import { RewardInfo, TickIndex, Type } from './common';
 export type Vault = {
     clmm_pool_id: string;
     fee_a: string;
@@ -54,23 +50,16 @@ export type TotalSupply = {
 export type TotalSupplyFields = {
     value: string;
 };
-export type VaultPositionInfo = {
-    id: string;
-    lowerTick: number;
-    upperTick: number;
-    liquidity: string;
-    totalSupply: string;
-};
-export type VaultPosition = {
+export type VaultPositionCetus = {
     id: ID;
     name: number[];
-    value: Value;
+    value: ValueCetus;
 };
-export type Value = {
-    fields: ValueFields;
+export type ValueCetus = {
+    fields: PositionFieldsCetus;
     type: string;
 };
-export type ValueFields = {
+export type PositionFieldsCetus = {
     coin_type_a: CoinType;
     coin_type_b: CoinType;
     description: string;
@@ -79,8 +68,8 @@ export type ValueFields = {
     liquidity: string;
     name: string;
     pool: string;
-    tick_lower_index: TickErIndex;
-    tick_upper_index: TickErIndex;
+    tick_lower_index: TickIndex;
+    tick_upper_index: TickIndex;
     url: string;
 };
 export type CoinType = {
@@ -90,66 +79,65 @@ export type CoinType = {
 export type CoinTypeAFields = {
     name: string;
 };
-export type TickErIndex = {
-    fields: TickLowerIndexFields;
+export type VaultPositionKriya = {
+    id: ID;
+    name: number[];
+    value: ValueKriya;
+};
+export type ValueKriya = {
+    fields: PositionFieldsKriya;
     type: string;
 };
-export type TickLowerIndexFields = {
-    bits: number;
+export type PositionFieldsKriya = {
+    fee_growth_inside_x_last: string;
+    fee_growth_inside_y_last: string;
+    fee_rate: string;
+    id: ID;
+    liquidity: string;
+    owed_coin_x: string;
+    owed_coin_y: string;
+    pool_id: string;
+    reward_infos: RewardInfo[];
+    tick_lower_index: TickIndex;
+    tick_upper_index: TickIndex;
+    type_x: Type;
+    type_y: Type;
 };
-export type FarmInfo = {
-    tokenXReserve: string;
-    lspSupply: string;
-    protocolFeesPercent: string;
-    createdAt: Date;
-    farmSource: FarmSource;
-    volume: number;
-    packageId: string;
+export type LeverageVaultInfo = {
+    depositedA: string;
+    apr: string;
+    borrowedBUsd: string;
+    farmStakeReceiptType: string;
+    decimalA: string;
+    createdAt: string;
+    farmSource: string;
+    coinB: string;
+    decimalB: string;
+    tvl: string;
+    borrowedB: string;
+    targetLeverage: string;
+    vaultName: string;
+    depositedAUsd: string;
+    lpSupply: string;
+    vaultSource: string;
     farmId: string;
+    fees: string;
+    coinA: string;
+    updatedAt: string;
+    id: string;
+};
+export type DynFieldPositionVault = {
+    name: Name;
+    bcsName: string;
+    type: string;
+    objectType: string;
     objectId: string;
-    poolSource: PoolSource;
-    lspType: string;
-    lpFeesPercent: string;
-    tokenYType: string;
-    data: string;
-    updatedAt: Date;
-    isStable: boolean;
-    tokenXType: string;
-    tokenYReserve: string;
-    tokenX: Token;
-    tokenY: Token;
-    tvl: number;
-    apy: number;
-    feeApy: number;
-};
-export declare enum FarmSource {
-    Buck = "buck",
-    Empty = "",
-    Kriya = "kriya"
-}
-export declare enum PoolSource {
-    Deepbook = "deepbook",
-    DeepbookV2 = "deepbook_v2",
-    Kriya = "kriya"
-}
-export type Token = {
-    coinType: string;
-    ticker: string;
-    tokenName: string;
-    updatedAt: Date;
-    createdAt: Date;
-    decimals: number;
-    iconUrl: string;
-    description: string;
-    price: string;
+    version: number;
+    digest: string;
 };
-export type LiquidityPosition = {
-    farm_id: string;
-    id: ID;
-    lock_until: string;
-    stake_amount: string;
-    stake_weight: string;
-    start_unit: string;
+export type Name = {
+    type: string;
+    value: number[];
 };
 export type StakeReceiptWithPoints = {
     farm_id: string;
@@ -178,26 +166,56 @@ export type StakeReceiptWithPoints = {
         type: string;
     };
 };
-export type LeverageVaultInfo = {
-    depositedA: string;
+export type VaultReceipt = {
+    farm_id: string;
+    id: ID;
+    reward_infos: RewardInfos;
+    shares: string;
+    user_points_info: UserPointsInfo;
+};
+export type RewardInfos = {
+    fields: RewardInfosFields;
+    type: string;
+};
+export type RewardInfosFields = {
+    id: ID;
+    size: string;
+};
+export type UserPointsInfo = {
+    fields: UserPointsInfoFields;
+    type: string;
+};
+export type UserPointsInfoFields = {
+    claimed_points: string;
+    index: string;
+    updated_at: string;
+};
+export type VaultData = {
+    lpPriceHigh: string;
     apr: string;
-    borrowedBUsd: string;
-    farmStakeReceiptType: string;
-    decimalA: string;
-    createdAt: string;
-    farmSource: string;
+    createdAt: Date;
     coinB: string;
-    decimalB: string;
     tvl: string;
-    borrowedB: string;
-    targetLeverage: string;
     vaultName: string;
-    depositedAUsd: string;
+    lastRebalance: string;
     lpSupply: string;
     vaultSource: string;
     farmId: string;
     fees: string;
     coinA: string;
-    updatedAt: string;
+    lpPriceLow: string;
+    updatedAt: Date;
+    currentLpPrice: string;
     id: string;
+    rebalanceCap: string;
+    pool: Pool;
+};
+export type Pool = {
+    tokenYDecimals: number;
+    vaultCoinType: string;
+    vaultType: string;
+    tokenXType: string;
+    tokenYType: string;
+    poolId: string;
+    tokenXDecimals: number;
 };

package/src/plugins/kriya/types/vaults.js

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

package/src/plugins/kriya/types/vaults.js.map

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

package/src/plugins/kriya/vaultsFetcher.js

@@ -17,77 +17,85 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("./constants");
 const clients_1 = require("../../utils/clients");
 const mulitpleGetBalances_1 = require("../../utils/sui/mulitpleGetBalances");
-const constants_2 = require("../cetus/constants");
 const tokenAmountFromLiquidity_1 = require("../../utils/clmm/tokenAmountFromLiquidity");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const getOwnedObjects_1 = require("../../utils/sui/getOwnedObjects");
+const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
+const vaultsPositionInfoMemo = new MemoizedCache_1.MemoizedCache(constants_1.vaultsInfoKey, {
+    prefix: constants_1.platformId,
+    networkId: portfolio_core_1.NetworkId.sui,
+});
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const client = (0, clients_1.getClientSui)();
-    const vaultsBalances = yield (0, mulitpleGetBalances_1.getMultipleBalances)(client, owner, constants_1.vaultsInfo.map((vault) => vault.tokenType));
-    if (!vaultsBalances.some((balance) => balance.totalBalance !== '0'))
-        return [];
-    const poolInfos = yield cache.getItems(constants_1.vaultsInfo.map((vault) => vault.underlyingPool), { prefix: constants_2.clmmPoolsPrefix, networkId: portfolio_core_1.NetworkId.sui });
-    const vaultsPositionInfo = yield cache.getItem(constants_1.vaultsInfoKey, {
-        prefix: constants_1.platformId,
-        networkId: portfolio_core_1.NetworkId.sui,
-    });
+    const [vaultsOldBalances, vaultBalances, vaultsPositionInfo] = yield Promise.all([
+        (0, mulitpleGetBalances_1.getMultipleBalances)(client, owner, constants_1.vaultsInfo.map((vault) => vault.tokenType)),
+        (0, getOwnedObjects_1.getOwnedObjects)(client, owner, {
+            filter: { StructType: constants_1.vaultStakeReceipt },
+        }),
+        vaultsPositionInfoMemo.getItem(cache),
+    ]);
     if (!vaultsPositionInfo)
         return [];
-    const tokenPriceById = yield cache.getTokenPricesAsMap(poolInfos
-        .map((pool) => (pool ? [pool.coinTypeA, pool.coinTypeB] : []))
-        .flat(), portfolio_core_1.NetworkId.sui);
-    let totalValue = 0;
-    const liquidities = [];
-    for (let i = 0; i < vaultsBalances.length; i++) {
-        const balance = vaultsBalances[i];
-        const pool = poolInfos[i];
-        const vault = vaultsPositionInfo[i];
-        if (!pool || !vault)
+    const vaultsByCoinType = new Map();
+    vaultsPositionInfo.forEach((vault) => vaultsByCoinType.set(vault.coinType, vault));
+    const vaultsByFarmId = new Map();
+    vaultsPositionInfo.forEach((vault) => vaultsByFarmId.set(vault.farmId, vault));
+    const registry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.sui, constants_1.platformId);
+    const liquidities = registry.addElementLiquidity({
+        name: 'Vaults',
+        label: 'LiquidityPool',
+    });
+    for (let i = 0; i < vaultsOldBalances.length; i++) {
+        const liquidity = liquidities.addLiquidity();
+        const balance = vaultsOldBalances[i];
+        if (balance.totalBalance === '0')
+            continue;
+        const vault = vaultsByCoinType.get(balance.coinType);
+        if (!vault)
             continue;
         const totalSupply = new bignumber_js_1.default(vault.totalSupply);
-        const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(vault.liquidity), pool.current_tick_index, vault.lowerTick, vault.upperTick, false);
+        const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(vault.liquidity), vault.currentTickIndex, vault.lowerTick, vault.upperTick, false);
         const shares = new bignumber_js_1.default(balance.totalBalance).dividedBy(totalSupply);
-        const [tokenPriceA, tokenPriceB] = [
-            tokenPriceById.get((0, portfolio_core_1.formatMoveTokenAddress)(pool.coinTypeA)),
-            tokenPriceById.get((0, portfolio_core_1.formatMoveTokenAddress)(pool.coinTypeB)),
-        ];
-        if (!tokenPriceA || !tokenPriceB)
+        const amountA = tokenAmountA.times(shares);
+        const amountB = tokenAmountB.times(shares);
+        liquidity.addAsset({
+            address: vault.mintA,
+            amount: amountA,
+        });
+        liquidity.addAsset({
+            address: vault.mintB,
+            amount: amountB,
+        });
+    }
+    for (let i = 0; i < vaultBalances.length; i++) {
+        const liquidity = liquidities.addLiquidity();
+        const stakeReceipt = (_b = (_a = vaultBalances[i].data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
+        if (!stakeReceipt || stakeReceipt.shares === '0')
             continue;
-        const amountA = tokenAmountA
-            .times(shares)
-            .dividedBy(Math.pow(10, tokenPriceA.decimals));
-        const amountB = tokenAmountB
-            .times(shares)
-            .dividedBy(Math.pow(10, tokenPriceB.decimals));
-        if (amountA.isZero() && amountB.isZero())
+        const vault = vaultsByFarmId.get(stakeReceipt.farm_id);
+        if (!vault)
             continue;
-        const assetA = (0, tokenPriceToAssetToken_1.default)(tokenPriceA.address, amountA.toNumber(), portfolio_core_1.NetworkId.sui, tokenPriceA);
-        const assetB = (0, tokenPriceToAssetToken_1.default)(tokenPriceB.address, amountB.toNumber(), portfolio_core_1.NetworkId.sui, tokenPriceB);
-        const value = (0, portfolio_core_1.getUsdValueSum)([assetA.value, assetB.value]);
-        totalValue = (0, portfolio_core_1.getUsdValueSum)([totalValue, value]);
-        liquidities.push({
-            assets: [assetA, assetB],
-            assetsValue: value,
-            rewardAssets: [],
-            rewardAssetsValue: null,
-            value,
-            yields: [],
+        const totalSupply = new bignumber_js_1.default(vault.totalSupply);
+        const { tokenAmountA, tokenAmountB } = (0, tokenAmountFromLiquidity_1.getTokenAmountsFromLiquidity)(new bignumber_js_1.default(vault.liquidity), 600, vault.lowerTick, vault.upperTick, false);
+        const useApiData = tokenAmountA.isLessThan(0) || tokenAmountB.isLessThan(0);
+        const shares = new bignumber_js_1.default(stakeReceipt.shares).dividedBy(totalSupply);
+        const amountA = useApiData
+            ? new bignumber_js_1.default(vault.amountA).times(shares)
+            : tokenAmountA.times(shares);
+        const amountB = useApiData
+            ? new bignumber_js_1.default(vault.amountB).times(shares)
+            : tokenAmountB.times(shares);
+        liquidity.addAsset({
+            address: vault.mintA,
+            amount: amountA,
+        });
+        liquidity.addAsset({
+            address: vault.mintB,
+            amount: amountB,
         });
     }
-    if (liquidities.length === 0)
-        return [];
-    return [
-        {
-            type: 'liquidity',
-            data: {
-                liquidities,
-            },
-            label: 'LiquidityPool',
-            networkId: portfolio_core_1.NetworkId.sui,
-            platformId: constants_1.platformId,
-            value: totalValue,
-            name: 'Vaults',
-        },
-    ];
+    return registry.getElements(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-vaults`,

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

@@ -1 +1 @@
-{"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/vaultsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAMoC;AACpC,gEAAqC;AAGrC,2CAAoE;AACpE,iDAAmD;AACnD,6EAA0E;AAE1E,kDAAqD;AAErD,wFAAyF;AACzF,qGAA6E;AAE7E,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,cAAc,GAAG,MAAM,IAAA,yCAAmB,EAC9C,MAAM,EACN,KAAK,EACL,sBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAC3C,CAAC;IAEF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,KAAK,GAAG,CAAC;QACjE,OAAO,EAAE,CAAC;IAEZ,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,QAAQ,CACpC,sBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,EAC/C,EAAE,MAAM,EAAE,2BAAe,EAAE,SAAS,EAAE,0BAAS,CAAC,GAAG,EAAE,CACtD,CAAC;IAEF,MAAM,kBAAkB,GAAG,MAAM,KAAK,CAAC,OAAO,CAC5C,yBAAa,EACb;QACE,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CACF,CAAC;IACF,IAAI,CAAC,kBAAkB;QAAE,OAAO,EAAE,CAAC;IAEnC,MAAM,cAAc,GAAG,MAAM,KAAK,CAAC,mBAAmB,CACpD,SAAS;SACN,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC7D,IAAI,EAAE,EACT,0BAAS,CAAC,GAAG,CACd,CAAC;IAEF,IAAI,UAAU,GAAa,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAyB,EAAE,CAAC;IAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK;YAAE,SAAS;QAE9B,MAAM,WAAW,GAAG,IAAI,sBAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAErD,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,uDAA4B,EACjE,IAAI,sBAAS,CAAC,KAAK,CAAC,SAAS,CAAC,EAC9B,IAAI,CAAC,kBAAkB,EACvB,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,SAAS,EACf,KAAK,CACN,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAE1E,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG;YACjC,cAAc,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,cAAc,CAAC,GAAG,CAAC,IAAA,uCAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3D,CAAC;QACF,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3C,MAAM,OAAO,GAAG,YAAY;aACzB,KAAK,CAAC,MAAM,CAAC;aACb,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,YAAY;aACzB,KAAK,CAAC,MAAM,CAAC;aACb,SAAS,CAAC,SAAA,EAAE,EAAI,WAAW,CAAC,QAAQ,CAAA,CAAC,CAAC;QAEzC,IAAI,OAAO,CAAC,MAAM,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE;YAAE,SAAS;QAEnD,MAAM,MAAM,GAAG,IAAA,gCAAsB,EACnC,WAAW,CAAC,OAAO,EACnB,OAAO,CAAC,QAAQ,EAAE,EAClB,0BAAS,CAAC,GAAG,EACb,WAAW,CACZ,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,gCAAsB,EACnC,WAAW,CAAC,OAAO,EACnB,OAAO,CAAC,QAAQ,EAAE,EAClB,0BAAS,CAAC,GAAG,EACb,WAAW,CACZ,CAAC;QACF,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAE3D,UAAU,GAAG,IAAA,+BAAc,EAAC,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;QACjD,WAAW,CAAC,IAAI,CAAC;YACf,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;YACxB,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,EAAE;YAChB,iBAAiB,EAAE,IAAI;YACvB,KAAK;YACL,MAAM,EAAE,EAAE;SACX,CAAC,CAAC;IACL,CAAC;IAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAExC,OAAO;QACL;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE;gBACJ,WAAW;aACZ;YACD,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,0BAAS,CAAC,GAAG;YACxB,UAAU,EAAV,sBAAU;YACV,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,SAAS,EAAE,0BAAS,CAAC,GAAG;IACxB,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"vaultsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/vaultsFetcher.ts"],"names":[],"mappings":"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"}

package/src/plugins/kriya/vaultsJob.js

@@ -8,40 +8,76 @@ 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 axios_1 = __importDefault(require("axios"));
 const clients_1 = require("../../utils/clients");
-const multiGetObjects_1 = require("../../utils/sui/multiGetObjects");
-const multipleGetDynamicFieldsObjects_1 = require("../../utils/sui/multipleGetDynamicFieldsObjects");
 const constants_1 = require("./constants");
+const common_1 = require("./types/common");
+const getObject_1 = require("../../utils/sui/getObject");
+const getDynamicFieldObjects_1 = require("../../utils/sui/getDynamicFieldObjects");
+const bitsToNumber_1 = require("../../utils/sui/bitsToNumber");
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const client = (0, clients_1.getClientSui)();
-    const [vaultsObjects, vaultsDynamicFields] = yield Promise.all([
-        (0, multiGetObjects_1.multiGetObjects)(client, constants_1.vaultsInfo.map((vault) => vault.id)),
-        (0, multipleGetDynamicFieldsObjects_1.multipleGetDynamicFieldsObjects)(client, constants_1.vaultsInfo.map((vault) => vault.id)),
-    ]);
     const vaultsInfos = [];
-    for (let i = 0; i < vaultsObjects.length; i++) {
-        const vault = (_b = (_a = vaultsObjects[i].data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
+    const vaultsApiData = yield axios_1.default.get(constants_1.vaultsUrl);
+    for (const vaultInfo of constants_1.vaultsInfo) {
+        const [vaultOject, vaultDynamicFields] = yield Promise.all([
+            (0, getObject_1.getObject)(client, vaultInfo.id),
+            (0, getDynamicFieldObjects_1.getDynamicFieldObjects)(client, vaultInfo.id),
+        ]);
+        const vault = (_b = (_a = vaultOject.data) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.fields;
         if (!vault)
             continue;
-        const dynamicFields = vaultsDynamicFields[i];
+        const vaultData = vaultsApiData.data.find((v) => v.id === vault.id.id);
+        if (!vaultData)
+            continue;
+        const isCetus = vaultInfo.underlyingDex === common_1.Dex.cetus;
+        const dynamicFieldType = isCetus
+            ? constants_1.dynamicFieldPositionTypeCetus
+            : constants_1.dynamicFieldPositionTypeKriya;
         let vaultPosition;
-        for (const fields of dynamicFields) {
-            if (((_c = fields.data) === null || _c === void 0 ? void 0 : _c.type) === constants_1.dynamicFieldPositionType)
-                vaultPosition = (_d = fields.data.content) === null || _d === void 0 ? void 0 : _d.fields;
+        for (const fields of vaultDynamicFields) {
+            if (((_c = fields.data) === null || _c === void 0 ? void 0 : _c.type) === dynamicFieldType) {
+                vaultPosition = isCetus
+                    ? (_d = fields.data.content) === null || _d === void 0 ? void 0 : _d.fields
+                    : (_e = fields.data.content) === null || _e === void 0 ? void 0 : _e.fields;
+            }
         }
         if (!vaultPosition)
             continue;
-        const vaultPositionInfo = {
+        const vaultPositionCommon = {
             id: vault.id.id,
+            farmId: vaultData.farmId,
+            coinType: vaultInfo.tokenType,
             liquidity: vaultPosition.value.fields.liquidity,
             lowerTick: vault.lower_tick,
             upperTick: vault.upper_tick,
             totalSupply: vault.treasury_cap.fields.total_supply.fields.value,
+            amountA: vaultData.coinA,
+            amountB: vaultData.coinB,
         };
-        vaultsInfos.push(vaultPositionInfo);
+        if (vaultInfo.underlyingDex === common_1.Dex.cetus) {
+            const poolInfo = yield (0, getObject_1.getObject)(client, vaultInfo.underlyingPool);
+            if ((_g = (_f = poolInfo.data) === null || _f === void 0 ? void 0 : _f.content) === null || _g === void 0 ? void 0 : _g.fields) {
+                const { keys } = (0, portfolio_core_1.parseTypeString)(poolInfo.data.type);
+                if (keys && keys.at(0) && keys.at(1)) {
+                    const vaultPositionInfo = Object.assign(Object.assign({}, vaultPositionCommon), { currentTickIndex: (0, bitsToNumber_1.bitsToNumber)(poolInfo.data.content.fields.current_tick_index.fields.bits), mintA: keys[0].type, mintB: keys[1].type });
+                    vaultsInfos.push(vaultPositionInfo);
+                }
+            }
+        }
+        else if (vaultInfo.underlyingDex === common_1.Dex.kriya) {
+            const poolInfo = yield (0, getObject_1.getObject)(client, vaultInfo.underlyingPool);
+            if ((_j = (_h = poolInfo.data) === null || _h === void 0 ? void 0 : _h.content) === null || _j === void 0 ? void 0 : _j.fields) {
+                const vaultPositionInfo = Object.assign(Object.assign({}, vaultPositionCommon), { currentTickIndex: (0, bitsToNumber_1.bitsToNumber)(poolInfo.data.content.fields.tick_index.fields.bits), mintA: poolInfo.data.content.fields.type_x.fields.name, mintB: poolInfo.data.content.fields.type_y.fields.name });
+                vaultsInfos.push(vaultPositionInfo);
+            }
+        }
     }
     yield cache.setItem(constants_1.vaultsInfoKey, vaultsInfos, {
         prefix: constants_1.platformId,
@@ -51,7 +87,7 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
 const job = {
     id: `${constants_1.platformId}-vaults`,
     executor,
-    label: 'normal',
+    label: 'realtime',
 };
 exports.default = job;
 //# sourceMappingURL=vaultsJob.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/vaultsJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AAGvD,iDAAmD;AACnD,qEAAkE;AAClE,qGAAkG;AAClG,2CAKqB;AAGrB,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;;IACnD,MAAM,MAAM,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE9B,MAAM,CAAC,aAAa,EAAE,mBAAmB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7D,IAAA,iCAAe,EACb,MAAM,EACN,sBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACpC;QACD,IAAA,iEAA+B,EAC7B,MAAM,EACN,sBAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CACpC;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAwB,EAAE,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,KAAK,GAAG,MAAA,MAAA,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,0CAAE,OAAO,0CAAE,MAAM,CAAC;QACrD,IAAI,CAAC,KAAK;YAAE,SAAS;QAErB,MAAM,aAAa,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,aAAa,CAAC;QAClB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;YACnC,IAAI,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,MAAK,oCAAwB;gBAChD,aAAa,GAAG,MAAA,MAAM,CAAC,IAAI,CAAC,OAAO,0CAAE,MAAuB,CAAC;QACjE,CAAC;QACD,IAAI,CAAC,aAAa;YAAE,SAAS;QAE7B,MAAM,iBAAiB,GAAsB;YAC3C,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE;YACf,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS;YAC/C,SAAS,EAAE,KAAK,CAAC,UAAU;YAC3B,SAAS,EAAE,KAAK,CAAC,UAAU;YAC3B,WAAW,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK;SACjE,CAAC;QACF,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,WAAW,EAAE;QAC9C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,GAAG;KACzB,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,SAAS;IAC1B,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"vaultsJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/kriya/vaultsJob.ts"],"names":[],"mappings":"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"}

package/src/plugins/native-stake/solana/solanaValidatorsJob.js

@@ -30,6 +30,10 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         voter: r.vote_identity,
         name: r.name,
         imageUri: r.image,
+        baseApy: r.apy_estimate,
+        jitoApy: r.jito_apy,
+        stakingApy: r.staking_apy,
+        totalApy: r.total_apy,
     }));
     yield cache.setItem(constants_1.validatorsKey, validators, {
         prefix: constants_1.platformId,

package/src/plugins/native-stake/solana/solanaValidatorsJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"solanaValidatorsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaValidatorsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAG7C,4CAAyD;AACzD,2CAA0C;AAG1C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,MAAM,eAAK;SACpB,GAAG,CAAgD,uBAAW,EAAE;QAC/D,OAAO,EAAE,KAAK;KACf,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,GAAG,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAgB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnD,KAAK,EAAE,CAAC,CAAC,aAAa;QACtB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,QAAQ,EAAE,CAAC,CAAC,KAAK;KAClB,CAAC,CAAC,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,UAAU,EAAE;QAC7C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,oBAAoB;IACrC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"solanaValidatorsJob.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/native-stake/solana/solanaValidatorsJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,kDAA6C;AAG7C,4CAAyD;AACzD,2CAA0C;AAG1C,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,GAAG,GAAG,MAAM,eAAK;SACpB,GAAG,CAAgD,uBAAW,EAAE;QAC/D,OAAO,EAAE,KAAK;KACf,CAAC;SACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACb,MAAM,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEL,IAAI,CAAC,GAAG,CAAC,IAAI;QAAE,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAgB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACnD,KAAK,EAAE,CAAC,CAAC,aAAa;QACtB,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,QAAQ,EAAE,CAAC,CAAC,KAAK;QACjB,OAAO,EAAE,CAAC,CAAC,YAAY;QACvB,OAAO,EAAE,CAAC,CAAC,QAAQ;QACnB,UAAU,EAAE,CAAC,CAAC,WAAW;QACzB,QAAQ,EAAE,CAAC,CAAC,SAAS;KACtB,CAAC,CAAC,CAAC;IAEJ,MAAM,KAAK,CAAC,OAAO,CAAC,yBAAa,EAAE,UAAU,EAAE;QAC7C,MAAM,EAAE,sBAAU;QAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,oBAAoB;IACrC,QAAQ;IACR,KAAK,EAAE,QAAQ;CAChB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/native-stake/solana/types.d.ts

@@ -3,9 +3,17 @@ export type ValidatorApiResponse = {
     vote_identity: string;
     name: string;
     image: string;
+    apy_estimate: number;
+    jito_apy: number;
+    staking_apy: number;
+    total_apy: number;
 };
 export type Validator = {
     voter: string;
     name?: string;
     imageUri?: string;
+    baseApy: number;
+    jitoApy: number;
+    stakingApy: number;
+    totalApy: number;
 };

package/src/plugins/parcl/stakingFetcher.js

@@ -8,17 +8,13 @@ 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 web3_js_1 = require("@solana/web3.js");
-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 ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
 const decodePosition = (buffer) => ({
     amount: Number(buffer.readBigUInt64LE(1)),
     activationEpoch: Number(buffer.readBigUInt64LE(1 + 8)),
@@ -58,34 +54,24 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         {
             memcmp: {
                 offset: 8,
-                bytes: new web3_js_1.PublicKey(owner).toBase58(),
+                bytes: new web3_js_1.PublicKey(owner).toString(),
             },
         },
     ]);
     if (accs.length === 0)
         return [];
     const positions = accs.map((acc) => acc && decodePositionAccount(acc.account.data));
-    const tokenPrice = yield cache.getTokenPrice(constants_1.prclMint, portfolio_core_1.NetworkId.solana);
-    if (!tokenPrice)
-        return [];
-    const assets = [];
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const element = elementRegistry.addElementMultiple({
+        label: 'Staked',
+    });
     positions.forEach((positionAccount) => {
-        positionAccount.positions.forEach((position) => {
-            assets.push((0, tokenPriceToAssetToken_1.default)(tokenPrice.address, new bignumber_js_1.default(position.amount)
-                .dividedBy(Math.pow(10, tokenPrice.decimals))
-                .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
+        element.addAsset({
+            address: constants_1.prclMint,
+            amount: positionAccount.positions.reduce((sum, position) => sum + Number(position.amount), 0),
         });
     });
-    return [
-        {
-            type: portfolio_core_1.PortfolioElementType.multiple,
-            label: 'Staked',
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            data: { assets },
-            value: (0, portfolio_core_1.getUsdValueSum)(assets.map((asset) => asset.value)),
-        },
-    ];
+    return elementRegistry.getElements(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-staking`,