@meteora-ag/zap-sdk 1.2.0 → 1.3.0

package/dist/index.js

@@ -114,6 +114,8 @@ __export(index_exports, {
   getOrCreateATAInstruction: () => getOrCreateATAInstruction,
   getTokenAccountBalance: () => getTokenAccountBalance,
   getTokenProgramFromMint: () => getTokenProgramFromMint,
+  isSingleSidedA: () => isSingleSidedA,
+  isSingleSidedB: () => isSingleSidedB,
   toProgramStrategyType: () => toProgramStrategyType,
   unwrapSOLInstruction: () => unwrapSOLInstruction,
   wrapSOLInstruction: () => wrapSOLInstruction
@@ -1792,9 +1794,8 @@ function getJupiterQuote(_0, _1, _2, _3, _4) {
       dynamicSlippage: dynamicSlippage.toString()
     });
     const url = `${config.jupiterApiUrl || DEFAULT_JUPITER_API_URL}/swap/v1/quote?${params.toString()}`;
-    let response = null;
     try {
-      response = yield fetch(url, {
+      const response = yield fetch(url, {
         method: "GET",
         headers: __spreadValues({
           Accept: "application/json"
@@ -1803,11 +1804,11 @@ function getJupiterQuote(_0, _1, _2, _3, _4) {
       if (!response.ok) {
         return null;
       }
+      const result = yield response.json();
+      return result;
     } catch (error) {
       return null;
     }
-    const result = yield response.json();
-    return result;
   });
 }
 function getJupiterSwapInstruction(_0, _1) {
@@ -1993,6 +1994,12 @@ function getDammV2RemainingAccounts(_0, _1, _2, _3) {
     return remainingAccounts;
   });
 }
+function isSingleSidedA(poolState) {
+  return poolState.collectFeeMode !== import_cp_amm_sdk.CollectFeeMode.Compounding && poolState.sqrtPrice.eq(poolState.sqrtMinPrice);
+}
+function isSingleSidedB(poolState) {
+  return poolState.collectFeeMode !== import_cp_amm_sdk.CollectFeeMode.Compounding && poolState.sqrtPrice.eq(poolState.sqrtMaxPrice);
+}
 function createDammV2SwapPayload(amountIn, minimumSwapAmountOut) {
   return Buffer.concat([
     Buffer.from(DAMM_V2_SWAP_DISCRIMINATOR),
@@ -3526,30 +3533,76 @@ var Zap = class {
         tokenBProgram
       );
       const inputTokenDecimal = inputTokenMint.equals(tokenAMint) ? tokenADecimal : tokenBDecimal;
+      const collectFeeMode = poolState.collectFeeMode;
       const poolBalanceTokenA = (0, import_cp_amm_sdk3.getAmountAFromLiquidityDelta)(
         poolState.sqrtPrice,
         poolState.sqrtMaxPrice,
         poolState.liquidity,
-        import_cp_amm_sdk3.Rounding.Down
+        import_cp_amm_sdk3.Rounding.Down,
+        collectFeeMode,
+        poolState.tokenAAmount,
+        poolState.liquidity
       );
       const poolBalanceTokenB = (0, import_cp_amm_sdk3.getAmountBFromLiquidityDelta)(
         poolState.sqrtMinPrice,
         poolState.sqrtPrice,
         poolState.liquidity,
-        import_cp_amm_sdk3.Rounding.Down
+        import_cp_amm_sdk3.Rounding.Down,
+        collectFeeMode,
+        poolState.tokenBAmount,
+        poolState.liquidity
       );
+      const isInputTokenA = tokenAMint.equals(inputTokenMint);
+      const outputTokenMint = isInputTokenA ? tokenBMint : tokenAMint;
+      const singleSidedA = isSingleSidedA(poolState);
+      const singleSidedB = isSingleSidedB(poolState);
       let amount;
       let swapTransactions = [];
       let maxTransferAmount;
       let swapInAmount;
       let swapRoute;
-      if (dammV2Quote === null && jupiterQuote === null) {
-        throw new Error("No Jupiter or DAMM v2 quote found, unable to proceed");
-      }
-      if (jupiterQuote !== null && (dammV2Quote === null || new import_anchor.BN(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
+      if (singleSidedA && isInputTokenA || singleSidedB && !isInputTokenA) {
+        amount = amountIn;
+        swapInAmount = new import_anchor.BN(0);
+        maxTransferAmount = new import_anchor.BN(0);
+        swapRoute = "dammV2" /* DammV2 */;
+      } else if (singleSidedA && !isInputTokenA || singleSidedB && isInputTokenA) {
+        if (jupiterQuote !== null && (dammV2Quote === null || new import_anchor.BN(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
+          swapInAmount = amountIn;
+          amount = new import_anchor.BN(0);
+          const result = yield buildJupiterSwapTransaction(
+            user,
+            inputTokenMint,
+            outputTokenMint,
+            swapInAmount,
+            maxAccounts,
+            slippageBps,
+            void 0,
+            {
+              jupiterApiUrl: this.jupiterApiUrl,
+              jupiterApiKey: this.jupiterApiKey
+            }
+          );
+          swapTransactions = [result.transaction];
+          maxTransferAmount = getExtendMaxAmountTransfer(
+            result.quoteResponse.outAmount,
+            maxTransferAmountExtendPercentage
+          );
+          swapRoute = "jupiter" /* Jupiter */;
+        } else if (dammV2Quote !== null) {
+          swapInAmount = new import_anchor.BN(0);
+          amount = amountIn;
+          maxTransferAmount = new import_anchor.BN(0);
+          swapRoute = "dammV2" /* DammV2 */;
+        } else {
+          throw new Error(
+            "No Jupiter or DAMM v2 quote found for single-sided swap, unable to proceed"
+          );
+        }
+      } else if (jupiterQuote !== null && (dammV2Quote === null || new import_anchor.BN(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
         const price = convertLamportsToUiAmount(
           new import_decimal4.default(jupiterQuote.outAmount),
-          tokenAMint.equals(inputTokenMint) ? tokenBDecimal : tokenADecimal
+          isInputTokenA ? tokenBDecimal : tokenADecimal
         );
         swapInAmount = calculateDirectPoolSwapAmount(
           amountIn,
@@ -3563,13 +3616,13 @@ var Zap = class {
             new import_decimal4.default(poolBalanceTokenB.toString()),
             tokenBDecimal
           ),
-          tokenAMint.equals(inputTokenMint)
+          isInputTokenA
         );
         amount = amountIn.sub(swapInAmount);
         const result = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
-          tokenAMint.equals(inputTokenMint) ? tokenBMint : tokenAMint,
+          outputTokenMint,
           swapInAmount,
           maxAccounts,
           slippageBps,
@@ -3585,7 +3638,7 @@ var Zap = class {
           maxTransferAmountExtendPercentage
         );
         swapRoute = "jupiter" /* Jupiter */;
-      } else {
+      } else if (dammV2Quote !== null) {
         const quote = dammV2Quote;
         amount = amountIn;
         const price = convertLamportsToUiAmount(
@@ -3604,13 +3657,15 @@ var Zap = class {
             new import_decimal4.default(poolBalanceTokenB.toString()),
             tokenBDecimal
           ),
-          tokenAMint.equals(inputTokenMint)
+          isInputTokenA
         );
         maxTransferAmount = getExtendMaxAmountTransfer(
           quote.swapOutAmount.toString(),
           maxTransferAmountExtendPercentage
         );
         swapRoute = "dammV2" /* DammV2 */;
+      } else {
+        throw new Error("No Jupiter or DAMM v2 quote found, unable to proceed");
       }
       const cleanUpInstructions = [];
       if (tokenAMint.equals(import_spl_token6.NATIVE_MINT) || tokenBMint.equals(import_spl_token6.NATIVE_MINT)) {
@@ -3624,7 +3679,7 @@ var Zap = class {
         position,
         positionNftAccount,
         isDirectPool: true,
-        isTokenA: tokenAMint.equals(inputTokenMint),
+        isTokenA: isInputTokenA,
         tokenAMint,
         tokenBMint,
         tokenAVault,
@@ -3735,20 +3790,131 @@ var Zap = class {
         const closewrapSol = unwrapSOLInstruction(user, user, false);
         closewrapSol && cleanUpInstructions.push(closewrapSol);
       }
+      const collectFeeMode = poolState.collectFeeMode;
       const poolBalanceTokenA = (0, import_cp_amm_sdk3.getAmountAFromLiquidityDelta)(
         poolState.sqrtPrice,
         poolState.sqrtMaxPrice,
         poolState.liquidity,
-        import_cp_amm_sdk3.Rounding.Down
+        import_cp_amm_sdk3.Rounding.Down,
+        collectFeeMode,
+        poolState.tokenAAmount,
+        poolState.liquidity
       );
       const poolBalanceTokenB = (0, import_cp_amm_sdk3.getAmountBFromLiquidityDelta)(
         poolState.sqrtMinPrice,
         poolState.sqrtPrice,
         poolState.liquidity,
-        import_cp_amm_sdk3.Rounding.Down
+        import_cp_amm_sdk3.Rounding.Down,
+        collectFeeMode,
+        poolState.tokenBAmount,
+        poolState.liquidity
       );
+      const singleSidedA = isSingleSidedA(poolState);
+      const singleSidedB = isSingleSidedB(poolState);
+      if (singleSidedA) {
+        if (!jupiterQuoteToA) {
+          throw new Error(
+            "No Jupiter quote for token A found for single-sided pool, unable to proceed"
+          );
+        }
+        const result = yield buildJupiterSwapTransaction(
+          user,
+          inputTokenMint,
+          tokenAMint,
+          amountIn,
+          maxAccounts,
+          slippageBps,
+          void 0,
+          {
+            jupiterApiUrl: this.jupiterApiUrl,
+            jupiterApiKey: this.jupiterApiKey
+          }
+        );
+        return {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new import_anchor.BN(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          maxTransferAmountA: getExtendMaxAmountTransfer(
+            result.quoteResponse.outAmount,
+            maxTransferAmountExtendPercentage
+          ),
+          swapType: 0 /* swapToA */,
+          maxTransferAmountB: new import_anchor.BN(0),
+          preSqrtPrice: poolState.sqrtPrice,
+          preInstructions,
+          swapTransactions: [result.transaction],
+          cleanUpInstructions,
+          swapInEstimate: {
+            inAmountA: amountIn,
+            inAmountB: new import_anchor.BN(0),
+            routeA: "jupiter" /* Jupiter */,
+            routeB: "dammV2" /* DammV2 */
+          }
+        };
+      }
+      if (singleSidedB) {
+        if (!jupiterQuoteToB) {
+          throw new Error(
+            "No Jupiter quote for token B found for single-sided pool, unable to proceed"
+          );
+        }
+        const result = yield buildJupiterSwapTransaction(
+          user,
+          inputTokenMint,
+          tokenBMint,
+          amountIn,
+          maxAccounts,
+          slippageBps,
+          void 0,
+          {
+            jupiterApiUrl: this.jupiterApiUrl,
+            jupiterApiKey: this.jupiterApiKey
+          }
+        );
+        return {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new import_anchor.BN(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          maxTransferAmountA: new import_anchor.BN(0),
+          maxTransferAmountB: getExtendMaxAmountTransfer(
+            result.quoteResponse.outAmount,
+            maxTransferAmountExtendPercentage
+          ),
+          swapType: 1 /* swapToB */,
+          preSqrtPrice: poolState.sqrtPrice,
+          preInstructions,
+          swapTransactions: [result.transaction],
+          cleanUpInstructions,
+          swapInEstimate: {
+            inAmountA: new import_anchor.BN(0),
+            inAmountB: amountIn,
+            routeA: "dammV2" /* DammV2 */,
+            routeB: "jupiter" /* Jupiter */
+          }
+        };
+      }
       if (jupiterQuoteToA && jupiterQuoteToB === null) {
-        const { transaction: swapTransaction } = yield buildJupiterSwapTransaction(
+        const result = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
           tokenAMint,
@@ -3776,14 +3942,14 @@ var Zap = class {
           tokenAProgram,
           tokenBProgram,
           maxTransferAmountA: getExtendMaxAmountTransfer(
-            jupiterQuoteToA.outAmount,
+            result.quoteResponse.outAmount,
             maxTransferAmountExtendPercentage
           ),
           swapType: 0 /* swapToA */,
           maxTransferAmountB: new import_anchor.BN(0),
           preSqrtPrice: poolState.sqrtPrice,
           preInstructions,
-          swapTransactions: [swapTransaction],
+          swapTransactions: [result.transaction],
           cleanUpInstructions,
           swapInEstimate: {
             inAmountA: amountIn,
@@ -3794,7 +3960,7 @@ var Zap = class {
         };
       }
       if (jupiterQuoteToB && jupiterQuoteToA === null) {
-        const { transaction: swapTransaction } = yield buildJupiterSwapTransaction(
+        const result = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
           tokenBMint,
@@ -3823,13 +3989,13 @@ var Zap = class {
           tokenBProgram,
           maxTransferAmountA: new import_anchor.BN(0),
           maxTransferAmountB: getExtendMaxAmountTransfer(
-            jupiterQuoteToB.outAmount,
+            result.quoteResponse.outAmount,
             maxTransferAmountExtendPercentage
           ),
           swapType: 1 /* swapToB */,
           preSqrtPrice: poolState.sqrtPrice,
           preInstructions,
-          swapTransactions: [swapTransaction],
+          swapTransactions: [result.transaction],
           cleanUpInstructions,
           swapInEstimate: {
             inAmountA: new import_anchor.BN(0),
@@ -3863,6 +4029,24 @@ var Zap = class {
           )
         );
         const swapAmountToB = amountIn.sub(swapAmountToA);
+        const baseParams = {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new import_anchor.BN(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          preInstructions,
+          preSqrtPrice: poolState.sqrtPrice,
+          cleanUpInstructions
+        };
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
@@ -3889,21 +4073,7 @@ var Zap = class {
             jupiterApiKey: this.jupiterApiKey
           }
         );
-        return {
-          user,
-          pool,
-          position,
-          positionNftAccount,
-          maxSqrtPriceChangeBps,
-          amount: new import_anchor.BN(0),
-          isDirectPool: false,
-          tokenAMint,
-          tokenBMint,
-          tokenAVault,
-          tokenBVault,
-          tokenAProgram,
-          tokenBProgram,
-          preInstructions,
+        return __spreadProps(__spreadValues({}, baseParams), {
           maxTransferAmountA: getExtendMaxAmountTransfer(
             swapToAQuote.outAmount,
             maxTransferAmountExtendPercentage
@@ -3913,16 +4083,14 @@ var Zap = class {
             maxTransferAmountExtendPercentage
           ),
           swapType: 2 /* swapToBoth */,
-          preSqrtPrice: poolState.sqrtPrice,
           swapTransactions: [swapToATransaction, swapToBTransaction],
-          cleanUpInstructions,
           swapInEstimate: {
             inAmountA: swapAmountToA,
             inAmountB: swapAmountToB,
             routeA: "jupiter" /* Jupiter */,
             routeB: "jupiter" /* Jupiter */
           }
-        };
+        });
       }
       throw new Error(
         "No Jupiter quote found for both tokens, unable to proceed"
@@ -4000,9 +4168,7 @@ var Zap = class {
         setupTransaction.add(...preInstructions);
       }
       const ledgerTransaction = new import_web38.Transaction();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectPool) {
         const isTokenA = params.isTokenA;
@@ -4491,9 +4657,7 @@ var Zap = class {
         setupTransaction.add(...preInstructions);
       }
       const ledgerTransaction = new import_web38.Transaction();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectRoute) {
         const { isTokenX, amount, maxTransferAmount } = params;
@@ -4796,9 +4960,7 @@ var Zap = class {
       const tokenXAmountAfterSwap = directSwapEstimate.swapType === 0 /* XToY */ ? tokenXAmount.sub(directSwapEstimate.swapAmount) : directSwapEstimate.swapType === 1 /* YToX */ ? tokenXAmount.add(directSwapEstimate.expectedOutput) : tokenXAmount;
       const tokenYAmountAfterSwap = directSwapEstimate.swapType === 0 /* XToY */ ? tokenYAmount.add(directSwapEstimate.expectedOutput) : directSwapEstimate.swapType === 1 /* YToX */ ? tokenYAmount.sub(directSwapEstimate.swapAmount) : tokenYAmount;
       const ledgerAddress = deriveLedgerAccount(user);
-      const ledgerAccountInfo = yield this.connection.getAccountInfo(
-        ledgerAddress
-      );
+      const ledgerAccountInfo = yield this.connection.getAccountInfo(ledgerAddress);
       const ledgerTransaction = new import_web38.Transaction();
       if (!ledgerAccountInfo) {
         const initLedgerTx = yield this.initializeLedgerAccount(user, user);
@@ -5262,6 +5424,8 @@ var Zap = class {
   getOrCreateATAInstruction,
   getTokenAccountBalance,
   getTokenProgramFromMint,
+  isSingleSidedA,
+  isSingleSidedB,
   toProgramStrategyType,
   unwrapSOLInstruction,
   wrapSOLInstruction