@sonarwatch/portfolio-plugins 0.14.63 → 0.14.65

package/CHANGELOG.md

@@ -2,22 +2,30 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
-## [0.14.63](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.62...plugins-0.14.63) (2024-12-11)
-
-
-
-## [0.14.62](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.61...plugins-0.14.62) (2024-12-10)
-
-
-
-## [0.14.61](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.60...plugins-0.14.61) (2024-12-09)
-
-
-
-## [0.14.60](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.59...plugins-0.14.60) (2024-12-09)
+## [0.14.65](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.64...plugins-0.14.65) (2024-12-13)
 
 
 
+## [0.14.64](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.63...plugins-0.14.64) (2024-12-12)
+
+
+
+## [0.14.63](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.62...plugins-0.14.63) (2024-12-11)
+
+
+
+## [0.14.62](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.61...plugins-0.14.62) (2024-12-10)
+
+
+
+## [0.14.61](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.60...plugins-0.14.61) (2024-12-09)
+
+
+
+## [0.14.60](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.59...plugins-0.14.60) (2024-12-09)
+
+
+
 ## [0.14.59](https://github.com/sonarwatch/portfolio/compare/plugins-0.14.58...plugins-0.14.59) (2024-12-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-plugins",
-  "version": "0.14.63",
+  "version": "0.14.65",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "peerDependencies": {
@@ -12,6 +12,8 @@
     "@aptos-labs/ts-sdk": "^1.19.0",
     "@bonfida/spl-name-service": "^1.0.10",
     "@cosmjs/cosmwasm-stargate": "^0.31.1",
+    "@drift-labs/sdk": "^2.104.0-beta.13",
+    "@drift-labs/vaults-sdk": "^0.2.7",
     "@ethersproject/bignumber": "^5.7.0",
     "@ethersproject/constants": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
@@ -22,6 +24,7 @@
     "@mysten/bcs": "^0.11.1",
     "@mysten/sui": "^1.12.0",
     "@onsol/tldparser": "^0.6.1",
+    "@project-serum/anchor": "^0.26.0",
     "@sei-js/core": "^3.0.1",
     "@sei-js/proto": "^3.0.1",
     "@solana/web3.js": "^1.91.8",

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Contract, Platform, Service, ServiceConfig } from '@sonarwatch/portfolio-core';
 export declare const platformId = "01";

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

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare function getPda(owner: PublicKey): PublicKey;

package/src/plugins/01/struct.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { WrappedI80F48 } from '../marginfi/structs/common';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "accessprotocol";

package/src/plugins/accessprotocol/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const stakeAccountStructFilter: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/accessprotocol/structs.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "adrastea";

package/src/plugins/adrastea/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 export declare const platformId = "adrena";

package/src/plugins/adrena/filters.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const positionFilter: (owner: string) => GetProgramAccountsFilter[];
 export declare const custodiesFilters: GetProgramAccountsFilter[];

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare function getStakingPda(stakedTokenMint: PublicKey): PublicKey;
 export declare function getUserStakingPda(owner: PublicKey, stakingPda: PublicKey): PublicKey;

package/src/plugins/adrena/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { IdlItem } from '@solanafm/explorer-kit-idls';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';
 import { Pools } from './types';

package/src/plugins/armada-staking/constants.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "armada-staking-program";

package/src/plugins/armada-staking/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const stakeFilters: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/armada-staking/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "atrix";

package/src/plugins/atrix/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "aurory";

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

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare function getStakingAccountAddress(owner: string): PublicKey;

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 import { IdlItem } from '@solanafm/explorer-kit-idls';

package/src/plugins/banx/filters.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const stakeFilters: (owner: string) => GetProgramAccountsFilter[];
 export declare const loanFiltersA: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/banx/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "bonfida";

package/src/plugins/bonfida/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const claimFilters: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/bonfida/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "bonkrewards";

package/src/plugins/bonkrewards/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const stakeDepositReceiptFilter: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/bonkrewards/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "bskt";

package/src/plugins/bskt/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare const vestingAccountFilter: (owner: string) => GetProgramAccountsFilter[];

package/src/plugins/bskt/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { IdlItem } from '@solanafm/explorer-kit-idls';

package/src/plugins/citrus/filters.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { GetProgramAccountsFilter } from '@solana/web3.js';
 export declare function getLoanFilters(owner: string): [GetProgramAccountsFilter[], GetProgramAccountsFilter[]];

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "clone";

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

@@ -1,2 +1,3 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 export declare function getUserAccount(owner: string): PublicKey;

package/src/plugins/clone/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct, FixableBeetStruct } from '@metaplex-foundation/beet';
 import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "cropper";

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 export declare const platformId = "cyberfrogs";

package/src/plugins/cyberfrogs/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 import { VSRInfos } from './types';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PortfolioAssetCollectible, PortfolioElement } from '@sonarwatch/portfolio-core';
 import BigNumber from 'bignumber.js';
 import { PublicKey } from '@solana/web3.js';

package/src/plugins/daos/structs/realms.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';
 export type VSRInfos = {

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Platform } from '@sonarwatch/portfolio-core';
 import { PublicKey } from '@solana/web3.js';
 import { AirdropStatics } from '../../AirdropFetcher';

package/src/plugins/doubleup/structs.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { BeetStruct } from '@metaplex-foundation/beet';
 import { PublicKey } from '@solana/web3.js';
 import BigNumber from 'bignumber.js';

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

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Platform } from '@sonarwatch/portfolio-core';
 import { AirdropStatics } from '../../AirdropFetcher';

package/src/plugins/drift/depositsFetcher.d.ts

@@ -1,3 +1,6 @@
 import { Fetcher } from '../../Fetcher';
+import { SpotMarketEnhanced } from './types';
+import { MemoizedCache } from '../../utils/misc/MemoizedCache';
+export declare const spotMarketsMemo: MemoizedCache<SpotMarketEnhanced[], SpotMarketEnhanced[]>;
 declare const fetcher: Fetcher;
 export default fetcher;

package/src/plugins/drift/depositsFetcher.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.spotMarketsMemo = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_js_1 = require("@solana/web3.js");
@@ -20,21 +21,23 @@ const struct_1 = require("./struct");
 const helpers_1 = require("./helpers");
 const solana_1 = require("../../utils/solana");
 const clients_1 = require("../../utils/clients");
-const tokenPriceToAssetToken_1 = __importDefault(require("../../utils/misc/tokenPriceToAssetToken"));
 const position_1 = require("./perpHelpers/position");
 const constants_2 = require("./perpHelpers/constants");
 const types_1 = require("./perpHelpers/types");
 const getOraclePrice_1 = require("./perpHelpers/getOraclePrice");
 const getPerpMarket_1 = require("./perpHelpers/getPerpMarket");
 const getMintFromOracle_1 = require("./perpHelpers/getMintFromOracle");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const MemoizedCache_1 = require("../../utils/misc/MemoizedCache");
+exports.spotMarketsMemo = new MemoizedCache_1.MemoizedCache(constants_1.keySpotMarkets, {
+    prefix: constants_1.platformId,
+    networkId: portfolio_core_1.NetworkId.solana,
+});
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const client = (0, clients_1.getClientSolana)();
-    const spotMarketsItems = yield cache.getItem(constants_1.keySpotMarkets, {
-        prefix: constants_1.platformId,
-        networkId: portfolio_core_1.NetworkId.solana,
-    });
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    const spotMarketsItems = yield exports.spotMarketsMemo.getItem(cache);
     const spotMarketByIndex = new Map();
-    const tokensMints = [];
     const insuranceFundStakeAccountsAddresses = [];
     const insuranceVaultsPkeys = [];
     for (const spotMarketItem of spotMarketsItems || []) {
@@ -42,23 +45,21 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             (0, helpers_1.getUserInsuranceFundStakeAccountPublicKey)(constants_1.driftProgram, new web3_js_1.PublicKey(owner), spotMarketItem.marketIndex);
         insuranceVaultsPkeys.push(new web3_js_1.PublicKey(spotMarketItem.insuranceFund.vault));
         spotMarketByIndex.set(spotMarketItem.marketIndex, spotMarketItem);
-        tokensMints.push(spotMarketItem.mint.toString());
     }
-    const [insuranceAccounts, insuranceTokenAccounts, tokensPrices] = yield Promise.all([
+    const [insuranceAccounts, insuranceTokenAccounts] = yield Promise.all([
         (0, solana_1.getParsedMultipleAccountsInfo)(client, struct_1.insuranceFundStakeStruct, insuranceFundStakeAccountsAddresses),
         (0, solana_1.getParsedMultipleAccountsInfo)(client, solana_1.tokenAccountStruct, insuranceVaultsPkeys),
-        cache.getTokenPrices(tokensMints, portfolio_core_1.NetworkId.solana),
     ]);
-    const tokenPriceById = new Map();
-    tokensPrices.forEach((tP) => (tP ? tokenPriceById.set(tP.address, tP) : []));
     const insuranceTokenAccountsById = new Map();
     insuranceTokenAccounts.forEach((acc) => {
         if (acc)
             insuranceTokenAccountsById.set(acc.pubkey.toString(), acc);
     });
     // Insurance
-    const elements = [];
-    const insuranceAssets = [];
+    const elementInsurance = elementRegistry.addElementMultiple({
+        label: 'Staked',
+        name: 'Insurance Fund',
+    });
     insuranceAccounts.forEach((account, i) => {
         if (!account || account.ifShares.isZero())
             return;
@@ -69,28 +70,13 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         const vault = insuranceTokenAccountsById.get(insuranceFund.vault.toString());
         if (!vault)
             return;
-        const tokenPrice = tokenPriceById.get(mint.toString());
-        if (!tokenPrice)
-            return;
-        const sharesAmount = account.ifShares
-            .dividedBy(insuranceFund.totalShares)
-            .times(vault.amount.dividedBy(Math.pow(10, tokenPrice.decimals)))
-            .toNumber();
-        insuranceAssets.push((0, tokenPriceToAssetToken_1.default)(mint.toString(), sharesAmount, portfolio_core_1.NetworkId.solana, tokenPrice));
-    });
-    if (insuranceAssets.length > 0) {
-        elements.push({
-            networkId: portfolio_core_1.NetworkId.solana,
-            label: 'Staked',
-            name: 'Insurance Fund',
-            platformId: constants_1.platformId,
-            type: portfolio_core_1.PortfolioElementType.multiple,
-            value: (0, portfolio_core_1.getUsdValueSum)(insuranceAssets.map((a) => a.value)),
-            data: {
-                assets: insuranceAssets,
-            },
+        elementInsurance.addAsset({
+            address: mint,
+            amount: account.ifShares
+                .dividedBy(insuranceFund.totalShares)
+                .times(vault.amount),
         });
-    }
+    });
     // Perps part
     let id = 0;
     const userAccounts = [];
@@ -102,7 +88,7 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         id += 10;
     } while (parsedAccount[parsedAccount.length]);
     if (!userAccounts || userAccounts.length === 0)
-        return elements;
+        return elementRegistry.getElements(cache);
     const perpMarketIndexesArr = yield cache.getItem(constants_1.perpMarketsIndexesKey, {
         prefix: constants_1.platformId,
         networkId: portfolio_core_1.NetworkId.solana,
@@ -115,13 +101,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
     for (const userAccount of userAccounts) {
         if (!userAccount)
             continue;
-        const borrowedAssets = [];
-        const borrowedYields = [];
-        const suppliedAssets = [];
-        const suppliedYields = [];
-        const rewardAssets = [];
         const marketIndexRef = 0;
-        const unsettledAssets = [];
+        const element = elementRegistry.addElementBorrowlend({
+            label: 'Lending',
+            name: (0, solana_1.u8ArrayToString)(userAccount.name),
+        });
         for (const perpPosition of userAccount.perpPositions) {
             if (perpPosition.baseAssetAmount.isZero())
                 continue;
@@ -139,27 +123,21 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 ? portfolio_core_1.LeverageSide.long
                 : portfolio_core_1.LeverageSide.short;
             const mint = yield (0, getMintFromOracle_1.getMintFromOracle)(market.amm.oracle.toString(), cache);
-            const asset = {
-                type: portfolio_core_1.PortfolioAssetType.generic,
-                networkId: portfolio_core_1.NetworkId.solana,
+            element.addUnsettledGenericAsset({
                 value: pnl,
                 name: (0, solana_1.u8ArrayToString)(market.name),
-                data: {
-                    address: mint || undefined,
-                },
+                address: mint || undefined,
                 attributes: {
                     tags: [side],
                 },
-            };
-            unsettledAssets.push(asset);
+            });
         }
         // Each account has up to 8 SpotPositions
         for (const spotPosition of userAccount.spotPositions) {
             if (spotPosition.scaledBalance.isZero())
                 continue;
-            const countForBase = marketIndexRef === undefined ||
-                spotPosition.marketIndex === marketIndexRef;
-            const countForQuote = marketIndexRef === undefined || marketIndexRef === 0;
+            const countForBase = spotPosition.marketIndex === marketIndexRef;
+            const countForQuote = marketIndexRef === 0;
             if ((0, helpers_1.isSpotPositionAvailable)(spotPosition) ||
                 (!countForBase && !countForQuote)) {
                 continue;
@@ -167,9 +145,6 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             const spotMarket = spotMarketByIndex.get(spotPosition.marketIndex);
             if (!spotMarket)
                 continue;
-            const tokenPrice = tokenPriceById.get(spotMarket.mint.toString());
-            if (!tokenPrice || tokenPrice === null)
-                continue;
             let tokenAmount = new bignumber_js_1.default(0);
             if (spotMarket.marketIndex !== 0 &&
                 spotPosition.balanceType === struct_1.SpotBalanceType.Deposit) {
@@ -179,8 +154,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 tokenAmount = (0, helpers_1.getSignedTokenAmount)((0, helpers_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType), spotPosition.balanceType);
             }
             if (spotPosition.balanceType === struct_1.SpotBalanceType.Deposit) {
-                suppliedAssets.push((0, tokenPriceToAssetToken_1.default)(spotMarket.mint.toString(), tokenAmount.div(Math.pow(10, tokenPrice.decimals)).toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
-                suppliedYields.push([
+                element.addSuppliedAsset({
+                    address: spotMarket.mint,
+                    amount: tokenAmount,
+                });
+                element.addSuppliedYield([
                     {
                         apr: spotMarket.depositApr,
                         apy: (0, portfolio_core_1.aprToApy)(spotMarket.depositApr),
@@ -188,11 +166,11 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 ]);
             }
             else if (spotPosition.balanceType === struct_1.SpotBalanceType.Borrow) {
-                borrowedAssets.push((0, tokenPriceToAssetToken_1.default)(spotMarket.mint.toString(), tokenAmount
-                    .div(Math.pow(10, tokenPrice.decimals))
-                    .abs()
-                    .toNumber(), portfolio_core_1.NetworkId.solana, tokenPrice));
-                borrowedYields.push([
+                element.addBorrowedAsset({
+                    address: spotMarket.mint,
+                    amount: tokenAmount.abs(),
+                });
+                element.addSuppliedYield([
                     {
                         apr: -spotMarket.borrowApr,
                         apy: -(0, portfolio_core_1.aprToApy)(spotMarket.borrowApr),
@@ -200,40 +178,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
                 ]);
             }
         }
-        if (suppliedAssets.length === 0 && borrowedAssets.length === 0)
-            continue;
-        const { borrowedValue, suppliedValue, value, healthRatio, rewardValue, unsettledValue, } = (0, portfolio_core_1.getElementLendingValues)({
-            suppliedAssets,
-            borrowedAssets,
-            rewardAssets,
-            unsettledAssets,
-        });
-        elements.push({
-            type: portfolio_core_1.PortfolioElementType.borrowlend,
-            networkId: portfolio_core_1.NetworkId.solana,
-            platformId: constants_1.platformId,
-            label: 'Lending',
-            value,
-            data: {
-                borrowedAssets,
-                borrowedValue,
-                borrowedYields,
-                suppliedAssets,
-                suppliedValue,
-                suppliedYields,
-                rewardAssets,
-                rewardValue,
-                healthRatio,
-                unsettled: {
-                    assets: unsettledAssets,
-                    value: unsettledValue,
-                },
-                value,
-            },
-            name: (0, solana_1.u8ArrayToString)(userAccount.name),
-        });
     }
-    return elements;
+    return elementRegistry.getElements(cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-deposits`,