@meteora-ag/dlmm 1.4.10 → 1.4.11

package/dist/index.d.ts

@@ -8268,7 +8268,7 @@ declare class DLMM {
     claimSwapFee({ owner, position, }: {
         owner: PublicKey;
         position: LbPosition;
-    }): Promise<Transaction>;
+    }): Promise<Transaction | null>;
     /**
      * The `claimAllSwapFee` function to claim swap fees for multiple positions owned by a specific owner.
      * @param

package/dist/index.js

@@ -10183,14 +10183,11 @@ function getBinArrayAccountMetasCoverage(lowerBinId, upperBinId, lbPair, program
     }
   );
 }
-function getPositionLowerUpperBinIdWithLiquidity(position) {
-  const binWithLiquidity = position.positionBinData.filter(
-    (b) => !new (0, _bnjs2.default)(b.binLiquidity).isZero()
-  );
-  return binWithLiquidity.length > 0 ? {
-    lowerBinId: new (0, _bnjs2.default)(binWithLiquidity[0].binId),
-    upperBinId: new (0, _bnjs2.default)(binWithLiquidity[binWithLiquidity.length - 1].binId)
-  } : null;
+function isPositionNoFee(position) {
+  return position.feeX.isZero() && position.feeY.isZero();
+}
+function isPositionNoReward(position) {
+  return position.rewardOne.isZero() && position.rewardTwo.isZero();
 }
 
 // src/dlmm/index.ts
@@ -13635,6 +13632,9 @@ var DLMM = class {
     owner,
     position
   }) {
+    if (isPositionNoReward(position.positionData)) {
+      throw new Error("No LM reward to claim");
+    }
     const claimTransactions = await this.createClaimBuildMethod({
       owner,
       position
@@ -13666,6 +13666,9 @@ var DLMM = class {
     owner,
     positions
   }) {
+    if (positions.every((position) => isPositionNoReward(position.positionData))) {
+      throw new Error("No LM reward to claim");
+    }
     const claimAllTxs = (await Promise.all(
       positions.filter(
         ({ positionData: { rewardOne, rewardTwo } }) => !rewardOne.isZero() || !rewardTwo.isZero()
@@ -13738,6 +13741,9 @@ var DLMM = class {
     owner,
     position
   }) {
+    if (isPositionNoFee(position.positionData)) {
+      throw new Error("No fee to claim");
+    }
     const claimFeeTx = await this.createClaimSwapFeeMethod({ owner, position });
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     const setCUIx = await getEstimatedComputeUnitIxWithBuffer(
@@ -13762,6 +13768,9 @@ var DLMM = class {
     owner,
     positions
   }) {
+    if (positions.every((position) => isPositionNoFee(position.positionData))) {
+      throw new Error("No fee to claim");
+    }
     const claimAllTxs = (await Promise.all(
       positions.filter(
         ({ positionData: { feeX, feeY } }) => !feeX.isZero() || !feeY.isZero()
@@ -13809,6 +13818,9 @@ var DLMM = class {
     owner,
     position
   }) {
+    if (isPositionNoFee(position.positionData) && isPositionNoReward(position.positionData)) {
+      throw new Error("No fee/reward to claim");
+    }
     const claimAllSwapFeeTxs = await this.createClaimSwapFeeMethod({
       owner,
       position
@@ -15034,15 +15046,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 (0, _anchor.BN)(lowerBinId),
+      new (0, _anchor.BN)(upperBinId),
       this.pubkey,
       this.program.programId
     );
@@ -15060,7 +15067,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 (0, _anchor.BN)(i), lowerBinId.toNumber(), upperBinId.toNumber(), {
+      const claimTransaction = await this.program.methods.claimReward2(new (0, _anchor.BN)(i), lowerBinId, upperBinId, {
         slices
       }).accounts({
         lbPair: this.pubkey,
@@ -15080,15 +15087,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 (0, _anchor.BN)(lowerBinId),
+      new (0, _anchor.BN)(upperBinId),
       this.pubkey,
       this.program.programId
     );
@@ -15125,7 +15127,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,