@kamino-finance/kliquidity-sdk 7.0.10 → 7.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/kliquidity-sdk",
-  "version": "7.0.10",
+  "version": "7.0.12",
   "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';
@@ -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 {
@@ -2205,6 +2207,10 @@ export class Kamino {
           console.log(`Could not find collateral info for token ${token.toString()}`);
           continue;
         }
+        // if there already is a spot price for this token, skip it
+        if (spotPrices[token.toString()]) {
+          continue;
+        }
         spotPrices[token.toString()] = {
           price: new Decimal(price),
           name: getTokenNameFromCollateralInfo(collInfo),
@@ -7391,7 +7397,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(
@@ -7408,7 +7414,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/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,
   };