@meteora-ag/dlmm 1.0.52-rc.9 → 1.0.54

package/dist/index.js

@@ -10993,7 +10993,7 @@ var DLMM = class {
     maxAmountIn = maxAmountIn.add(maxFee);
     if (amount0.gt(maxAmountIn)) {
       return {
-        withdrawAmount: maxAmountOut
+        withdrawAmount: amount1.add(maxAmountOut)
       };
     }
     const fee = computeFeeFromAmount(
@@ -11005,34 +11005,32 @@ var DLMM = class {
     const amount0AfterFee = amount0.sub(fee);
     const amountOut = isWithdrawForY ? mulShr(price, amount0AfterFee, SCALE_OFFSET, 1 /* Down */) : shlDiv(amount0AfterFee, price, SCALE_OFFSET, 1 /* Down */);
     return {
-      withdrawAmount: amount1.add(amountOut > maxAmountOut ? maxAmountOut : amountOut)
+      withdrawAmount: amount1.add(amountOut)
     };
   }
   async getWithdrawSingleSideAmount(positionPubkey, isWithdrawForY) {
     let totalWithdrawAmount = new (0, _anchor.BN)(0);
-    let _lowerBinArray;
-    let _upperBinArray;
+    let lowerBinArray;
+    let upperBinArray;
     const position = await this.program.account.positionV2.fetch(
       positionPubkey
     );
     const lowerBinArrayIdx = binIdToBinArrayIndex(new (0, _anchor.BN)(position.lowerBinId));
-    const [lowerBinArray] = deriveBinArray(
+    const [lowerBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       lowerBinArrayIdx,
       this.program.programId
     );
     const upperBinArrayIdx = lowerBinArrayIdx.add(new (0, _anchor.BN)(1));
-    const [upperBinArray] = deriveBinArray(
+    const [upperBinArrayPubKey] = deriveBinArray(
       position.lbPair,
       upperBinArrayIdx,
       this.program.programId
     );
-    [_lowerBinArray, _upperBinArray] = await this.program.account.binArray.fetchMultiple([
-      lowerBinArray,
-      upperBinArray
+    [lowerBinArray, upperBinArray] = await this.program.account.binArray.fetchMultiple([
+      lowerBinArrayPubKey,
+      upperBinArrayPubKey
     ]);
-    if (!_lowerBinArray || !_upperBinArray)
-      throw new Error("BinArray not found");
     for (let idx = 0; idx < position.liquidityShares.length; idx++) {
       const shareToRemove = position.liquidityShares[idx];
       if (shareToRemove.eq(new (0, _anchor.BN)(0))) {
@@ -11040,7 +11038,10 @@ var DLMM = class {
       }
       const binId = new (0, _anchor.BN)(position.lowerBinId).add(new (0, _anchor.BN)(idx));
       const binArrayIndex = binIdToBinArrayIndex(binId);
-      const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? _lowerBinArray : _upperBinArray;
+      const binArray = binArrayIndex.eq(lowerBinArrayIdx) ? lowerBinArray : upperBinArray;
+      if (!binArray) {
+        throw new Error("BinArray not found");
+      }
       const bin = getBinFromBinArray(binId.toNumber(), binArray);
       if (isWithdrawForY) {
         if (binId.gt(new (0, _anchor.BN)(this.lbPair.activeId))) {