@meteora-ag/dlmm 1.0.7 → 1.0.8

package/dist/index.js

@@ -4550,6 +4550,7 @@ var BitmapType = /* @__PURE__ */ ((BitmapType2) => {
 
 
 
+
 var _spltoken = require('@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 = _spltoken.getAssociatedTokenAddressSync.call(void 0, 
+    tokenMint,
+    owner,
+    allowOwnerOffCurve
+  );
   try {
-    const toAccount = await _spltoken.getAssociatedTokenAddress.call(void 0, 
-      tokenMint,
-      owner,
-      allowOwnerOffCurve
-    );
-    const account = await connection.getAccountInfo(toAccount);
-    if (account)
-      return { ataPubKey: toAccount, ix: void 0 };
-    const ix = _spltoken.createAssociatedTokenAccountInstruction.call(void 0, 
-      payer,
-      toAccount,
-      owner,
-      tokenMint
-    );
-    return { ataPubKey: toAccount, ix };
+    await _spltoken.getAccount.call(void 0, connection, toAccount);
+    return { ataPubKey: toAccount, ix: void 0 };
   } catch (e) {
-    console.error("Error::getOrCreateATAInstruction", e);
-    throw e;
+    if (e instanceof _spltoken.TokenAccountNotFoundError || e instanceof _spltoken.TokenInvalidAccountOwnerError) {
+      const ix = _spltoken.createAssociatedTokenAccountInstruction.call(void 0, 
+        payer,
+        toAccount,
+        owner,
+        tokenMint
+      );
+      return { ataPubKey: toAccount, ix };
+    } else {
+      console.error("Error::getOrCreateATAInstruction", e);
+      throw e;
+    }
   }
 };
 async function getTokenBalance(conn, tokenAccount) {