@meteora-ag/zap-sdk 1.2.0-rc.5 → 1.2.0-rc.7

package/dist/index.d.mts

@@ -1716,6 +1716,7 @@ type GetZapInDammV2IndirectPoolParams = {
     slippageBps: number;
     jupiterQuoteToA: JupiterQuoteResponse | null;
     jupiterQuoteToB: JupiterQuoteResponse | null;
+    forceTwoSidedWhenBothQuotes?: boolean;
 };
 declare enum ZapInDammV2PoolSwapRoute {
     Jupiter = "jupiter",
@@ -2020,6 +2021,7 @@ declare class Zap {
     private zapInDammV2;
     private resetOrInitializeLedgerAccount;
     private isJupiterQuoteableAmount;
+    private getJupiterQuoteForAmount;
     private findMinimumJupiterQuoteableAmount;
     private zapInDlmmForInitializedPosition;
     private zapInDlmmForUninitializedPosition;

package/dist/index.d.ts

@@ -1716,6 +1716,7 @@ type GetZapInDammV2IndirectPoolParams = {
     slippageBps: number;
     jupiterQuoteToA: JupiterQuoteResponse | null;
     jupiterQuoteToB: JupiterQuoteResponse | null;
+    forceTwoSidedWhenBothQuotes?: boolean;
 };
 declare enum ZapInDammV2PoolSwapRoute {
     Jupiter = "jupiter",
@@ -2020,6 +2021,7 @@ declare class Zap {
     private zapInDammV2;
     private resetOrInitializeLedgerAccount;
     private isJupiterQuoteableAmount;
+    private getJupiterQuoteForAmount;
     private findMinimumJupiterQuoteableAmount;
     private zapInDlmmForInitializedPosition;
     private zapInDlmmForUninitializedPosition;

package/dist/index.js

@@ -3354,6 +3354,27 @@ var Zap = class {
       return quote !== null;
     });
   }
+  getJupiterQuoteForAmount(inputMint, outputMint, amount, maxAccounts, slippageBps) {
+    return __async(this, null, function* () {
+      if (amount.isZero()) {
+        return null;
+      }
+      return yield getJupiterQuote(
+        inputMint,
+        outputMint,
+        amount,
+        maxAccounts,
+        slippageBps,
+        false,
+        true,
+        true,
+        {
+          jupiterApiUrl: this.jupiterApiUrl,
+          jupiterApiKey: this.jupiterApiKey
+        }
+      );
+    });
+  }
   findMinimumJupiterQuoteableAmount(inputMint, outputMint, maxAmount, maxAccounts, slippageBps) {
     return __async(this, null, function* () {
       if (maxAmount.isZero()) {
@@ -3369,9 +3390,45 @@ var Zap = class {
       if (!maxAmountQuoteable) {
         return null;
       }
-      let left = new import_anchor.BN(1);
+      const defaultLowerBound = inputMint.equals(import_spl_token6.NATIVE_MINT) ? new import_anchor.BN(100) : new import_anchor.BN(1);
+      let left = defaultLowerBound.gt(maxAmount) ? maxAmount : defaultLowerBound;
       let right = maxAmount;
       let best = maxAmount;
+      const leftIsQuoteable = yield this.isJupiterQuoteableAmount(
+        inputMint,
+        outputMint,
+        left,
+        maxAccounts,
+        slippageBps
+      );
+      if (!leftIsQuoteable) {
+        let probe = left;
+        let found = false;
+        while (probe.lt(maxAmount)) {
+          const nextProbe = import_anchor.BN.min(probe.mul(new import_anchor.BN(2)), maxAmount);
+          const nextIsQuoteable = yield this.isJupiterQuoteableAmount(
+            inputMint,
+            outputMint,
+            nextProbe,
+            maxAccounts,
+            slippageBps
+          );
+          if (nextIsQuoteable) {
+            left = probe.add(new import_anchor.BN(1));
+            right = nextProbe;
+            best = nextProbe;
+            found = true;
+            break;
+          }
+          probe = nextProbe;
+        }
+        if (!found) {
+          return null;
+        }
+      } else {
+        best = left;
+        right = left;
+      }
       while (left.lte(right)) {
         const mid = left.add(right).div(new import_anchor.BN(2));
         const isQuoteable = yield this.isJupiterQuoteableAmount(
@@ -3757,7 +3814,8 @@ var Zap = class {
         maxTransferAmountExtendPercentage,
         slippageBps,
         jupiterQuoteToA,
-        jupiterQuoteToB
+        jupiterQuoteToB,
+        forceTwoSidedWhenBothQuotes = false
       } = params;
       const poolState = yield getDammV2Pool(this.connection, pool);
       const {
@@ -3942,6 +4000,32 @@ var Zap = class {
           )
         );
         let { swapAmountToA: adjustedSwapAmountToA, swapAmountToB } = splitIndirectSwapAmounts(amountIn, swapAmountToA);
+        if (forceTwoSidedWhenBothQuotes && adjustedSwapAmountToA.isZero()) {
+          const minQuoteableToA = yield this.findMinimumJupiterQuoteableAmount(
+            inputTokenMint,
+            tokenAMint,
+            amountIn,
+            maxAccounts,
+            slippageBps
+          );
+          if (minQuoteableToA !== null && minQuoteableToA.gt(new import_anchor.BN(0)) && minQuoteableToA.lt(amountIn)) {
+            adjustedSwapAmountToA = minQuoteableToA;
+            swapAmountToB = amountIn.sub(adjustedSwapAmountToA);
+          }
+        }
+        if (forceTwoSidedWhenBothQuotes && swapAmountToB.isZero()) {
+          const minQuoteableToB = yield this.findMinimumJupiterQuoteableAmount(
+            inputTokenMint,
+            tokenBMint,
+            amountIn,
+            maxAccounts,
+            slippageBps
+          );
+          if (minQuoteableToB !== null && minQuoteableToB.gt(new import_anchor.BN(0)) && minQuoteableToB.lt(amountIn)) {
+            swapAmountToB = minQuoteableToB;
+            adjustedSwapAmountToA = amountIn.sub(swapAmountToB);
+          }
+        }
         const quoteableA = yield this.isJupiterQuoteableAmount(
           inputTokenMint,
           tokenAMint,
@@ -3997,7 +4081,26 @@ var Zap = class {
             "Calculated zero swap amount for both token routes, unable to proceed"
           );
         }
-        if (!hasSwapToA) {
+        const quoteToAForSwap = yield this.getJupiterQuoteForAmount(
+          inputTokenMint,
+          tokenAMint,
+          adjustedSwapAmountToA,
+          maxAccounts,
+          slippageBps
+        );
+        const quoteToBForSwap = yield this.getJupiterQuoteForAmount(
+          inputTokenMint,
+          tokenBMint,
+          swapAmountToB,
+          maxAccounts,
+          slippageBps
+        );
+        if (!hasSwapToA || quoteToAForSwap === null) {
+          if (quoteToBForSwap === null) {
+            throw new Error(
+              `Failed to get Jupiter quote for swap from ${inputTokenMint.toBase58()} to ${tokenBMint.toBase58()}`
+            );
+          }
           const { transaction: swapToBTransaction2, quoteResponse: swapToBQuote2 } = yield buildJupiterSwapTransaction(
             user,
             inputTokenMint,
@@ -4005,7 +4108,7 @@ var Zap = class {
             swapAmountToB,
             maxAccounts,
             slippageBps,
-            void 0,
+            quoteToBForSwap,
             {
               jupiterApiUrl: this.jupiterApiUrl,
               jupiterApiKey: this.jupiterApiKey
@@ -4043,7 +4146,12 @@ var Zap = class {
             }
           };
         }
-        if (!hasSwapToB) {
+        if (!hasSwapToB || quoteToBForSwap === null) {
+          if (quoteToAForSwap === null) {
+            throw new Error(
+              `Failed to get Jupiter quote for swap from ${inputTokenMint.toBase58()} to ${tokenAMint.toBase58()}`
+            );
+          }
           const { transaction: swapToATransaction2, quoteResponse: swapToAQuote2 } = yield buildJupiterSwapTransaction(
             user,
             inputTokenMint,
@@ -4051,7 +4159,7 @@ var Zap = class {
             adjustedSwapAmountToA,
             maxAccounts,
             slippageBps,
-            void 0,
+            quoteToAForSwap,
             {
               jupiterApiUrl: this.jupiterApiUrl,
               jupiterApiKey: this.jupiterApiKey
@@ -4089,6 +4197,11 @@ var Zap = class {
             }
           };
         }
+        if (quoteToAForSwap === null || quoteToBForSwap === null) {
+          throw new Error(
+            "Failed to get Jupiter quote for both token routes, unable to proceed"
+          );
+        }
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
@@ -4096,7 +4209,7 @@ var Zap = class {
           adjustedSwapAmountToA,
           maxAccounts,
           slippageBps,
-          void 0,
+          quoteToAForSwap,
           {
             jupiterApiUrl: this.jupiterApiUrl,
             jupiterApiKey: this.jupiterApiKey
@@ -4109,7 +4222,7 @@ var Zap = class {
           swapAmountToB,
           maxAccounts,
           slippageBps,
-          void 0,
+          quoteToBForSwap,
           {
             jupiterApiUrl: this.jupiterApiUrl,
             jupiterApiKey: this.jupiterApiKey

package/dist/index.mjs

@@ -3333,6 +3333,27 @@ var Zap = class {
       return quote !== null;
     });
   }
+  getJupiterQuoteForAmount(inputMint, outputMint, amount, maxAccounts, slippageBps) {
+    return __async(this, null, function* () {
+      if (amount.isZero()) {
+        return null;
+      }
+      return yield getJupiterQuote(
+        inputMint,
+        outputMint,
+        amount,
+        maxAccounts,
+        slippageBps,
+        false,
+        true,
+        true,
+        {
+          jupiterApiUrl: this.jupiterApiUrl,
+          jupiterApiKey: this.jupiterApiKey
+        }
+      );
+    });
+  }
   findMinimumJupiterQuoteableAmount(inputMint, outputMint, maxAmount, maxAccounts, slippageBps) {
     return __async(this, null, function* () {
       if (maxAmount.isZero()) {
@@ -3348,9 +3369,45 @@ var Zap = class {
       if (!maxAmountQuoteable) {
         return null;
       }
-      let left = new BN5(1);
+      const defaultLowerBound = inputMint.equals(NATIVE_MINT3) ? new BN5(100) : new BN5(1);
+      let left = defaultLowerBound.gt(maxAmount) ? maxAmount : defaultLowerBound;
       let right = maxAmount;
       let best = maxAmount;
+      const leftIsQuoteable = yield this.isJupiterQuoteableAmount(
+        inputMint,
+        outputMint,
+        left,
+        maxAccounts,
+        slippageBps
+      );
+      if (!leftIsQuoteable) {
+        let probe = left;
+        let found = false;
+        while (probe.lt(maxAmount)) {
+          const nextProbe = BN5.min(probe.mul(new BN5(2)), maxAmount);
+          const nextIsQuoteable = yield this.isJupiterQuoteableAmount(
+            inputMint,
+            outputMint,
+            nextProbe,
+            maxAccounts,
+            slippageBps
+          );
+          if (nextIsQuoteable) {
+            left = probe.add(new BN5(1));
+            right = nextProbe;
+            best = nextProbe;
+            found = true;
+            break;
+          }
+          probe = nextProbe;
+        }
+        if (!found) {
+          return null;
+        }
+      } else {
+        best = left;
+        right = left;
+      }
       while (left.lte(right)) {
         const mid = left.add(right).div(new BN5(2));
         const isQuoteable = yield this.isJupiterQuoteableAmount(
@@ -3736,7 +3793,8 @@ var Zap = class {
         maxTransferAmountExtendPercentage,
         slippageBps,
         jupiterQuoteToA,
-        jupiterQuoteToB
+        jupiterQuoteToB,
+        forceTwoSidedWhenBothQuotes = false
       } = params;
       const poolState = yield getDammV2Pool(this.connection, pool);
       const {
@@ -3921,6 +3979,32 @@ var Zap = class {
           )
         );
         let { swapAmountToA: adjustedSwapAmountToA, swapAmountToB } = splitIndirectSwapAmounts(amountIn, swapAmountToA);
+        if (forceTwoSidedWhenBothQuotes && adjustedSwapAmountToA.isZero()) {
+          const minQuoteableToA = yield this.findMinimumJupiterQuoteableAmount(
+            inputTokenMint,
+            tokenAMint,
+            amountIn,
+            maxAccounts,
+            slippageBps
+          );
+          if (minQuoteableToA !== null && minQuoteableToA.gt(new BN5(0)) && minQuoteableToA.lt(amountIn)) {
+            adjustedSwapAmountToA = minQuoteableToA;
+            swapAmountToB = amountIn.sub(adjustedSwapAmountToA);
+          }
+        }
+        if (forceTwoSidedWhenBothQuotes && swapAmountToB.isZero()) {
+          const minQuoteableToB = yield this.findMinimumJupiterQuoteableAmount(
+            inputTokenMint,
+            tokenBMint,
+            amountIn,
+            maxAccounts,
+            slippageBps
+          );
+          if (minQuoteableToB !== null && minQuoteableToB.gt(new BN5(0)) && minQuoteableToB.lt(amountIn)) {
+            swapAmountToB = minQuoteableToB;
+            adjustedSwapAmountToA = amountIn.sub(swapAmountToB);
+          }
+        }
         const quoteableA = yield this.isJupiterQuoteableAmount(
           inputTokenMint,
           tokenAMint,
@@ -3976,7 +4060,26 @@ var Zap = class {
             "Calculated zero swap amount for both token routes, unable to proceed"
           );
         }
-        if (!hasSwapToA) {
+        const quoteToAForSwap = yield this.getJupiterQuoteForAmount(
+          inputTokenMint,
+          tokenAMint,
+          adjustedSwapAmountToA,
+          maxAccounts,
+          slippageBps
+        );
+        const quoteToBForSwap = yield this.getJupiterQuoteForAmount(
+          inputTokenMint,
+          tokenBMint,
+          swapAmountToB,
+          maxAccounts,
+          slippageBps
+        );
+        if (!hasSwapToA || quoteToAForSwap === null) {
+          if (quoteToBForSwap === null) {
+            throw new Error(
+              `Failed to get Jupiter quote for swap from ${inputTokenMint.toBase58()} to ${tokenBMint.toBase58()}`
+            );
+          }
           const { transaction: swapToBTransaction2, quoteResponse: swapToBQuote2 } = yield buildJupiterSwapTransaction(
             user,
             inputTokenMint,
@@ -3984,7 +4087,7 @@ var Zap = class {
             swapAmountToB,
             maxAccounts,
             slippageBps,
-            void 0,
+            quoteToBForSwap,
             {
               jupiterApiUrl: this.jupiterApiUrl,
               jupiterApiKey: this.jupiterApiKey
@@ -4022,7 +4125,12 @@ var Zap = class {
             }
           };
         }
-        if (!hasSwapToB) {
+        if (!hasSwapToB || quoteToBForSwap === null) {
+          if (quoteToAForSwap === null) {
+            throw new Error(
+              `Failed to get Jupiter quote for swap from ${inputTokenMint.toBase58()} to ${tokenAMint.toBase58()}`
+            );
+          }
           const { transaction: swapToATransaction2, quoteResponse: swapToAQuote2 } = yield buildJupiterSwapTransaction(
             user,
             inputTokenMint,
@@ -4030,7 +4138,7 @@ var Zap = class {
             adjustedSwapAmountToA,
             maxAccounts,
             slippageBps,
-            void 0,
+            quoteToAForSwap,
             {
               jupiterApiUrl: this.jupiterApiUrl,
               jupiterApiKey: this.jupiterApiKey
@@ -4068,6 +4176,11 @@ var Zap = class {
             }
           };
         }
+        if (quoteToAForSwap === null || quoteToBForSwap === null) {
+          throw new Error(
+            "Failed to get Jupiter quote for both token routes, unable to proceed"
+          );
+        }
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
@@ -4075,7 +4188,7 @@ var Zap = class {
           adjustedSwapAmountToA,
           maxAccounts,
           slippageBps,
-          void 0,
+          quoteToAForSwap,
           {
             jupiterApiUrl: this.jupiterApiUrl,
             jupiterApiKey: this.jupiterApiKey
@@ -4088,7 +4201,7 @@ var Zap = class {
           swapAmountToB,
           maxAccounts,
           slippageBps,
-          void 0,
+          quoteToBForSwap,
           {
             jupiterApiUrl: this.jupiterApiUrl,
             jupiterApiKey: this.jupiterApiKey

package/package.json

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