@kamino-finance/kliquidity-sdk 7.0.9 → 7.0.11

package/dist/utils/utils.d.ts.map

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

package/dist/utils/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReferencePriceType = exports.Dex = exports.RebalanceParamOffset = exports.ProportionalMintingMethod = exports.DolarBasedMintingMethod = void 0;
+exports.ReferencePriceType = exports.Dex = exports.ZERO_BN = exports.RebalanceParamOffset = exports.ProportionalMintingMethod = exports.DolarBasedMintingMethod = void 0;
 exports.sleep = sleep;
 exports.dexToNumber = dexToNumber;
 exports.numberToDex = numberToDex;
@@ -33,15 +33,16 @@ const programId_2 = require("../raydium_client/programId");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const types_1 = require("../kamino-client/types");
 const instructions_1 = require("../kamino-client/instructions");
-const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
 const bn_js_1 = __importDefault(require("bn.js"));
 const priceReferenceTypes_1 = require("./priceReferenceTypes");
 const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
 const programId_3 = require("../meteora_client/programId");
 const numericalValues_1 = require("../constants/numericalValues");
+const math_1 = require("@raydium-io/raydium-sdk-v2/lib/raydium/clmm/utils/math");
 exports.DolarBasedMintingMethod = new decimal_js_1.default(0);
 exports.ProportionalMintingMethod = new decimal_js_1.default(1);
 exports.RebalanceParamOffset = new decimal_js_1.default(256);
+exports.ZERO_BN = new bn_js_1.default(0);
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -112,8 +113,8 @@ function buildStrategyRebalanceParams(params, rebalance_type, tokenADecimals, to
     }
     else if (rebalance_type.kind == types_1.RebalanceType.TakeProfit.kind) {
         // TODO: fix this for meteora
-        const lowerPrice = raydium_sdk_1.SqrtPriceMath.priceToSqrtPriceX64(params[0], tokenADecimals, tokenBDecimals);
-        const upperPrice = raydium_sdk_1.SqrtPriceMath.priceToSqrtPriceX64(params[1], tokenADecimals, tokenBDecimals);
+        const lowerPrice = math_1.SqrtPriceMath.priceToSqrtPriceX64(params[0], tokenADecimals, tokenBDecimals);
+        const upperPrice = math_1.SqrtPriceMath.priceToSqrtPriceX64(params[1], tokenADecimals, tokenBDecimals);
         writeBN128LE(buffer, lowerPrice, 0);
         writeBN128LE(buffer, upperPrice, 16);
         buffer.writeUint8(params[2].toNumber(), 32);
@@ -278,7 +279,7 @@ function sqrtPriceToPrice(sqrtPrice, dexNo, decimalsA, decimalsB) {
         return (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(sqrtPrice, decimalsA, decimalsB);
     }
     if (dex == 'RAYDIUM') {
-        return raydium_sdk_1.SqrtPriceMath.sqrtPriceX64ToPrice(sqrtPrice, decimalsA, decimalsB);
+        return math_1.SqrtPriceMath.sqrtPriceX64ToPrice(sqrtPrice, decimalsA, decimalsB);
     }
     if (dex == 'METEORA') {
         const price = new decimal_js_1.default(sqrtPrice.toString());

package/dist/utils/utils.js.map

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

package/dist/whirlpools-client/shim/remove-liquidity.js

@@ -7,7 +7,7 @@ exports.getRemoveLiquidityQuote = getRemoveLiquidityQuote;
  */
 const whirlpool_client_sdk_1 = require("@orca-so/whirlpool-client-sdk");
 const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
-const raydium_sdk_1 = require("@raydium-io/raydium-sdk");
+const utils_1 = require("../../utils");
 function getRemoveLiquidityQuote(param, roundUp = false) {
     const positionStatus = whirlpool_sdk_1.PositionUtil.getPositionStatus(param.tickCurrentIndex, param.tickLowerIndex, param.tickUpperIndex);
     switch (positionStatus) {
@@ -30,9 +30,9 @@ function getRemoveLiquidityQuoteWhenPositionIsBelowRange(param, roundUp = false)
     return {
         positionAddress,
         minTokenA,
-        minTokenB: raydium_sdk_1.ZERO,
+        minTokenB: utils_1.ZERO_BN,
         estTokenA,
-        estTokenB: raydium_sdk_1.ZERO,
+        estTokenB: utils_1.ZERO_BN,
         liquidity,
     };
 }
@@ -62,9 +62,9 @@ function getRemoveLiquidityQuoteWhenPositionIsAboveRange(param, roundUp = false)
     const minTokenB = (0, whirlpool_sdk_1.adjustForSlippage)(estTokenB, slippageTolerance, roundUp);
     return {
         positionAddress,
-        minTokenA: raydium_sdk_1.ZERO,
+        minTokenA: utils_1.ZERO_BN,
         minTokenB,
-        estTokenA: raydium_sdk_1.ZERO,
+        estTokenA: utils_1.ZERO_BN,
         estTokenB,
         liquidity,
     };

package/dist/whirlpools-client/shim/remove-liquidity.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/kliquidity-sdk",
-  "version": "7.0.9",
+  "version": "7.0.11",
   "description": "Typescript SDK for interacting with the Kamino Liquidity (kliquidity) protocol",
   "repository": {
     "type": "git",
@@ -49,11 +49,11 @@
     "@coral-xyz/anchor": "^0.29.0",
     "@coral-xyz/borsh": "^0.30.1",
     "@hubbleprotocol/hubble-config": "^5.0.0",
-    "@jup-ag/api": "^6.0.24",
+    "@jup-ag/api": "^6.0.38",
     "@kamino-finance/scope-sdk": "^8.0.2",
     "@orca-so/whirlpool-client-sdk": "^0.0.8",
     "@orca-so/whirlpool-sdk": "^0.4.2",
-    "@raydium-io/raydium-sdk": "=1.3.1-beta.5",
+    "@raydium-io/raydium-sdk-v2": "=0.1.111-alpha",
     "@solana/spl-token": "^0.4.9",
     "@solana/web3.js": "^1.95.8",
     "axios": "^1.7.8",

package/src/Kamino.ts

@@ -119,6 +119,7 @@ import {
   getTokenNameFromCollateralInfo,
   keyOrDefault,
   getMintDecimals,
+  ZERO_BN,
 } from './utils';
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -180,14 +181,6 @@ import {
 } from './kamino-client/types';
 import { AmmConfig, PersonalPositionState, PoolState } from './raydium_client';
 import { setRaydiumProgramId } from './raydium_client/programId';
-import {
-  getPdaProtocolPositionAddress,
-  i32ToBytes,
-  LiquidityMath,
-  SqrtPriceMath,
-  TickMath,
-  TickUtils,
-} from '@raydium-io/raydium-sdk';
 
 import KaminoIdl from './kamino-client/idl.json';
 import { OrcaService, RaydiumService, Whirlpool as OrcaPool, WhirlpoolAprApy } from './services';
@@ -237,7 +230,7 @@ import {
   TakeProfitMethod,
 } from './utils/CreationParameters';
 import { DOLAR_BASED, PROPORTION_BASED } from './constants/deposit_method';
-import { JupService } from './services/JupService';
+import { DEFAULT_JUP_API_ENDPOINT, JupService } from './services/JupService';
 import {
   simulateManualPool,
   simulatePercentagePool,
@@ -345,6 +338,15 @@ import { BinArray, LbPair, PositionV2 } from './meteora_client/accounts';
 import LbPairWithAddress from './models/LbPairWithAddress';
 import { initializeBinArray, InitializeBinArrayAccounts, InitializeBinArrayArgs } from './meteora_client/instructions';
 import { PubkeyHashMap } from './utils/pubkey';
+import {
+  LiquidityMath,
+  SqrtPriceMath,
+  TickMath,
+  getPdaProtocolPositionAddress,
+  i32ToBytes,
+  TickUtils,
+} from '@raydium-io/raydium-sdk-v2/lib';
+
 export const KAMINO_IDL = KaminoIdl;
 
 export class Kamino {
@@ -359,6 +361,7 @@ export class Kamino {
   private readonly _orcaService: OrcaService;
   private readonly _raydiumService: RaydiumService;
   private readonly _meteoraService: MeteoraService;
+  private readonly _jupBaseAPI: string = DEFAULT_JUP_API_ENDPOINT;
 
   /**
    * Create a new instance of the Kamino SDK class.
@@ -376,7 +379,8 @@ export class Kamino {
     programId?: PublicKey,
     whirlpoolProgramId?: PublicKey,
     raydiumProgramId?: PublicKey,
-    meteoraProgramId?: PublicKey
+    meteoraProgramId?: PublicKey,
+    jupBaseAPI?: string
   ) {
     this._cluster = cluster;
     this._connection = connection;
@@ -412,6 +416,10 @@ export class Kamino {
     this._orcaService = new OrcaService(connection, cluster, whirlpoolProgramId);
     this._raydiumService = new RaydiumService(connection, raydiumProgramId);
     this._meteoraService = new MeteoraService(connection, meteoraProgramId);
+
+    if (jupBaseAPI) {
+      this._jupBaseAPI = jupBaseAPI;
+    }
   }
 
   getConnection = () => this._connection;
@@ -442,7 +450,10 @@ export class Kamino {
   getDisabledTokensPrices = async (collateralInfos?: CollateralInfo[]) => {
     const collInfos = collateralInfos ? collateralInfos : await this.getCollateralInfos();
     const disabledTokens = collInfos.filter((x) => x.disabled && !x.mint.equals(PublicKey.default));
-    return JupService.getDollarPrices(disabledTokens.map((x) => x.mint));
+    return JupService.getDollarPrices(
+      disabledTokens.map((x) => x.mint),
+      this._jupBaseAPI
+    );
   };
 
   getSupportedDexes = (): Dex[] => ['ORCA', 'RAYDIUM', 'METEORA'];
@@ -2189,7 +2200,7 @@ export class Kamino {
     try {
       const tokensPrices = disabledTokensPrices
         ? disabledTokensPrices
-        : await JupService.getDollarPrices(disabledTokens);
+        : await JupService.getDollarPrices(disabledTokens, this._jupBaseAPI);
       for (const [token, price] of tokensPrices) {
         const collInfo = collateralInfos.find((x) => x.mint.equals(token));
         if (!collInfo) {
@@ -7382,7 +7393,7 @@ export class Kamino {
       throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
     }
 
-    return { amountSlippageA: new BN(0), amountSlippageB: new BN(0) };
+    return { amountSlippageA: ZERO_BN, amountSlippageB: ZERO_BN };
   }
 
   private async getDepositRatioFromBMeteora(
@@ -7399,7 +7410,7 @@ export class Kamino {
       throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
     }
 
-    return { amountSlippageA: new BN(0), amountSlippageB: new BN(0) };
+    return { amountSlippageA: ZERO_BN, amountSlippageB: ZERO_BN };
   }
 
   private getDepositRatioFromBOrca = async (

package/src/rebalance_methods/autodriftRebalance.ts

@@ -2,11 +2,11 @@ import Decimal from 'decimal.js';
 import { PositionRange, RebalanceFieldInfo, RebalanceFieldsDict } from '../utils/types';
 import { Dex, readPriceOption } from '../utils';
 import { priceToTickIndex, sqrtPriceX64ToPrice, tickIndexToPrice } from '@orca-so/whirlpool-sdk';
-import { SqrtPriceMath } from '@raydium-io/raydium-sdk';
 import { RebalanceRaw } from '../kamino-client/types';
 import { RebalanceTypeLabelName } from './consts';
 import { upsertManyRebalanceFieldInfos } from './utils';
 import { getPriceOfBinByBinIdWithDecimals } from '../utils/meteora';
+import { SqrtPriceMath } from '@raydium-io/raydium-sdk-v2/lib';
 
 export const DEFAULT_DRIFT_TICKS_PER_EPOCH = new Decimal(1);
 export const DEFAULT_TICKS_BELOW_MID = new Decimal(10);

package/src/rebalance_methods/driftRebalance.ts

@@ -2,11 +2,11 @@ import Decimal from 'decimal.js';
 import { PositionRange, RebalanceFieldInfo, RebalanceFieldsDict } from '../utils/types';
 import { Dex } from '../utils';
 import { priceToTickIndex, sqrtPriceX64ToPrice, tickIndexToPrice } from '@orca-so/whirlpool-sdk';
-import { SqrtPriceMath } from '@raydium-io/raydium-sdk';
 import { RebalanceRaw } from '../kamino-client/types';
 import { RebalanceTypeLabelName } from './consts';
 import { upsertManyRebalanceFieldInfos } from './utils';
 import { getPriceOfBinByBinIdWithDecimals } from '../utils/meteora';
+import { SqrtPriceMath } from '@raydium-io/raydium-sdk-v2/lib';
 
 export const DEFAULT_TICKS_BELOW_MID = new Decimal(10);
 export const DEFAULT_TICKS_ABOVE_MID = new Decimal(10);

package/src/rebalance_methods/takeProfitRebalance.ts

@@ -5,8 +5,8 @@ import { Dex, readBigUint128LE } from '../utils';
 import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
 import BN from 'bn.js';
 import { RebalanceRaw } from '../kamino-client/types';
-import { SqrtPriceMath } from '@raydium-io/raydium-sdk';
 import { getPriceFromQ64Price } from '../utils/meteora';
+import { SqrtPriceMath } from '@raydium-io/raydium-sdk-v2/lib';
 
 export const DEFAULT_LOWER_RANGE_PRICE_DIFF_BPS = new Decimal(500);
 export const DEFAULT_UPPER_RANGE_PRICE_DIFF_BPS = new Decimal(500);

package/src/services/JupService.ts

@@ -8,6 +8,8 @@ import { PubkeyHashMap } from '../utils/pubkey';
 
 const USDC_MINT = new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 
+export const DEFAULT_JUP_API_ENDPOINT = 'https://api.jup.ag';
+
 export type SwapTransactionsResponse = {
   setupTransaction: string | undefined;
   swapTransaction: string;
@@ -71,11 +73,10 @@ export class JupService {
     slippageBps: number,
     asLegacyTransaction?: boolean,
     maxAccounts?: number,
-    onlyDirectRoutes?: boolean
+    onlyDirectRoutes?: boolean,
+    jupEndpoint?: string
   ): Promise<QuoteResponse> => {
     try {
-      const jupiterQuoteApi = createJupiterApiClient(); // config is optional
-
       const params = {
         inputMint: inputMint.toString(),
         outputMint: outputMint.toString(),
@@ -86,7 +87,9 @@ export class JupService {
         maxAccounts,
       };
 
-      return await jupiterQuoteApi.quoteGet(params);
+      const baseURL = jupEndpoint || DEFAULT_JUP_API_ENDPOINT;
+      const res = await axios.get(`${baseURL}/swap/v1/quote`, { params });
+      return res.data as QuoteResponse;
     } catch (error) {
       console.log('getBestRouteQuoteV6 error', error);
       throw error;
@@ -116,7 +119,11 @@ export class JupService {
     }
   };
 
-  static getPrice = async (inputMint: PublicKey | string, outputMint: PublicKey | string): Promise<number> => {
+  static getPrice = async (
+    inputMint: PublicKey | string,
+    outputMint: PublicKey | string,
+    jupEndpoint?: string
+  ): Promise<number> => {
     const params = {
       ids: inputMint.toString(),
       vsToken: outputMint.toString(),
@@ -128,13 +135,15 @@ export class JupService {
       params.vsAmount = 100;
     }
 
-    const res = await axios.get('https://api.jup.ag/price/v2', { params });
+    const baseURL = jupEndpoint || DEFAULT_JUP_API_ENDPOINT;
+    const res = await axios.get(`${baseURL}/price/v2`, { params });
     return res.data.data[inputMint.toString()].price;
   };
 
   static getPrices = async (
     inputMints: (PublicKey | string)[],
-    outputMint: PublicKey | string
+    outputMint: PublicKey | string,
+    jupEndpoint?: string
   ): Promise<PubkeyHashMap<PublicKey, Decimal>> => {
     const mintsCommaSeparated = inputMints.map((mint) => mint.toString()).join(',');
     const params = {
@@ -148,7 +157,8 @@ export class JupService {
       params.vsAmount = 100;
     }
 
-    const res = await axios.get('https://api.jup.ag/price/v2', { params });
+    const baseURL = jupEndpoint || DEFAULT_JUP_API_ENDPOINT;
+    const res = await axios.get(`${baseURL}/price/v2`, { params });
     const prices: PubkeyHashMap<PublicKey, Decimal> = new PubkeyHashMap();
     for (const mint of inputMints) {
       try {
@@ -161,12 +171,15 @@ export class JupService {
     return prices;
   };
 
-  static getDollarPrices(inputMints: (PublicKey | string)[]): Promise<PubkeyHashMap<PublicKey, Decimal>> {
-    return this.getPrices(inputMints, USDC_MINT);
+  static getDollarPrices(
+    inputMints: (PublicKey | string)[],
+    jupEndpoint?: string
+  ): Promise<PubkeyHashMap<PublicKey, Decimal>> {
+    return this.getPrices(inputMints, USDC_MINT, jupEndpoint);
   }
 
-  static getDollarPrice = async (inputMint: PublicKey | string): Promise<number> => {
-    return this.getPrice(inputMint, USDC_MINT);
+  static getDollarPrice = async (inputMint: PublicKey | string, jupEndpoint?: string): Promise<number> => {
+    return this.getPrice(inputMint, USDC_MINT, jupEndpoint);
   };
 
   static buildTransactionsFromSerialized = (serializedTransactions: Array<string | undefined>): Transaction[] => {

package/src/services/RaydiumPoolsResponse.ts

@@ -1,4 +1,4 @@
-import { AmmV3ConfigInfo } from '@raydium-io/raydium-sdk';
+import { ClmmConfigInfo } from "@raydium-io/raydium-sdk-v2/lib";
 
 export interface RaydiumPoolsResponse {
   data: Pool[];
@@ -12,7 +12,7 @@ export interface Pool {
   vaultB: string;
   mintDecimalsA: number;
   mintDecimalsB: number;
-  ammConfig: AmmV3ConfigInfo;
+  ammConfig: ClmmConfigInfo;
   tvl: number;
   day: Day;
   week: Week;

package/src/services/RaydiumService.ts

@@ -6,7 +6,6 @@ import {
 } from './RaydiumPoolsResponse';
 import { PersonalPositionState, PoolState } from '../raydium_client';
 import Decimal from 'decimal.js';
-import { AmmV3, AmmV3PoolInfo, PositionInfoLayout, TickMath, SqrtPriceMath } from '@raydium-io/raydium-sdk';
 import { WhirlpoolAprApy } from './WhirlpoolAprApy';
 import { WhirlpoolStrategy } from '../kamino-client/accounts';
 import {
@@ -21,6 +20,16 @@ import axios from 'axios';
 import { FullPercentage } from '../utils/CreationParameters';
 import { PROGRAM_ID as RAYDIUM_PROGRAM_ID } from '../raydium_client/programId';
 import { priceToTickIndexWithRounding } from '../utils/raydium';
+import {
+  ApiV3PoolInfoConcentratedItem,
+  Clmm,
+  PoolUtils,
+  PositionInfoLayout,
+  Raydium,
+  RaydiumLoadParams,
+  SqrtPriceMath,
+  TickMath,
+} from '@raydium-io/raydium-sdk-v2/lib';
 
 export class RaydiumService {
   private readonly _connection: Connection;
@@ -38,6 +47,15 @@ export class RaydiumService {
   async getRaydiumWhirlpools(): Promise<RaydiumPoolsResponse> {
     return (await axios.get<RaydiumPoolsResponse>(`https://api.kamino.finance/v2/raydium/ammPools`)).data;
   }
+  
+  async getRaydiumPoolInfo(poolPubkey: PublicKey): Promise<ApiV3PoolInfoConcentratedItem> {
+    const raydiumLoadParams: RaydiumLoadParams = { connection: this._connection };
+    const raydium = await Raydium.load(raydiumLoadParams);
+    const rayClmm = new Clmm({ scope: raydium, moduleName: '' });
+    const otherPoolInfo = await rayClmm.getPoolInfoFromRpc(poolPubkey.toString());
+    console.log('otherPoolInfo', otherPoolInfo);
+    return otherPoolInfo.poolInfo;
+  }
 
   async getRaydiumPoolLiquidityDistribution(
     pool: PublicKey,
@@ -122,16 +140,6 @@ export class RaydiumService {
       throw Error(`Could not get find Raydium amm pool ${strategy.pool} from Raydium API`);
     }
 
-    const poolInfo = (
-      await AmmV3.fetchMultiplePoolInfos({
-        connection: this._connection,
-        // @ts-ignore
-        poolKeys: [raydiumPool],
-        batchRequest: true,
-        chainTime: new Date().getTime() / 1000,
-      })
-    )[strategy.pool.toString()].state;
-
     const priceRange = getStrategyPriceRangeRaydium(
       position.tickLowerIndex,
       position.tickUpperIndex,
@@ -151,19 +159,21 @@ export class RaydiumService {
       };
     }
 
+    const raydiumPoolInfo = await this.getRaydiumPoolInfo(strategy.pool);
+    console.log('raydiumPoolInfo', raydiumPoolInfo);
     const params: {
-      poolInfo: AmmV3PoolInfo;
+      poolInfo: ApiV3PoolInfoConcentratedItem;
       aprType: 'day' | 'week' | 'month';
       positionTickLowerIndex: number;
       positionTickUpperIndex: number;
     } = {
-      poolInfo,
+      poolInfo: raydiumPoolInfo,
       aprType: 'day',
       positionTickLowerIndex: position.tickLowerIndex,
       positionTickUpperIndex: position.tickUpperIndex,
     };
 
-    const { apr, feeApr, rewardsApr } = AmmV3.estimateAprsForPriceRangeMultiplier(params);
+    const { apr, feeApr, rewardsApr } = PoolUtils.estimateAprsForPriceRangeMultiplier(params);
     const totalApr = new Decimal(apr).div(100);
     const fee = new Decimal(feeApr).div(100);
     const rewards = rewardsApr.map((reward) => new Decimal(reward).div(100));
@@ -203,16 +213,6 @@ export class RaydiumService {
       throw Error(`Could not get find Raydium amm pool ${poolPubkey.toString()} from Raydium API`);
     }
 
-    const poolInfo = (
-      await AmmV3.fetchMultiplePoolInfos({
-        connection: this._connection,
-        // @ts-ignore
-        poolKeys: [raydiumPool],
-        batchRequest: true,
-        chainTime: new Date().getTime() / 1000,
-      })
-    )[poolPubkey.toString()].state;
-
     const tickLowerIndex = TickMath.getTickWithPriceAndTickspacing(
       priceLower,
       poolState.tickSpacing,
@@ -246,8 +246,9 @@ export class RaydiumService {
       };
     }
 
+    const poolInfo = await this.getRaydiumPoolInfo(poolPubkey);
     const params: {
-      poolInfo: AmmV3PoolInfo;
+      poolInfo: ApiV3PoolInfoConcentratedItem;
       aprType: 'day' | 'week' | 'month';
       positionTickLowerIndex: number;
       positionTickUpperIndex: number;
@@ -258,7 +259,7 @@ export class RaydiumService {
       positionTickUpperIndex: tickUpperIndex,
     };
 
-    const { apr, feeApr, rewardsApr } = AmmV3.estimateAprsForPriceRangeMultiplier(params);
+    const { apr, feeApr, rewardsApr } = PoolUtils.estimateAprsForPriceRangeMultiplier(params);
     const totalApr = new Decimal(apr).div(100);
     const fee = new Decimal(feeApr).div(100);
     const rewards = rewardsApr.map((reward) => new Decimal(reward).div(100));

package/src/utils/utils.ts

@@ -19,19 +19,21 @@ import {
   UpdateStrategyConfigArgs,
   updateStrategyConfig,
 } from '../kamino-client/instructions';
-import { SqrtPriceMath } from '@raydium-io/raydium-sdk';
 import { RebalanceFieldInfo, RebalanceFieldsDict } from './types';
 import BN from 'bn.js';
 import { PoolPriceReferenceType, TwapPriceReferenceType } from './priceReferenceTypes';
 import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
 import { METEORA_PROGRAM_ID } from '../meteora_client/programId';
 import { U64_MAX } from '../constants/numericalValues';
+import { SqrtPriceMath } from '@raydium-io/raydium-sdk-v2/lib/raydium/clmm/utils/math';
 
 export const DolarBasedMintingMethod = new Decimal(0);
 export const ProportionalMintingMethod = new Decimal(1);
 
 export const RebalanceParamOffset = new Decimal(256);
 
+export const ZERO_BN = new BN(0);
+
 export function sleep(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/src/whirlpools-client/shim/remove-liquidity.ts

@@ -9,7 +9,7 @@ import {
   adjustForSlippage, getTokenAFromLiquidity,
   getTokenBFromLiquidity, Percentage, PositionStatus, PositionUtil, RemoveLiquidityQuote,
 } from '@orca-so/whirlpool-sdk';
-import { ZERO } from '@raydium-io/raydium-sdk';
+import { ZERO_BN } from "../../utils";
 
 export type InternalRemoveLiquidityQuoteParam = {
   positionAddress: PublicKey;
@@ -58,9 +58,9 @@ function getRemoveLiquidityQuoteWhenPositionIsBelowRange(
   return {
     positionAddress,
     minTokenA,
-    minTokenB: ZERO,
+    minTokenB: ZERO_BN,
     estTokenA,
-    estTokenB: ZERO,
+    estTokenB: ZERO_BN,
     liquidity,
   };
 }
@@ -119,9 +119,9 @@ function getRemoveLiquidityQuoteWhenPositionIsAboveRange(
 
   return {
     positionAddress,
-    minTokenA: ZERO,
+    minTokenA: ZERO_BN,
     minTokenB,
-    estTokenA: ZERO,
+    estTokenA: ZERO_BN,
     estTokenB,
     liquidity,
   };