@sonarwatch/portfolio-plugins 0.15.44 → 0.15.47

package/src/plugins/carrot/crtYieldJob.js

@@ -0,0 +1,35 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const axios_1 = __importDefault(require("axios"));
+const constants_1 = require("./constants");
+const executor = (cache) => __awaiter(void 0, void 0, void 0, function* () {
+    const apiRes = yield axios_1.default.get(`https://api.deficarrot.com/performance?vault=FfCRL34rkJiMiX5emNDrYp3MdWH2mES3FvDQyFppqgpJ&useCache=true`);
+    if (apiRes.data.apy) {
+        yield cache.setTokenYield({
+            address: constants_1.crtMint,
+            networkId: portfolio_core_1.NetworkId.solana,
+            yield: (0, portfolio_core_1.yieldFromApy)(apiRes.data.apy),
+            timestamp: Date.now(),
+        });
+    }
+});
+const job = {
+    id: `${constants_1.platformId}-crt-yield`,
+    executor,
+    labels: ['normal'],
+};
+exports.default = job;
+//# sourceMappingURL=crtYieldJob.js.map

package/src/plugins/carrot/crtYieldJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"crtYieldJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/carrot/crtYieldJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,+DAAqE;AACrE,kDAA0B;AAG1B,2CAAkD;AAElD,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,MAAM,GAAG,MAAM,eAAK,CAAC,GAAG,CAC5B,yGAAyG,CAC1G,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACpB,MAAM,KAAK,CAAC,aAAa,CAAC;YACxB,OAAO,EAAE,mBAAO;YAChB,SAAS,EAAE,0BAAS,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAA,6BAAY,EAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACpC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAA,CAAC;AAEF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,YAAY;IAC7B,QAAQ;IACR,MAAM,EAAE,CAAC,QAAQ,CAAC;CACnB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/carrot/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchers = exports.jobs = void 0;
 const banksJob_1 = __importDefault(require("./banksJob"));
 const depositsFetcher_1 = __importDefault(require("./depositsFetcher"));
-exports.jobs = [banksJob_1.default];
+const crtYieldJob_1 = __importDefault(require("./crtYieldJob"));
+exports.jobs = [banksJob_1.default, crtYieldJob_1.default];
 exports.fetchers = [depositsFetcher_1.default];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/carrot/index.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AAClC,wEAAgD;AAEnC,QAAA,IAAI,GAAU,CAAC,kBAAQ,CAAC,CAAC;AACzB,QAAA,QAAQ,GAAc,CAAC,yBAAe,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/carrot/index.ts"],"names":[],"mappings":";;;;;;AAEA,0DAAkC;AAClC,wEAAgD;AAChD,gEAAwC;AAE3B,QAAA,IAAI,GAAU,CAAC,kBAAQ,EAAE,qBAAW,CAAC,CAAC;AACtC,QAAA,QAAQ,GAAc,CAAC,yBAAe,CAAC,CAAC"}

package/src/plugins/fragmetric/airdropFetcher.d.ts

@@ -0,0 +1,2 @@
+import { AirdropFetcher } from '../../AirdropFetcher';
+export declare const airdropFetcher: AirdropFetcher;

package/src/plugins/fragmetric/airdropFetcher.js

@@ -0,0 +1,48 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.airdropFetcher = void 0;
+const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const AirdropFetcher_1 = require("../../AirdropFetcher");
+const clients_1 = require("../../utils/clients");
+const getClaimTransactions_1 = require("../../utils/solana/jupiter/getClaimTransactions");
+const deriveClaimStatus_1 = require("../../utils/solana/jupiter/deriveClaimStatus");
+const constants_1 = require("./constants");
+const executor = (owner) => __awaiter(void 0, void 0, void 0, function* () {
+    const client = (0, clients_1.getClientSolana)();
+    const claimStatus = (0, deriveClaimStatus_1.deriveClaimStatus)(owner, 'BDWeWshtozDsYrfL1UpHbRG7zeWKZ8fAV7cUCBuum61a', constants_1.distributorPid);
+    const claimAccount = yield client.getAccountInfo(claimStatus);
+    const claims = yield (0, getClaimTransactions_1.getClaimTransactions)(owner, claimStatus, constants_1.fragMint);
+    const totalAmount = claims.reduce((acc, claim) => acc.plus(claim.amount), new bignumber_js_1.default(0));
+    return (0, AirdropFetcher_1.getAirdropRaw)({
+        statics: constants_1.airdropStatics,
+        items: [
+            {
+                amount: totalAmount.toNumber(),
+                isClaimed: !!claimAccount,
+                label: 'FRAG',
+                address: constants_1.fragMint,
+                claims,
+                ref: claimAccount ? claimStatus.toString() : undefined,
+            },
+        ],
+    });
+});
+exports.airdropFetcher = {
+    id: constants_1.airdropStatics.id,
+    networkId: portfolio_core_1.NetworkId.solana,
+    executor,
+};
+//# sourceMappingURL=airdropFetcher.js.map

package/src/plugins/fragmetric/airdropFetcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"airdropFetcher.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/airdropFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+DAAuD;AACvD,gEAAqC;AACrC,yDAI8B;AAC9B,iDAAsD;AACtD,0FAAuF;AACvF,oFAAiF;AACjF,2CAAuE;AAEvE,MAAM,QAAQ,GAA2B,CAAO,KAAa,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,IAAA,yBAAe,GAAE,CAAC;IACjC,MAAM,WAAW,GAAG,IAAA,qCAAiB,EACnC,KAAK,EACL,8CAA8C,EAC9C,0BAAc,CACf,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG,MAAM,IAAA,2CAAoB,EAAC,KAAK,EAAE,WAAW,EAAE,oBAAQ,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAC/B,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EACtC,IAAI,sBAAS,CAAC,CAAC,CAAC,CACjB,CAAC;IACF,OAAO,IAAA,8BAAa,EAAC;QACnB,OAAO,EAAE,0BAAc;QACvB,KAAK,EAAE;YACL;gBACE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE;gBAC9B,SAAS,EAAE,CAAC,CAAC,YAAY;gBACzB,KAAK,EAAE,MAAM;gBACb,OAAO,EAAE,oBAAQ;gBACjB,MAAM;gBACN,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;aACvD;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEW,QAAA,cAAc,GAAmB;IAC5C,EAAE,EAAE,0BAAc,CAAC,EAAE;IACrB,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC"}

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

@@ -1,8 +1,12 @@
 /// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
 /// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
+import { AirdropStatics } from '../../AirdropFetcher';
 export declare const platformId = "fragmetric";
 export declare const fragmetricPid: PublicKey;
+export declare const fragMint = "FRAGMEWj2z65qM62zqKhNtwNFskdfKs4ekDUDX3b4VD5";
+export declare const distributorPid = "fdropWhSi5xVKa9z26qKXveXoHDePDXfb5zxt3RKvKx";
+export declare const airdropStatics: AirdropStatics;
 export declare const vaults: ({
     vaultProgramAddress: string;
     receiptToken: string;
@@ -15,4 +19,10 @@ export declare const vaults: ({
     tokenMint: string;
     reserveAccount: string;
     normalizedTokenPoolAccount?: undefined;
+} | {
+    receiptToken: string;
+    tokenMint: string;
+    reserveAccount: string;
+    vaultProgramAddress?: undefined;
+    normalizedTokenPoolAccount?: undefined;
 })[];

package/src/plugins/fragmetric/constants.js

@@ -1,9 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vaults = exports.fragmetricPid = exports.platformId = void 0;
+exports.vaults = exports.airdropStatics = exports.distributorPid = exports.fragMint = exports.fragmetricPid = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'fragmetric';
 exports.fragmetricPid = new web3_js_1.PublicKey('fragnAis7Bp6FTsMoa6YcH8UffhEw43Ph79qAiK3iF3');
+exports.fragMint = 'FRAGMEWj2z65qM62zqKhNtwNFskdfKs4ekDUDX3b4VD5';
+exports.distributorPid = 'fdropWhSi5xVKa9z26qKXveXoHDePDXfb5zxt3RKvKx';
+exports.airdropStatics = {
+    claimLink: 'https://airdrop.fragmetric.xyz/',
+    emitterLink: 'https://fragmetric.xyz/',
+    emitterName: 'Fragmetric',
+    id: 'fragmetric-airdrop',
+    image: 'https://sonarwatch.github.io/portfolio/assets/images/platforms/fragmetric.webp',
+    claimStart: 1751355000000,
+    claimEnd: 1754033400000,
+};
 // https://api.fragmetric.xyz/v1/graphql operationName "fragmetricStats"
 exports.vaults = [
     {
@@ -24,5 +35,11 @@ exports.vaults = [
         tokenMint: 'zBTCug3er3tLyffELcvDNrKkCymbPWysGcWihESYfLg',
         reserveAccount: 'B5eYu4dKBS8bTvLdeZungomcaQx52rDprdKEcyHzgbBD',
     },
+    {
+        // vaultProgramAddress: 'BmJvUzoiiNBRx3v2Gqsix9WvVtw8FaztrfBHQyqpMbTd',
+        receiptToken: 'FRAG2gPNXozPpYcn2a8zK7YdtfNXCLsioZNwZXwTQ3cP',
+        tokenMint: 'FRAGMEWj2z65qM62zqKhNtwNFskdfKs4ekDUDX3b4VD5',
+        reserveAccount: '7q7YjoiDCeWudGrRJuL8PoajYYiEB7KAdTURDJi7aTtd',
+    },
 ];
 //# sourceMappingURL=constants.js.map

package/src/plugins/fragmetric/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AAEF,wEAAwE;AAC3D,QAAA,MAAM,GAAG;IACpB;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,0BAA0B,EAAE,8CAA8C;QAC1E,cAAc,EAAE,8CAA8C;KAC/D;IACD;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,SAAS,EAAE,6CAA6C;QACxD,cAAc,EAAE,8CAA8C;KAC/D;IACD;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,SAAS,EAAE,6CAA6C;QACxD,cAAc,EAAE,8CAA8C;KAC/D;CACF,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAG/B,QAAA,UAAU,GAAG,YAAY,CAAC;AAC1B,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,6CAA6C,CAC9C,CAAC;AACW,QAAA,QAAQ,GAAG,8CAA8C,CAAC;AAC1D,QAAA,cAAc,GAAG,6CAA6C,CAAC;AAC/D,QAAA,cAAc,GAAmB;IAC5C,SAAS,EAAE,iCAAiC;IAC5C,WAAW,EAAE,yBAAyB;IACtC,WAAW,EAAE,YAAY;IACzB,EAAE,EAAE,oBAAoB;IACxB,KAAK,EACH,gFAAgF;IAClF,UAAU,EAAE,aAAa;IACzB,QAAQ,EAAE,aAAa;CACxB,CAAC;AAEF,wEAAwE;AAC3D,QAAA,MAAM,GAAG;IACpB;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,0BAA0B,EAAE,8CAA8C;QAC1E,cAAc,EAAE,8CAA8C;KAC/D;IACD;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,SAAS,EAAE,6CAA6C;QACxD,cAAc,EAAE,8CAA8C;KAC/D;IACD;QACE,mBAAmB,EAAE,8CAA8C;QACnE,YAAY,EAAE,8CAA8C;QAC5D,SAAS,EAAE,6CAA6C;QACxD,cAAc,EAAE,8CAA8C;KAC/D;IACD;QACE,uEAAuE;QACvE,YAAY,EAAE,8CAA8C;QAC5D,SAAS,EAAE,8CAA8C;QACzD,cAAc,EAAE,8CAA8C;KAC/D;CACF,CAAC"}

package/src/plugins/fragmetric/index.d.ts

@@ -1,4 +1,6 @@
+import { AirdropFetcher } from '../../AirdropFetcher';
 import { Fetcher } from '../../Fetcher';
 import { Job } from '../../Job';
 export declare const jobs: Job[];
 export declare const fetchers: Fetcher[];
+export declare const airdropFetchers: AirdropFetcher[];

package/src/plugins/fragmetric/index.js

@@ -3,8 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchers = exports.jobs = void 0;
+exports.airdropFetchers = exports.fetchers = exports.jobs = void 0;
 const pricingJob_1 = __importDefault(require("./pricingJob"));
+const airdropFetcher_1 = require("./airdropFetcher");
 exports.jobs = [pricingJob_1.default];
 exports.fetchers = [];
+exports.airdropFetchers = [airdropFetcher_1.airdropFetcher];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/index.ts"],"names":[],"mappings":";;;;;;AAEA,8DAAsC;AAEzB,QAAA,IAAI,GAAU,CAAC,oBAAU,CAAC,CAAC;AAC3B,QAAA,QAAQ,GAAc,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/fragmetric/index.ts"],"names":[],"mappings":";;;;;;AAGA,8DAAsC;AACtC,qDAAkD;AAErC,QAAA,IAAI,GAAU,CAAC,oBAAU,CAAC,CAAC;AAC3B,QAAA,QAAQ,GAAc,EAAE,CAAC;AACzB,QAAA,eAAe,GAAqB,CAAC,+BAAc,CAAC,CAAC"}

package/src/plugins/kamino/constants.js

@@ -71,6 +71,10 @@ exports.lendingConfigs = new Map([
                     'Bybit2vBJGhPF52GBdNaQfUJ6ZpThSgHBobjWZpLPb4B',
                     portfolio_core_1.solanaNativeWrappedAddress,
                 ],
+                [
+                    'strng7mqqc1MBJJV6vMzYbEqnwVGvKKGKedeCvtktWA',
+                    portfolio_core_1.solanaNativeWrappedAddress,
+                ],
             ],
             leveragePairs: [
                 ['6DNSN2BJsaPFdFFc1zP37kkeNe4Usc1Sqkzr9C9vPWcU', solana_1.usdcSolanaMint],

package/src/plugins/kamino/constants.js.map

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

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

@@ -1,6 +1,9 @@
+/// <reference types="@drift-labs/sdk/node_modules/@solana/web3.js" />
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
+import { PublicKey } from '@solana/web3.js';
 import { Fetcher } from '../../Fetcher';
 import { Cache } from '../../Cache';
 import { ParsedAccount, TokenAccountWithMetadata } from '../../utils/solana';
-export declare const getRaydiumClmmPositions: (tokenAccounts: ParsedAccount<TokenAccountWithMetadata>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;
+export declare function getRaydiumClmmPositions(platformId?: string, positionsIdentifier?: string, programId?: PublicKey, link?: string): (tokenAccounts: ParsedAccount<TokenAccountWithMetadata>[], cache: Cache) => Promise<import("@sonarwatch/portfolio-core").PortfolioElement[]>;
 declare const fetcher: Fetcher;
 export default fetcher;

package/src/plugins/raydium/clmmFetcher.js

@@ -19,99 +19,101 @@ const clients_1 = require("../../utils/clients");
 const clmms_1 = require("./structs/clmms");
 const helpers_1 = require("./helpers");
 const ElementRegistry_1 = require("../../utils/elementbuilder/ElementRegistry");
-const getRaydiumClmmPositions = (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const potentialTokens = tokenAccounts.filter((x) => { var _a; return ((_a = x.metadata) === null || _a === void 0 ? void 0 : _a.name) === constants_1.positionsIdentifier; });
-    if (!potentialTokens.length)
-        return [];
-    const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], constants_1.raydiumProgram)[0]);
-    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)
+function getRaydiumClmmPositions(platformId = constants_1.platformId, positionsIdentifier = constants_1.raydiumPositionsIdentifier, programId = constants_1.raydiumProgram, link = 'https://raydium.io/portfolio/?position_tab=concentrated') {
+    return (tokenAccounts, cache) => __awaiter(this, void 0, void 0, function* () {
+        const potentialTokens = tokenAccounts.filter((x) => { var _a; return ((_a = x.metadata) === null || _a === void 0 ? void 0 : _a.name) === positionsIdentifier; });
+        if (!potentialTokens.length)
             return [];
-        const poolStateInfo = poolStatesInfo[index];
-        if (!poolStateInfo)
+        const positionsProgramAddress = potentialTokens.map((address) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('position'), address.mint.toBuffer()], programId)[0]);
+        const client = (0, clients_1.getClientSolana)();
+        const personalPositionsInfo = yield (0, solana_1.getParsedMultipleAccountsInfo)(client, clmms_1.personalPositionStateStruct, positionsProgramAddress);
+        if (!personalPositionsInfo || personalPositionsInfo.length === 0)
             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 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 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,
+        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, 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,
             });
-            liquidity.addRewardAsset({
-                address: poolStateInfo.tokenMint1,
-                amount: feesAndRewardsBalances.tokenFeeAmountB,
+            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(),
+                    },
+                ],
             });
-            feesAndRewardsBalances.rewards.forEach((rewardBalance, i) => {
-                if (rewardBalance.isZero() ||
-                    poolStateInfo.rewardInfos[i].tokenMint.toString() ===
-                        '11111111111111111111111111111111')
-                    return;
+            const feesAndRewardsBalances = (0, helpers_1.getFeesAndRewardsBalance)(personalPositionInfo, poolStateInfo, tickArrays[index]);
+            if (feesAndRewardsBalances) {
                 liquidity.addRewardAsset({
-                    address: poolStateInfo.rewardInfos[i].tokenMint,
-                    amount: rewardBalance,
+                    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);
-});
+        return elementRegistry.getElements(cache);
+    });
+}
 exports.getRaydiumClmmPositions = getRaydiumClmmPositions;
-const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
+const raydiumExecutor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const potentialTokens = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)((0, clients_1.getClientSolana)(), owner);
-    return (0, exports.getRaydiumClmmPositions)(potentialTokens, cache);
+    return getRaydiumClmmPositions()(potentialTokens, cache);
 });
 const fetcher = {
     id: `${constants_1.platformId}-clmm`,
     networkId: portfolio_core_1.NetworkId.solana,
-    executor,
+    executor: raydiumExecutor,
 };
 exports.default = fetcher;
 //# sourceMappingURL=clmmFetcher.js.map

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

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

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

@@ -10,5 +10,5 @@ export declare const AMM_PROGRAM_ID_V4: PublicKey;
 export declare const AMM_PROGRAM_ID_V5: PublicKey;
 export declare const raydiumProgram: PublicKey;
 export declare const cpmmProgramId: PublicKey;
-export declare const positionsIdentifier = "Raydium Concentrated Liquidity";
+export declare const raydiumPositionsIdentifier = "Raydium Concentrated Liquidity";
 export declare const rayDecimals = 6;

package/src/plugins/raydium/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rayDecimals = exports.positionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.poolStatsPrefix = exports.rayMint = exports.platformId = void 0;
+exports.rayDecimals = exports.raydiumPositionsIdentifier = exports.cpmmProgramId = exports.raydiumProgram = exports.AMM_PROGRAM_ID_V5 = exports.AMM_PROGRAM_ID_V4 = exports.AMM_PROGRAM_ID_V3 = exports.apiV3 = exports.poolStatsPrefix = exports.rayMint = exports.platformId = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.platformId = 'raydium';
 exports.rayMint = '4k3Dyjzvzp8eMZWUXbBCjEvwSkkk59S5iCNLY3QrkX6R';
@@ -11,6 +11,6 @@ exports.AMM_PROGRAM_ID_V4 = new web3_js_1.PublicKey('675kPX9MHTjS2zt1qfr1NYHuzeL
 exports.AMM_PROGRAM_ID_V5 = new web3_js_1.PublicKey('5quBtoiQqxF9Jv6KYKctB59NT3gtJD2Y65kdnB1Uev3h');
 exports.raydiumProgram = new web3_js_1.PublicKey('CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK');
 exports.cpmmProgramId = new web3_js_1.PublicKey('CPMMoo8L3F4NbTegBCKVNunggL7H1ZpdTHKxQB5qKP1C');
-exports.positionsIdentifier = 'Raydium Concentrated Liquidity';
+exports.raydiumPositionsIdentifier = 'Raydium Concentrated Liquidity';
 exports.rayDecimals = 6;
 //# sourceMappingURL=constants.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AAEzD,QAAA,eAAe,GAAG,oBAAoB,CAAC;AACvC,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,mBAAmB,GAAG,gCAAgC,CAAC;AAEvD,QAAA,WAAW,GAAG,CAAC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/raydium/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,OAAO,GAAG,8CAA8C,CAAC;AAEzD,QAAA,eAAe,GAAG,oBAAoB,CAAC;AACvC,QAAA,KAAK,GAAG,4BAA4B,CAAC;AAErC,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AACW,QAAA,iBAAiB,GAAG,IAAI,mBAAS,CAC5C,8CAA8C,CAC/C,CAAC;AAEW,QAAA,cAAc,GAAG,IAAI,mBAAS,CACzC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,aAAa,GAAG,IAAI,mBAAS,CACxC,8CAA8C,CAC/C,CAAC;AAEW,QAAA,0BAA0B,GAAG,gCAAgC,CAAC;AAE9D,QAAA,WAAW,GAAG,CAAC,CAAC"}

package/src/plugins/sushiswap/helpers.js

@@ -54,30 +54,30 @@ function sushiV3PairToUniV2(pair) {
 }
 function getV3PairsAddresses(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pools(
-        orderBy: totalValueLockedUSD
-        first: ${length}
-        orderDirection: desc
-        where: { volumeUSD_not: "0", liquidity_not: "0"  }
-      ) {
-        id
-        token0Price
-        token1Price
-        liquidity
-        token0 {
-          id
-          totalSupply
-          decimals
-        }
-        token1 {
-          id
-          totalSupply
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pools(
+        orderBy: totalValueLockedUSD
+        first: ${length}
+        orderDirection: desc
+        where: { volumeUSD_not: "0", liquidity_not: "0"  }
+      ) {
+        id
+        token0Price
+        token1Price
+        liquidity
+        token0 {
+          id
+          totalSupply
+          decimals
+        }
+        token1 {
+          id
+          totalSupply
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pools = res.pools;

package/src/plugins/switchboard/onDemandPricingJob.js

@@ -17,6 +17,7 @@ const getSwitchboardOnDemandPrice_1 = require("./helpers/getSwitchboardOnDemandP
 const getDecimalsForToken_1 = require("../../utils/misc/getDecimalsForToken");
 const solana_1 = require("../../utils/solana");
 const constants_2 = require("../huma/constants");
+const constants_3 = require("../carrot/constants");
 const feedsToFetch = [
     {
         feedsAddresses: [
@@ -34,7 +35,7 @@ const feedsToFetch = [
     },
     {
         feedsAddresses: ['GQbKvThYgyvdp8T8MoE8KKD2NngXumQ8mDkCLxmhvJKm'],
-        mintAddress: solana_1.crtSolanaMint,
+        mintAddress: constants_3.crtMint,
         networkId: portfolio_core_1.NetworkId.solana,
     },
     {

package/src/plugins/switchboard/onDemandPricingJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"onDemandPricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/switchboard/onDemandPricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAKoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,iDAAsD;AACtD,uFAAqF;AACrF,8EAA2E;AAE3E,+CAAmE;AACnE,iDAA4C;AAE5C,MAAM,YAAY,GAAkC;IAClD;QACE,cAAc,EAAE;YACd,8CAA8C;YAC9C,8CAA8C;YAC9C,8CAA8C;SAC/C;QACD,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,WAAW,EAAE,2CAA0B;KACxC;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,uBAAc;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,sBAAa;QAC1B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,mBAAO;QACpB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAA,0DAA4B,EAC/C,UAAU,EACV,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,yCAAmB,EACxC,SAAS,CAAC,WAAW,EACrB,0BAAS,CAAC,MAAM,CACjB,CAAC;QAEF,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEhC,MAAM,MAAM,GAAqB;gBAC/B,OAAO,EAAE,SAAS,CAAC,WAAW;gBAC9B,QAAQ;gBACR,EAAE,EAAE,GAAG,sBAAU,SAAS,WAAW,CAAC,QAAQ,EAAE,EAAE;gBAClD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,uCAAsB;gBAClC,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,KAAK;aACN,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,mBAAmB;IACpC,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}
+{"version":3,"file":"onDemandPricingJob.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/switchboard/onDemandPricingJob.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAKoC;AACpC,6CAA4C;AAG5C,2CAAyC;AACzC,iDAAsD;AACtD,uFAAqF;AACrF,8EAA2E;AAE3E,+CAAoD;AACpD,iDAA4C;AAC5C,mDAA8C;AAE9C,MAAM,YAAY,GAAkC;IAClD;QACE,cAAc,EAAE;YACd,8CAA8C;YAC9C,8CAA8C;YAC9C,8CAA8C;SAC/C;QACD,SAAS,EAAE,0BAAS,CAAC,MAAM;QAC3B,WAAW,EAAE,2CAA0B;KACxC;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,uBAAc;QAC3B,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,mBAAO;QACpB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;IACD;QACE,cAAc,EAAE,CAAC,8CAA8C,CAAC;QAChE,WAAW,EAAE,mBAAO;QACpB,SAAS,EAAE,0BAAS,CAAC,MAAM;KAC5B;CACF,CAAC;AAEF,MAAM,QAAQ,GAAgB,CAAO,KAAY,EAAE,EAAE;IACnD,MAAM,UAAU,GAAG,IAAA,yBAAe,GAAE,CAAC;IACrC,MAAM,OAAO,GAAuB,EAAE,CAAC;IAEvC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,IAAA,0DAA4B,EAC/C,UAAU,EACV,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,CACtD,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,yCAAmB,EACxC,SAAS,CAAC,WAAW,EACrB,0BAAS,CAAC,MAAM,CACjB,CAAC;QAEF,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAEhC,MAAM,MAAM,GAAqB;gBAC/B,OAAO,EAAE,SAAS,CAAC,WAAW;gBAC9B,QAAQ;gBACR,EAAE,EAAE,GAAG,sBAAU,SAAS,WAAW,CAAC,QAAQ,EAAE,EAAE;gBAClD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,uCAAsB;gBAClC,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,KAAK;aACN,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAA,CAAC;AACF,MAAM,GAAG,GAAQ;IACf,EAAE,EAAE,GAAG,sBAAU,mBAAmB;IACpC,QAAQ;IACR,MAAM,EAAE,CAAC,UAAU,CAAC;CACrB,CAAC;AACF,kBAAe,GAAG,CAAC"}

package/src/plugins/tokens/fetchers/solana.js

@@ -23,6 +23,7 @@ const cpammPositionsFetcher_1 = require("../../meteora/cpamm/cpammPositionsFetch
 const clmmFetcher_1 = require("../../raydium/clmmFetcher");
 const resizableNftFetcher_1 = require("../../metaplex/resizableNftFetcher");
 const clients_1 = require("../../../utils/clients");
+const constants_3 = require("../../byreal/constants");
 const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0, void 0, void 0, function* () {
     const fungibleAddresses = tokenAccounts.map((ta) => ta.mint.toString());
     const tokenPrices = yield cache.getTokenPricesAsMap(fungibleAddresses, portfolio_core_1.NetworkId.solana);
@@ -78,7 +79,8 @@ const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0,
 });
 exports.getSolanaTokens = getSolanaTokens;
 const tokensFetchers = [
-    clmmFetcher_1.getRaydiumClmmPositions,
+    (0, clmmFetcher_1.getRaydiumClmmPositions)(),
+    constants_3.getByrealClmmPositions,
     cpammPositionsFetcher_1.getMeteoraCpammPositions,
     (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_1.platformId),
     (0, getWhirlpoolPositions_1.getOrcaPositions)(constants_2.platformId, constants_2.clmmPid),