@meteora-ag/zap-sdk 1.0.2 → 1.0.4

package/dist/index.d.mts

@@ -320,6 +320,13 @@ declare const getOrCreateATAInstruction: (connection: Connection, tokenMint: Pub
  * @returns The unwrap SOL instruction
  */
 declare function unwrapSOLInstruction(owner: PublicKey, receiver: PublicKey, allowOwnerOffCurve?: boolean): TransactionInstruction | null;
+/**
+ * Get token account balance
+ * @param connection - Solana connection
+ * @param tokenAccount - The token account address
+ * @returns The token account balance as a string
+ */
+declare function getTokenAccountBalance(connection: Connection, tokenAccount: PublicKey): Promise<string>;
 /**
  * Wrap SOL instruction
  * @param from - The from address
@@ -380,4 +387,4 @@ declare const AMOUNT_IN_JUP_V6_REVERSE_OFFSET = 19;
 declare const AMOUNT_IN_DAMM_V2_OFFSET = 8;
 declare const DAMM_V2_SWAP_DISCRIMINATOR: number[];
 
-export { AMOUNT_IN_DAMM_V2_OFFSET, AMOUNT_IN_DLMM_OFFSET, AMOUNT_IN_JUP_V6_REVERSE_OFFSET, AccountsType, BIN_ARRAY_INDEX_BOUND, DAMM_V2_PROGRAM_ID, DAMM_V2_SWAP_DISCRIMINATOR, DLMM_PROGRAM_ID, DLMM_SWAP_DISCRIMINATOR, JUP_V6_PROGRAM_ID, type JupiterInstruction, type JupiterQuoteResponse, type JupiterRoutePlan, type JupiterSwapInstructionResponse, MEMO_PROGRAM_ID, ZAP_PROGRAM_ID, Zap, type ZapOutParameters, type ZapOutParams, type ZapOutThroughDammV2Params, type ZapOutThroughDlmmParams, type ZapOutThroughJupiterParams, type ZapProgram, convertAccountTypeToNumber, createDammV2SwapPayload, createDlmmSwapPayload, deriveDammV2EventAuthority, getBinArrayBitmapExtension, getBitFromBinArrayIndexInBitmapExtension, getDammV2Pool, getDammV2RemainingAccounts, getDlmmRemainingAccounts, getExtraAccountMetasForTransferHook, getJupiterQuote, getJupiterSwapInstruction, getLbPairState, getNextBinArrayIndexWithLiquidity, getOrCreateATAInstruction, getTokenProgramFromMint, unwrapSOLInstruction, wrapSOLInstruction };
+export { AMOUNT_IN_DAMM_V2_OFFSET, AMOUNT_IN_DLMM_OFFSET, AMOUNT_IN_JUP_V6_REVERSE_OFFSET, AccountsType, BIN_ARRAY_INDEX_BOUND, DAMM_V2_PROGRAM_ID, DAMM_V2_SWAP_DISCRIMINATOR, DLMM_PROGRAM_ID, DLMM_SWAP_DISCRIMINATOR, JUP_V6_PROGRAM_ID, type JupiterInstruction, type JupiterQuoteResponse, type JupiterRoutePlan, type JupiterSwapInstructionResponse, MEMO_PROGRAM_ID, ZAP_PROGRAM_ID, Zap, type ZapOutParameters, type ZapOutParams, type ZapOutThroughDammV2Params, type ZapOutThroughDlmmParams, type ZapOutThroughJupiterParams, type ZapProgram, convertAccountTypeToNumber, createDammV2SwapPayload, createDlmmSwapPayload, deriveDammV2EventAuthority, getBinArrayBitmapExtension, getBitFromBinArrayIndexInBitmapExtension, getDammV2Pool, getDammV2RemainingAccounts, getDlmmRemainingAccounts, getExtraAccountMetasForTransferHook, getJupiterQuote, getJupiterSwapInstruction, getLbPairState, getNextBinArrayIndexWithLiquidity, getOrCreateATAInstruction, getTokenAccountBalance, getTokenProgramFromMint, unwrapSOLInstruction, wrapSOLInstruction };

package/dist/index.d.ts

@@ -320,6 +320,13 @@ declare const getOrCreateATAInstruction: (connection: Connection, tokenMint: Pub
  * @returns The unwrap SOL instruction
  */
 declare function unwrapSOLInstruction(owner: PublicKey, receiver: PublicKey, allowOwnerOffCurve?: boolean): TransactionInstruction | null;
+/**
+ * Get token account balance
+ * @param connection - Solana connection
+ * @param tokenAccount - The token account address
+ * @returns The token account balance as a string
+ */
+declare function getTokenAccountBalance(connection: Connection, tokenAccount: PublicKey): Promise<string>;
 /**
  * Wrap SOL instruction
  * @param from - The from address
@@ -380,4 +387,4 @@ declare const AMOUNT_IN_JUP_V6_REVERSE_OFFSET = 19;
 declare const AMOUNT_IN_DAMM_V2_OFFSET = 8;
 declare const DAMM_V2_SWAP_DISCRIMINATOR: number[];
 
-export { AMOUNT_IN_DAMM_V2_OFFSET, AMOUNT_IN_DLMM_OFFSET, AMOUNT_IN_JUP_V6_REVERSE_OFFSET, AccountsType, BIN_ARRAY_INDEX_BOUND, DAMM_V2_PROGRAM_ID, DAMM_V2_SWAP_DISCRIMINATOR, DLMM_PROGRAM_ID, DLMM_SWAP_DISCRIMINATOR, JUP_V6_PROGRAM_ID, type JupiterInstruction, type JupiterQuoteResponse, type JupiterRoutePlan, type JupiterSwapInstructionResponse, MEMO_PROGRAM_ID, ZAP_PROGRAM_ID, Zap, type ZapOutParameters, type ZapOutParams, type ZapOutThroughDammV2Params, type ZapOutThroughDlmmParams, type ZapOutThroughJupiterParams, type ZapProgram, convertAccountTypeToNumber, createDammV2SwapPayload, createDlmmSwapPayload, deriveDammV2EventAuthority, getBinArrayBitmapExtension, getBitFromBinArrayIndexInBitmapExtension, getDammV2Pool, getDammV2RemainingAccounts, getDlmmRemainingAccounts, getExtraAccountMetasForTransferHook, getJupiterQuote, getJupiterSwapInstruction, getLbPairState, getNextBinArrayIndexWithLiquidity, getOrCreateATAInstruction, getTokenProgramFromMint, unwrapSOLInstruction, wrapSOLInstruction };
+export { AMOUNT_IN_DAMM_V2_OFFSET, AMOUNT_IN_DLMM_OFFSET, AMOUNT_IN_JUP_V6_REVERSE_OFFSET, AccountsType, BIN_ARRAY_INDEX_BOUND, DAMM_V2_PROGRAM_ID, DAMM_V2_SWAP_DISCRIMINATOR, DLMM_PROGRAM_ID, DLMM_SWAP_DISCRIMINATOR, JUP_V6_PROGRAM_ID, type JupiterInstruction, type JupiterQuoteResponse, type JupiterRoutePlan, type JupiterSwapInstructionResponse, MEMO_PROGRAM_ID, ZAP_PROGRAM_ID, Zap, type ZapOutParameters, type ZapOutParams, type ZapOutThroughDammV2Params, type ZapOutThroughDlmmParams, type ZapOutThroughJupiterParams, type ZapProgram, convertAccountTypeToNumber, createDammV2SwapPayload, createDlmmSwapPayload, deriveDammV2EventAuthority, getBinArrayBitmapExtension, getBitFromBinArrayIndexInBitmapExtension, getDammV2Pool, getDammV2RemainingAccounts, getDlmmRemainingAccounts, getExtraAccountMetasForTransferHook, getJupiterQuote, getJupiterSwapInstruction, getLbPairState, getNextBinArrayIndexWithLiquidity, getOrCreateATAInstruction, getTokenAccountBalance, getTokenProgramFromMint, unwrapSOLInstruction, wrapSOLInstruction };

package/dist/index.js

@@ -95,6 +95,7 @@ __export(index_exports, {
   getLbPairState: () => getLbPairState,
   getNextBinArrayIndexWithLiquidity: () => getNextBinArrayIndexWithLiquidity,
   getOrCreateATAInstruction: () => getOrCreateATAInstruction,
+  getTokenAccountBalance: () => getTokenAccountBalance,
   getTokenProgramFromMint: () => getTokenProgramFromMint,
   unwrapSOLInstruction: () => unwrapSOLInstruction,
   wrapSOLInstruction: () => wrapSOLInstruction
@@ -496,6 +497,11 @@ function unwrapSOLInstruction(owner, receiver, allowOwnerOffCurve = true) {
   }
   return null;
 }
+function getTokenAccountBalance(connection, tokenAccount) {
+  return __async(this, null, function* () {
+    return (yield connection.getTokenAccountBalance(tokenAccount)).value.amount;
+  });
+}
 function wrapSOLInstruction(from, to, amount, tokenProgram = import_spl_token3.TOKEN_PROGRAM_ID) {
   return [
     import_web34.SystemProgram.transfer({
@@ -896,7 +902,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(import_spl_token5.NATIVE_MINT)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const remainingAccounts = jupiterSwapResponse.swapInstruction.accounts.map(
         (account) => {
           let pubkey = typeof account.pubkey === "string" ? new import_web37.PublicKey(account.pubkey) : account.pubkey;
@@ -988,7 +1004,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(import_spl_token5.NATIVE_MINT)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const remainingAccounts = yield getDammV2RemainingAccounts(
         poolAddress,
         user,
@@ -1076,7 +1102,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(import_spl_token5.NATIVE_MINT)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const { remainingAccounts, remainingAccountsInfo } = yield getDlmmRemainingAccounts(
         this.connection,
         lbPairAddress,
@@ -1145,6 +1181,7 @@ var Zap = class {
   getLbPairState,
   getNextBinArrayIndexWithLiquidity,
   getOrCreateATAInstruction,
+  getTokenAccountBalance,
   getTokenProgramFromMint,
   unwrapSOLInstruction,
   wrapSOLInstruction

package/dist/index.mjs

@@ -453,6 +453,11 @@ function unwrapSOLInstruction(owner, receiver, allowOwnerOffCurve = true) {
   }
   return null;
 }
+function getTokenAccountBalance(connection, tokenAccount) {
+  return __async(this, null, function* () {
+    return (yield connection.getTokenAccountBalance(tokenAccount)).value.amount;
+  });
+}
 function wrapSOLInstruction(from, to, amount, tokenProgram = TOKEN_PROGRAM_ID3) {
   return [
     SystemProgram.transfer({
@@ -866,7 +871,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(NATIVE_MINT3)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const remainingAccounts = jupiterSwapResponse.swapInstruction.accounts.map(
         (account) => {
           let pubkey = typeof account.pubkey === "string" ? new PublicKey7(account.pubkey) : account.pubkey;
@@ -958,7 +973,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(NATIVE_MINT3)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const remainingAccounts = yield getDammV2RemainingAccounts(
         poolAddress,
         user,
@@ -1046,7 +1071,17 @@ var Zap = class {
       ]);
       inputTokenAccountIx && preInstructions.push(inputTokenAccountIx);
       outputTokenAccountIx && preInstructions.push(outputTokenAccountIx);
-      const preUserTokenBalance = (yield this.connection.getTokenAccountBalance(inputTokenAccount)).value.amount;
+      if (inputMint.equals(NATIVE_MINT3)) {
+        const wrapIxs = wrapSOLInstruction(
+          user,
+          inputTokenAccount,
+          BigInt(maxSwapAmount.toString())
+        );
+        if (wrapIxs) {
+          preInstructions.push(...wrapIxs);
+        }
+      }
+      const preUserTokenBalance = inputTokenAccountIx ? "0" : yield getTokenAccountBalance(this.connection, inputTokenAccount);
       const { remainingAccounts, remainingAccountsInfo } = yield getDlmmRemainingAccounts(
         this.connection,
         lbPairAddress,
@@ -1114,6 +1149,7 @@ export {
   getLbPairState,
   getNextBinArrayIndexWithLiquidity,
   getOrCreateATAInstruction,
+  getTokenAccountBalance,
   getTokenProgramFromMint,
   unwrapSOLInstruction,
   wrapSOLInstruction

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "A Typescript SDK for interacting with the Zap program on Meteora.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -27,8 +27,8 @@
   "devDependencies": {
     "@types/bn.js": "^5.1.0",
     "@types/bun": "latest",
-    "tsx": "^4.20.3",
-    "tsup": "^8.4.0"
+    "tsup": "^8.4.0",
+    "tsx": "^4.20.3"
   },
   "peerDependencies": {
     "typescript": "^5"
@@ -40,7 +40,8 @@
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",
-    "decimal.js": "^10.4.2"
+    "decimal.js": "^10.4.2",
+    "jito-ts": "^4.2.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsup src/index.ts --format esm,cjs --dts",