@sonarwatch/portfolio-plugins 0.15.46 → 0.15.49

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-simple.js

@@ -14,7 +14,7 @@ const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccount
 const solana_1 = require("./solana");
 const clients_1 = require("../../../utils/clients");
 const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* () {
-    const tokenAccounts = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)((0, clients_1.getClientSolana)(), owner);
+    const tokenAccounts = yield (0, getTokenAccountsByOwner_1.getTokenAccountsByOwner)((0, clients_1.getClientSolana)(), owner, false);
     return (0, solana_1.getSolanaTokens)(true)(tokenAccounts, cache);
 });
 const fetcher = {

package/src/plugins/tokens/fetchers/solana-simple.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-simple.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-simple.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA+E;AAI/E,2FAAwF;AACxF,qCAA2C;AAC3C,oDAAyD;AAEzD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EAAC,IAAA,yBAAe,GAAE,EAAE,KAAK,CAAC,CAAC;IAE9E,OAAO,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,gBAAgB;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"solana-simple.js","sourceRoot":"","sources":["../../../../../../../packages/plugins/src/plugins/tokens/fetchers/solana-simple.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAA+E;AAI/E,2FAAwF;AACxF,qCAA2C;AAC3C,oDAAyD;AAEzD,MAAM,QAAQ,GAAoB,CAAO,KAAa,EAAE,KAAY,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,MAAM,IAAA,iDAAuB,EACjD,IAAA,yBAAe,GAAE,EACjB,KAAK,EACL,KAAK,CACN,CAAC;IAEF,OAAO,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AACrD,CAAC,CAAA,CAAC;AAEF,MAAM,OAAO,GAAY;IACvB,EAAE,EAAE,GAAG,uCAAsB,gBAAgB;IAC7C,SAAS,EAAE,0BAAS,CAAC,MAAM;IAC3B,QAAQ;CACT,CAAC;AAEF,kBAAe,OAAO,CAAC"}

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

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSolanaTokens = void 0;
 const portfolio_core_1 = require("@sonarwatch/portfolio-core");
+const web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("../helpers");
 const getTokenAccountsByOwner_1 = require("../../../utils/solana/getTokenAccountsByOwner");
 const ElementRegistry_1 = require("../../../utils/elementbuilder/ElementRegistry");
@@ -23,9 +24,20 @@ 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 getJupiterPrices_1 = require("../../jupiter/getJupiterPrices");
 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);
+    const missingMints = tokenAccounts.flatMap((tokenAccount) => {
+        const address = tokenAccount.mint.toString();
+        const tokenPrice = tokenPrices.get(address);
+        if (!tokenPrice) {
+            return [new web3_js_1.PublicKey(address)];
+        }
+        return [];
+    });
+    const missingPrices = yield (0, getJupiterPrices_1.getJupiterPrices)(missingMints);
     const elementRegistry = new ElementRegistry_1.ElementRegistry(portfolio_core_1.NetworkId.solana, portfolio_core_1.walletTokensPlatformId);
     const elementTokens = elementRegistry.addElementMultiple({
         label: 'Wallet',
@@ -35,50 +47,62 @@ const getSolanaTokens = (simple) => (tokenAccounts, cache) => __awaiter(void 0,
         var _a;
         const address = tokenAccount.mint.toString();
         const tokenPrice = tokenPrices.get(address);
-        if (!tokenPrice)
-            return;
-        const amount = tokenAccount.amount.shiftedBy(-tokenPrice.decimals);
-        if (tokenPrice.platformId === portfolio_core_1.walletTokensPlatformId) {
-            // it's a regular token
-            elementTokens.addAsset({
-                address,
-                amount,
-                alreadyShifted: true,
-                ref: tokenAccount.pubkey,
-                link: tokenPrice.link,
-                sourceRefs: tokenPrice.sourceRefs,
-            });
+        const missingPrice = missingPrices.get(address);
+        if (tokenPrice) {
+            const amount = tokenAccount.amount.shiftedBy(-tokenPrice.decimals);
+            if (tokenPrice.platformId === portfolio_core_1.walletTokensPlatformId) {
+                // it's a regular token
+                elementTokens.addAsset({
+                    address,
+                    amount,
+                    alreadyShifted: true,
+                    ref: tokenAccount.pubkey,
+                    link: tokenPrice.link,
+                    sourceRefs: tokenPrice.sourceRefs,
+                });
+            }
+            else if (!simple) {
+                // it's an LP Token
+                const tag = (0, helpers_1.getLpTag)(tokenPrice.platformId, tokenPrice.elementName, tokenPrice.label);
+                let elementLiquidity = elementsLiquidity.get(tag);
+                if (!elementLiquidity) {
+                    elementLiquidity = elementRegistry.addElementLiquidity({
+                        name: tokenPrice.elementName,
+                        label: (_a = tokenPrice.label) !== null && _a !== void 0 ? _a : 'LiquidityPool',
+                        platformId: tokenPrice.platformId,
+                    });
+                }
+                const liquidity = elementLiquidity.addLiquidity({
+                    name: tokenPrice.liquidityName,
+                    link: tokenPrice.link,
+                    ref: tokenAccount.pubkey,
+                    sourceRefs: tokenPrice.sourceRefs,
+                });
+                liquidity.addAsset({
+                    address,
+                    amount,
+                    alreadyShifted: true,
+                });
+                elementsLiquidity.set(tag, elementLiquidity);
+            }
         }
-        else if (!simple) {
-            // it's an LP Token
-            const tag = (0, helpers_1.getLpTag)(tokenPrice.platformId, tokenPrice.elementName, tokenPrice.label);
-            let elementLiquidity = elementsLiquidity.get(tag);
-            if (!elementLiquidity) {
-                elementLiquidity = elementRegistry.addElementLiquidity({
-                    name: tokenPrice.elementName,
-                    label: (_a = tokenPrice.label) !== null && _a !== void 0 ? _a : 'LiquidityPool',
-                    platformId: tokenPrice.platformId,
+        else if (missingPrice) {
+            if (missingPrice.usdPrice) {
+                elementTokens.addPricedAsset({
+                    address,
+                    amount: tokenAccount.amount.shiftedBy(-missingPrice.decimals),
+                    price: missingPrice.usdPrice,
+                    ref: tokenAccount.pubkey,
                 });
             }
-            const liquidity = elementLiquidity.addLiquidity({
-                name: tokenPrice.liquidityName,
-                link: tokenPrice.link,
-                ref: tokenAccount.pubkey,
-                sourceRefs: tokenPrice.sourceRefs,
-            });
-            liquidity.addAsset({
-                address,
-                amount,
-                alreadyShifted: true,
-            });
-            elementsLiquidity.set(tag, elementLiquidity);
         }
     });
     return elementRegistry.getElements(cache);
 });
 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),

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

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

package/src/plugins/triad/marketsFetcher.js

@@ -50,6 +50,8 @@ const executor = (owner, cache) => __awaiter(void 0, void 0, void 0, function* (
         acc.orders.forEach((order) => {
             if (order.status === structs_1.OrderStatus.Init)
                 return;
+            if (order.status === structs_1.OrderStatus.Closed)
+                return;
             const market = markets.find((m) => m && m.market_id.toString() === order.market_id.toString());
             if (!market)
                 return;

package/src/plugins/triad/marketsFetcher.js.map

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

package/src/plugins/uniswap-v2/helpers.js

@@ -40,28 +40,28 @@ function getPairKey(version) {
 exports.getPairKey = getPairKey;
 function getPairsV2FromTheGraph(url, length = 300) {
     return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, graphql_request_1.gql) `
-    {
-      pairs(
-        orderBy: reserveUSD
-        first: ${length}
-        orderDirection: desc
-        where: { trackedReserveETH_not: "0" }
-      ) {
-        id
-        reserve0
-        reserve1
-        totalSupply
-        token0 {
-          id
-          decimals
-        }
-        token1 {
-          id
-          decimals
-        }
-      }
-    }
+        const query = (0, graphql_request_1.gql) `
+    {
+      pairs(
+        orderBy: reserveUSD
+        first: ${length}
+        orderDirection: desc
+        where: { trackedReserveETH_not: "0" }
+      ) {
+        id
+        reserve0
+        reserve1
+        totalSupply
+        token0 {
+          id
+          decimals
+        }
+        token1 {
+          id
+          decimals
+        }
+      }
+    }
   `;
         const res = yield (0, graphql_request_1.default)(url, query);
         const pairs = res.pairs;

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

@@ -0,0 +1,5 @@
+/// <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';
+export declare const platformId = "voltr";
+export declare const vaultPid: PublicKey;

package/src/plugins/voltr/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.vaultPid = exports.platformId = void 0;
+const web3_js_1 = require("@solana/web3.js");
+exports.platformId = 'voltr';
+exports.vaultPid = new web3_js_1.PublicKey('vVoLTRjQmtFpiYoegx285Ze4gsLJ8ZxgFKVcuvmG1a8');
+//# sourceMappingURL=constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../packages/plugins/src/plugins/voltr/constants.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAE/B,QAAA,UAAU,GAAG,OAAO,CAAC;AAErB,QAAA,QAAQ,GAAG,IAAI,mBAAS,CACnC,6CAA6C,CAC9C,CAAC"}

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

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

package/src/plugins/voltr/index.js

@@ -0,0 +1,10 @@
+"use strict";
+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;
+const vaultsJob_1 = __importDefault(require("./vaultsJob"));
+exports.jobs = [vaultsJob_1.default];
+exports.fetchers = [];
+//# sourceMappingURL=index.js.map