@meteora-ag/dlmm 1.0.7 → 1.0.8

package/dist/index.mjs

@@ -4544,10 +4544,11 @@ import { AnchorProvider, BN as BN6, Program } from "@coral-xyz/anchor";
 import {
   NATIVE_MINT,
   TOKEN_PROGRAM_ID,
+  TokenAccountNotFoundError,
+  TokenInvalidAccountOwnerError,
   createAssociatedTokenAccountInstruction,
   createCloseAccountInstruction,
   getAccount,
-  getAssociatedTokenAddress,
   getAssociatedTokenAddressSync,
   getMint
 } from "@solana/spl-token";
@@ -5517,25 +5518,27 @@ async function getTokenDecimals(conn, mint) {
   return await token.decimals;
 }
 var getOrCreateATAInstruction = async (connection, tokenMint, owner, payer = owner, allowOwnerOffCurve = true) => {
+  const toAccount = getAssociatedTokenAddressSync(
+    tokenMint,
+    owner,
+    allowOwnerOffCurve
+  );
   try {
-    const toAccount = await getAssociatedTokenAddress(
-      tokenMint,
-      owner,
-      allowOwnerOffCurve
-    );
-    const account = await connection.getAccountInfo(toAccount);
-    if (account)
-      return { ataPubKey: toAccount, ix: void 0 };
-    const ix = createAssociatedTokenAccountInstruction(
-      payer,
-      toAccount,
-      owner,
-      tokenMint
-    );
-    return { ataPubKey: toAccount, ix };
+    await getAccount(connection, toAccount);
+    return { ataPubKey: toAccount, ix: void 0 };
   } catch (e) {
-    console.error("Error::getOrCreateATAInstruction", e);
-    throw e;
+    if (e instanceof TokenAccountNotFoundError || e instanceof TokenInvalidAccountOwnerError) {
+      const ix = createAssociatedTokenAccountInstruction(
+        payer,
+        toAccount,
+        owner,
+        tokenMint
+      );
+      return { ataPubKey: toAccount, ix };
+    } else {
+      console.error("Error::getOrCreateATAInstruction", e);
+      throw e;
+    }
   }
 };
 async function getTokenBalance(conn, tokenAccount) {