@meteora-ag/zap-sdk 1.0.4 → 1.0.5-rc.2

package/dist/index.js

@@ -460,24 +460,15 @@ var getOrCreateATAInstruction = (connection, tokenMint, owner, payer, allowOwner
     allowOwnerOffCurve,
     tokenProgram
   );
-  try {
-    yield (0, import_spl_token3.getAccount)(connection, toAccount);
-    return { ataPubkey: toAccount, ix: void 0 };
-  } catch (e) {
-    if (e instanceof import_spl_token3.TokenAccountNotFoundError || e instanceof import_spl_token3.TokenInvalidAccountOwnerError) {
-      const ix = (0, import_spl_token3.createAssociatedTokenAccountIdempotentInstruction)(
-        payer,
-        toAccount,
-        owner,
-        tokenMint,
-        tokenProgram
-      );
-      return { ataPubkey: toAccount, ix };
-    } else {
-      console.error("Error::getOrCreateATAInstruction", e);
-      throw e;
-    }
-  }
+  yield (0, import_spl_token3.getAccount)(connection, toAccount);
+  const ix = (0, import_spl_token3.createAssociatedTokenAccountIdempotentInstruction)(
+    payer,
+    toAccount,
+    owner,
+    tokenMint,
+    tokenProgram
+  );
+  return { ataPubkey: toAccount, ix };
 });
 function unwrapSOLInstruction(owner, receiver, allowOwnerOffCurve = true) {
   const wSolATAAccount = (0, import_spl_token3.getAssociatedTokenAddressSync)(
@@ -902,7 +893,7 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      if (inputMint.equals(import_spl_token5.NATIVE_MINT)) {
+      if ([inputMint, outputMint].includes(import_spl_token5.NATIVE_MINT)) {
         const wrapIxs = wrapSOLInstruction(
           user,
           inputTokenAccount,

package/dist/index.mjs

@@ -401,9 +401,7 @@ import {
   getAccount,
   getAssociatedTokenAddressSync,
   NATIVE_MINT as NATIVE_MINT2,
-  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID3,
-  TokenAccountNotFoundError,
-  TokenInvalidAccountOwnerError
+  TOKEN_PROGRAM_ID as TOKEN_PROGRAM_ID3
 } from "@solana/spl-token";
 import {
   SystemProgram,
@@ -416,24 +414,15 @@ var getOrCreateATAInstruction = (connection, tokenMint, owner, payer, allowOwner
     allowOwnerOffCurve,
     tokenProgram
   );
-  try {
-    yield getAccount(connection, toAccount);
-    return { ataPubkey: toAccount, ix: void 0 };
-  } catch (e) {
-    if (e instanceof TokenAccountNotFoundError || e instanceof TokenInvalidAccountOwnerError) {
-      const ix = createAssociatedTokenAccountIdempotentInstruction(
-        payer,
-        toAccount,
-        owner,
-        tokenMint,
-        tokenProgram
-      );
-      return { ataPubkey: toAccount, ix };
-    } else {
-      console.error("Error::getOrCreateATAInstruction", e);
-      throw e;
-    }
-  }
+  yield getAccount(connection, toAccount);
+  const ix = createAssociatedTokenAccountIdempotentInstruction(
+    payer,
+    toAccount,
+    owner,
+    tokenMint,
+    tokenProgram
+  );
+  return { ataPubkey: toAccount, ix };
 });
 function unwrapSOLInstruction(owner, receiver, allowOwnerOffCurve = true) {
   const wSolATAAccount = getAssociatedTokenAddressSync(
@@ -871,7 +860,7 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      if (inputMint.equals(NATIVE_MINT3)) {
+      if ([inputMint, outputMint].includes(NATIVE_MINT3)) {
         const wrapIxs = wrapSOLInstruction(
           user,
           inputTokenAccount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.0.4",
+  "version": "1.0.5-rc.2",
   "description": "A Typescript SDK for interacting with the Zap program on Meteora.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -17,6 +17,11 @@
   "files": [
     "dist/**"
   ],
+  "scripts": {
+    "build": "rm -rf dist && tsup src/index.ts --format esm,cjs --dts",
+    "clean": "rm -rf dist && rm -rf node_modules rm -rf pnpm-lock.yaml",
+    "test": "ts-node -r dotenv/config examples/removeDlmmLiquidityAndZapOut.ts"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -42,9 +47,5 @@
     "bn.js": "^5.2.2",
     "decimal.js": "^10.4.2",
     "jito-ts": "^4.2.0"
-  },
-  "scripts": {
-    "build": "rm -rf dist && tsup src/index.ts --format esm,cjs --dts",
-    "clean": "rm -rf dist && rm -rf node_modules rm -rf pnpm-lock.yaml"
   }
-}
+}