@meteora-ag/dlmm 1.5.1-test.2 → 1.5.1

package/dist/index.js

@@ -8530,6 +8530,24 @@ function getPositionCount(minBinId, maxBinId) {
   const positionCount = binDelta.div(MAX_BIN_PER_POSITION);
   return positionCount.add(new (0, _anchor.BN)(1));
 }
+function findOptimumDecompressMultiplier(binAmount, tokenDecimal) {
+  let multiplier = new (0, _anchor.BN)(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 (0, _anchor.BN)(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 (0, _anchor.BN)(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;
@@ -10359,10 +10380,11 @@ var DLMM = class {
    */
   static async create(connection, dlmm, opt) {
     const cluster = _optionalChain([opt, 'optionalAccess', _38 => _38.cluster]) || "mainnet-beta";
-    const provider = new (0, _anchor.AnchorProvider)(connection, {}, {
-      ..._anchor.AnchorProvider.defaultOptions(),
-      commitment: "confirmed"
-    });
+    const provider = new (0, _anchor.AnchorProvider)(
+      connection,
+      {},
+      _anchor.AnchorProvider.defaultOptions()
+    );
     const program = new (0, _anchor.Program)(
       IDL,
       _nullishCoalesce(_optionalChain([opt, 'optionalAccess', _39 => _39.programId]), () => ( LBCLMM_PROGRAM_IDS[cluster])),
@@ -12992,21 +13014,11 @@ var DLMM = class {
     owner,
     position
   }) {
-    const preInstructions = [];
-    console.log(
-      position.positionData.feeX.toString(),
-      position.positionData.feeY.toString()
-    );
-    if (!position.positionData.feeX.isZero() || !position.positionData.feeY.isZero()) {
-      const claimIx = await this.createClaimSwapFeeMethod({ owner, position });
-      preInstructions.push(...claimIx.instructions);
-      console.log("\u{1F680} ~ DLMM ~ claimIx:", claimIx);
-    }
     const closePositionIx = await this.program.methods.closePosition2().accounts({
       rentReceiver: owner,
       position: position.publicKey,
       sender: owner
-    }).preInstructions(preInstructions).instruction();
+    }).instruction();
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
       this.program.provider.connection,
       [closePositionIx],
@@ -13928,7 +13940,10 @@ var DLMM = class {
       maxBinId,
       k
     );
-    const decompressMultiplier = new (0, _anchor.BN)(10 ** this.tokenX.mint.decimals);
+    const decompressMultiplier = findOptimumDecompressMultiplier(
+      binDepositAmount,
+      new (0, _anchor.BN)(this.tokenX.mint.decimals)
+    );
     let { compressedBinAmount, compressionLoss } = compressBinAmount(
       binDepositAmount,
       decompressMultiplier
@@ -14091,7 +14106,7 @@ var DLMM = class {
           }).instruction()
         );
       }
-      if (instructions.length > 1) {
+      if (instructions.length > 0) {
         initializeBinArraysAndPositionIxs.push(instructions);
         instructions = [];
       }