@kamino-finance/kliquidity-sdk 8.3.1 → 8.4.0

package/dist/Kamino.js

@@ -11,9 +11,7 @@ const accounts_1 = require("./@codegen/kliquidity/accounts");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const instructions_1 = require("./@codegen/whirlpools/instructions");
 const accounts_2 = require("./@codegen/whirlpools/accounts");
-const whirlpool_sdk_1 = require("@orca-so/whirlpool-sdk");
-const orca_dal_1 = require("@orca-so/whirlpool-sdk/dist/dal/orca-dal");
-const orca_position_1 = require("@orca-so/whirlpool-sdk/dist/position/orca-position");
+const whirlpools_core_1 = require("@orca-so/whirlpools-core");
 const models_1 = require("./models");
 const scope_sdk_1 = require("@kamino-finance/scope-sdk");
 const utils_1 = require("./utils");
@@ -24,7 +22,6 @@ const constants_1 = require("./constants");
 const types_1 = require("./@codegen/kliquidity/types");
 const accounts_3 = require("./@codegen/raydium/accounts");
 const services_1 = require("./services");
-const add_liquidity_1 = require("@orca-so/whirlpool-sdk/dist/position/quotes/add-liquidity");
 const StrategyConfigOption_1 = require("./@codegen/kliquidity/types/StrategyConfigOption");
 const DefaultStrategyConfig_1 = require("./constants/DefaultStrategyConfig");
 const pubkeys_1 = require("./constants/pubkeys");
@@ -92,7 +89,7 @@ class Kamino {
             this._globalConfig = globalConfig ? globalConfig : (0, compat_1.fromLegacyPublicKey)(this._config.kamino.globalConfig);
         }
         this._scope = new scope_sdk_1.Scope(cluster, rpc);
-        this._orcaService = new services_1.OrcaService(rpc, legacyConnection, cluster, whirlpoolProgramId);
+        this._orcaService = new services_1.OrcaService(rpc, legacyConnection, whirlpoolProgramId);
         this._raydiumService = new services_1.RaydiumService(rpc, legacyConnection, raydiumProgramId);
         this._meteoraService = new MeteoraService_1.MeteoraService(rpc, meteoraProgramId);
         if (jupBaseAPI) {
@@ -100,6 +97,7 @@ class Kamino {
         }
     }
     getConnection = () => this._rpc;
+    getLegacyConnection = () => this._legacyConnection;
     getProgramID = () => this._kliquidityProgramId;
     setGlobalConfig = (globalConfig) => {
         this._globalConfig = globalConfig;
@@ -435,7 +433,7 @@ class Kamino {
             if (pools.length === 0) {
                 throw new Error(`No pool found for ${poolTokenA.toString()} and ${poolTokenB.toString()}`);
             }
-            return pools[0].price;
+            return Number(pools[0].price);
         }
         else if (dex === 'RAYDIUM') {
             const pools = await this.getRaydiumPoolsForTokens(poolTokenA, poolTokenB);
@@ -490,7 +488,7 @@ class Kamino {
             let pool = pubkeys_1.DEFAULT_PUBLIC_KEY;
             const orcaPools = await this.getOrcaPoolsForTokens(poolTokenA, poolTokenB);
             orcaPools.forEach((element) => {
-                if (element.lpFeeRate * CreationParameters_1.FullBPS === feeBPS.toNumber()) {
+                if (element.feeRate * CreationParameters_1.FullBPS === feeBPS.toNumber()) {
                     pool = (0, kit_1.address)(element.address);
                 }
             });
@@ -541,19 +539,19 @@ class Kamino {
             const genericPoolInfos = await Promise.all(pools.map(async (pool) => {
                 const positionsCount = new decimal_js_1.default(await this.getPositionsCountForPool(dex, (0, kit_1.address)(pool.address)));
                 // read price from pool
-                const poolData = await this._orcaService.getPool((0, kit_1.address)(pool.address));
+                const poolData = await this._orcaService.getOrcaWhirlpool((0, kit_1.address)(pool.address));
                 if (!poolData) {
                     throw new Error(`Pool ${pool.address} not found`);
                 }
                 const poolInfo = {
                     dex,
                     address: (0, kit_1.address)(pool.address),
-                    price: (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(poolData.sqrtPrice, pool.tokenA.decimals, pool.tokenB.decimals),
-                    tokenMintA: (0, kit_1.address)(pool.tokenA.mint),
-                    tokenMintB: (0, kit_1.address)(pool.tokenB.mint),
-                    tvl: pool.tvl ? new decimal_js_1.default(pool.tvl) : undefined,
-                    feeRate: new decimal_js_1.default(pool.lpFeeRate).mul(CreationParameters_1.FullBPS),
-                    volumeOnLast7d: pool.volume ? new decimal_js_1.default(pool.volume.week) : undefined,
+                    price: new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(poolData.sqrtPrice), pool.tokenA.decimals, pool.tokenB.decimals)),
+                    tokenMintA: (0, kit_1.address)(pool.tokenMintA),
+                    tokenMintB: (0, kit_1.address)(pool.tokenMintB),
+                    tvl: pool.tvlUsdc ? new decimal_js_1.default(pool.tvlUsdc) : undefined,
+                    feeRate: new decimal_js_1.default(pool.feeRate).mul(CreationParameters_1.FullBPS),
+                    volumeOnLast7d: pool.stats['7d'] ? new decimal_js_1.default(pool.stats['7d'].volume) : undefined,
                     tickSpacing: new decimal_js_1.default(pool.tickSpacing),
                     positions: positionsCount,
                 };
@@ -613,9 +611,9 @@ class Kamino {
         const poolTokenAString = poolTokenA.toString();
         const poolTokenBString = poolTokenB.toString();
         const whirlpools = await this._orcaService.getOrcaWhirlpools();
-        whirlpools.whirlpools.forEach((element) => {
-            if ((element.tokenA.mint === poolTokenAString && element.tokenB.mint === poolTokenBString) ||
-                (element.tokenA.mint === poolTokenBString && element.tokenB.mint === poolTokenAString))
+        whirlpools.forEach((element) => {
+            if ((element.tokenMintA === poolTokenAString && element.tokenMintB === poolTokenBString) ||
+                (element.tokenMintA === poolTokenBString && element.tokenMintB === poolTokenAString))
                 pools.push(element);
         });
         return pools;
@@ -690,7 +688,7 @@ class Kamino {
             filters.push({
                 memcmp: {
                     offset: 8n,
-                    bytes: strategyFilters.owner,
+                    bytes: strategyFilters.owner.toString(),
                     encoding: 'base58',
                 },
             });
@@ -759,7 +757,7 @@ class Kamino {
             },
             {
                 memcmp: {
-                    bytes: kTokenMint,
+                    bytes: kTokenMint.toString(),
                     offset: 720n,
                     encoding: 'base58',
                 },
@@ -1034,12 +1032,12 @@ class Kamino {
         const computedHoldings = this.getStrategyHoldingsUsd(tokenHoldings.available.a, tokenHoldings.available.b, tokenHoldings.invested.a, tokenHoldings.invested.b, new decimal_js_1.default(strategy.tokenAMintDecimals.toString()), new decimal_js_1.default(strategy.tokenBMintDecimals.toString()), strategyPrices.aPrice, strategyPrices.bPrice);
         const decimalsA = strategy.tokenAMintDecimals.toNumber();
         const decimalsB = strategy.tokenBMintDecimals.toNumber();
-        const poolPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(pool.sqrtPrice, decimalsA, decimalsB);
+        const poolPrice = new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(pool.sqrtPrice.toString()), decimalsA, decimalsB));
         const twapPrice = strategyPrices.aTwapPrice !== null && strategyPrices.bTwapPrice !== null
             ? strategyPrices.aTwapPrice.div(strategyPrices.bTwapPrice)
             : null;
-        const upperPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(position.tickUpperIndex, decimalsA, decimalsB);
-        const lowerPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(position.tickLowerIndex, decimalsA, decimalsB);
+        const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(position.tickUpperIndex, decimalsA, decimalsB));
+        const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(position.tickLowerIndex, decimalsA, decimalsB));
         let lowerResetPrice = null;
         let upperResetPrice = null;
         const dex = (0, utils_1.numberToDex)(strategy.strategyDex.toNumber());
@@ -1063,7 +1061,7 @@ class Kamino {
         const quote = (0, whirlpools_1.getRemoveLiquidityQuote)({
             positionAddress: strategy.position,
             liquidity: position.liquidity,
-            slippageTolerance: whirlpool_sdk_1.Percentage.fromFraction(0, 1000),
+            slippageTolerance: { numerator: constants_1.ZERO_BN, denominator: new bn_js_1.default(1000) },
             sqrtPrice: pool.sqrtPrice,
             tickLowerIndex: position.tickLowerIndex,
             tickUpperIndex: position.tickUpperIndex,
@@ -1435,7 +1433,10 @@ class Kamino {
         //datasize:165 filter selects all token accounts, memcmp filter selects based on the mint address withing each token account
         return this._rpc
             .getProgramAccounts(token_1.TOKEN_PROGRAM_ADDRESS, {
-            filters: [{ dataSize: 165n }, { memcmp: { offset: 0n, bytes: shareMint, encoding: 'base58' } }],
+            filters: [
+                { dataSize: 165n },
+                { memcmp: { offset: 0n, bytes: shareMint.toString(), encoding: 'base58' } },
+            ],
             encoding: 'jsonParsed',
         })
             .send();
@@ -1447,7 +1448,10 @@ class Kamino {
         //how to get all token accounts for specific wallet: https://spl.solana.com/token#finding-all-token-accounts-for-a-wallet
         return this._rpc
             .getProgramAccounts(token_1.TOKEN_PROGRAM_ADDRESS, {
-            filters: [{ dataSize: 165n }, { memcmp: { offset: 32n, bytes: wallet, encoding: 'base58' } }],
+            filters: [
+                { dataSize: 165n },
+                { memcmp: { offset: 32n, bytes: wallet.toString(), encoding: 'base58' } },
+            ],
             encoding: 'jsonParsed',
         })
             .send();
@@ -1526,8 +1530,8 @@ class Kamino {
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const lowerPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(position.tickLowerIndex, decimalsA, decimalsB);
-        const upperPrice = (0, whirlpool_sdk_1.tickIndexToPrice)(position.tickUpperIndex, decimalsA, decimalsB);
+        const lowerPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(position.tickLowerIndex, decimalsA, decimalsB));
+        const upperPrice = new decimal_js_1.default((0, whirlpools_core_1.tickIndexToPrice)(position.tickUpperIndex, decimalsA, decimalsB));
         const positionRange = { lowerPrice, upperPrice };
         return positionRange;
     };
@@ -1539,8 +1543,8 @@ class Kamino {
         if (!position) {
             return { lowerPrice: utils_1.ZERO, upperPrice: utils_1.ZERO };
         }
-        const lowerPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(position.tickLowerIndex), decimalsA, decimalsB);
-        const upperPrice = (0, whirlpool_sdk_1.sqrtPriceX64ToPrice)(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(position.tickUpperIndex), decimalsA, decimalsB);
+        const lowerPrice = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(position.tickLowerIndex), decimalsA, decimalsB);
+        const upperPrice = lib_1.SqrtPriceMath.sqrtPriceX64ToPrice(lib_1.SqrtPriceMath.getSqrtPriceX64FromTick(position.tickUpperIndex), decimalsA, decimalsB);
         const positionRange = { lowerPrice, upperPrice };
         return positionRange;
     };
@@ -1603,6 +1607,9 @@ class Kamino {
         }, {});
         return whirlpoolMap;
     };
+    getAllWhirlpoolsFromAPI = async (tokens = []) => {
+        return await this._orcaService.getOrcaWhirlpools(tokens);
+    };
     /**
      * Get a list of Orca positions from public keys
      * @param positions
@@ -2941,8 +2948,8 @@ class Kamino {
         };
     };
     getStartEndTicketIndexProgramAddressesOrca = async (whirlpool, whirlpoolState, tickLowerIndex, tickUpperIndex) => {
-        const startTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickLowerIndex, whirlpoolState.tickSpacing, 0);
-        const endTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickUpperIndex, whirlpoolState.tickSpacing, 0);
+        const startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(tickLowerIndex, whirlpoolState.tickSpacing);
+        const endTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(tickUpperIndex, whirlpoolState.tickSpacing);
         const [lowerTickPubkey, lowerTickBump] = await (0, kit_1.getProgramDerivedAddress)({
             seeds: [Buffer.from('tick_array'), addressEncoder.encode(whirlpool), Buffer.from(startTickIndex.toString())],
             programAddress: this._orcaService.getWhirlpoolProgramId(),
@@ -3090,8 +3097,8 @@ class Kamino {
         const isRebalancing = status.discriminator === StrategyStatus_1.Rebalancing.discriminator;
         const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, whirlpool.tokenMintA);
         const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, whirlpool.tokenMintB);
-        const tickLowerIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceLower, decimalsA, decimalsB), whirlpool.tickSpacing);
-        const tickUpperIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(priceUpper, decimalsA, decimalsB), whirlpool.tickSpacing);
+        const tickLowerIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)((0, whirlpools_core_1.priceToTickIndex)(priceLower.toNumber(), decimalsA, decimalsB), whirlpool.tickSpacing);
+        const tickUpperIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)((0, whirlpools_core_1.priceToTickIndex)(priceUpper.toNumber(), decimalsA, decimalsB), whirlpool.tickSpacing);
         const { position, positionBump, positionMetadata } = await this.getMetadataProgramAddressesOrca(positionMint.address);
         const positionTokenAccount = await (0, utils_1.getAssociatedTokenAddress)(positionMint.address, baseVaultAuthority);
         const args = {
@@ -3610,7 +3617,7 @@ class Kamino {
         if (dex === 'ORCA') {
             const { whirlpool: whilrpoolState } = await this.getWhirlpoolStateIfNotFetched(pool);
             if (rebalanceTypeKind.kind === types_1.RebalanceType.Drift.kind) {
-                processedRebalanceParams[0] = new decimal_js_1.default((0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)(rebalanceParams[0].toNumber(), whilrpoolState.tickSpacing));
+                processedRebalanceParams[0] = new decimal_js_1.default((0, utils_1.getNearestValidTickIndexFromTickIndex)(rebalanceParams[0].toNumber(), whilrpoolState.tickSpacing));
             }
         }
         return processedRebalanceParams;
@@ -3805,7 +3812,7 @@ class Kamino {
             case types_1.RebalanceType.Expander.kind:
                 return (0, rebalance_methods_1.getPositionRangeFromExpanderParams)(price, rebalanceParams[0], rebalanceParams[1]);
             case types_1.RebalanceType.Autodrift.kind:
-                const currentTickIndex = (0, whirlpool_sdk_1.priceToTickIndex)(price, tokenADecimals, tokenBDecimals);
+                const currentTickIndex = (0, whirlpools_core_1.priceToTickIndex)(price.toNumber(), tokenADecimals, tokenBDecimals);
                 const startMidTick = new decimal_js_1.default(currentTickIndex);
                 return (0, autodriftRebalance_1.getPositionRangeFromAutodriftParams)(dex, tokenADecimals, tokenBDecimals, startMidTick, rebalanceParams[1], rebalanceParams[2], tickSpacing);
             default:
@@ -3816,11 +3823,11 @@ class Kamino {
         const strategyWithAddress = await this.getStrategyStateIfNotFetched(strategy);
         const pool = strategyWithAddress.strategy.pool;
         const dex = (0, utils_1.numberToDex)(strategyWithAddress.strategy.strategyDex.toNumber());
-        return this.getCurrentPriceFromPool(dex, pool);
+        return this.getCurrentPriceFromPool(dex, pool, strategyWithAddress.strategy.tokenAMintDecimals.toNumber(), strategyWithAddress.strategy.tokenBMintDecimals.toNumber());
     }
-    async getCurrentPriceFromPool(dex, pool) {
+    async getCurrentPriceFromPool(dex, pool, tokenADecimals, tokenBDecimals) {
         if (dex === 'ORCA') {
-            return this.getOrcaPoolPrice(pool);
+            return this.getOrcaPoolPrice(pool, tokenADecimals, tokenBDecimals);
         }
         else if (dex === 'RAYDIUM') {
             return this.getRaydiumPoolPrice(pool);
@@ -4116,9 +4123,9 @@ class Kamino {
     /**
      * Read the pool price for a specific dex and pool
      */
-    async getPoolPrice(dex, pool) {
+    async getPoolPrice(dex, pool, tokenADecimals, tokenBDecimals) {
         if (dex === 'ORCA') {
-            return this.getOrcaPoolPrice(pool);
+            return this.getOrcaPoolPrice(pool, tokenADecimals, tokenBDecimals);
         }
         else if (dex === 'RAYDIUM') {
             return this.getRaydiumPoolPrice(pool);
@@ -4130,12 +4137,22 @@ class Kamino {
             throw new Error(`Invalid dex ${dex}`);
         }
     }
-    async getOrcaPoolPrice(pool) {
-        const poolData = await this._orcaService.getPool(pool);
-        if (!poolData) {
-            throw Error(`Could not fetch Whirlpool data for ${pool.toString()}`);
+    async getOrcaPoolPrice(pool, tokenADecimals, tokenBDecimals) {
+        // if the decimals are provided read from API, otherwise use RPC
+        if (tokenADecimals && tokenBDecimals) {
+            const whirlpool = await accounts_2.Whirlpool.fetch(this._rpc, pool, this._orcaService.getWhirlpoolProgramId());
+            if (!whirlpool) {
+                throw Error(`Could not fetch Whirlpool data for ${pool.toString()}`);
+            }
+            return new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(whirlpool.sqrtPrice.toString()), tokenADecimals, tokenBDecimals));
+        }
+        else {
+            const whirlpool = await this._orcaService.getOrcaWhirlpool(pool);
+            if (!whirlpool) {
+                throw Error(`Could not fetch Whirlpool data for ${pool.toString()}`);
+            }
+            return new decimal_js_1.default((0, whirlpools_core_1.sqrtPriceToPrice)(BigInt(whirlpool.sqrtPrice.toString()), whirlpool.tokenA.decimals, whirlpool.tokenB.decimals));
         }
-        return poolData.price;
     }
     async getRaydiumPoolPrice(pool) {
         const poolState = await accounts_3.PoolState.fetch(this._rpc, pool, this._raydiumService.getRaydiumProgramId());
@@ -4200,7 +4217,9 @@ class Kamino {
             this._cluster === 'devnet') {
             return await this._rpc
                 .getProgramAccounts(address_lookup_table_1.ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS, {
-                filters: [{ memcmp: { offset: 22n, bytes: pubkeys_1.LUT_OWNER_KEY, encoding: 'base58' } }],
+                filters: [
+                    { memcmp: { offset: 22n, bytes: pubkeys_1.LUT_OWNER_KEY.toString(), encoding: 'base58' } },
+                ],
                 dataSlice: { length: 0, offset: 0 },
             })
                 .send()
@@ -4483,7 +4502,7 @@ class Kamino {
         if (isOrca) {
             const prices = await this.getAllPrices();
             const collateralInfos = await this.getCollateralInfos();
-            return this._orcaService.getStrategyWhirlpoolPoolAprApy(strategyState, collateralInfos, prices, orcaPools);
+            return this._orcaService.getStrategyWhirlpoolPoolAprApy(strategyState, collateralInfos, prices);
         }
         if (isRaydium) {
             return this._raydiumService.getStrategyWhirlpoolPoolAprApy(strategyState, raydiumPools);
@@ -4658,23 +4677,15 @@ class Kamino {
             const tokenMintB = whirlpoolState.tokenMintB;
             const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintA);
             const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, tokenMintB);
-            const tickLowerIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(lowerPrice, decimalsA, decimalsB), whirlpoolState.tickSpacing);
-            const tickUpperIndex = (0, whirlpool_sdk_1.getNearestValidTickIndexFromTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(upperPrice, decimalsA, decimalsB), whirlpoolState.tickSpacing);
-            const params = {
-                tokenMintA: (0, compat_2.toLegacyPublicKey)(tokenMintA),
-                tokenMintB: (0, compat_2.toLegacyPublicKey)(tokenMintB),
-                tickCurrentIndex: whirlpoolState.tickCurrentIndex,
-                sqrtPrice: whirlpoolState.sqrtPrice,
-                inputTokenMint: (0, compat_2.toLegacyPublicKey)(tokenMintA),
-                inputTokenAmount: new bn_js_1.default((0, utils_1.collToLamportsDecimal)(tokenAAmountToDeposit, decimalsA).toString()),
-                tickLowerIndex,
-                tickUpperIndex,
-                slippageTolerance: whirlpool_sdk_1.defaultSlippagePercentage,
+            const tickLowerIndex = (0, utils_1.getNearestValidTickIndexFromTickIndex)((0, whirlpools_core_1.priceToTickIndex)(lowerPrice.toNumber(), decimalsA, decimalsB), whirlpoolState.tickSpacing);
+            const tickUpperIndex = (0, utils_1.getNearestValidTickIndexFromTickIndex)((0, whirlpools_core_1.priceToTickIndex)(upperPrice.toNumber(), decimalsA, decimalsB), whirlpoolState.tickSpacing);
+            const param = {
+                tokenA: BigInt((0, utils_1.collToLamportsDecimal)(tokenAAmountToDeposit, decimalsA).toString()),
             };
-            const addLiqResult = (0, add_liquidity_1.getAddLiquidityQuote)(params);
+            const addLiqResult = (0, utils_1.getIncreaseLiquidityQuote)(param, whirlpoolState, tickLowerIndex, tickUpperIndex, utils_1.defaultSlippagePercentageBPS, undefined, undefined);
             return [
-                (0, utils_1.lamportsToNumberDecimal)(addLiqResult.estTokenA.toNumber(), decimalsA),
-                (0, utils_1.lamportsToNumberDecimal)(addLiqResult.estTokenB.toNumber(), decimalsB),
+                (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(addLiqResult.tokenEstA.toString()), decimalsA),
+                (0, utils_1.lamportsToNumberDecimal)(new decimal_js_1.default(addLiqResult.tokenEstB.toString()), decimalsB),
             ];
         }
         else if (dex === 'METEORA') {
@@ -4771,9 +4782,7 @@ class Kamino {
                 throw new Error(`Unable to get Orca whirlpool for pubkey ${strategyState.pool}`);
             }
             return this.calculateAmountsOrca({
-                whirlpoolConfig: whirlpool.whirlpoolsConfig,
-                tokenAMint: strategyState.tokenAMint,
-                tokenBMint: strategyState.tokenBMint,
+                whirlpoolState: whirlpool,
                 positionAddress: strategyState.position,
                 tokenAAmount,
                 tokenBAmount,
@@ -4789,46 +4798,42 @@ class Kamino {
             throw new Error(`The strategy ${strategy.toString()} is not Orca or Raydium`);
         }
     };
-    calculateAmountsOrca = async ({ whirlpoolConfig, tokenAMint, tokenBMint, positionAddress, tokenAAmount, tokenBAmount, }) => {
+    calculateAmountsOrca = async ({ whirlpoolState, positionAddress, tokenAAmount, tokenBAmount, }) => {
         if (!tokenAAmount && !tokenBAmount) {
             return [new decimal_js_1.default(0), new decimal_js_1.default(0)];
         }
         // Given A in ATA, calc how much A and B
-        const accessor = new orca_dal_1.OrcaDAL(whirlpoolConfig, this._orcaService.getWhirlpoolProgramId(), this._legacyConnection);
-        const orcaPosition = new orca_position_1.OrcaPosition(accessor);
-        const defaultSlippagePercentage = whirlpool_sdk_1.Percentage.fromFraction(1, 1000); // 0.1%
-        const primaryTokenAmount = tokenAAmount || tokenBAmount;
-        const primaryTokenMint = tokenAAmount ? tokenAMint : tokenBMint;
-        const secondaryTokenAmount = tokenAAmount ? tokenBAmount : tokenAAmount;
-        const secondaryTokenMint = tokenAAmount ? tokenBMint : tokenAMint;
-        let params = {
-            positionAddress,
-            tokenMint: primaryTokenMint,
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            tokenAmount: new bn_js_1.default(primaryTokenAmount.toString()), // safe to use ! here because we check in the beginning that at least one of the amounts are not undefined;
-            refresh: true,
-            slippageTolerance: defaultSlippagePercentage,
-        };
-        const estimatedGivenPrimary = await orcaPosition.getAddLiquidityQuote(params);
-        if (secondaryTokenAmount &&
-            new decimal_js_1.default(estimatedGivenPrimary.estTokenB.toString()) > new decimal_js_1.default(secondaryTokenAmount.toString())) {
-            params = {
-                positionAddress,
-                tokenMint: secondaryTokenMint,
-                tokenAmount: new bn_js_1.default(secondaryTokenAmount.toString()),
-                refresh: true,
-                slippageTolerance: defaultSlippagePercentage,
+        const defaultSlippagePercentageBPS = 10;
+        const positionState = await accounts_2.Position.fetch(this._rpc, positionAddress, this._orcaService.getWhirlpoolProgramId());
+        if (!positionState) {
+            throw new Error(`Unable to get Orca position for pubkey ${positionAddress}`);
+        }
+        let computedAmounts = [new decimal_js_1.default(0), new decimal_js_1.default(0)];
+        if (tokenAAmount) {
+            const tokenAForQuote = BigInt(tokenAAmount.toString());
+            const params = {
+                tokenA: tokenAForQuote,
             };
-            const estimatedGivenSecondary = await orcaPosition.getAddLiquidityQuote(params);
-            return [
-                new decimal_js_1.default(estimatedGivenSecondary.estTokenA.toString()),
-                new decimal_js_1.default(estimatedGivenSecondary.estTokenB.toString()),
+            const estimatedGivenA = (0, utils_1.getIncreaseLiquidityQuote)(params, whirlpoolState, positionState.tickLowerIndex, positionState.tickUpperIndex, defaultSlippagePercentageBPS, undefined, // todo: use new Wirlpool state and read transfer fees
+            undefined);
+            computedAmounts = [
+                new decimal_js_1.default(estimatedGivenA.tokenEstA.toString()),
+                new decimal_js_1.default(estimatedGivenA.tokenEstB.toString()),
             ];
         }
-        return [
-            new decimal_js_1.default(estimatedGivenPrimary.estTokenA.toString()),
-            new decimal_js_1.default(estimatedGivenPrimary.estTokenB.toString()),
-        ];
+        if (tokenBAmount && computedAmounts[1] > tokenBAmount) {
+            const tokenBForQuote = BigInt(tokenBAmount.toString());
+            const params = {
+                tokenB: tokenBForQuote,
+            };
+            const estimatedGivenB = (0, utils_1.getIncreaseLiquidityQuote)(params, whirlpoolState, positionState.tickLowerIndex, positionState.tickUpperIndex, defaultSlippagePercentageBPS, undefined, // todo: use new Wirlpool state and read transfer fees
+            undefined);
+            computedAmounts = [
+                new decimal_js_1.default(estimatedGivenB.tokenEstA.toString()),
+                new decimal_js_1.default(estimatedGivenB.tokenEstB.toString()),
+            ];
+        }
+        return computedAmounts;
     };
     calculateAmountsRaydium = async ({ strategyState, tokenAAmount, tokenBAmount, }) => {
         if (!tokenAAmount && !tokenBAmount) {
@@ -5008,18 +5013,10 @@ class Kamino {
             throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
         }
         const params = {
-            tokenMintA: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
-            tokenMintB: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
-            tickCurrentIndex: whirlpool.tickCurrentIndex,
-            sqrtPrice: whirlpool.sqrtPrice,
-            inputTokenMint: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
-            inputTokenAmount: amountA,
-            tickLowerIndex: position.tickLowerIndex,
-            tickUpperIndex: position.tickUpperIndex,
-            slippageTolerance: whirlpool_sdk_1.defaultSlippagePercentage,
+            tokenA: BigInt(amountA.toString()),
         };
-        const quote = (0, add_liquidity_1.getAddLiquidityQuote)(params);
-        return { amountSlippageA: quote.estTokenA, amountSlippageB: quote.estTokenB };
+        const quote = (0, utils_1.getIncreaseLiquidityQuote)(params, whirlpool, position.tickLowerIndex, position.tickUpperIndex, utils_1.defaultSlippagePercentageBPS, undefined, undefined);
+        return { amountSlippageA: new bn_js_1.default(quote.tokenEstA.toString()), amountSlippageB: new bn_js_1.default(quote.tokenEstB.toString()) };
     }
     async getDepositRatioFromAMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
@@ -5029,7 +5026,7 @@ class Kamino {
         if (!poolState) {
             throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
         }
-        return { amountSlippageA: utils_1.ZERO_BN, amountSlippageB: utils_1.ZERO_BN };
+        return { amountSlippageA: constants_1.ZERO_BN, amountSlippageB: constants_1.ZERO_BN };
     }
     async getDepositRatioFromBMeteora(strategy) {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
@@ -5040,7 +5037,7 @@ class Kamino {
         if (!poolState) {
             throw Error(`Could not fetch lb pair state with pubkey ${strategyState.pool.toString()}`);
         }
-        return { amountSlippageA: utils_1.ZERO_BN, amountSlippageB: utils_1.ZERO_BN };
+        return { amountSlippageA: constants_1.ZERO_BN, amountSlippageB: constants_1.ZERO_BN };
     }
     getDepositRatioFromBOrca = async (strategy, amountB) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
@@ -5052,19 +5049,11 @@ class Kamino {
         if (!position) {
             throw new Error(`Whirlpool position ${strategyState.position} does not exist`);
         }
-        const params = {
-            tokenMintA: (0, compat_2.toLegacyPublicKey)(strategyState.tokenAMint),
-            tokenMintB: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
-            tickCurrentIndex: whirlpool.tickCurrentIndex,
-            sqrtPrice: whirlpool.sqrtPrice,
-            inputTokenMint: (0, compat_2.toLegacyPublicKey)(strategyState.tokenBMint),
-            inputTokenAmount: amountB,
-            tickLowerIndex: position.tickLowerIndex,
-            tickUpperIndex: position.tickUpperIndex,
-            slippageTolerance: whirlpool_sdk_1.defaultSlippagePercentage,
+        const param = {
+            tokenB: BigInt(amountB.toString()),
         };
-        const quote = (0, add_liquidity_1.getAddLiquidityQuote)(params);
-        return { amountSlippageA: quote.estTokenA, amountSlippageB: quote.estTokenB };
+        const quote = (0, utils_1.getIncreaseLiquidityQuote)(param, whirlpool, position.tickLowerIndex, position.tickUpperIndex, utils_1.defaultSlippagePercentageBPS, undefined, undefined);
+        return { amountSlippageA: new bn_js_1.default(quote.tokenEstA.toString()), amountSlippageB: new bn_js_1.default(quote.tokenEstB.toString()) };
     };
     getDepositRatioFromARaydium = async (strategy, amountA) => {
         const { strategy: strategyState } = await this.getStrategyStateIfNotFetched(strategy);
@@ -5278,8 +5267,8 @@ class Kamino {
         const { address: poolAddress, whirlpool: whilrpoolState } = await this.getWhirlpoolStateIfNotFetched(pool);
         const decimalsA = await (0, utils_1.getMintDecimals)(this._rpc, whilrpoolState.tokenMintA);
         const decimalsB = await (0, utils_1.getMintDecimals)(this._rpc, whilrpoolState.tokenMintB);
-        const tickIndex = (0, whirlpool_sdk_1.getNextValidTickIndex)((0, whirlpool_sdk_1.priceToTickIndex)(price, decimalsA, decimalsB), whilrpoolState.tickSpacing);
-        const startTickIndex = (0, whirlpool_sdk_1.getStartTickIndex)(tickIndex, whilrpoolState.tickSpacing);
+        const tickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)((0, whirlpools_core_1.priceToTickIndex)(price.toNumber(), decimalsA, decimalsB), whilrpoolState.tickSpacing);
+        const startTickIndex = (0, whirlpools_core_1.getTickArrayStartTickIndex)(tickIndex, whilrpoolState.tickSpacing);
         const [startTickIndexPk, _startTickIndexBump] = await (0, utils_1.getTickArray)(this._orcaService.getWhirlpoolProgramId(), poolAddress, startTickIndex);
         const tick = await accounts_2.TickArray.fetch(this._rpc, startTickIndexPk, this._orcaService.getWhirlpoolProgramId());
         // initialize tick if it doesn't exist