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

package/dist/index.js

@@ -10183,6 +10183,12 @@ function getBinArrayAccountMetasCoverage(lowerBinId, upperBinId, lbPair, program
     }
   );
 }
+function isPositionNoFee(position) {
+  return position.feeX.isZero() && position.feeY.isZero();
+}
+function isPositionNoReward(position) {
+  return position.rewardOne.isZero() && position.rewardTwo.isZero();
+}
 
 // src/dlmm/index.ts
 
@@ -13626,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
@@ -13657,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()
@@ -13729,9 +13741,10 @@ var DLMM = class {
     owner,
     position
   }) {
+    if (isPositionNoFee(position.positionData)) {
+      throw new Error("No fee to claim");
+    }
     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,
@@ -13755,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()
@@ -13764,7 +13780,7 @@ var DLMM = class {
           position
         });
       })
-    )).flat().filter(Boolean);
+    )).flat();
     const chunkedClaimAllTx = chunks(claimAllTxs, MAX_CLAIM_ALL_ALLOWED);
     if (chunkedClaimAllTx.length === 0)
       return [];
@@ -13802,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