@meteora-ag/dlmm 1.9.11 → 1.9.12

package/dist/index.mjs

@@ -10165,6 +10165,9 @@ var POSITION_MAX_LENGTH = new BN(
 var MAX_RESIZE_LENGTH = new BN(
   CONSTANTS.find(([_, v]) => v.name == "MAX_RESIZE_LENGTH")?.[1].value ?? 0
 );
+var MAX_BIN_ID_PER_BIN_STEP = Number(
+  CONSTANTS.find(([_, v]) => v.name == "MAX_BIN_ID_PER_BIN_STEP")?.[1].value ?? 0
+);
 var SIMULATION_USER = new PublicKey(
   "HrY9qR5TiB2xPzzvbBu5KrBorMfYGQXh9osXydz4jy9s"
 );
@@ -10202,7 +10205,6 @@ var CollectFeeMode = /* @__PURE__ */ ((CollectFeeMode2) => {
   CollectFeeMode2[CollectFeeMode2["OnlyY"] = 1] = "OnlyY";
   return CollectFeeMode2;
 })(CollectFeeMode || {});
-var MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT = 5;
 
 // src/dlmm/error.ts
 import { AnchorError } from "@coral-xyz/anchor";
@@ -13273,7 +13275,7 @@ function binRangeToBinIdArray(minBinId, maxBinId) {
   }
   return binIdArray;
 }
-function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, pairAddress, programId, maxActiveBinSlippage = 0, includeSlippageForBinArray = false) {
+function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, pairAddress, programId) {
   let indexMap = /* @__PURE__ */ new Map();
   removes.forEach((value) => {
     let minBinId = value.minBinId;
@@ -13299,13 +13301,10 @@ function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, p
   adds.forEach((value) => {
     const minBinId = activeId + value.minDeltaId;
     const maxBinId = activeId + value.maxDeltaId;
-    let binArrayIndex = binIdToBinArrayIndex(
-      includeSlippageForBinArray ? new BN12(minBinId - maxActiveBinSlippage) : new BN12(minBinId)
-    );
-    let binArrayIndexes2 = [];
-    const upperBinId = includeSlippageForBinArray ? new BN12(maxBinId + maxActiveBinSlippage) : new BN12(maxBinId);
+    let binArrayIndex = binIdToBinArrayIndex(new BN12(minBinId));
+    const upperBinId = new BN12(maxBinId);
     while (true) {
-      binArrayIndexes2.push(binArrayIndex.toNumber());
+      indexMap.set(binArrayIndex.toNumber(), true);
       const [binArrayLowerBinId, binArrayUpperBinId] = getBinArrayLowerUpperBinId(binArrayIndex);
       if (upperBinId.gte(binArrayLowerBinId) && upperBinId.lte(binArrayUpperBinId)) {
         break;
@@ -13313,13 +13312,6 @@ function getRebalanceBinArrayIndexesAndBitmapCoverage(adds, removes, activeId, p
         binArrayIndex = binArrayIndex.add(new BN12(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 BN12(idx));
   const requireBitmapExtension = binArrayIndexes.some(
@@ -13385,19 +13377,22 @@ function findBaseDeltaX(amountX, minDeltaId, maxDeltaId, binStep, activeId) {
   if (minDeltaId.gt(maxDeltaId) || amountX.lte(new BN13(0))) {
     return new BN13(0);
   }
+  const m1 = minDeltaId;
+  const m2 = maxDeltaId;
   let b = new BN13(0);
   let c = new BN13(0);
-  let m1 = minDeltaId;
-  let m2 = maxDeltaId.addn(1);
-  for (let m = m1.toNumber(); m <= m2.toNumber(); m++) {
-    const binId = activeId.addn(m);
-    const pm = getQPriceFromId(binId.neg(), binStep);
-    const bDelta = m1.mul(pm);
-    b = b.add(bDelta);
-    const cDelta = new BN13(m).mul(pm);
-    c = c.add(cDelta);
+  let s = new BN13(0);
+  const base = getQPriceBaseFactor(binStep);
+  const maxBinId = activeId.add(maxDeltaId);
+  let inverseBasePrice = pow(base, maxBinId.neg());
+  for (let m = m2.toNumber(); m >= m1.toNumber(); m--) {
+    const pm = inverseBasePrice;
+    b = b.add(m1.mul(pm));
+    c = c.add(new BN13(m).mul(pm));
+    s = s.add(pm);
+    inverseBasePrice = inverseBasePrice.mul(base).shrn(SCALE_OFFSET);
   }
-  return amountX.shln(SCALE_OFFSET).div(c.sub(b));
+  return amountX.shln(SCALE_OFFSET).div(c.sub(b).add(s));
 }
 function findX0AndDeltaX(amountX, minDeltaId, maxDeltaId, binStep, activeId) {
   if (minDeltaId.gt(maxDeltaId) || amountX.lte(new BN13(0)) || amountX.isZero()) {
@@ -13413,8 +13408,14 @@ function findX0AndDeltaX(amountX, minDeltaId, maxDeltaId, binStep, activeId) {
     binStep,
     activeId
   );
-  const x0 = minDeltaId.neg().mul(baseDeltaX).add(baseDeltaX);
+  let maxProbe = 100;
   while (true) {
+    if (maxProbe < 0) {
+      throw new Error(
+        "Something wrong: Unable to find suitable x0 and delta_x within probe limit"
+      );
+    }
+    const x0 = minDeltaId.neg().addn(1).mul(baseDeltaX);
     const amountInBins = getAmountInBinsAskSide(
       activeId,
       binStep,
@@ -13427,7 +13428,8 @@ function findX0AndDeltaX(amountX, minDeltaId, maxDeltaId, binStep, activeId) {
       return acc.add(amountX2);
     }, new BN13(0));
     if (totalAmountX.gt(amountX)) {
-      baseDeltaX = baseDeltaX.sub(new BN13(1));
+      baseDeltaX = baseDeltaX.subn(1);
+      maxProbe--;
     } else {
       return {
         base: x0,
@@ -15313,7 +15315,7 @@ function resetUninvolvedLiquidityParams(minDeltaId, maxDeltaId, favorXInActiveId
     deltaY
   };
 }
-async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercentage, maxActiveBinSlippage, position, positionMinBinId, positionMaxBinId, liquidityStrategyParameters, owner, payer, isParallel, skipSolWrappingOperation = false, includeSlippageForBinArray = false) {
+async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercentage, maxActiveBinSlippage, position, positionMinBinId, positionMaxBinId, liquidityStrategyParameters, owner, payer, isParallel, skipSolWrappingOperation = false) {
   const { slices, accounts: transferHookAccounts } = dlmm.getPotentialToken2022IxDataAndAccounts(0 /* Liquidity */);
   const userTokenX = getAssociatedTokenAddressSync(
     dlmm.lbPair.tokenXMint,
@@ -15354,14 +15356,10 @@ async function chunkDepositWithRebalanceEndpoint(dlmm, strategy, slippagePercent
     const chunkMaxBinId = chunkedBinRange[i].upperBinId;
     const initBinArrayIxs = [];
     const initBitmapIxs = [];
-    let binArrayIndexes = getBinArrayIndexesCoverage(
-      includeSlippageForBinArray ? new BN20(chunkMinBinId - maxActiveBinSlippage) : new BN20(chunkMinBinId),
-      includeSlippageForBinArray ? new BN20(chunkMaxBinId + maxActiveBinSlippage) : new BN20(chunkMaxBinId)
+    const binArrayIndexes = getBinArrayIndexesCoverage(
+      new BN20(chunkMinBinId),
+      new BN20(chunkMaxBinId)
     );
-    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);
-    }
     const overflowDefaultBinArrayBitmap = binArrayIndexes.reduce(
       (acc, binArrayIndex) => acc || isOverflowDefaultBinArrayBitmap(binArrayIndex),
       false
@@ -18157,7 +18155,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, includeSlippageForBinArray = false) {
+  async initializeMultiplePositionAndAddLiquidityByStrategy2(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage, altAddress) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippagePercentage,
       this.lbPair.binStep,
@@ -18228,8 +18226,7 @@ var DLMM = class {
         owner,
         payer,
         true,
-        this.opt?.skipSolWrappingOperation,
-        includeSlippageForBinArray
+        this.opt?.skipSolWrappingOperation
       );
       for (const instructions of addLiquidityIxs) {
         const txIxs = [];
@@ -18265,7 +18262,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, includeSlippageForBinArray = false) {
+  async initializeMultiplePositionAndAddLiquidityByStrategy(positionKeypairGenerator, totalXAmount, totalYAmount, strategy, owner, payer, slippagePercentage) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippagePercentage,
       this.lbPair.binStep,
@@ -18351,8 +18348,7 @@ var DLMM = class {
         owner,
         payer,
         false,
-        this.opt?.skipSolWrappingOperation,
-        includeSlippageForBinArray
+        this.opt?.skipSolWrappingOperation
       );
       instructionsByPositions.push({
         positionKeypair: position,
@@ -18386,8 +18382,7 @@ var DLMM = class {
     totalYAmount,
     strategy,
     user,
-    slippage,
-    includeSlippageForBinArray = false
+    slippage
   }) {
     const maxActiveBinSlippage = getAndCapMaxActiveBinSlippage(
       slippage,
@@ -18417,8 +18412,7 @@ var DLMM = class {
       user,
       user,
       true,
-      this.opt?.skipSolWrappingOperation,
-      includeSlippageForBinArray
+      this.opt?.skipSolWrappingOperation
     );
     const latestBlockhashInfo = await this.program.provider.connection.getLatestBlockhash();
     return chunkedAddLiquidityIx.map((ixs) => {
@@ -21672,7 +21666,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, includeSlippageForBinArray = false) {
+  async rebalancePosition(rebalancePositionResponse, maxActiveBinSlippage, rentPayer, slippage = 100) {
     const { rebalancePosition, simulationResult } = rebalancePositionResponse;
     const { lbPair, shouldClaimFee, shouldClaimReward, owner, address } = rebalancePosition;
     const { depositParams, withdrawParams } = simulationResult;
@@ -21745,9 +21739,7 @@ var DLMM = class {
       withdrawParams,
       activeId.toNumber(),
       this.pubkey,
-      this.program.programId,
-      maxActiveBinSlippage.toNumber(),
-      includeSlippageForBinArray
+      this.program.programId
     );
     const binArrayPublicKeys = binArrayIndexes.map((index) => {
       const [binArrayPubkey] = deriveBinArray(
@@ -22911,9 +22903,9 @@ export {
   LIMIT_ORDER_MIN_SIZE,
   LimitOrderStatus,
   MAX_ACTIVE_BIN_SLIPPAGE,
-  MAX_ALLOWED_REBALANCE_BIN_ARRAY_COUNT,
   MAX_BINS_PER_POSITION,
   MAX_BIN_ARRAY_SIZE,
+  MAX_BIN_ID_PER_BIN_STEP,
   MAX_BIN_LENGTH_ALLOWED_IN_ONE_TX,
   MAX_BIN_PER_LIMIT_ORDER,
   MAX_CLAIM_ALL_ALLOWED,