@meteora-ag/dlmm 1.9.11-rc.1 → 1.9.11

package/dist/index.d.ts

@@ -12163,7 +12163,7 @@ interface SimulateRebalanceResp {
     withdrawParams: RebalanceRemoveLiquidityParam[];
     rentalCostLamports: BN$1;
 }
-declare function getRebalanceBinArrayIndexesAndBitmapCoverage(adds: RebalanceAddLiquidityParam[], removes: RebalanceRemoveLiquidityParam[], activeId: number, pairAddress: PublicKey, programId: PublicKey, maxActiveBinSlippage?: number): {
+declare function getRebalanceBinArrayIndexesAndBitmapCoverage(adds: RebalanceAddLiquidityParam[], removes: RebalanceRemoveLiquidityParam[], activeId: number, pairAddress: PublicKey, programId: PublicKey, maxActiveBinSlippage?: number, includeSlippageForBinArray?: boolean): {
     binArrayIndexes: BN$1[];
     binArrayBitmap: PublicKey;
 };
@@ -12398,6 +12398,7 @@ interface TInitializePositionAndAddLiquidityParamsByStrategy {
     strategy: StrategyParameters;
     user: PublicKey;
     slippage?: number;
+    includeSlippageForBinArray?: boolean;
 }
 interface InitializeMultiplePositionAndAddLiquidityByStrategyResponse {
     instructionsByPositions: {
@@ -13450,7 +13451,7 @@ declare function resetUninvolvedLiquidityParams(minDeltaId: BN, maxDeltaId: BN,
     deltaX: BN;
     deltaY: BN;
 };
-declare function chunkDepositWithRebalanceEndpoint(dlmm: DLMM, strategy: StrategyParameters, slippagePercentage: number, maxActiveBinSlippage: number, position: PublicKey, positionMinBinId: number, positionMaxBinId: number, liquidityStrategyParameters: LiquidityStrategyParameters, owner: PublicKey, payer: PublicKey, isParallel: boolean, skipSolWrappingOperation?: boolean): Promise<TransactionInstruction[][]>;
+declare function chunkDepositWithRebalanceEndpoint(dlmm: DLMM, strategy: StrategyParameters, slippagePercentage: number, maxActiveBinSlippage: number, position: PublicKey, positionMinBinId: number, positionMaxBinId: number, liquidityStrategyParameters: LiquidityStrategyParameters, owner: PublicKey, payer: PublicKey, isParallel: boolean, skipSolWrappingOperation?: boolean, includeSlippageForBinArray?: boolean): Promise<TransactionInstruction[][]>;
 declare function encodePositionPermissions(permissions: PositionPermission[]): number;
 
 declare class DLMM {
@@ -13885,7 +13886,7 @@ declare class DLMM {
      * @param slippagePercentage The slippage percentage for adding liquidity.
      * @returns An object with two properties: `initPositionIxs` and `addLiquidityIxs`.
      */
-    initializeMultiplePositionAndAddLiquidityByStrategy2(positionKeypairGenerator: (count: number) => Promise<Keypair[]>, totalXAmount: BN, totalYAmount: BN, strategy: StrategyParameters, owner: PublicKey, payer: PublicKey, slippagePercentage: number, altAddress?: PublicKey): Promise<InitializeMultiplePositionAndAddLiquidityByStrategyResponse2>;
+    initializeMultiplePositionAndAddLiquidityByStrategy2(positionKeypairGenerator: (count: number) => Promise<Keypair[]>, totalXAmount: BN, totalYAmount: BN, strategy: StrategyParameters, owner: PublicKey, payer: PublicKey, slippagePercentage: number, altAddress?: PublicKey, includeSlippageForBinArray?: boolean): Promise<InitializeMultiplePositionAndAddLiquidityByStrategyResponse2>;
     /**
      * Creates multiple positions and adds liquidity by strategy without chainsaw issues.
      * @param positionKeypairGenerator A function that generates a specified number of keypairs.
@@ -13897,7 +13898,7 @@ declare class DLMM {
      * @param slippagePercentage The slippage percentage for adding liquidity.
      * @returns An object with two properties: `initPositionIxs` and `addLiquidityIxs`.
      */
-    initializeMultiplePositionAndAddLiquidityByStrategy(positionKeypairGenerator: (count: number) => Promise<Keypair[]>, totalXAmount: BN, totalYAmount: BN, strategy: StrategyParameters, owner: PublicKey, payer: PublicKey, slippagePercentage: number): Promise<InitializeMultiplePositionAndAddLiquidityByStrategyResponse>;
+    initializeMultiplePositionAndAddLiquidityByStrategy(positionKeypairGenerator: (count: number) => Promise<Keypair[]>, totalXAmount: BN, totalYAmount: BN, strategy: StrategyParameters, owner: PublicKey, payer: PublicKey, slippagePercentage: number, includeSlippageForBinArray?: boolean): Promise<InitializeMultiplePositionAndAddLiquidityByStrategyResponse>;
     /**
      * Adds liquidity to an existing position using a specified strategy, allowing for chunkable transactions.
      * If adding liquidity to bin out of position range, it will automatically expand. The limitation is 70 bins.
@@ -13912,7 +13913,7 @@ declare class DLMM {
      *
      * @returns {Promise<Transaction[]>} A promise that resolves to an array of transactions for adding liquidity.
      */
-    addLiquidityByStrategyChunkable({ positionPubKey, totalXAmount, totalYAmount, strategy, user, slippage, }: TInitializePositionAndAddLiquidityParamsByStrategy): Promise<Transaction[]>;
+    addLiquidityByStrategyChunkable({ positionPubKey, totalXAmount, totalYAmount, strategy, user, slippage, includeSlippageForBinArray, }: TInitializePositionAndAddLiquidityParamsByStrategy): Promise<Transaction[]>;
     /**
      * The function `initializePositionAndAddLiquidityByStrategy` function is used to initializes a position and adds liquidity
      * @param {TInitializePositionAndAddLiquidityParamsByStrategy}
@@ -14282,7 +14283,7 @@ declare class DLMM {
      *
      * @returns An object containing the instructions to initialize new bin arrays and the instruction to rebalance the position.
      */
-    rebalancePosition(rebalancePositionResponse: RebalancePositionResponse, maxActiveBinSlippage: BN, rentPayer?: PublicKey, slippage?: number): Promise<{
+    rebalancePosition(rebalancePositionResponse: RebalancePositionResponse, maxActiveBinSlippage: BN, rentPayer?: PublicKey, slippage?: number, includeSlippageForBinArray?: boolean): Promise<{
         initBinArrayInstructions: TransactionInstruction[];
         rebalancePositionInstruction: TransactionInstruction[];
     }>;

package/dist/index.js

@@ -13273,16 +13273,16 @@ function binRangeToBinIdArray(minBinId, maxBinId) {
   }
   return binIdArray;
 }
-function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, pairAddress, programId, maxActiveBinSlippage = 0) {
+function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, pairAddress, programId, maxActiveBinSlippage = 0, includeSlippageForBinArray = false) {
   let indexMap = /* @__PURE__ */ new Map();
   removes.forEach((value) => {
-    let minBinId = value.minBinId - maxActiveBinSlippage;
+    let minBinId = value.minBinId;
     if (minBinId == null) {
-      minBinId = activeId - maxActiveBinSlippage;
+      minBinId = activeId;
     }
-    let maxBinId = value.maxBinId + maxActiveBinSlippage;
+    let maxBinId = value.maxBinId;
     if (maxBinId == null) {
-      maxBinId = activeId + maxActiveBinSlippage;
+      maxBinId = activeId;
     }
     let binArrayIndex = binIdToBinArrayIndex(new (0, _bnjs2.default)(minBinId));
     const upperBinId = new (0, _bnjs2.default)(maxBinId);
@@ -13297,12 +13297,15 @@ function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, p
     }
   });
   adds.forEach((value) => {
-    const minBinId = activeId + value.minDeltaId - maxActiveBinSlippage;
-    const maxBinId = activeId + value.maxDeltaId + maxActiveBinSlippage;
-    let binArrayIndex = binIdToBinArrayIndex(new (0, _bnjs2.default)(minBinId));
-    const upperBinId = new (0, _bnjs2.default)(maxBinId);
+    const minBinId = activeId + value.minDeltaId;
+    const maxBinId = activeId + value.maxDeltaId;
+    let binArrayIndex = binIdToBinArrayIndex(
+      includeSlippageForBinArray ? new (0, _bnjs2.default)(minBinId - maxActiveBinSlippage) : new (0, _bnjs2.default)(minBinId)
+    );
+    let binArrayIndexes2 = [];
+    const upperBinId = includeSlippageForBinArray ? new (0, _bnjs2.default)(maxBinId + maxActiveBinSlippage) : new (0, _bnjs2.default)(maxBinId);
     while (true) {
-      indexMap.set(binArrayIndex.toNumber(), true);
+      binArrayIndexes2.push(binArrayIndex.toNumber());
       const [binArrayLowerBinId, binArrayUpperBinId] = getBinArrayLowerUpperBinId(binArrayIndex);
       if (upperBinId.gte(binArrayLowerBinId) && upperBinId.lte(binArrayUpperBinId)) {
         break;
@@ -13310,6 +13313,13 @@ function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, p
         binArrayIndex = binArrayIndex.add(new (0, _bnjs2.default)(1));
       }
     }
+    if (includeSlippageForBinArray && binArrayIndexes2.length > MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT) {
+      const start = Math.floor((binArrayIndexes2.length - MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT) / 2);
+      binArrayIndexes2 = binArrayIndexes2.slice(start, start + MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT);
+    }
+    binArrayIndexes2.forEach((index) => {
+      indexMap.set(index, true);
+    });
   });
   const binArrayIndexes = Array.from(indexMap.keys()).map((idx) => new (0, _bnjs2.default)(idx));
   const requireBitmapExtension = binArrayIndexes.some(
@@ -15303,7 +15313,7 @@ function resetUninvolvedLiquidityParams(minDeltaId, maxDeltaId, favorXInActiveId
     deltaY
   };
 }
-async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercentage, maxActiveBinSlippage, position, positionMinBinId, positionMaxBinId, liquidityStrategyParameters, owner, payer, isParallel, skipSolWrappingOperation = false) {
+async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercentage, maxActiveBinSlippage, position, positionMinBinId, positionMaxBinId, liquidityStrategyParameters, owner, payer, isParallel, skipSolWrappingOperation = false, includeSlippageForBinArray = false) {
   const { slices, accounts: transferHookAccounts } = dlmm.getPotentialToken2022IxDataAndAccounts(0 /* Liquidity */);
   const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
     dlmm.lbPair.tokenXMint,
@@ -15345,10 +15355,10 @@ async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercent
     const initBinArrayIxs = [];
     const initBitmapIxs = [];
     let binArrayIndexes = getBinArrayIndexesCoverage(
-      new (0, _anchor.BN)(chunkMinBinId - maxActiveBinSlippage),
-      new (0, _anchor.BN)(chunkMaxBinId + maxActiveBinSlippage)
+      includeSlippageForBinArray ? new (0, _anchor.BN)(chunkMinBinId - maxActiveBinSlippage) : new (0, _anchor.BN)(chunkMinBinId),
+      includeSlippageForBinArray ? new (0, _anchor.BN)(chunkMaxBinId + maxActiveBinSlippage) : new (0, _anchor.BN)(chunkMaxBinId)
     );
-    if (binArrayIndexes.length > MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT) {
+    if (includeSlippageForBinArray && binArrayIndexes.length > MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT) {
       const start = Math.floor((binArrayIndexes.length - MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT) / 2);
       binArrayIndexes = binArrayIndexes.slice(start, start + MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT);
     }
@@ -18147,7 +18157,7 @@ var DLMM = class {
    * @param slippagePercentage The slippage percentage for adding liquidity.
    * @returns An object with two properties: `initPositionIxs` and `addLiquidityIxs`.
    */
-  async initializeMultiplePositionAndAddLiquidityByStrategy2(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage, altAddress) {
+  async initializeMultiplePositionAndAddLiquidityByStrategy2(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage, altAddress, includeSlippageForBinArray = false) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippagePercentage,
       this.lbPair.binStep,
@@ -18218,7 +18228,8 @@ var DLMM = class {
         owner,
         payer,
         true,
-        _optionalChain([this, 'access', _106 => _106.opt, 'optionalAccess', _107 => _107.skipSolWrappingOperation])
+        _optionalChain([this, 'access', _106 => _106.opt, 'optionalAccess', _107 => _107.skipSolWrappingOperation]),
+        includeSlippageForBinArray
       );
       for (const instructions of addLiquidityIxs) {
         const txIxs = [];
@@ -18254,7 +18265,7 @@ var DLMM = class {
    * @param slippagePercentage The slippage percentage for adding liquidity.
    * @returns An object with two properties: `initPositionIxs` and `addLiquidityIxs`.
    */
-  async initializeMultiplePositionAndAddLiquidityByStrategy(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage) {
+  async initializeMultiplePositionAndAddLiquidityByStrategy(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage, includeSlippageForBinArray = false) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippagePercentage,
       this.lbPair.binStep,
@@ -18340,7 +18351,8 @@ var DLMM = class {
         owner,
         payer,
         false,
-        _optionalChain([this, 'access', _108 => _108.opt, 'optionalAccess', _109 => _109.skipSolWrappingOperation])
+        _optionalChain([this, 'access', _108 => _108.opt, 'optionalAccess', _109 => _109.skipSolWrappingOperation]),
+        includeSlippageForBinArray
       );
       instructionsByPositions.push({
         positionKeypair: position,
@@ -18374,7 +18386,8 @@ var DLMM = class {
     totalYAmount,
     strategy,
     user,
-    slippage
+    slippage,
+    includeSlippageForBinArray = false
   }) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippage,
@@ -18404,7 +18417,8 @@ var DLMM = class {
       user,
       user,
       true,
-      _optionalChain([this, 'access', _110 => _110.opt, 'optionalAccess', _111 => _111.skipSolWrappingOperation])
+      _optionalChain([this, 'access', _110 => _110.opt, 'optionalAccess', _111 => _111.skipSolWrappingOperation]),
+      includeSlippageForBinArray
     );
     const latestBlockhashInfo = await this.program.provider.connection.getLatestBlockhash();
     return chunkedAddLiquidityIx.map((ixs) => {
@@ -21658,7 +21672,7 @@ var DLMM = class {
    *
    * @returns An object containing the instructions to initialize new bin arrays and the instruction to rebalance the position.
    */
-  async rebalancePosition(rebalancePositionResponse, maxActiveBinSlippage, rentPayer, slippage = 100) {
+  async rebalancePosition(rebalancePositionResponse, maxActiveBinSlippage, rentPayer, slippage = 100, includeSlippageForBinArray = false) {
     const { rebalancePosition, simulationResult } = rebalancePositionResponse;
     const { lbPair, shouldClaimFee, shouldClaimReward, owner, address } = rebalancePosition;
     const { depositParams, withdrawParams } = simulationResult;
@@ -21732,7 +21746,8 @@ var DLMM = class {
       activeId.toNumber(),
       this.pubkey,
       this.program.programId,
-      maxActiveBinSlippage.toNumber()
+      maxActiveBinSlippage.toNumber(),
+      includeSlippageForBinArray
     );
     const binArrayPublicKeys = binArrayIndexes.map((index) => {
       const [binArrayPubkey] = deriveBinArray(