@kamino-finance/kliquidity-sdk 8.4.7-beta.0 → 8.4.7

package/dist/services/OrcaService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAML,QAAQ,EACT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,sBAAsB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAEL,eAAe,EAEf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAa;IACzC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAY;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,kBAAkB,GAAE,SAAgC;IAOhH,qBAAqB,IAAI,SAAS;IAI5B,iBAAiB;IAIvB;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,OAAO,CAAC,WAAW,EAAE,SAAS;IAQ9B,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAkErB,iCAAiC,CACrC,IAAI,EAAE,SAAS,EACf,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAqD3B,0BAA0B,CAC9B,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,UAAU,CAAC,EAAE,SAAS,EAAE,GACvB,OAAO,CAAC,eAAe,CAAC;IAqErB,kBAAkB,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE;IAkClE,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAYhE"}
+{"version":3,"file":"OrcaService.d.ts","sourceRoot":"","sources":["../../src/services/OrcaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAsB,GAAG,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,OAAO,MAAM,YAAY,CAAC;AAEjC,OAAO,EAA0B,SAAS,IAAI,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAGL,eAAe,EAMf,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAU;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAGnC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,EACtB,kBAAkB,GAAE,OAA+B;IAOrD,qBAAqB,IAAI,OAAO;IAK1B,iBAAiB,CAAC,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqD1E,gBAAgB,CAAC,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAW3E;;;;;;;OAOG;IACH,OAAO,CAAC,cAAc;IAuCtB,OAAO,CAAC,mBAAmB;IAsBrB,8BAA8B,CAClC,QAAQ,EAAE,iBAAiB,EAC3B,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,eAAe,CAAC;IA6ErB,iCAAiC,CACrC,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,OAAc,EACzB,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,qBAAqB,CAAC;IAoD3B,0BAA0B,CAC9B,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,YAAY,EACpB,eAAe,EAAE,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GACpC,OAAO,CAAC,eAAe,CAAC;IAiErB,kBAAkB,CAAC,UAAU,EAAE,OAAO;IAsBtC,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAc9D"}

package/dist/services/OrcaService.js

@@ -4,29 +4,80 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrcaService = void 0;
-const web3_js_1 = require("@solana/web3.js");
+const kit_1 = require("@solana/kit");
 const decimal_js_1 = __importDefault(require("decimal.js"));
-const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
 const axios_1 = __importDefault(require("axios"));
-const whirlpools_client_1 = require("../whirlpools-client");
+const accounts_1 = require("../@codegen/whirlpools/accounts");
 const utils_1 = require("../utils");
-const programId_1 = require("../whirlpools-client/programId");
+const programId_1 = require("../@codegen/whirlpools/programId");
+const whirlpools_core_1 = require("@orca-so/whirlpools-core");
 class OrcaService {
-    _connection;
-    _whirilpoolProgramId;
-    _orcaNetwork;
+    _rpc;
+    _whirlpoolProgramId;
     _orcaApiUrl;
-    constructor(connection, cluster, whirlpoolProgramId = programId_1.WHIRLPOOL_PROGRAM_ID) {
-        this._connection = connection;
-        this._whirilpoolProgramId = whirlpoolProgramId;
-        this._orcaNetwork = cluster === 'mainnet-beta' ? whirlpool_sdk_1.OrcaNetwork.MAINNET : whirlpool_sdk_1.OrcaNetwork.DEVNET;
-        this._orcaApiUrl = `https://api.${cluster === 'mainnet-beta' ? 'mainnet' : 'devnet'}.orca.so`;
+    constructor(rpc, whirlpoolProgramId = programId_1.PROGRAM_ID) {
+        this._rpc = rpc;
+        this._whirlpoolProgramId = whirlpoolProgramId;
+        this._orcaApiUrl = `https://api.orca.so/v2/solana`;
     }
     getWhirlpoolProgramId() {
-        return this._whirilpoolProgramId;
+        return this._whirlpoolProgramId;
     }
-    async getOrcaWhirlpools() {
-        return (await axios_1.default.get(`${this._orcaApiUrl}/v1/whirlpool/list`)).data;
+    // Fetch all Orca whirlpools with pagination support (note there are over 20 pages so it may take a while)
+    async getOrcaWhirlpools(tokens = []) {
+        const maxPageSize = 1000;
+        const maxPages = 100; // Safety limit to prevent infinite loops
+        const allWhirlpools = [];
+        let after = undefined;
+        let hasMore = true;
+        let pageCount = 0;
+        while (hasMore && pageCount < maxPages) {
+            pageCount++;
+            const url = new URL(`${this._orcaApiUrl}/pools`);
+            url.searchParams.set('size', maxPageSize.toString());
+            if (after) {
+                url.searchParams.set('after', after);
+            }
+            // Add token filtering parameters based on the number of tokens provided
+            if (tokens.length === 1) {
+                url.searchParams.set('token', tokens[0]);
+            }
+            else if (tokens.length === 2) {
+                url.searchParams.set('tokensBothOf', tokens.join(','));
+            }
+            try {
+                const response = await axios_1.default.get(url.toString());
+                const data = response.data;
+                // Add whirlpools from this page to our collection
+                if (data.data && data.data.length > 0) {
+                    allWhirlpools.push(...data.data);
+                }
+                // Check if there are more pages using the meta.cursor.next field
+                if (data.meta?.cursor?.next) {
+                    after = data.meta.cursor.next;
+                    hasMore = true;
+                }
+                else {
+                    hasMore = false;
+                }
+            }
+            catch (error) {
+                console.error('Error fetching Orca whirlpools page:', error);
+                throw error;
+            }
+        }
+        if (pageCount >= maxPages) {
+            console.warn(`Reached maximum page limit (${maxPages}). There might be more whirlpools available.`);
+        }
+        return allWhirlpools;
+    }
+    async getOrcaWhirlpool(poolAddress) {
+        const response = await axios_1.default.get(`${this._orcaApiUrl}/pools/${poolAddress}`);
+        // If the API response has a nested data field that contains the actual pool data
+        if (response.data.data && typeof response.data.data === 'object') {
+            return response.data.data;
+        }
+        return response.data;
     }
     /**
      * Get token prices for a strategy - for use with orca sdk
@@ -37,7 +88,7 @@ class OrcaService {
      * @private
      */
     getTokenPrices(strategy, prices, collateralInfos) {
-        const tokensPrices = {};
+        const tokensPrices = new Map();
         const tokenA = collateralInfos[strategy.tokenACollateralId.toNumber()];
         const tokenB = collateralInfos[strategy.tokenBCollateralId.toNumber()];
         const rewardToken0 = collateralInfos[strategy.reward0CollateralId.toNumber()];
@@ -48,31 +99,31 @@ class OrcaService {
         const reward0Price = strategy.reward0Decimals.toNumber() !== 0 ? prices.spot[rewardToken0.mint.toString()] : null;
         const reward1Price = strategy.reward1Decimals.toNumber() !== 0 ? prices.spot[rewardToken1.mint.toString()] : null;
         const reward2Price = strategy.reward2Decimals.toNumber() !== 0 ? prices.spot[rewardToken2.mint.toString()] : null;
-        const [mintA, mintB] = [strategy.tokenAMint.toString(), strategy.tokenBMint.toString()];
-        const reward0 = collateralInfos[strategy.reward0CollateralId.toNumber()]?.mint?.toString();
-        const reward1 = collateralInfos[strategy.reward1CollateralId.toNumber()]?.mint?.toString();
-        const reward2 = collateralInfos[strategy.reward2CollateralId.toNumber()]?.mint?.toString();
-        tokensPrices[mintA] = aPrice.price;
-        tokensPrices[mintB] = bPrice.price;
+        const [mintA, mintB] = [(0, kit_1.address)(strategy.tokenAMint.toString()), (0, kit_1.address)(strategy.tokenBMint.toString())];
+        const reward0 = (0, kit_1.address)(collateralInfos[strategy.reward0CollateralId.toNumber()]?.mint?.toString());
+        const reward1 = (0, kit_1.address)(collateralInfos[strategy.reward1CollateralId.toNumber()]?.mint?.toString());
+        const reward2 = (0, kit_1.address)(collateralInfos[strategy.reward2CollateralId.toNumber()]?.mint?.toString());
+        tokensPrices.set(mintA, aPrice.price);
+        tokensPrices.set(mintB, bPrice.price);
         if (reward0Price !== null) {
-            tokensPrices[reward0] = reward0Price.price;
+            tokensPrices.set(reward0, reward0Price.price);
         }
         if (reward1Price !== null) {
-            tokensPrices[reward1] = reward1Price.price;
+            tokensPrices.set(reward1, reward1Price.price);
         }
         if (reward2Price !== null) {
-            tokensPrices[reward2] = reward2Price.price;
+            tokensPrices.set(reward2, reward2Price.price);
         }
         return tokensPrices;
     }
     getPoolTokensPrices(pool, prices) {
-        const tokensPrices = {};
+        const tokensPrices = new Map();
         const tokens = [
-            pool.tokenMintA.toString(),
-            pool.tokenMintB.toString(),
-            pool.rewards[0].mint.toString(),
-            pool.rewards[1].mint.toString(),
-            pool.rewards[2].mint.toString(),
+            (0, kit_1.address)(pool.tokenMintA.toString()),
+            (0, kit_1.address)(pool.tokenMintB.toString()),
+            (0, kit_1.address)(pool.rewards[0]?.mint.toString()),
+            (0, kit_1.address)(pool.rewards[1]?.mint.toString()),
+            (0, kit_1.address)(pool.rewards[2]?.mint.toString()),
         ];
         for (const mint of tokens) {
             if (mint) {
@@ -80,39 +131,27 @@ class OrcaService {
                 if (!price) {
                     throw new Error(`Could not get token ${mint} price`);
                 }
-                tokensPrices[mint] = price;
+                tokensPrices.set(mint, price);
             }
         }
         return tokensPrices;
     }
-    async getPool(poolAddress) {
-        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
-            network: this._orcaNetwork,
-        });
-        return await orca.getPool(poolAddress);
-    }
-    async getStrategyWhirlpoolPoolAprApy(strategy, collateralInfos, prices, whirlpools) {
-        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
-            network: this._orcaNetwork,
-        });
-        const position = await whirlpools_client_1.Position.fetch(this._connection, strategy.position);
+    async getStrategyWhirlpoolPoolAprApy(strategy, collateralInfos, prices) {
+        const position = await accounts_1.Position.fetch(this._rpc, strategy.position);
         if (!position) {
             throw new Error(`Position ${strategy.position.toString()} does not exist`);
         }
-        const pool = await orca.getPool(strategy.pool);
-        if (!whirlpools) {
-            ({ whirlpools } = await this.getOrcaWhirlpools());
-        }
-        const whirlpool = whirlpools?.find((x) => x.address === strategy.pool.toString());
-        if (!pool || !whirlpool) {
+        const pool = await this.getOrcaWhirlpool(strategy.pool);
+        if (!pool) {
             throw Error(`Could not get orca pool data for ${strategy.pool.toString()}`);
         }
         const priceRange = (0, utils_1.getStrategyPriceRangeOrca)(position.tickLowerIndex, position.tickUpperIndex, strategy, new decimal_js_1.default(pool.price.toString()));
         if (priceRange.strategyOutOfRange) {
             return {
-                ...priceRange,
+                priceLower: new decimal_js_1.default(priceRange.priceLower),
+                priceUpper: new decimal_js_1.default(priceRange.priceUpper),
+                poolPrice: new decimal_js_1.default(pool.price),
+                strategyOutOfRange: priceRange.strategyOutOfRange,
                 rewardsApy: [],
                 rewardsApr: [],
                 feeApy: utils_1.ZERO,
@@ -121,12 +160,25 @@ class OrcaService {
                 totalApr: utils_1.ZERO,
             };
         }
-        const lpFeeRate = pool.feePercentage;
-        const volume24hUsd = whirlpool?.volume?.day ?? new decimal_js_1.default(0);
+        const lpFeeRate = new decimal_js_1.default(pool.feeRate);
+        const volume24hUsd = pool.stats['24h']?.volume ?? new decimal_js_1.default(0);
         const fee24Usd = new decimal_js_1.default(volume24hUsd).mul(lpFeeRate).toNumber();
         const tokensPrices = this.getTokenPrices(strategy, prices, collateralInfos);
-        const apr = (0, whirlpool_sdk_1.estimateAprsForPriceRange)(pool, tokensPrices, fee24Usd, position.tickLowerIndex, position.tickUpperIndex);
-        const totalApr = new decimal_js_1.default(apr.fee).add(apr.rewards[0]).add(apr.rewards[1]).add(apr.rewards[2]);
+        const rewardsDecimals = new Map();
+        if (strategy.reward0Decimals.toNumber() !== 0) {
+            rewardsDecimals.set((0, kit_1.address)(pool.rewards[0]?.mint), strategy.reward0Decimals.toNumber());
+        }
+        if (strategy.reward1Decimals.toNumber() !== 0) {
+            rewardsDecimals.set((0, kit_1.address)(pool.rewards[1]?.mint), strategy.reward1Decimals.toNumber());
+        }
+        if (strategy.reward2Decimals.toNumber() !== 0) {
+            rewardsDecimals.set((0, kit_1.address)(pool.rewards[2]?.mint), strategy.reward2Decimals.toNumber());
+        }
+        const apr = (0, utils_1.estimateAprsForPriceRange)(pool, tokensPrices, fee24Usd, position.tickLowerIndex, position.tickUpperIndex, rewardsDecimals);
+        let totalApr = new decimal_js_1.default(apr.fee);
+        for (const reward of apr.rewards) {
+            totalApr = totalApr.add(reward);
+        }
         const feeApr = new decimal_js_1.default(apr.fee);
         const rewardsApr = apr.rewards.map((r) => new decimal_js_1.default(r));
         return {
@@ -136,17 +188,16 @@ class OrcaService {
             feeApy: (0, utils_1.aprToApy)(feeApr, 365),
             rewardsApr,
             rewardsApy: rewardsApr.map((x) => (0, utils_1.aprToApy)(x, 365)),
-            ...priceRange,
+            priceLower: new decimal_js_1.default(priceRange.priceLower),
+            priceUpper: new decimal_js_1.default(priceRange.priceUpper),
+            poolPrice: new decimal_js_1.default(pool.price),
+            strategyOutOfRange: priceRange.strategyOutOfRange,
         };
     }
     // strongly recommended to pass lowestTick and highestTick because fetching the lowest and highest existent takes very long
     async getWhirlpoolLiquidityDistribution(pool, keepOrder = true, lowestTick, highestTick) {
-        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
-            network: this._orcaNetwork,
-        });
-        const poolData = await orca.getPool(pool);
-        if (!poolData) {
+        const whirlpool = await this.getOrcaWhirlpool(pool);
+        if (!whirlpool) {
             throw new Error(`Could not get pool data for Whirlpool ${pool}`);
         }
         let lowestInitializedTick;
@@ -154,19 +205,19 @@ class OrcaService {
             lowestInitializedTick = lowestTick;
         }
         else {
-            lowestInitializedTick = await orca.pool.getLowestInitializedTickArrayTickIndex(pool, poolData.tickSpacing);
+            lowestInitializedTick = await (0, utils_1.getLowestInitializedTickArrayTickIndex)(this._rpc, pool, whirlpool.tickSpacing);
         }
         let highestInitializedTick;
         if (highestTick) {
             highestInitializedTick = highestTick;
         }
         else {
-            highestInitializedTick = await orca.pool.getHighestInitializedTickArrayTickIndex(pool, poolData.tickSpacing);
+            highestInitializedTick = await (0, utils_1.getHighestInitializedTickArrayTickIndex)(this._rpc, pool, whirlpool.tickSpacing);
         }
-        const orcaLiqDistribution = await orca.pool.getLiquidityDistribution(pool, lowestInitializedTick, highestInitializedTick);
+        const orcaLiqDistribution = await (0, utils_1.getLiquidityDistribution)(this._rpc, pool, whirlpool, lowestInitializedTick, highestInitializedTick, this._whirlpoolProgramId);
         const liqDistribution = {
-            currentPrice: poolData.price,
-            currentTickIndex: poolData.tickCurrentIndex,
+            currentPrice: new decimal_js_1.default(whirlpool.price),
+            currentTickIndex: whirlpool.tickCurrentIndex,
             distribution: [],
         };
         orcaLiqDistribution.datapoints.forEach((entry) => {
@@ -183,21 +234,13 @@ class OrcaService {
         });
         return liqDistribution;
     }
-    async getWhirlpoolPositionAprApy(poolPubkey, priceLower, priceUpper, prices, whirlpools) {
-        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
-            network: this._orcaNetwork,
-        });
-        const pool = await orca.getPool(poolPubkey);
-        if (!whirlpools) {
-            ({ whirlpools } = await this.getOrcaWhirlpools());
-        }
-        const whirlpool = whirlpools?.find((x) => x.address === poolPubkey.toString());
-        if (!pool || !whirlpool) {
+    async getWhirlpoolPositionAprApy(poolPubkey, priceLower, priceUpper, prices, rewardsDecimals) {
+        const pool = await this.getOrcaWhirlpool(poolPubkey);
+        if (!pool) {
             throw Error(`Could not get orca pool data for ${poolPubkey}`);
         }
         let strategyOutOfRange = false;
-        if (priceLower.gt(pool.price) || priceUpper.lt(pool.price)) {
+        if (priceLower.gt(new decimal_js_1.default(pool.price)) || priceUpper.lt(new decimal_js_1.default(pool.price))) {
             strategyOutOfRange = true;
         }
         if (strategyOutOfRange) {
@@ -205,7 +248,7 @@ class OrcaService {
                 priceLower,
                 priceUpper,
                 strategyOutOfRange,
-                poolPrice: pool.price,
+                poolPrice: new decimal_js_1.default(pool.price),
                 rewardsApy: [],
                 rewardsApr: [],
                 feeApy: utils_1.ZERO,
@@ -214,13 +257,13 @@ class OrcaService {
                 totalApr: utils_1.ZERO,
             };
         }
-        const lpFeeRate = pool.feePercentage;
-        const volume24hUsd = whirlpool?.volume?.day ?? new decimal_js_1.default(0);
+        const lpFeeRate = pool.feeRate;
+        const volume24hUsd = pool?.stats?.['24h']?.volume ?? new decimal_js_1.default(0);
         const fee24Usd = new decimal_js_1.default(volume24hUsd).mul(lpFeeRate).toNumber();
         const tokensPrices = this.getPoolTokensPrices(pool, prices);
-        const tickLowerIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceLower, pool.tokenDecimalsA, pool.tokenDecimalsB), whirlpool.tickSpacing);
-        const tickUpperIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceUpper, pool.tokenDecimalsA, pool.tokenDecimalsB), whirlpool.tickSpacing);
-        const apr = (0, whirlpool_sdk_1.estimateAprsForPriceRange)(pool, tokensPrices, fee24Usd, tickLowerIndex, tickUpperIndex);
+        const tickLowerIndex = (0, utils_1.getNearestValidTickIndexFromTickIndex)((0, whirlpools_core_1.priceToTickIndex)(priceLower.toNumber(), pool.tokenA.decimals, pool.tokenB.decimals), pool.tickSpacing);
+        const tickUpperIndex = (0, utils_1.getNearestValidTickIndexFromTickIndex)((0, whirlpools_core_1.priceToTickIndex)(priceUpper.toNumber(), pool.tokenA.decimals, pool.tokenB.decimals), pool.tickSpacing);
+        const apr = (0, utils_1.estimateAprsForPriceRange)(pool, tokensPrices, fee24Usd, tickLowerIndex, tickUpperIndex, rewardsDecimals);
         const totalApr = new decimal_js_1.default(apr.fee).add(apr.rewards[0]).add(apr.rewards[1]).add(apr.rewards[2]);
         const feeApr = new decimal_js_1.default(apr.fee);
         const rewardsApr = apr.rewards.map((r) => new decimal_js_1.default(r));
@@ -233,33 +276,24 @@ class OrcaService {
             rewardsApy: rewardsApr.map((x) => (0, utils_1.aprToApy)(x, 365)),
             priceLower,
             priceUpper,
-            poolPrice: pool.price,
+            poolPrice: new decimal_js_1.default(pool.price),
             strategyOutOfRange,
         };
     }
-    async getGenericPoolInfo(poolPubkey, whirlpools) {
-        const orca = new whirlpool_sdk_1.OrcaWhirlpoolClient({
-            connection: this._connection,
-            network: this._orcaNetwork,
-        });
-        const poolString = poolPubkey.toString();
-        const pool = await orca.getPool(poolPubkey);
-        if (!whirlpools) {
-            ({ whirlpools } = await this.getOrcaWhirlpools());
-        }
-        const whirlpool = whirlpools?.find((x) => x.address === poolString);
-        if (!pool || !whirlpool) {
-            throw Error(`Could not get orca pool data for ${poolString}`);
+    async getGenericPoolInfo(poolPubkey) {
+        const pool = await this.getOrcaWhirlpool(poolPubkey);
+        if (!pool) {
+            throw Error(`Could not get orca pool data for ${poolPubkey.toString()}`);
         }
         const poolInfo = {
             dex: 'ORCA',
-            address: new web3_js_1.PublicKey(poolPubkey),
-            tokenMintA: pool.tokenMintA,
-            tokenMintB: pool.tokenMintB,
-            price: pool.price,
-            feeRate: pool.feePercentage,
-            volumeOnLast7d: whirlpool.volume ? new decimal_js_1.default(whirlpool.volume?.week) : undefined,
-            tvl: whirlpool.tvl ? new decimal_js_1.default(whirlpool.tvl) : undefined,
+            address: poolPubkey,
+            tokenMintA: (0, kit_1.address)(pool.tokenMintA),
+            tokenMintB: (0, kit_1.address)(pool.tokenMintB),
+            price: new decimal_js_1.default(pool.price),
+            feeRate: new decimal_js_1.default(pool.feeRate),
+            volumeOnLast7d: pool.stats['7d'] ? new decimal_js_1.default(pool.stats['7d'].volume) : undefined,
+            tvl: pool.tvlUsdc ? new decimal_js_1.default(pool.tvlUsdc) : undefined,
             tickSpacing: new decimal_js_1.default(pool.tickSpacing),
             // todo(Silviu): get real amount of positions
             positions: new decimal_js_1.default(0),
@@ -267,14 +301,16 @@ class OrcaService {
         return poolInfo;
     }
     async getPositionsCountByPool(pool) {
-        const rawPositions = await this._connection.getProgramAccounts(programId_1.WHIRLPOOL_PROGRAM_ID, {
+        const rawPositions = await this._rpc
+            .getProgramAccounts(programId_1.PROGRAM_ID, {
             commitment: 'confirmed',
             filters: [
                 // account LAYOUT: https://github.com/orca-so/whirlpools/blob/main/programs/whirlpool/src/state/position.rs#L20
-                { dataSize: 216 },
-                { memcmp: { bytes: pool.toBase58(), offset: 8 } },
+                { dataSize: 216n },
+                { memcmp: { bytes: pool.toString(), offset: 8n, encoding: 'base58' } },
             ],
-        });
+        })
+            .send();
         return rawPositions.length;
     }
 }

package/dist/services/OrcaService.js.map

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

package/dist/services/OrcaWhirlpoolsResponse.d.ts

@@ -1,106 +1,77 @@
 export interface OrcaWhirlpoolsResponse {
-    whirlpools: Whirlpool[];
-    hasMore: boolean;
+    data: Whirlpool[];
+    meta: {
+        cursor: {
+            previous: string | null;
+            next: string | null;
+        };
+    };
 }
 export interface Whirlpool {
     address: string;
-    tokenA: TokenA;
-    tokenB: TokenB;
-    whitelisted: boolean;
+    whirlpoolsConfig: string;
+    whirlpoolBump: number[];
     tickSpacing: number;
-    price: number;
-    lpFeeRate: number;
+    tickSpacingSeed: number[];
+    feeRate: number;
     protocolFeeRate: number;
-    whirlpoolsConfig: string;
-    modifiedTimeMs?: number;
-    tvl?: number;
-    volume?: Volume;
-    volumeDenominatedA?: VolumeDenominatedA;
-    volumeDenominatedB?: VolumeDenominatedB;
-    priceRange?: PriceRange;
-    feeApr?: FeeApr;
-    reward0Apr?: Reward0Apr;
-    reward1Apr?: Reward1Apr;
-    reward2Apr?: Reward2Apr;
-    totalApr?: TotalApr;
-}
-export interface TokenA {
-    mint: string;
-    symbol: string;
+    liquidity: string;
+    sqrtPrice: string;
+    tickCurrentIndex: number;
+    protocolFeeOwedA: string;
+    protocolFeeOwedB: string;
+    tokenMintA: string;
+    tokenVaultA: string;
+    feeGrowthGlobalA: string;
+    tokenMintB: string;
+    tokenVaultB: string;
+    feeGrowthGlobalB: string;
+    rewardLastUpdatedTimestamp: string;
+    updatedAt: string;
+    updatedSlot: number;
+    writeVersion: number;
+    hasWarning: boolean;
+    poolType: string;
+    tokenA: WhirlpoolToken;
+    tokenB: WhirlpoolToken;
+    price: string;
+    tvlUsdc: string;
+    yieldOverTvl: string;
+    tokenBalanceA: string;
+    tokenBalanceB: string;
+    stats: Stats;
+    rewards: WhirlpoolReward[];
+    feeTierIndex: number;
+    adaptiveFeeEnabled: boolean;
+    tradeEnableTimestamp: string;
+}
+export interface WhirlpoolToken {
+    address: string;
+    programId: string;
+    imageURL: string;
     name: string;
-    decimals: number;
-    logoURI?: string;
-    coingeckoId?: string;
-    whitelisted: boolean;
-    poolToken: boolean;
-    wrapper?: string;
-}
-export interface TokenB {
-    mint: string;
     symbol: string;
-    name: string;
     decimals: number;
-    logoURI: string;
-    coingeckoId?: string;
-    whitelisted: boolean;
-    poolToken: boolean;
-    wrapper?: string;
+    tags: string[];
 }
-export interface Volume {
-    day: number;
-    week: number;
-    month: number;
+export interface WhirlpoolStat {
+    volume: string;
+    fees: string;
+    rewards: string;
+    yieldOverTvl: string;
 }
-export interface VolumeDenominatedA {
-    day: number;
-    week: number;
-    month: number;
+export interface Stats {
+    '24h': WhirlpoolStat;
+    '7d': WhirlpoolStat;
+    '30d': WhirlpoolStat;
 }
-export interface VolumeDenominatedB {
-    day: number;
-    week: number;
-    month: number;
-}
-export interface PriceRange {
-    day: Day;
-    week: Week;
-    month: Month;
-}
-export interface Day {
-    min: number;
-    max: number;
-}
-export interface Week {
-    min: number;
-    max: number;
-}
-export interface Month {
-    min: number;
-    max: number;
-}
-export interface FeeApr {
-    day: number;
-    week: number;
-    month: number;
-}
-export interface Reward0Apr {
-    day: number;
-    week?: number;
-    month?: number;
-}
-export interface Reward1Apr {
-    day: number;
-    week: number;
-    month: number;
-}
-export interface Reward2Apr {
-    day: number;
-    week: number;
-    month: number;
-}
-export interface TotalApr {
-    day: number;
-    week?: number;
-    month?: number;
+export interface WhirlpoolReward {
+    mint: string;
+    vault: string;
+    authority: string;
+    emissions_per_second_x64: string;
+    growth_global_x64: string;
+    active: boolean;
+    emissionsPerSecond: string;
 }
 //# sourceMappingURL=OrcaWhirlpoolsResponse.d.ts.map