@meteora-ag/zap-sdk 1.1.0 → 1.1.1

package/dist/index.d.mts

@@ -1769,12 +1769,17 @@ declare enum DlmmDirectSwapQuoteRoute {
     Jupiter = 0,
     Dlmm = 1
 }
-interface SwapQuoteResult {
+type SwapQuoteResult = {
     inAmount: BN;
     outAmount: BN;
-    route: DlmmDirectSwapQuoteRoute;
-    originalQuote: JupiterQuoteResponse | SwapQuote;
-}
+    route: DlmmDirectSwapQuoteRoute.Jupiter;
+    originalQuote: JupiterQuoteResponse;
+} | {
+    inAmount: BN;
+    outAmount: BN;
+    route: DlmmDirectSwapQuoteRoute.Dlmm;
+    originalQuote: SwapQuote;
+};
 declare enum DlmmSwapType {
     XToY = 0,
     YToX = 1,
@@ -2229,7 +2234,7 @@ declare class Zap {
 
 declare function getJupiterQuote(inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number, dynamicSlippage: boolean | undefined, onlyDirectRoutes: boolean, restrictIntermediateTokens: boolean, apiUrl?: string, apiKey?: string): Promise<JupiterQuoteResponse | null>;
 declare function getJupiterSwapInstruction(userPublicKey: PublicKey, quoteResponse: any, apiUrl?: string, apiKey?: string): Promise<JupiterSwapInstructionResponse>;
-declare function buildJupiterSwapTransaction(user: PublicKey, inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number): Promise<{
+declare function buildJupiterSwapTransaction(user: PublicKey, inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number, jupiterQuoteResponse?: JupiterQuoteResponse): Promise<{
     transaction: Transaction;
     quoteResponse: JupiterQuoteResponse;
 }>;

package/dist/index.d.ts

@@ -1769,12 +1769,17 @@ declare enum DlmmDirectSwapQuoteRoute {
     Jupiter = 0,
     Dlmm = 1
 }
-interface SwapQuoteResult {
+type SwapQuoteResult = {
     inAmount: BN;
     outAmount: BN;
-    route: DlmmDirectSwapQuoteRoute;
-    originalQuote: JupiterQuoteResponse | SwapQuote;
-}
+    route: DlmmDirectSwapQuoteRoute.Jupiter;
+    originalQuote: JupiterQuoteResponse;
+} | {
+    inAmount: BN;
+    outAmount: BN;
+    route: DlmmDirectSwapQuoteRoute.Dlmm;
+    originalQuote: SwapQuote;
+};
 declare enum DlmmSwapType {
     XToY = 0,
     YToX = 1,
@@ -2229,7 +2234,7 @@ declare class Zap {
 
 declare function getJupiterQuote(inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number, dynamicSlippage: boolean | undefined, onlyDirectRoutes: boolean, restrictIntermediateTokens: boolean, apiUrl?: string, apiKey?: string): Promise<JupiterQuoteResponse | null>;
 declare function getJupiterSwapInstruction(userPublicKey: PublicKey, quoteResponse: any, apiUrl?: string, apiKey?: string): Promise<JupiterSwapInstructionResponse>;
-declare function buildJupiterSwapTransaction(user: PublicKey, inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number): Promise<{
+declare function buildJupiterSwapTransaction(user: PublicKey, inputMint: PublicKey, outputMint: PublicKey, amount: BN, maxAccounts: number, slippageBps: number, jupiterQuoteResponse?: JupiterQuoteResponse): Promise<{
     transaction: Transaction;
     quoteResponse: JupiterQuoteResponse;
 }>;

package/dist/index.js

@@ -1737,14 +1737,18 @@ function getJupiterQuote(inputMint, outputMint, amount, maxAccounts, slippageBps
       dynamicSlippage: dynamicSlippage.toString()
     });
     const url = `${apiUrl}/swap/v1/quote?${params.toString()}`;
-    console.log(url);
-    const response = yield fetch(url, {
-      method: "GET",
-      headers: __spreadValues({
-        Accept: "application/json"
-      }, apiKey ? { "x-api-key": apiKey } : {})
-    });
-    if (!response.ok) {
+    let response = null;
+    try {
+      response = yield fetch(url, {
+        method: "GET",
+        headers: __spreadValues({
+          Accept: "application/json"
+        }, apiKey ? { "x-api-key": apiKey } : {})
+      });
+      if (!response.ok) {
+        return null;
+      }
+    } catch (error) {
       return null;
     }
     const result = yield response.json();
@@ -1758,27 +1762,32 @@ function getJupiterSwapInstruction(userPublicKey, quoteResponse, apiUrl = "https
       userPublicKey: userPublicKey.toString(),
       quoteResponse
     };
-    const response = yield fetch(url, {
-      method: "POST",
-      headers: __spreadValues({
-        "Content-Type": "application/json",
-        Accept: "application/json"
-      }, apiKey ? { "x-api-key": apiKey } : {}),
-      body: JSON.stringify(requestBody)
-    });
-    if (!response.ok) {
-      const errorText = yield response.text();
-      throw new Error(
-        `Jupiter swap instruction failed (${response.status}): ${errorText}`
-      );
+    let response = null;
+    try {
+      response = yield fetch(url, {
+        method: "POST",
+        headers: __spreadValues({
+          "Content-Type": "application/json",
+          Accept: "application/json"
+        }, apiKey ? { "x-api-key": apiKey } : {}),
+        body: JSON.stringify(requestBody)
+      });
+      if (!response.ok) {
+        const errorText = yield response.text();
+        throw new Error(
+          `Jupiter swap instruction failed (${response.status}): ${errorText}`
+        );
+      }
+    } catch (error) {
+      throw new Error(`Jupiter swap instruction failed to fetch`);
     }
     const result = yield response.json();
     return result;
   });
 }
-function buildJupiterSwapTransaction(user, inputMint, outputMint, amount, maxAccounts, slippageBps) {
+function buildJupiterSwapTransaction(user, inputMint, outputMint, amount, maxAccounts, slippageBps, jupiterQuoteResponse) {
   return __async(this, null, function* () {
-    const quoteResponse = yield getJupiterQuote(
+    const quoteResponse = jupiterQuoteResponse != null ? jupiterQuoteResponse : yield getJupiterQuote(
       inputMint,
       outputMint,
       amount,
@@ -4117,7 +4126,8 @@ var Zap = class {
             directSwapEstimate.swapType === 0 /* XToY */ ? tokenYMint : tokenXMint,
             directSwapEstimate.swapAmount,
             maxAccounts,
-            swapSlippageBps
+            swapSlippageBps,
+            swapQuote.originalQuote
           );
           swapTransactions.push(swapTx);
         } else {
@@ -4281,7 +4291,8 @@ var Zap = class {
           tokenXMint,
           swapAmountToXInLamports,
           maxAccounts,
-          swapSlippageBps
+          swapSlippageBps,
+          indirectSwapEstimate.swapToX
         );
         swapTransactions.push(swapToXTransaction);
       }
@@ -4292,7 +4303,8 @@ var Zap = class {
           tokenYMint,
           swapAmountToYInLamports,
           maxAccounts,
-          swapSlippageBps
+          swapSlippageBps,
+          indirectSwapEstimate.swapToY
         );
         swapTransactions.push(swapToYTransaction);
       }
@@ -4689,7 +4701,8 @@ var Zap = class {
             directSwapEstimate.swapType === 0 /* XToY */ ? dlmm.lbPair.tokenYMint : dlmm.lbPair.tokenXMint,
             directSwapEstimate.swapAmount,
             maxAccounts,
-            swapSlippageBps
+            swapSlippageBps,
+            swapQuote.originalQuote
           );
           swapTransaction = swapTx;
         } else {

package/dist/index.mjs

@@ -1665,14 +1665,18 @@ function getJupiterQuote(inputMint, outputMint, amount, maxAccounts, slippageBps
       dynamicSlippage: dynamicSlippage.toString()
     });
     const url = `${apiUrl}/swap/v1/quote?${params.toString()}`;
-    console.log(url);
-    const response = yield fetch(url, {
-      method: "GET",
-      headers: __spreadValues({
-        Accept: "application/json"
-      }, apiKey ? { "x-api-key": apiKey } : {})
-    });
-    if (!response.ok) {
+    let response = null;
+    try {
+      response = yield fetch(url, {
+        method: "GET",
+        headers: __spreadValues({
+          Accept: "application/json"
+        }, apiKey ? { "x-api-key": apiKey } : {})
+      });
+      if (!response.ok) {
+        return null;
+      }
+    } catch (error) {
       return null;
     }
     const result = yield response.json();
@@ -1686,27 +1690,32 @@ function getJupiterSwapInstruction(userPublicKey, quoteResponse, apiUrl = "https
       userPublicKey: userPublicKey.toString(),
       quoteResponse
     };
-    const response = yield fetch(url, {
-      method: "POST",
-      headers: __spreadValues({
-        "Content-Type": "application/json",
-        Accept: "application/json"
-      }, apiKey ? { "x-api-key": apiKey } : {}),
-      body: JSON.stringify(requestBody)
-    });
-    if (!response.ok) {
-      const errorText = yield response.text();
-      throw new Error(
-        `Jupiter swap instruction failed (${response.status}): ${errorText}`
-      );
+    let response = null;
+    try {
+      response = yield fetch(url, {
+        method: "POST",
+        headers: __spreadValues({
+          "Content-Type": "application/json",
+          Accept: "application/json"
+        }, apiKey ? { "x-api-key": apiKey } : {}),
+        body: JSON.stringify(requestBody)
+      });
+      if (!response.ok) {
+        const errorText = yield response.text();
+        throw new Error(
+          `Jupiter swap instruction failed (${response.status}): ${errorText}`
+        );
+      }
+    } catch (error) {
+      throw new Error(`Jupiter swap instruction failed to fetch`);
     }
     const result = yield response.json();
     return result;
   });
 }
-function buildJupiterSwapTransaction(user, inputMint, outputMint, amount, maxAccounts, slippageBps) {
+function buildJupiterSwapTransaction(user, inputMint, outputMint, amount, maxAccounts, slippageBps, jupiterQuoteResponse) {
   return __async(this, null, function* () {
-    const quoteResponse = yield getJupiterQuote(
+    const quoteResponse = jupiterQuoteResponse != null ? jupiterQuoteResponse : yield getJupiterQuote(
       inputMint,
       outputMint,
       amount,
@@ -4097,7 +4106,8 @@ var Zap = class {
             directSwapEstimate.swapType === 0 /* XToY */ ? tokenYMint : tokenXMint,
             directSwapEstimate.swapAmount,
             maxAccounts,
-            swapSlippageBps
+            swapSlippageBps,
+            swapQuote.originalQuote
           );
           swapTransactions.push(swapTx);
         } else {
@@ -4261,7 +4271,8 @@ var Zap = class {
           tokenXMint,
           swapAmountToXInLamports,
           maxAccounts,
-          swapSlippageBps
+          swapSlippageBps,
+          indirectSwapEstimate.swapToX
         );
         swapTransactions.push(swapToXTransaction);
       }
@@ -4272,7 +4283,8 @@ var Zap = class {
           tokenYMint,
           swapAmountToYInLamports,
           maxAccounts,
-          swapSlippageBps
+          swapSlippageBps,
+          indirectSwapEstimate.swapToY
         );
         swapTransactions.push(swapToYTransaction);
       }
@@ -4669,7 +4681,8 @@ var Zap = class {
             directSwapEstimate.swapType === 0 /* XToY */ ? dlmm.lbPair.tokenYMint : dlmm.lbPair.tokenXMint,
             directSwapEstimate.swapAmount,
             maxAccounts,
-            swapSlippageBps
+            swapSlippageBps,
+            swapQuote.originalQuote
           );
           swapTransaction = swapTx;
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A Typescript SDK for interacting with the Zap program on Meteora.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",