@sonarwatch/portfolio-plugins 0.15.29 → 0.15.31

package/src/plugins/picasso/positionsFetcher.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
+const getPicassoPositions_1 = require("./getPicassoPositions");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
+    return (0, getPicassoPositions_1.getPicassoPositions)(potentialTokens, cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-positions`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=positionsFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"positionsFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/picasso/positionsFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAyF;AACzF,+DAA4D;AAE5D,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,yCAAmB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AACrD,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/pumpswap/marketsJob.js

@@ -8,6 +8,9 @@ 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");
@@ -17,6 +20,7 @@ const ParsedGpa_1 = require("../../utils/solana/beets/ParsedGpa");
 const solana_1 = require("../../utils/solana");
 const getLpTokenSourceRaw_1 = require("../../utils/misc/getLpTokenSourceRaw");
 const getCachedDecimalsForToken_1 = require("../../utils/misc/getCachedDecimalsForToken");
+const sleep_1 = __importDefault(require("../../utils/misc/sleep"));
 const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
     const connection = (0, clients_1.getClientSolana)();
     const markets = yield ParsedGpa_1.ParsedGpa.build(connection, structs_1.marketStruct, constants_1.programId)
@@ -24,10 +28,11 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
         .run();
     if (!markets)
         throw new Error('No Markets found');
+    yield (0, sleep_1.default)(5000);
     const MARKETS_BATCH_SIZE = 100;
+    const batchSources = [];
     for (let offset = 0; offset < markets.length; offset += MARKETS_BATCH_SIZE) {
         const marketsBatch = markets.slice(offset, offset + MARKETS_BATCH_SIZE);
-        const batchSources = [];
         const [tokenPrices, baseTokenAccounts, quoteTokenAccounts] = yield Promise.all([
             cache.getTokenPricesAsMap(marketsBatch
                 .map((market) => [
@@ -91,13 +96,13 @@ const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
             });
             batchSources.push(...lpSources);
         });
-        yield cache.setTokenPriceSources(batchSources);
     }
+    yield cache.setTokenPriceSources(batchSources);
 });
 const job = {
     id: `${constants_1.platformId}-markets`,
     executor,
-    labels: ['normal'],
+    labels: ['slow'],
 };
 exports.default = job;
 //# sourceMappingURL=marketsJob.js.map

package/src/plugins/pumpswap/marketsJob.js.map

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

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

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

package/src/plugins/raydium/clmmFetcher.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const constants_1 = require("./constants");
+const getTokenAccountsByOwner_1 = require("../../utils/solana/getTokenAccountsByOwner");
+const getClmmPositions_1 = require("./getClmmPositions");
+const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const potentialTokens = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwnerMemo)(owner)).filter((x) => x.amount.isEqualTo(1));
+    return (0, getClmmPositions_1.getClmmPositions)(potentialTokens, cache);
+});
+const fetcher = {
+    id: `${constants_1.platformId}-clmm`,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+exports.default = fetcher;
+//# sourceMappingURL=clmmFetcher.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"clmmFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/clmmFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,2CAAyC;AAGzC,wFAAyF;AACzF,yDAAsD;AAEtD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,qDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7B,CAAC;IAEF,OAAO,IAAA,mCAAgB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,OAAO;IACxB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -0,0 +1,3 @@
+import { ParsedAccount, TokenAccount } from '../../utils/solana';
+import { Cache } from '../../Cache';
+export declare const getClmmPositions: (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;

package/src/plugins/raydium/getClmmPositions.js

@@ -0,0 +1,107 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClmmPositions = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const clients_1 = require("../../utils/clients");
+const solana_1 = require("../../utils/solana");
+const clmms_1 = require("./structs/clmms");
+const constants_1 = require("./constants");
+const helpers_1 = require("./helpers");
+const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
+const getClmmPositions = (potentialTokens, cache) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!potentialTokens.length)
+        return [];
+    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
+    if (positionsProgramAddress.length === 0)
+        return [];
+    const client = (0, clients_1.getClientSolana)();
+    const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
+    if (!personalPositionsInfo || personalPositionsInfo.length === 0)
+        return [];
+    const poolsIds = personalPositionsInfo.flatMap((position) => position ? position.poolId : []);
+    const [poolStatesInfo, poolsStats] = yield Promise.all([
+        (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.poolStateStruct, poolsIds),
+        cache.getItems(poolsIds.map((p) => p.toString()), { prefix: constants_1.poolStatsPrefix, networkId: portfolio_core_1.NetworkId.solana }),
+    ]);
+    const tickArrays = yield Promise.all(personalPositionsInfo.map((personalPositionInfo, index) => {
+        if (!personalPositionInfo)
+            return [];
+        const poolStateInfo = poolStatesInfo[index];
+        if (!poolStateInfo)
+            return [];
+        return (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.tickArrayStatetruct, [
+            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickLowerIndex, poolStateInfo.tickSpacing),
+            (0, helpers_1.getTickArrayAddress)(constants_1.raydiumProgram.toString(), poolStateInfo.pubkey.toString(), personalPositionInfo.tickUpperIndex, poolStateInfo.tickSpacing),
+        ]);
+    }));
+    const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, constants_1.platformId);
+    for (let index = 0; index < personalPositionsInfo.length; index++) {
+        const personalPositionInfo = personalPositionsInfo[index];
+        if (!personalPositionInfo)
+            continue;
+        const poolStateInfo = poolStatesInfo.find((p) => p && personalPositionInfo.poolId.toString() === p.pubkey.toString());
+        if (!poolStateInfo)
+            continue;
+        const element = elementRegistry.addElementConcentratedLiquidity({
+            link: 'https://raydium.io/portfolio/?position_tab=concentrated',
+        });
+        const poolStats = poolsStats.find((p) => (p === null || p === void 0 ? void 0 : p.address) === personalPositionInfo.poolId.toString());
+        const liquidity = element.setLiquidity({
+            addressA: poolStateInfo.tokenMint0,
+            addressB: poolStateInfo.tokenMint1,
+            liquidity: personalPositionInfo.liquidity,
+            tickCurrentIndex: poolStateInfo.tickCurrent,
+            tickLowerIndex: personalPositionInfo.tickLowerIndex,
+            tickUpperIndex: personalPositionInfo.tickUpperIndex,
+            ref: personalPositionInfo.pubkey,
+            swapVolume24h: poolStats === null || poolStats === void 0 ? void 0 : poolStats.stats['24h'].volume,
+            feeRate: poolStats === null || poolStats === void 0 ? void 0 : poolStats.feeRate,
+            currentSqrtPrice: poolStateInfo.sqrtPriceX64,
+            poolLiquidity: poolStateInfo.liquidity,
+            sourceRefs: [
+                {
+                    name: 'Pool',
+                    address: personalPositionInfo.poolId.toString(),
+                },
+                {
+                    name: 'NFT Mint',
+                    address: personalPositionInfo.nftMint.toString(),
+                },
+            ],
+        });
+        const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
+        if (feesAndRewardsBalances) {
+            liquidity.addRewardAsset({
+                address: poolStateInfo.tokenMint0,
+                amount: feesAndRewardsBalances.tokenFeeAmountA,
+            });
+            liquidity.addRewardAsset({
+                address: poolStateInfo.tokenMint1,
+                amount: feesAndRewardsBalances.tokenFeeAmountB,
+            });
+            feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
+                if (rewardBalance.isZero() ||
+                    poolStateInfo.rewardInfos[i].tokenMint.toString() ===
+                        '11111111111111111111111111111111')
+                    return;
+                liquidity.addRewardAsset({
+                    address: poolStateInfo.rewardInfos[i].tokenMint,
+                    amount: rewardBalance,
+                });
+            });
+        }
+    }
+    return elementRegistry.getElements(cache);
+});
+exports.getClmmPositions = getClmmPositions;
+//# sourceMappingURL=getClmmPositions.js.map

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

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

package/src/plugins/streamflow/stakingFetcher.js

@@ -39,6 +39,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
             continue;
         if (stakeEntry.amount.isZero())
             continue;
+        if (!stakeEntry.unstakeTs.isZero())
+            continue;
         const element = registry.addElementMultiple({
             label: 'Staked',
             link: `https://app.streamflow.finance/staking/solana/mainnet/${stakeEntry.stakePool.toString()}`,

package/src/plugins/streamflow/stakingFetcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAAmD;AACnD,iDAAsD;AACtD,uCAA6C;AAC7C,kEAA+D;AAE/D,gFAA6E;AAC7E,kEAA+D;AAE/D,MAAM,cAAc,GAAG,IAAI,6BAAa,CAAkB,YAAY,EAAE;IACtE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC9C,MAAM,EACN,0BAAgB,EAChB,oBAAQ,CACT;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SACrE,SAAS,CAAC,WAAW,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC5C,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC3D,CAAC;QACF,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAEzC,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,yDAAyD,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YAChG,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,UAAU,EAAE;gBACV,WAAW,EAAE,UAAU,CAAC,SAAS;qBAC9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;qBACzB,KAAK,CAAC,IAAI,CAAC;qBACX,QAAQ,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"stakingFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/streamflow/stakingFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAuD;AACvD,6CAA4C;AAG5C,2CAAmD;AACnD,iDAAsD;AACtD,uCAA6C;AAC7C,kEAA+D;AAE/D,gFAA6E;AAC7E,kEAA+D;AAE/D,MAAM,cAAc,GAAG,IAAI,6BAAa,CAAkB,YAAY,EAAE;IACtE,MAAM,EAAE,sBAAU;IAClB,SAAS,EAAE,0BAAS,CAAC,MAAM;CAC5B,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,MAAM,qBAAS,CAAC,KAAK,CAC9C,MAAM,EACN,0BAAgB,EAChB,oBAAQ,CACT;SACE,SAAS,CAAC,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;SACrE,SAAS,CAAC,WAAW,EAAE,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC;SAC5C,iBAAiB,CAAC,GAAG,CAAC;SACtB,GAAG,EAAE,CAAC;IAET,MAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,0BAAS,CAAC,MAAM,EAAE,sBAAU,CAAC,CAAC;IACnE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAC/B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,CAC3D,CAAC;QACF,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;YAAE,SAAS;QAEzC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE;YAAE,SAAS;QAE7C,MAAM,OAAO,GAAG,QAAQ,CAAC,kBAAkB,CAAC;YAC1C,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,yDAAyD,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YAChG,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,CAAC;YACf,OAAO,EAAE,SAAS,CAAC,IAAI;YACvB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,UAAU,EAAE;gBACV,WAAW,EAAE,UAAU,CAAC,SAAS;qBAC9B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;qBACzB,KAAK,CAAC,IAAI,CAAC;qBACX,QAAQ,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,sBAAU,UAAU;IAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/src/plugins/texture/helpers.js

@@ -14,20 +14,15 @@ const web3_js_1 = require("@solana/web3.js");
 const clients_1 = require("../../utils/clients");
 const structs_1 = require("./structs");
 const constants_1 = require("./constants");
-const Memoized_1 = require("../../utils/misc/Memoized");
 const getParsedAccountInfo_1 = require("../../utils/solana/getParsedAccountInfo");
-const textureUsersMemo = {};
-const getMemoizedUser = (owner) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!textureUsersMemo[owner]) {
-        textureUsersMemo[owner] = new Memoized_1.Memoized(() => __awaiter(void 0, void 0, void 0, function* () { return getUser(owner); }));
-    }
-    return textureUsersMemo[owner].getItem();
-});
-exports.getMemoizedUser = getMemoizedUser;
+const MemoryCache_1 = require("../../utils/misc/MemoryCache");
 const getUser = (owner) => __awaiter(void 0, void 0, void 0, function* () {
     const userPk = web3_js_1.PublicKey.findProgramAddressSync([new web3_js_1.PublicKey(owner).toBytes(), Buffer.from('MONEY_LENDER_USER')], new web3_js_1.PublicKey(constants_1.lendyProgramId))[0];
     const connection = (0, clients_1.getClientSolana)();
     const account = yield (0, getParsedAccountInfo_1.getParsedAccountInfo)(connection, structs_1.userStruct, userPk);
     return (account === null || account === void 0 ? void 0 : account.pubkey.toString()) || null;
 });
+const memoCollection = new MemoryCache_1.MemoryCache(getUser);
+const getMemoizedUser = (owner) => __awaiter(void 0, void 0, void 0, function* () { return memoCollection.getItem(owner); });
+exports.getMemoizedUser = getMemoizedUser;
 //# sourceMappingURL=helpers.js.map

package/src/plugins/texture/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/texture/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,iDAAsD;AACtD,uCAAuC;AACvC,2CAA6C;AAC7C,wDAAqD;AACrD,kFAA+E;AAE/E,MAAM,gBAAgB,GAA+C,EAAE,CAAC;AAEjE,MAAM,eAAe,GAAG,CAC7B,KAAa,EACW,EAAE;IAC1B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,mBAAQ,CAAgB,GAAS,EAAE,kDAC/D,OAAA,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CACf,CAAC;IACJ,CAAC;IACD,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;AAC3C,CAAC,CAAA,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEF,MAAM,OAAO,GAAG,CAAO,KAAa,EAA0B,EAAE;IAC9D,MAAM,MAAM,GAAG,mBAAS,CAAC,sBAAsB,CAC7C,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAClE,IAAI,mBAAS,CAAC,0BAAc,CAAC,CAC9B,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,UAAU,EAAE,oBAAU,EAAE,MAAM,CAAC,CAAC;IAE3E,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,QAAQ,EAAE,KAAI,IAAI,CAAC;AAC5C,CAAC,CAAA,CAAC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/texture/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,iDAAsD;AACtD,uCAAuC;AACvC,2CAA6C;AAC7C,kFAA+E;AAC/E,8DAA2D;AAE3D,MAAM,OAAO,GAAG,CAAO,KAAa,EAA0B,EAAE;IAC9D,MAAM,MAAM,GAAG,mBAAS,CAAC,sBAAsB,CAC7C,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAClE,IAAI,mBAAS,CAAC,0BAAc,CAAC,CAC9B,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,2CAAoB,EAAC,UAAU,EAAE,oBAAU,EAAE,MAAM,CAAC,CAAC;IAE3E,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,CAAC,QAAQ,EAAE,KAAI,IAAI,CAAC;AAC5C,CAAC,CAAA,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CAAgB,OAAO,CAAC,CAAC;AAExD,MAAM,eAAe,GAAG,CAAO,KAAa,EAAE,EAAE,kDACrD,OAAA,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AADnB,QAAA,eAAe,mBACI"}

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.js

@@ -8,91 +8,27 @@ 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 getRaydiumCLMMPositions_1 = require("../../raydium/getRaydiumCLMMPositions");
-const getWhirlpoolPositions_1 = require("../../orca/getWhirlpoolPositions");
-const helpers_1 = require("../../raydium/helpers");
-const helpers_2 = require("../../orca/helpers");
-const helpers_3 = require("../../cropper/helpers");
-const helpers_4 = require("../../daos/helpers");
-const getSolanaDasEndpoint_1 = __importDefault(require("../../../utils/clients/getSolanaDasEndpoint"));
-const getAssetsByOwnerDas_1 = require("../../../utils/solana/das/getAssetsByOwnerDas");
-const heliusAssetToAssetCollectible_1 = require("../../../utils/solana/das/heliusAssetToAssetCollectible");
 const constants_1 = require("../../orca/constants");
 const constants_2 = require("../../cropper/constants");
-const helpers_5 = require("../../picasso/helpers");
+const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
+const getClmmPositions_1 = require("../../raydium/getClmmPositions");
+const getWhirlpoolPositions_1 = require("../../orca/getWhirlpoolPositions");
+const getHeliumPositions_1 = require("../../helium/getHeliumPositions");
+const getPicassoPositions_1 = require("../../picasso/getPicassoPositions");
 const nftsUnderlyingsMap = new Map([
-    [
-        'raydium',
-        { checker: helpers_1.isARaydiumPosition, fetcher: getRaydiumCLMMPositions_1.getRaydiumCLMMPositions },
-    ],
-    [
-        'orca',
-        {
-            checker: helpers_2.isAnOrcaPosition,
-            fetcher: (0, getWhirlpoolPositions_1.getOrcaNftFetcher)(constants_1.platformId, constants_1.whirlpoolProgram),
-        },
-    ],
-    [
-        'cropper',
-        {
-            checker: helpers_3.isClmmPosition,
-            fetcher: (0, getWhirlpoolPositions_1.getOrcaNftFetcher)(constants_2.platformId, constants_2.clmmPid),
-        },
-    ],
-    [
-        'helium',
-        {
-            checker: helpers_4.isAnHeliumNFTVote,
-            fetcher: helpers_4.getHeliumElementsFromNFTs,
-        },
-    ],
-    [
-        'picasso',
-        {
-            checker: helpers_5.isPicassoPosition,
-            fetcher: helpers_5.getPicassoElementsFromNFTs,
-        },
-    ],
+    ['raydium', getClmmPositions_1.getClmmPositions],
+    ['orca', (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_1.platformId)],
+    ['cropper', (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_2.platformId, constants_2.clmmPid)],
+    ['helium', getHeliumPositions_1.getHeliumPositions],
+    ['picasso', getPicassoPositions_1.getPicassoPositions],
 ]);
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
-    const dasEndpoint = (0, getSolanaDasEndpoint_1.default)();
-    const displayOptions = {
-        showCollectionMetadata: true,
-        showUnverifiedCollections: true,
-        showInscription: false,
-        showNativeBalance: false,
-        showGrandTotal: false,
-        showFungible: true,
-    };
-    const assets = yield (0, getAssetsByOwnerDas_1.getAssetsByOwnerDas)(dasEndpoint, owner, displayOptions);
-    const nftsByIndentifier = new Map();
-    for (let n = 0; n < assets.length; n += 1) {
-        const nft = (0, heliusAssetToAssetCollectible_1.heliusAssetToAssetCollectible)(assets[n]);
-        if (!nft)
-            continue;
-        if ((_a = nft.attributes.tags) === null || _a === void 0 ? void 0 : _a.includes('compressed'))
-            continue;
-        for (const [key, { checker }] of nftsUnderlyingsMap.entries()) {
-            if (!checker(nft))
-                continue;
-            if (!nftsByIndentifier.get(key)) {
-                nftsByIndentifier.set(key, []);
-            }
-            (_b = nftsByIndentifier.get(key)) === null || _b === void 0 ? void 0 : _b.push(nft);
-            break;
-        }
-    }
+    const tokenAccounts = (yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)(owner)).filter((x) => x.amount.isEqualTo(1));
     const results = [];
-    for (const [key, { fetcher }] of nftsUnderlyingsMap) {
-        const nfts = nftsByIndentifier.get(key);
-        if (nfts)
-            results.push(fetcher(cache, nfts));
+    for (const nftsUnderlyingsMapElement of nftsUnderlyingsMap) {
+        results.push(nftsUnderlyingsMapElement[1](tokenAccounts, cache));
     }
     const result = yield Promise.allSettled(results);
     return result

package/src/plugins/tokens/fetchers/solana-nfts-underlyings.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-nfts-underlyings.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-nfts-underlyings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solana-nfts-underlyings.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-nfts-underlyings.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAIoC;AAMpC,oDAAoE;AACpE,uDAGiC;AACjC,2FAAwF;AACxF,qEAAkE;AAClE,4EAAoE;AACpE,wEAAqE;AACrE,2EAAwE;AAExE,MAAM,kBAAkB,GAA4B,IAAI,GAAG,CAAC;IAC1D,CAAC,SAAS,EAAE,mCAAgB,CAAC;IAC7B,CAAC,MAAM,EAAE,IAAA,wCAAgB,EAAC,sBAAc,CAAC,CAAC;IAC1C,CAAC,SAAS,EAAE,IAAA,wCAAgB,EAAC,sBAAiB,EAAE,mBAAO,CAAC,CAAC;IACzD,CAAC,QAAQ,EAAE,uCAAkB,CAAC;IAC9B,CAAC,SAAS,EAAE,yCAAmB,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,CAAC,MAAM,IAAA,iDAAuB,EAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACtB,CAAC;IAEF,MAAM,OAAO,GAAkC,EAAE,CAAC;IAClD,KAAK,MAAM,yBAAyB,IAAI,kBAAkB,EAAE,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjD,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1D,IAAI,EAAE,CAAC;AACZ,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,0BAA0B;IACvD,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAwE;AAKxE,kEAA0C;AAC1C,6DAA4C;AAC5C,yDAAwC;AACxC,mEAAiD;AACjD,yDAAwC;AACxC,iEAAgD;AAChD,+DAA8C;AAC9C,6EAA2D;AAC3D,iGAA8E;AAC9E,0CAA0D;AAC1D,0EAAkD;AAElD,6EAA2D;AA2BlD,8BA3BF,uBAAmB,CA2BE;AAzBf,QAAA,IAAI,GAAU;IACzB,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,KAAK,CAAC;IAC7B,IAAA,sBAAY,EAAC,0BAAS,CAAC,MAAM,CAAC;IAC9B,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC;IAChC,IAAA,sBAAY,EAAC,0BAAS,CAAC,SAAS,CAAC;IACjC,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,GAAG,gCAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;CAClE,CAAC;AAEW,QAAA,QAAQ,GAAc;IACjC,eAAY;IACZ,gBAAa;IACb,uBAAmB;IACnB,iCAA4B;IAC5B,aAAU;IACV,kBAAc;IACd,aAAU;IACV,iBAAc;IACd,GAAG,eAAW;CACf,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/tokens/index.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAwE;AAIxE,kEAA0C;AAC1C,6DAA4C;AAC5C,yDAAwC;AACxC,mEAAiD;AACjD,yDAAwC;AACxC,iEAAgD;AAChD,+DAA8C;AAC9C,6EAA2D;AAC3D,iGAA8E;AAC9E,0CAA0D;AAC1D,0EAAkD;AAElD,6EAA2D;AA2BlD,8BA3BF,uBAAmB,CA2BE;AAzBf,QAAA,IAAI,GAAU;IACzB,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,KAAK,CAAC;IAC7B,IAAA,sBAAY,EAAC,0BAAS,CAAC,MAAM,CAAC;IAC9B,IAAA,sBAAY,EAAC,0BAAS,CAAC,QAAQ,CAAC;IAChC,IAAA,sBAAY,EAAC,0BAAS,CAAC,SAAS,CAAC;IACjC,IAAA,sBAAY,EAAC,0BAAS,CAAC,OAAO,CAAC;IAC/B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,IAAA,sBAAY,EAAC,0BAAS,CAAC,GAAG,CAAC;IAC3B,GAAG,gCAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,0BAAgB,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;CAClE,CAAC;AAEW,QAAA,QAAQ,GAAc;IACjC,eAAY;IACZ,gBAAa;IACb,uBAAmB;IACnB,iCAA4B;IAC5B,aAAU;IACV,kBAAc;IACd,aAAU;IACV,iBAAc;IACd,GAAG,eAAW;CACf,CAAC"}

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

@@ -1,5 +1,6 @@
-import { PortfolioAssetCollectible, PortfolioElement } from '@sonarwatch/portfolio-core';
+import { PortfolioElement } from '@sonarwatch/portfolio-core';
 import { Cache } from '../../Cache';
+import { ParsedAccount, TokenAccount } from '../../utils/solana';
 export type TokenData = {
     address: string;
     decimals: number;
@@ -35,4 +36,4 @@ export type Token = {
         index?: string;
     };
 };
-export type NftFetcher = (cache: Cache, nfts: PortfolioAssetCollectible[]) => Promise<PortfolioElement[]>;
+export type NftFetcher = (potentialTokens: ParsedAccount<TokenAccount>[], cache: Cache) => Promise<PortfolioElement[]>;

package/src/utils/misc/MemoryCache.d.ts

@@ -0,0 +1,6 @@
+export declare class MemoryCache<T> {
+    private readonly fetch;
+    private cache;
+    constructor(fetch: (owner: string) => Promise<T>, ttl?: number, max?: number);
+    getItem: (key: string) => Promise<T>;
+}

package/src/utils/misc/{Memoized.js → MemoryCache.js}

@@ -8,24 +8,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Memoized = void 0;
-const defaultMemoizedRefreshInterval = 600;
+exports.MemoryCache = void 0;
+const ttlcache_1 = __importDefault(require("@isaacs/ttlcache"));
+const defaultTtl = 600;
+const defaultMax = 100;
 // T is the type of item memoized
-class Memoized {
-    constructor(fetch, ttl = defaultMemoizedRefreshInterval) {
-        this.getItem = () => __awaiter(this, void 0, void 0, function* () {
-            const now = Date.now();
-            if (!this.item || this.lastUpdate + this.ttl < now) {
-                this.item = yield this.fetch();
-                this.lastUpdate = now;
+class MemoryCache {
+    constructor(fetch, ttl = defaultTtl, max = defaultMax) {
+        this.getItem = (key) => __awaiter(this, void 0, void 0, function* () {
+            let item;
+            if (!this.cache.has(key)) {
+                item = yield this.fetch(key);
+                this.cache.set(key, item);
+                return item;
             }
-            return this.item;
+            return this.cache.get(key);
         });
         this.fetch = fetch;
-        this.ttl = ttl;
-        this.lastUpdate = 0;
+        this.cache = new ttlcache_1.default({
+            max,
+            ttl,
+        });
     }
 }
-exports.Memoized = Memoized;
-//# sourceMappingURL=Memoized.js.map
+exports.MemoryCache = MemoryCache;
+//# sourceMappingURL=MemoryCache.js.map

package/src/utils/misc/MemoryCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MemoryCache.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/misc/MemoryCache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAwC;AAExC,MAAM,UAAU,GAAG,GAAG,CAAC;AACvB,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,iCAAiC;AACjC,MAAa,WAAW;IAItB,YACE,KAAoC,EACpC,MAAc,UAAU,EACxB,MAAc,UAAU;QAS1B,YAAO,GAAG,CAAO,GAAW,EAAE,EAAE;YAC9B,IAAI,IAAO,CAAC;YAEZ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC1B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAM,CAAC;QAClC,CAAC,CAAA,CAAC;QAjBA,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,kBAAQ,CAAC;YACxB,GAAG;YACH,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;CAaF;AA3BD,kCA2BC"}

package/src/utils/misc/getCachedDecimalsForToken.d.ts

@@ -1,6 +1,6 @@
 import { NetworkIdType } from '@sonarwatch/portfolio-core';
 import { Cache } from '../../Cache';
-type Decimal = number | null;
+export type Decimal = number | null;
 /**
  * Return the decimals of a token on any network using RPC calls or TokenList.
  *
@@ -11,4 +11,3 @@ type Decimal = number | null;
  * @returns The number of decimals or undefined if unsuccessful request.
  */
 export declare function getCachedDecimalsForToken(cache: Cache, address: string, networkId: NetworkIdType): Promise<Decimal>;
-export {};

package/src/utils/solana/getTokenAccountsByOwner.d.ts

@@ -0,0 +1,4 @@
+import { TokenAccount } from './structs';
+import { ParsedAccount } from './types';
+export declare const getTokenAccountsByOwner: (owner: string) => Promise<ParsedAccount<TokenAccount>[]>;
+export declare const getTokenAccountsByOwnerMemo: (owner: string) => Promise<ParsedAccount<TokenAccount>[]>;

package/src/utils/solana/getTokenAccountsByOwner.js

@@ -0,0 +1,36 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAccountsByOwnerMemo = exports.getTokenAccountsByOwner = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const constants_1 = require("./constants");
+const structs_1 = require("./structs");
+const clients_1 = require("../clients");
+const MemoryCache_1 = require("../misc/MemoryCache");
+const getTokenAccountsByOwner = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const tokenAccounts = yield Promise.all([
+        client.getTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
+            programId: constants_1.solanaTokenPidPk,
+        }),
+        client.getTokenAccountsByOwner(new web3_js_1.PublicKey(owner), {
+            programId: constants_1.solanaToken2022PidPk,
+        }),
+    ]);
+    return [...tokenAccounts[0].value, ...tokenAccounts[1].value]
+        .map((x) => (Object.assign(Object.assign({}, structs_1.tokenAccountStruct.deserialize(x.account.data)[0]), { pubkey: x.pubkey, lamports: x.account.lamports, tokenProgram: x.account.owner })))
+        .filter((a) => !a.amount.isZero());
+});
+exports.getTokenAccountsByOwner = getTokenAccountsByOwner;
+const memoCollection = new MemoryCache_1.MemoryCache(exports.getTokenAccountsByOwner);
+const getTokenAccountsByOwnerMemo = (owner) => __awaiter(void 0, void 0, void 0, function* () { return memoCollection.getItem(owner); });
+exports.getTokenAccountsByOwnerMemo = getTokenAccountsByOwnerMemo;
+//# sourceMappingURL=getTokenAccountsByOwner.js.map

package/src/utils/solana/getTokenAccountsByOwner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getTokenAccountsByOwner.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/utils/solana/getTokenAccountsByOwner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,2CAAqE;AACrE,uCAA6D;AAC7D,wCAA6C;AAE7C,qDAAkD;AAE3C,MAAM,uBAAuB,GAAG,CAAO,KAAa,EAAE,EAAE;IAC7D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACtC,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,4BAAgB;SAC5B,CAAC;QACF,MAAM,CAAC,uBAAuB,CAAC,IAAI,mBAAS,CAAC,KAAK,CAAC,EAAE;YACnD,SAAS,EAAE,gCAAoB;SAChC,CAAC;KACH,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;SAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACP,4BAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KACpD,MAAM,EAAE,CAAC,CAAC,MAAM,EAChB,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAC5B,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,IAC7B,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAkC,CAAC;AACxE,CAAC,CAAA,CAAC;AAlBW,QAAA,uBAAuB,2BAkBlC;AAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CACpC,+BAAuB,CACxB,CAAC;AAEK,MAAM,2BAA2B,GAAG,CAAO,KAAa,EAAE,EAAE,kDACjE,OAAA,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA,GAAA,CAAC;AADnB,QAAA,2BAA2B,+BACR"}

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

@@ -1,3 +0,0 @@
-import { PortfolioAssetCollectible, PortfolioElement } from '@sonarwatch/portfolio-core';
-import { Cache } from '../../Cache';
-export declare function getRaydiumCLMMPositions(cache: Cache, nfts: PortfolioAssetCollectible[]): Promise<PortfolioElement[]>;