fix: getOrCreateATAInstruction

MeteoraAg · Feb 5, 2024 · 9e9bf95 · 9e9bf95
1 parent 3fa2749
commit 9e9bf95
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/ts-client/package.json b/ts-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/dlmm",
-  "version": "1.0.7",
+  "version": "1.0.8-abc1234.0",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

diff --git a/ts-client/src/dlmm/helpers/index.ts b/ts-client/src/dlmm/helpers/index.ts
@@ -2,10 +2,11 @@ import { BN, EventParser } from "@coral-xyz/anchor";
 import {
   NATIVE_MINT,
   TOKEN_PROGRAM_ID,
+  TokenAccountNotFoundError,
+  TokenInvalidAccountOwnerError,
   createAssociatedTokenAccountInstruction,
   createCloseAccountInstruction,
   getAccount,
-  getAssociatedTokenAddress,
   getAssociatedTokenAddressSync,
   getMint,
 } from "@solana/spl-token";
@@ -81,29 +82,34 @@ export const getOrCreateATAInstruction = async (
   payer: PublicKey = owner,
   allowOwnerOffCurve = true
 ): Promise<GetOrCreateATAResponse> => {
-  try {
-    const toAccount = await getAssociatedTokenAddress(
-      tokenMint,
-      owner,
-      allowOwnerOffCurve
-    );
-
-    const account = await connection.getAccountInfo(toAccount);
-
-    if (account) return { ataPubKey: toAccount, ix: undefined };
+  const toAccount = getAssociatedTokenAddressSync(
+    tokenMint,
+    owner,
+    allowOwnerOffCurve
+  );
 
-    const ix = createAssociatedTokenAccountInstruction(
-      payer,
-      toAccount,
-      owner,
-      tokenMint
-    );
+  try {
+    await getAccount(connection, toAccount);
 
-    return { ataPubKey: toAccount, ix };
+    return { ataPubKey: toAccount, ix: undefined };
   } catch (e) {
-    /* handle error */
-    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 {
+      /* handle error */
+      console.error("Error::getOrCreateATAInstruction", e);
+      throw e;
+    }
   }
 };