@meteora-ag/dlmm 1.1.3-rc.1 → 1.1.3

package/dist/index.mjs

@@ -6588,7 +6588,7 @@ function findNextBinArrayWithLiquidity(swapForY, activeBinId, lbPairState, binAr
     (ba) => ba.account.index.eq(nearestBinArrayIndexWithLiquidity)
   );
   if (!binArrayAccount) {
-    throw new Error("Bin array not found based on indexing");
+    return null;
   }
   return binArrayAccount;
 }
@@ -7492,6 +7492,51 @@ import {
   TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID2,
   getAssociatedTokenAddressSync as getAssociatedTokenAddressSync2
 } from "@solana/spl-token";
+
+// src/dlmm/error.ts
+import { AnchorError } from "@coral-xyz/anchor";
+var DLMMError = class extends Error {
+  errorCode;
+  errorName;
+  errorMessage;
+  constructor(error) {
+    let _errorCode = 0;
+    let _errorName = "Something went wrong";
+    let _errorMessage = "Something went wrong";
+    if (error instanceof Error) {
+      const anchorError = AnchorError.parse(
+        JSON.parse(JSON.stringify(error)).logs
+      );
+      if (anchorError?.program.toBase58() === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
+        _errorCode = anchorError.error.errorCode.number;
+        _errorName = anchorError.error.errorCode.code;
+        _errorMessage = anchorError.error.errorMessage;
+      }
+    } else {
+      const idlError = IDL.errors.find((err) => err.code === error);
+      if (idlError) {
+        _errorCode = idlError.code;
+        _errorName = idlError.name;
+        _errorMessage = idlError.msg;
+      }
+    }
+    super(_errorMessage);
+    this.errorCode = _errorCode;
+    this.errorName = _errorName;
+    this.errorMessage = _errorMessage;
+  }
+};
+var DlmmSdkError = class extends Error {
+  name;
+  message;
+  constructor(name, message) {
+    super();
+    this.name = name;
+    this.message = message;
+  }
+};
+
+// src/dlmm/index.ts
 var DLMM = class {
   constructor(pubkey, program, lbPair, binArrayBitmapExtension, tokenX, tokenY, clock, opt) {
     this.pubkey = pubkey;
@@ -9766,10 +9811,11 @@ var DLMM = class {
       user
     );
     createPayerTokenIx && preInstructions.push(createPayerTokenIx);
-    const reserve = removeLiquidityForY ? reserveY : reserveX;
-    const tokenMint = removeLiquidityForY ? tokenYMint : tokenXMint;
     const postInstructions = [];
-    if (tokenMint.equals(NATIVE_MINT2)) {
+    if ([
+      this.tokenX.publicKey.toBase58(),
+      this.tokenY.publicKey.toBase58()
+    ].includes(NATIVE_MINT2.toBase58())) {
       const closeWrappedSOLIx = await unwrapSOLInstruction(user);
       closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
     }
@@ -9779,6 +9825,8 @@ var DLMM = class {
     const maxBinArrayIndex = binIdToBinArrayIndex(new BN9(maxBinId));
     const useExtension = isOverflowDefaultBinArrayBitmap(minBinArrayIndex) || isOverflowDefaultBinArrayBitmap(maxBinArrayIndex);
     const binArrayBitmapExtension = useExtension ? deriveBinArrayBitmapExtension(this.pubkey, this.program.programId)[0] : null;
+    const reserve = removeLiquidityForY ? reserveY : reserveX;
+    const tokenMint = removeLiquidityForY ? tokenYMint : tokenXMint;
     const removeLiquiditySingleSideTx = await this.program.methods.removeLiquiditySingleSide().accounts({
       position,
       lbPair,
@@ -9790,7 +9838,7 @@ var DLMM = class {
       binArrayUpper,
       sender: user,
       tokenProgram: TOKEN_PROGRAM_ID2
-    }).preInstructions(preInstructions).postInstructions(postInstructions).transaction();
+    }).preInstructions(preInstructions).transaction();
     const { blockhash, lastValidBlockHeight } = await this.program.provider.connection.getLatestBlockhash("confirmed");
     return new Transaction({
       blockhash,
@@ -9852,6 +9900,8 @@ var DLMM = class {
    *    - `protocolFee`: Protocol fee amount
    *    - `maxInAmount`: Maximum amount of lamport to swap in
    *    - `binArraysPubkey`: Array of bin arrays involved in the swap
+   * @throws {DlmmSdkError}
+   *
    */
   swapQuoteExactOut(outAmount, swapForY, allowedSlippage, binArrays) {
     const currentTimestamp = Date.now() / 1e3;
@@ -9880,7 +9930,10 @@ var DLMM = class {
         binArrays
       );
       if (binArrayAccountToSwap == null) {
-        throw new Error("Insufficient liquidity");
+        throw new DlmmSdkError(
+          "SWAP_QUOTE_INSUFFICIENT_LIQUIDITY",
+          "Insufficient liquidity in binArrays"
+        );
       }
       binArraysForSwap.set(binArrayAccountToSwap.publicKey, true);
       this.updateVolatilityAccumulator(
@@ -9952,6 +10005,7 @@ var DLMM = class {
    *    - `minOutAmount`: Minimum amount of lamport to swap out
    *    - `priceImpact`: Price impact of the swap
    *    - `binArraysPubkey`: Array of bin arrays involved in the swap
+   * @throws {DlmmSdkError}
    */
   swapQuote(inAmount, swapForY, allowedSlippage, binArrays, isPartialFill) {
     const currentTimestamp = Date.now() / 1e3;
@@ -9983,7 +10037,10 @@ var DLMM = class {
         if (isPartialFill) {
           break;
         } else {
-          throw new Error("Insufficient liquidity");
+          throw new DlmmSdkError(
+            "SWAP_QUOTE_INSUFFICIENT_LIQUIDITY",
+            "Insufficient liquidity in binArrays for swapQuote"
+          );
         }
       }
       binArraysForSwap.set(binArrayAccountToSwap.publicKey, true);
@@ -10023,8 +10080,12 @@ var DLMM = class {
         }
       }
     }
-    if (!startBin)
-      throw new Error("Invalid start bin");
+    if (!startBin) {
+      throw new DlmmSdkError(
+        "SWAP_QUOTE_INSUFFICIENT_LIQUIDITY",
+        "Insufficient liquidity"
+      );
+    }
     inAmount = inAmount.sub(inAmountLeft);
     const outAmountWithoutSlippage = getOutAmount(
       startBin,
@@ -11734,40 +11795,6 @@ var DLMM = class {
   }
 };
 
-// src/dlmm/error.ts
-import { AnchorError } from "@coral-xyz/anchor";
-var DLMMError = class extends Error {
-  errorCode;
-  errorName;
-  errorMessage;
-  constructor(error) {
-    let _errorCode = 0;
-    let _errorName = "Something went wrong";
-    let _errorMessage = "Something went wrong";
-    if (error instanceof Error) {
-      const anchorError = AnchorError.parse(
-        JSON.parse(JSON.stringify(error)).logs
-      );
-      if (anchorError?.program.toBase58() === LBCLMM_PROGRAM_IDS["mainnet-beta"]) {
-        _errorCode = anchorError.error.errorCode.number;
-        _errorName = anchorError.error.errorCode.code;
-        _errorMessage = anchorError.error.errorMessage;
-      }
-    } else {
-      const idlError = IDL.errors.find((err) => err.code === error);
-      if (idlError) {
-        _errorCode = idlError.code;
-        _errorName = idlError.name;
-        _errorMessage = idlError.msg;
-      }
-    }
-    super(_errorMessage);
-    this.errorCode = _errorCode;
-    this.errorName = _errorName;
-    this.errorMessage = _errorMessage;
-  }
-};
-
 // src/index.ts
 var src_default = DLMM;
 export {
@@ -11779,6 +11806,7 @@ export {
   BitmapType,
   ClockLayout,
   DLMMError,
+  DlmmSdkError,
   EXTENSION_BINARRAY_BITMAP_SIZE,
   FEE_PRECISION,
   IDL,