@meteora-ag/dlmm 1.5.2-rc.7 → 1.5.3-rc.0

package/dist/index.mjs

@@ -8530,6 +8530,24 @@ function getPositionCount(minBinId, maxBinId) {
   const positionCount = binDelta.div(MAX_BIN_PER_POSITION);
   return positionCount.add(new BN6(1));
 }
+function findOptimumDecompressMultiplier(binAmount, tokenDecimal) {
+  let multiplier = new BN6(10).pow(tokenDecimal);
+  while (!multiplier.isZero()) {
+    let found = true;
+    for (const [_binId, amount] of binAmount) {
+      const compressedAmount = amount.div(multiplier);
+      if (compressedAmount.isZero()) {
+        multiplier = multiplier.div(new BN6(10));
+        found = false;
+        break;
+      }
+    }
+    if (found) {
+      return multiplier;
+    }
+  }
+  throw "Couldn't find optimum multiplier";
+}
 function compressBinAmount(binAmount, multiplier) {
   const compressedBinAmount = /* @__PURE__ */ new Map();
   let totalAmount = new BN6(0);
@@ -8566,6 +8584,9 @@ function generateAmountForBinRange(amount, binStep, tokenXDecimal, tokenYDecimal
       maxPrice,
       k
     );
+    if (binAmount.isZero()) {
+      throw "bin amount is zero";
+    }
     binAmounts.set(i, binAmount);
   }
   return binAmounts;
@@ -13919,7 +13940,10 @@ var DLMM = class {
       maxBinId,
       k
     );
-    const decompressMultiplier = new BN13(10 ** this.tokenX.mint.decimals);
+    const decompressMultiplier = findOptimumDecompressMultiplier(
+      binDepositAmount,
+      new BN13(this.tokenX.mint.decimals)
+    );
     let { compressedBinAmount, compressionLoss } = compressBinAmount(
       binDepositAmount,
       decompressMultiplier
@@ -14082,7 +14106,7 @@ var DLMM = class {
           }).instruction()
         );
       }
-      if (instructions.length > 1) {
+      if (instructions.length > 0) {
         initializeBinArraysAndPositionIxs.push(instructions);
         instructions = [];
       }
@@ -14444,8 +14468,8 @@ var DLMM = class {
       tokenXMint: this.lbPair.tokenXMint,
       tokenYMint: this.lbPair.tokenYMint,
       sender: operator,
-      tokenXProgram: TOKEN_PROGRAM_ID4,
-      tokenYProgram: TOKEN_PROGRAM_ID4
+      tokenXProgram: this.tokenX.owner,
+      tokenYProgram: this.tokenY.owner
     }).remainingAccounts([
       ...transferHookAccountMetas,
       {
@@ -14822,8 +14846,8 @@ var DLMM = class {
       const binSupply = bin.supply;
       const posShare = posShares[idx];
       const posBinRewardInfo = positionRewardInfos[idx];
-      const positionXAmount = binSupply.eq(ZERO) ? ZERO : new Decimal6(posShare.toString()).mul(new Decimal6(bin.xAmount.toString())).div(new Decimal6(binSupply.toString()));
-      const positionYAmount = binSupply.eq(ZERO) ? ZERO : new Decimal6(posShare.toString()).mul(new Decimal6(bin.yAmount.toString())).div(new Decimal6(binSupply.toString()));
+      const positionXAmount = binSupply.eq(ZERO) ? new Decimal6(0) : new Decimal6(posShare.toString()).mul(new Decimal6(bin.xAmount.toString())).div(new Decimal6(binSupply.toString()));
+      const positionYAmount = binSupply.eq(ZERO) ? new Decimal6(0) : new Decimal6(posShare.toString()).mul(new Decimal6(bin.yAmount.toString())).div(new Decimal6(binSupply.toString())).floor();
       totalXAmount = totalXAmount.add(new Decimal6(positionXAmount.toString()));
       totalYAmount = totalYAmount.add(new Decimal6(positionYAmount.toString()));
       const feeInfo = feeInfos[idx];
@@ -14886,8 +14910,8 @@ var DLMM = class {
         binYAmount: bin.yAmount.toString(),
         binLiquidity: binSupply.toString(),
         positionLiquidity: posShare.toString(),
-        positionXAmount: positionXAmount.toString(),
-        positionYAmount: positionYAmount.toString(),
+        positionXAmount: positionXAmount.toFixed(),
+        positionYAmount: positionYAmount.toFixed(),
         positionFeeXAmount: claimableFeeX.toString(),
         positionFeeYAmount: claimableFeeY.toString(),
         positionRewardAmount: claimableRewardsInBin.map(