@kamino-finance/kliquidity-sdk 8.3.1 → 8.3.2

package/src/constants/numericalValues.ts

@@ -1 +1,6 @@
+import { BN } from '@coral-xyz/anchor';
+
 export const U64_MAX = '18446744073709551615';
+
+export const ZERO_BN = new BN(0);
+export const ONE_BN = new BN(1);

package/src/rebalance_methods/autodriftRebalance.ts

@@ -1,7 +1,7 @@
 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 { priceToTickIndex, sqrtPriceToPrice as orcaSqrtPriceToPrice, tickIndexToPrice } from '@orca-so/whirlpools-core';
 import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { RebalanceTypeLabelName } from './consts';
 import { upsertManyRebalanceFieldInfos } from './utils';
@@ -138,20 +138,24 @@ export function getPositionRangeFromAutodriftParams(
   const upperTickIndex = startMidTick.add(ticksAboveMid);
 
   if (dex == 'ORCA') {
-    const lowerPrice = tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
-    const upperPrice = tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
+    const lowerPrice = new Decimal(tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
+    const upperPrice = new Decimal(tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
     return { lowerPrice, upperPrice };
   } else if (dex == 'RAYDIUM') {
-    const lowerPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    const lowerPrice = new Decimal(
+      SqrtPriceMath.sqrtPriceX64ToPrice(
+        SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
-    const upperPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    const upperPrice = new Decimal(
+      SqrtPriceMath.sqrtPriceX64ToPrice(
+        SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
     return { lowerPrice, upperPrice };
@@ -184,7 +188,7 @@ export function getDefaultAutodriftRebalanceFieldInfos(
   tokenBDecimals: number,
   tickSpacing: number
 ): RebalanceFieldInfo[] {
-  const currentTickIndex = priceToTickIndex(price, tokenADecimals, tokenBDecimals);
+  const currentTickIndex = priceToTickIndex(price.toNumber(), tokenADecimals, tokenBDecimals);
   const startMidTick = new Decimal(currentTickIndex);
 
   return getAutodriftRebalanceFieldInfos(
@@ -262,19 +266,23 @@ export function readAutodriftRebalanceStateFromStrategy(
 
   let lowerPrice: Decimal, upperPrice: Decimal;
   if (dex == 'ORCA') {
-    lowerPrice = tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
-    upperPrice = tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
+    lowerPrice = new Decimal(tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
+    upperPrice = new Decimal(tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
   } else if (dex == 'RAYDIUM') {
-    lowerPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(
+        BigInt(SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()).toString()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
-    upperPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(
+        BigInt(SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()).toString()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
   } else if (dex == 'METEORA') {
     lowerPrice = getPriceOfBinByBinIdWithDecimals(

package/src/rebalance_methods/driftRebalance.ts

@@ -1,7 +1,7 @@
 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 { priceToTickIndex, sqrtPriceToPrice as orcaSqrtPriceToPrice, tickIndexToPrice } from '@orca-so/whirlpools-core';
 import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { RebalanceTypeLabelName } from './consts';
 import { upsertManyRebalanceFieldInfos } from './utils';
@@ -111,20 +111,24 @@ export function getPositionRangeFromDriftParams(
   const upperTickIndex = startMidTick.add(ticksAboveMid);
 
   if (dex == 'ORCA') {
-    const lowerPrice = tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
-    const upperPrice = tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
+    const lowerPrice = new Decimal(tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
+    const upperPrice = new Decimal(tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
     return { lowerPrice, upperPrice };
   } else if (dex == 'RAYDIUM') {
-    const lowerPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    const lowerPrice = new Decimal(
+      SqrtPriceMath.sqrtPriceX64ToPrice(
+        SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
-    const upperPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    const upperPrice = new Decimal(
+      SqrtPriceMath.sqrtPriceX64ToPrice(
+        SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
     return { lowerPrice, upperPrice };
@@ -157,7 +161,7 @@ export function getDefaultDriftRebalanceFieldInfos(
   tokenADecimals: number,
   tokenBDecimals: number
 ): RebalanceFieldInfo[] {
-  const currentTickIndex = priceToTickIndex(price, tokenADecimals, tokenBDecimals);
+  const currentTickIndex = priceToTickIndex(price.toNumber(), tokenADecimals, tokenBDecimals);
   const startMidTick = new Decimal(currentTickIndex);
 
   return getDriftRebalanceFieldInfos(
@@ -217,19 +221,23 @@ export function readDriftRebalanceStateFromStrategy(
 
   let lowerPrice: Decimal, upperPrice: Decimal;
   if (dex == 'ORCA') {
-    lowerPrice = tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
-    upperPrice = tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals);
+    lowerPrice = new Decimal(tickIndexToPrice(lowerTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
+    upperPrice = new Decimal(tickIndexToPrice(upperTickIndex.toNumber(), tokenADecimals, tokenBDecimals));
   } else if (dex == 'RAYDIUM') {
-    lowerPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(
+        BigInt(SqrtPriceMath.getSqrtPriceX64FromTick(lowerTickIndex.toNumber()).toString()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
 
-    upperPrice = sqrtPriceX64ToPrice(
-      SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()),
-      tokenADecimals,
-      tokenBDecimals
+    upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(
+        BigInt(SqrtPriceMath.getSqrtPriceX64FromTick(upperTickIndex.toNumber()).toString()),
+        tokenADecimals,
+        tokenBDecimals
+      )
     );
   } else if (dex == 'METEORA') {
     lowerPrice = getPriceOfBinByBinIdWithDecimals(

package/src/rebalance_methods/expanderRebalance.ts

@@ -4,8 +4,7 @@ import { DefaultLowerPercentageBPSDecimal, DefaultUpperPercentageBPSDecimal } fr
 import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { RebalanceTypeLabelName } from './consts';
 import { Dex, readBigUint128LE } from '../utils';
-import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
-import BN from 'bn.js';
+import { sqrtPriceToPrice as orcaSqrtPriceToPrice } from '@orca-so/whirlpools-core';
 import { upsertManyRebalanceFieldInfos } from './utils';
 import { getPriceRangeFromPriceAndDiffBPS, getResetRangeFromPriceAndDiffBPS } from './math_utils';
 import { getPriceFromQ64Price } from '../utils/meteora';
@@ -273,9 +272,13 @@ export function readExpanderRebalanceStateFromStrategy(
 
   let initialPrice: Decimal;
   if (dex == 'ORCA') {
-    initialPrice = sqrtPriceX64ToPrice(new BN(initialPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    initialPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(initialPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'RAYDIUM') {
-    initialPrice = sqrtPriceX64ToPrice(new BN(initialPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    initialPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(initialPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'METEORA') {
     initialPrice = getPriceFromQ64Price(new Decimal(initialPriceX64.toString()), tokenADecimals, tokenBDecimals);
   } else {

package/src/rebalance_methods/pricePercentageRebalance.ts

@@ -5,8 +5,7 @@ import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { RebalanceTypeLabelName } from './consts';
 import { Dex, readBigUint128LE } from '../utils';
 import { upsertManyRebalanceFieldInfos } from './utils';
-import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
-import BN from 'bn.js';
+import { sqrtPriceToPrice as orcaSqrtPriceToPrice } from '@orca-so/whirlpools-core';
 import { getPriceRangeFromPriceAndDiffBPS } from './math_utils';
 import { getPriceFromQ64Price } from '../utils/meteora';
 
@@ -131,11 +130,19 @@ export function readPricePercentageRebalanceStateFromStrategy(
   let lowerPrice: Decimal, upperPrice: Decimal;
 
   if (dex == 'ORCA') {
-    lowerPrice = sqrtPriceX64ToPrice(new BN(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    upperPrice = sqrtPriceX64ToPrice(new BN(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'RAYDIUM') {
-    lowerPrice = sqrtPriceX64ToPrice(new BN(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    upperPrice = sqrtPriceX64ToPrice(new BN(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'METEORA') {
     lowerPrice = getPriceFromQ64Price(new Decimal(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
     upperPrice = getPriceFromQ64Price(new Decimal(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);

package/src/rebalance_methods/pricePercentageWithResetRebalance.ts

@@ -8,8 +8,7 @@ import {
 import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { RebalanceTypeLabelName } from './consts';
 import { Dex, readBigUint128LE } from '../utils';
-import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
-import BN from 'bn.js';
+import { sqrtPriceToPrice as orcaSqrtPriceToPrice } from '@orca-so/whirlpools-core';
 import { upsertManyRebalanceFieldInfos } from './utils';
 import { getPriceRangeFromPriceAndDiffBPS, getResetRangeFromPriceAndDiffBPS } from './math_utils';
 import { getPriceFromQ64Price } from '../utils/meteora';
@@ -223,11 +222,19 @@ export function readPricePercentageWithResetRebalanceStateFromStrategy(
   let lowerResetPrice: Decimal, upperResetPrice: Decimal;
 
   if (dex == 'ORCA') {
-    lowerResetPrice = sqrtPriceX64ToPrice(new BN(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    upperResetPrice = sqrtPriceX64ToPrice(new BN(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    lowerResetPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    upperResetPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'RAYDIUM') {
-    lowerResetPrice = sqrtPriceX64ToPrice(new BN(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    upperResetPrice = sqrtPriceX64ToPrice(new BN(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    lowerResetPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    upperResetPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperResetSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
   } else if (dex == 'METEORA') {
     lowerResetPrice = getPriceFromQ64Price(
       new Decimal(lowerResetSqrtPriceX64.toString()),

package/src/rebalance_methods/takeProfitRebalance.ts

@@ -2,7 +2,7 @@ import Decimal from 'decimal.js';
 import { PositionRange, RebalanceFieldInfo, RebalanceFieldsDict } from '../utils/types';
 import { FullBPSDecimal } from '../utils/CreationParameters';
 import { Dex, readBigUint128LE } from '../utils';
-import { sqrtPriceX64ToPrice } from '@orca-so/whirlpool-sdk';
+import { sqrtPriceToPrice as orcaSqrtPriceToPrice } from '@orca-so/whirlpools-core';
 import BN from 'bn.js';
 import { RebalanceRaw } from '../@codegen/kliquidity/types';
 import { getPriceFromQ64Price } from '../utils/meteora';
@@ -60,12 +60,20 @@ export function getPositionRangeFromTakeProfitParams(
   upperSqrtPriceX64: Decimal
 ): PositionRange {
   if (dex == 'ORCA') {
-    const lowerPrice = sqrtPriceX64ToPrice(new BN(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    const upperPrice = sqrtPriceX64ToPrice(new BN(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    const lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    const upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
     return { lowerPrice, upperPrice };
   } else if (dex == 'RAYDIUM') {
-    const lowerPrice = sqrtPriceX64ToPrice(new BN(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
-    const upperPrice = sqrtPriceX64ToPrice(new BN(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);
+    const lowerPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
+    const upperPrice = new Decimal(
+      orcaSqrtPriceToPrice(BigInt(upperSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals)
+    );
     return { lowerPrice, upperPrice };
   } else if (dex == 'METEORA') {
     const lowerPrice = getPriceFromQ64Price(new Decimal(lowerSqrtPriceX64.toString()), tokenADecimals, tokenBDecimals);