@meteora-ag/dlmm 1.4.9 → 1.4.11-rc.0

package/dist/index.mjs

@@ -10183,15 +10183,6 @@ function getBinArrayAccountMetasCoverage(lowerBinId, upperBinId, lbPair, program
     }
   );
 }
-function getPositionLowerUpperBinIdWithLiquidity(position) {
-  const binWithLiquidity = position.positionBinData.filter(
-    (b) => !new BN12(b.binLiquidity).isZero()
-  );
-  return binWithLiquidity.length > 0 ? {
-    lowerBinId: new BN12(binWithLiquidity[0].binId),
-    upperBinId: new BN12(binWithLiquidity[binWithLiquidity.length - 1].binId)
-  } : null;
-}
 
 // src/dlmm/index.ts
 import { bs58 as bs582 } from "@coral-xyz/anchor/dist/cjs/utils/bytes";
@@ -13739,6 +13730,8 @@ var DLMM = class {
     position
   }) {
     const claimFeeTx = await this.createClaimSwapFeeMethod({ owner, position });
+    if (!claimFeeTx)
+      return null;
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
       this.program.provider.connection,
@@ -13771,7 +13764,7 @@ var DLMM = class {
           position
         });
       })
-    )).flat();
+    )).flat().filter(Boolean);
     const chunkedClaimAllTx = chunks(claimAllTxs, MAX_CLAIM_ALL_ALLOWED);
     if (chunkedClaimAllTx.length === 0)
       return [];
@@ -15034,15 +15027,10 @@ var DLMM = class {
     owner,
     position
   }) {
-    const maybeClaimableBinRange = getPositionLowerUpperBinIdWithLiquidity(
-      position.positionData
-    );
-    if (!maybeClaimableBinRange)
-      return;
-    const { lowerBinId, upperBinId } = maybeClaimableBinRange;
+    const { lowerBinId, upperBinId } = position.positionData;
     const binArrayAccountsMeta = getBinArrayAccountMetasCoverage(
-      lowerBinId,
-      upperBinId,
+      new BN13(lowerBinId),
+      new BN13(upperBinId),
       this.pubkey,
       this.program.programId
     );
@@ -15060,7 +15048,7 @@ var DLMM = class {
       );
       ix && preInstructions.push(ix);
       const { slices, accounts: transferHookAccounts } = this.getPotentialToken2022IxDataAndAccounts(1 /* Reward */, i);
-      const claimTransaction = await this.program.methods.claimReward2(new BN13(i), lowerBinId.toNumber(), upperBinId.toNumber(), {
+      const claimTransaction = await this.program.methods.claimReward2(new BN13(i), lowerBinId, upperBinId, {
         slices
       }).accounts({
         lbPair: this.pubkey,
@@ -15080,15 +15068,10 @@ var DLMM = class {
     owner,
     position
   }) {
-    const maybeClaimableBinRange = getPositionLowerUpperBinIdWithLiquidity(
-      position.positionData
-    );
-    if (!maybeClaimableBinRange)
-      return;
-    const { lowerBinId, upperBinId } = maybeClaimableBinRange;
+    const { lowerBinId, upperBinId } = position.positionData;
     const binArrayAccountsMeta = getBinArrayAccountMetasCoverage(
-      lowerBinId,
-      upperBinId,
+      new BN13(lowerBinId),
+      new BN13(upperBinId),
       this.pubkey,
       this.program.programId
     );
@@ -15125,7 +15108,7 @@ var DLMM = class {
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
     const { slices, accounts: transferHookAccounts } = this.getPotentialToken2022IxDataAndAccounts(0 /* Liquidity */);
-    const claimFeeTx = await this.program.methods.claimFee2(lowerBinId.toNumber(), upperBinId.toNumber(), {
+    const claimFeeTx = await this.program.methods.claimFee2(lowerBinId, upperBinId, {
       slices
     }).accounts({
       lbPair: this.pubkey,