@meteora-ag/dlmm 1.9.3 → 1.9.4-rc.0

package/dist/index.d.ts

@@ -10436,7 +10436,7 @@ declare function getTokenBalance(conn: Connection, tokenAccount: PublicKey): Pro
 declare const parseLogs: <T>(eventParser: EventParser, logs: string[]) => T;
 declare const wrapSOLInstruction: (from: PublicKey, to: PublicKey, amount: bigint) => TransactionInstruction[];
 declare const unwrapSOLInstruction: (owner: PublicKey, allowOwnerOffCurve?: boolean) => Promise<TransactionInstruction>;
-declare function chunkedGetMultipleAccountInfos(connection: Connection, pks: PublicKey[], chunkSize?: number): Promise<AccountInfo<Buffer<ArrayBufferLike>>[]>;
+declare function chunkedGetMultipleAccountInfos(connection: Connection, pks: PublicKey[], chunkSize?: number): Promise<AccountInfo<Buffer>[]>;
 /**
  * Fetches program accounts in a chunked manner to handle large result sets.
  *

package/dist/index.js

@@ -19145,25 +19145,33 @@ 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 binDataWithBinId = liquidityShares.map((share, i) => {
+      const feeInfo = feeInfos[i];
       return {
         share,
-        binId: positionState.lowerBinId().add(new (0, _anchor.BN)(i))
+        binId: positionState.lowerBinId().add(new (0, _anchor.BN)(i)),
+        hasFees: feeInfo && (!feeInfo.feeXPending.isZero() || !feeInfo.feeYPending.isZero())
       };
     });
-    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.hasFees;
+    });
+    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(_web3js.PublicKey.default) ? user : feeOwner;
     const userTokenX = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
@@ -19301,28 +19309,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(