@meteora-ag/dlmm 1.9.3 → 1.9.4

package/dist/index.mjs

@@ -19145,25 +19145,37 @@ var DLMM = class {
     const owner = positionState.owner();
     const feeOwner = positionState.feeOwner();
     const liquidityShares = positionState.liquidityShares();
-    const liqudityShareWithBinId = liquidityShares.map((share, i) => {
+    const feeInfos = positionState.feeInfos();
+    const rewardInfos = positionState.rewardInfos();
+    const binDataWithBinId = liquidityShares.map((share, i) => {
+      const feeInfo = feeInfos[i];
+      const rewardInfo = rewardInfos[i];
+      const hasFees = feeInfo && (!feeInfo.feeXPending.isZero() || !feeInfo.feeYPending.isZero());
+      const hasRewards = rewardInfo && rewardInfo.rewardPendings.some((pending) => !pending.isZero());
       return {
         share,
-        binId: positionState.lowerBinId().add(new BN21(i))
+        binId: positionState.lowerBinId().add(new BN21(i)),
+        hasFeesOrRewards: hasFees || hasRewards
       };
     });
-    const binIdsWithLiquidity = liqudityShareWithBinId.filter((bin) => {
+    const binIdsWithLiquidity = binDataWithBinId.filter((bin) => {
       return !bin.share.isZero();
     });
-    if (binIdsWithLiquidity.length == 0) {
+    const binIdsWithLiquidityOrFees = binDataWithBinId.filter((bin) => {
+      return !bin.share.isZero() || bin.hasFeesOrRewards;
+    });
+    const hasLiquidity = binIdsWithLiquidity.length > 0;
+    if (!hasLiquidity && !shouldClaimAndClose) {
       throw new Error("No liquidity to remove");
     }
-    const lowerBinIdWithLiquidity = binIdsWithLiquidity[0].binId.toNumber();
-    const upperBinIdWithLiquidity = binIdsWithLiquidity[binIdsWithLiquidity.length - 1].binId.toNumber();
-    if (fromBinId < lowerBinIdWithLiquidity) {
-      fromBinId = lowerBinIdWithLiquidity;
+    const activeBins = shouldClaimAndClose ? binIdsWithLiquidityOrFees : binIdsWithLiquidity;
+    const lowerActiveBinId = activeBins[0].binId.toNumber();
+    const upperActiveBinId = activeBins[activeBins.length - 1].binId.toNumber();
+    if (fromBinId < lowerActiveBinId) {
+      fromBinId = lowerActiveBinId;
     }
-    if (toBinId > upperBinIdWithLiquidity) {
-      toBinId = upperBinIdWithLiquidity;
+    if (toBinId > upperActiveBinId) {
+      toBinId = upperActiveBinId;
     }
     const walletToReceiveFee = feeOwner.equals(PublicKey10.default) ? user : feeOwner;
     const userTokenX = getAssociatedTokenAddressSync2(
@@ -19301,28 +19313,28 @@ var DLMM = class {
       preInstructions.push(createUserTokenXIx);
       preInstructions.push(createUserTokenYIx);
       const binArrayBitmapExtension = this.binArrayBitmapExtension ? this.binArrayBitmapExtension.publicKey : this.program.programId;
-      const removeLiquidityTx = await this.program.methods.removeLiquidityByRange2(lowerBinId, upperBinId, bps.toNumber(), {
-        slices
-      }).accountsPartial({
-        position,
-        lbPair,
-        userTokenX,
-        userTokenY,
-        reserveX: this.lbPair.reserveX,
-        reserveY: this.lbPair.reserveY,
-        tokenXMint: this.tokenX.publicKey,
-        tokenYMint: this.tokenY.publicKey,
-        binArrayBitmapExtension,
-        tokenXProgram: this.tokenX.owner,
-        tokenYProgram: this.tokenY.owner,
-        sender: user,
-        memoProgram: MEMO_PROGRAM_ID
-      }).remainingAccounts(transferHookAccounts).remainingAccounts(binArrayAccountsMeta).instruction();
-      const instructions = [
-        ...preInstructions,
-        removeLiquidityTx,
-        ...postInstructions
-      ];
+      const instructions = [...preInstructions];
+      if (hasLiquidity) {
+        const removeLiquidityTx = await this.program.methods.removeLiquidityByRange2(lowerBinId, upperBinId, bps.toNumber(), {
+          slices
+        }).accountsPartial({
+          position,
+          lbPair,
+          userTokenX,
+          userTokenY,
+          reserveX: this.lbPair.reserveX,
+          reserveY: this.lbPair.reserveY,
+          tokenXMint: this.tokenX.publicKey,
+          tokenYMint: this.tokenY.publicKey,
+          binArrayBitmapExtension,
+          tokenXProgram: this.tokenX.owner,
+          tokenYProgram: this.tokenY.owner,
+          sender: user,
+          memoProgram: MEMO_PROGRAM_ID
+        }).remainingAccounts(transferHookAccounts).remainingAccounts(binArrayAccountsMeta).instruction();
+        instructions.push(removeLiquidityTx);
+      }
+      instructions.push(...postInstructions);
       groupedInstructions.push(instructions);
     }
     const groupedInstructionsWithCUIx = await Promise.all(