@meteora-ag/zap-sdk 1.2.0 → 1.3.1-rc.0

package/dist/index.mjs

@@ -40,10 +40,10 @@ var __async = (__this, __arguments, generator) => {
 
 // src/zap.ts
 import {
-  ComputeBudgetProgram,
+  ComputeBudgetProgram as ComputeBudgetProgram2,
   PublicKey as PublicKey8,
   SystemProgram as SystemProgram2,
-  Transaction as Transaction2
+  Transaction
 } from "@solana/web3.js";
 import invariant2 from "invariant";
 import { BN as BN5, Program } from "@coral-xyz/anchor";
@@ -583,6 +583,9 @@ var idl_default = {
           {
             name: "TransferHookMultiReward",
             fields: ["u8"]
+          },
+          {
+            name: "TransferHookReferral"
           }
         ]
       }
@@ -1648,9 +1651,12 @@ var DlmmSingleSided = /* @__PURE__ */ ((DlmmSingleSided2) => {
 
 // src/helpers/jupiter.ts
 import {
+  AddressLookupTableAccount,
+  ComputeBudgetProgram,
   PublicKey as PublicKey2,
-  Transaction,
-  TransactionInstruction
+  TransactionInstruction,
+  TransactionMessage,
+  VersionedTransaction
 } from "@solana/web3.js";
 
 // src/constants.ts
@@ -1709,6 +1715,67 @@ var DAMM_V2_SWAP_DISCRIMINATOR = [
 var DEFAULT_JUPITER_API_URL = "https://api.jup.ag";
 
 // src/helpers/jupiter.ts
+var PLACEHOLDER_BLOCKHASH = PublicKey2.default.toBase58();
+var DEFAULT_SWAP_COMPUTE_UNIT_LIMIT = 6e5;
+var MAX_COMPUTE_UNIT_LIMIT = 14e5;
+function toTransactionInstruction(instruction) {
+  return new TransactionInstruction({
+    keys: instruction.accounts.map((item) => ({
+      pubkey: typeof item.pubkey === "string" ? new PublicKey2(item.pubkey) : item.pubkey,
+      isSigner: item.isSigner,
+      isWritable: item.isWritable
+    })),
+    programId: new PublicKey2(instruction.programId),
+    data: Buffer.from(instruction.data, "base64")
+  });
+}
+function getAddressLookupTableAccounts(connection, addresses) {
+  return __async(this, null, function* () {
+    if (!addresses || addresses.length === 0) {
+      return [];
+    }
+    const accountInfos = yield connection.getMultipleAccountsInfo(
+      addresses.map((address) => new PublicKey2(address))
+    );
+    const lookupTableAccounts = [];
+    accountInfos.forEach((accountInfo, index) => {
+      if (accountInfo) {
+        lookupTableAccounts.push(
+          new AddressLookupTableAccount({
+            key: new PublicKey2(addresses[index]),
+            state: AddressLookupTableAccount.deserialize(accountInfo.data)
+          })
+        );
+      }
+    });
+    return lookupTableAccounts;
+  });
+}
+function buildVersionedTransaction(payerKey, instructions, lookupTableAccounts) {
+  const message = new TransactionMessage({
+    payerKey,
+    recentBlockhash: PLACEHOLDER_BLOCKHASH,
+    instructions
+  }).compileToV0Message(lookupTableAccounts);
+  return new VersionedTransaction(message);
+}
+function buildVersionedJupiterSwapTransaction(connection, user, swapInstructionResponse) {
+  return __async(this, null, function* () {
+    const lookupTableAccounts = yield getAddressLookupTableAccounts(
+      connection,
+      swapInstructionResponse.addressLookupTableAddresses
+    );
+    const computeUnitLimit = Math.min(
+      swapInstructionResponse.computeUnitLimit || DEFAULT_SWAP_COMPUTE_UNIT_LIMIT,
+      MAX_COMPUTE_UNIT_LIMIT
+    );
+    const instructions = [
+      ComputeBudgetProgram.setComputeUnitLimit({ units: computeUnitLimit }),
+      toTransactionInstruction(swapInstructionResponse.swapInstruction)
+    ];
+    return buildVersionedTransaction(user, instructions, lookupTableAccounts);
+  });
+}
 function getJupiterQuote(_0, _1, _2, _3, _4) {
   return __async(this, arguments, function* (inputMint, outputMint, amount, maxAccounts, slippageBps, dynamicSlippage = false, onlyDirectRoutes, restrictIntermediateTokens, config = {}) {
     const params = new URLSearchParams({
@@ -1722,9 +1789,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"
@@ -1733,11 +1799,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) {
@@ -1770,8 +1836,8 @@ function getJupiterSwapInstruction(_0, _1) {
     return result;
   });
 }
-function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6) {
-  return __async(this, arguments, function* (user, inputMint, outputMint, amount, maxAccounts, slippageBps, jupiterQuoteResponse, config = {}) {
+function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6, _7) {
+  return __async(this, arguments, function* (connection, user, inputMint, outputMint, amount, maxAccounts, slippageBps, jupiterQuoteResponse, config = {}) {
     const quoteResponse = jupiterQuoteResponse != null ? jupiterQuoteResponse : yield getJupiterQuote(
       inputMint,
       outputMint,
@@ -1779,7 +1845,7 @@ function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6) {
       maxAccounts,
       slippageBps,
       false,
-      true,
+      false,
       true,
       config
     );
@@ -1793,24 +1859,22 @@ function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6) {
       quoteResponse,
       config
     );
-    const instruction = new TransactionInstruction({
-      keys: swapInstructionResponse.swapInstruction.accounts.map((item) => {
-        return {
-          pubkey: new PublicKey2(item.pubkey),
-          isSigner: item.isSigner,
-          isWritable: item.isWritable
-        };
-      }),
-      programId: new PublicKey2(swapInstructionResponse.swapInstruction.programId),
-      data: Buffer.from(swapInstructionResponse.swapInstruction.data, "base64")
-    });
-    return { transaction: new Transaction().add(instruction), quoteResponse };
+    const transaction = yield buildVersionedJupiterSwapTransaction(
+      connection,
+      user,
+      swapInstructionResponse
+    );
+    return { transaction, quoteResponse };
   });
 }
 
 // src/helpers/dammV2.ts
 import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
-import { CpAmm, derivePoolAuthority } from "@meteora-ag/cp-amm-sdk";
+import {
+  CollectFeeMode,
+  CpAmm,
+  derivePoolAuthority
+} from "@meteora-ag/cp-amm-sdk";
 
 // src/helpers/pda.ts
 import { PublicKey as PublicKey3 } from "@solana/web3.js";
@@ -1923,6 +1987,12 @@ function getDammV2RemainingAccounts(_0, _1, _2, _3) {
     return remainingAccounts;
   });
 }
+function isSingleSidedA(poolState) {
+  return poolState.collectFeeMode !== CollectFeeMode.Compounding && poolState.sqrtPrice.eq(poolState.sqrtMinPrice);
+}
+function isSingleSidedB(poolState) {
+  return poolState.collectFeeMode !== CollectFeeMode.Compounding && poolState.sqrtPrice.eq(poolState.sqrtMaxPrice);
+}
 function createDammV2SwapPayload(amountIn, minimumSwapAmountOut) {
   return Buffer.concat([
     Buffer.from(DAMM_V2_SWAP_DISCRIMINATOR),
@@ -2233,7 +2303,7 @@ function getDlmmRemainingAccounts(connection, lbPair, user, userInputTokenAccoun
       },
       {
         isSigner: false,
-        isWritable: false,
+        isWritable: true,
         pubkey: binArrayBitmapExtension
       },
       {
@@ -3286,7 +3356,7 @@ var Zap = class {
       if (accountInfo) {
         const closeLedger = yield this.closeLedgerAccount(user, user);
         const reInitializeLedger = yield this.initializeLedgerAccount(user, user);
-        return new Transaction2().add(closeLedger).add(reInitializeLedger);
+        return new Transaction().add(closeLedger).add(reInitializeLedger);
       }
       return yield this.initializeLedgerAccount(user, user);
     });
@@ -3505,30 +3575,77 @@ var Zap = class {
         tokenBProgram
       );
       const inputTokenDecimal = inputTokenMint.equals(tokenAMint) ? tokenADecimal : tokenBDecimal;
+      const collectFeeMode = poolState.collectFeeMode;
       const poolBalanceTokenA = getAmountAFromLiquidityDelta(
         poolState.sqrtPrice,
         poolState.sqrtMaxPrice,
         poolState.liquidity,
-        Rounding.Down
+        Rounding.Down,
+        collectFeeMode,
+        poolState.tokenAAmount,
+        poolState.liquidity
       );
       const poolBalanceTokenB = getAmountBFromLiquidityDelta(
         poolState.sqrtMinPrice,
         poolState.sqrtPrice,
         poolState.liquidity,
-        Rounding.Down
+        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 BN5(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
+      if (singleSidedA && isInputTokenA || singleSidedB && !isInputTokenA) {
+        amount = amountIn;
+        swapInAmount = new BN5(0);
+        maxTransferAmount = new BN5(0);
+        swapRoute = "dammV2" /* DammV2 */;
+      } else if (singleSidedA && !isInputTokenA || singleSidedB && isInputTokenA) {
+        if (jupiterQuote !== null && (dammV2Quote === null || new BN5(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
+          swapInAmount = amountIn;
+          amount = new BN5(0);
+          const result = yield buildJupiterSwapTransaction(
+            this.connection,
+            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 BN5(0);
+          amount = amountIn;
+          maxTransferAmount = new BN5(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 BN5(jupiterQuote.outAmount).gte(dammV2Quote.swapOutAmount))) {
         const price = convertLamportsToUiAmount(
           new Decimal4(jupiterQuote.outAmount),
-          tokenAMint.equals(inputTokenMint) ? tokenBDecimal : tokenADecimal
+          isInputTokenA ? tokenBDecimal : tokenADecimal
         );
         swapInAmount = calculateDirectPoolSwapAmount(
           amountIn,
@@ -3542,13 +3659,14 @@ var Zap = class {
             new Decimal4(poolBalanceTokenB.toString()),
             tokenBDecimal
           ),
-          tokenAMint.equals(inputTokenMint)
+          isInputTokenA
         );
         amount = amountIn.sub(swapInAmount);
         const result = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
-          tokenAMint.equals(inputTokenMint) ? tokenBMint : tokenAMint,
+          outputTokenMint,
           swapInAmount,
           maxAccounts,
           slippageBps,
@@ -3564,7 +3682,7 @@ var Zap = class {
           maxTransferAmountExtendPercentage
         );
         swapRoute = "jupiter" /* Jupiter */;
-      } else {
+      } else if (dammV2Quote !== null) {
         const quote = dammV2Quote;
         amount = amountIn;
         const price = convertLamportsToUiAmount(
@@ -3583,13 +3701,15 @@ var Zap = class {
             new Decimal4(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(NATIVE_MINT3) || tokenBMint.equals(NATIVE_MINT3)) {
@@ -3603,7 +3723,7 @@ var Zap = class {
         position,
         positionNftAccount,
         isDirectPool: true,
-        isTokenA: tokenAMint.equals(inputTokenMint),
+        isTokenA: isInputTokenA,
         tokenAMint,
         tokenBMint,
         tokenAVault,
@@ -3714,20 +3834,134 @@ var Zap = class {
         const closewrapSol = unwrapSOLInstruction(user, user, false);
         closewrapSol && cleanUpInstructions.push(closewrapSol);
       }
+      const collectFeeMode = poolState.collectFeeMode;
       const poolBalanceTokenA = getAmountAFromLiquidityDelta(
         poolState.sqrtPrice,
         poolState.sqrtMaxPrice,
         poolState.liquidity,
-        Rounding.Down
+        Rounding.Down,
+        collectFeeMode,
+        poolState.tokenAAmount,
+        poolState.liquidity
       );
       const poolBalanceTokenB = getAmountBFromLiquidityDelta(
         poolState.sqrtMinPrice,
         poolState.sqrtPrice,
         poolState.liquidity,
-        Rounding.Down
+        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(
+          this.connection,
+          user,
+          inputTokenMint,
+          tokenAMint,
+          amountIn,
+          maxAccounts,
+          slippageBps,
+          void 0,
+          {
+            jupiterApiUrl: this.jupiterApiUrl,
+            jupiterApiKey: this.jupiterApiKey
+          }
+        );
+        return {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new BN5(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          maxTransferAmountA: getExtendMaxAmountTransfer(
+            result.quoteResponse.outAmount,
+            maxTransferAmountExtendPercentage
+          ),
+          swapType: 0 /* swapToA */,
+          maxTransferAmountB: new BN5(0),
+          preSqrtPrice: poolState.sqrtPrice,
+          preInstructions,
+          swapTransactions: [result.transaction],
+          cleanUpInstructions,
+          swapInEstimate: {
+            inAmountA: amountIn,
+            inAmountB: new BN5(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(
+          this.connection,
+          user,
+          inputTokenMint,
+          tokenBMint,
+          amountIn,
+          maxAccounts,
+          slippageBps,
+          void 0,
+          {
+            jupiterApiUrl: this.jupiterApiUrl,
+            jupiterApiKey: this.jupiterApiKey
+          }
+        );
+        return {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new BN5(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          maxTransferAmountA: new BN5(0),
+          maxTransferAmountB: getExtendMaxAmountTransfer(
+            result.quoteResponse.outAmount,
+            maxTransferAmountExtendPercentage
+          ),
+          swapType: 1 /* swapToB */,
+          preSqrtPrice: poolState.sqrtPrice,
+          preInstructions,
+          swapTransactions: [result.transaction],
+          cleanUpInstructions,
+          swapInEstimate: {
+            inAmountA: new BN5(0),
+            inAmountB: amountIn,
+            routeA: "dammV2" /* DammV2 */,
+            routeB: "jupiter" /* Jupiter */
+          }
+        };
+      }
       if (jupiterQuoteToA && jupiterQuoteToB === null) {
-        const { transaction: swapTransaction } = yield buildJupiterSwapTransaction(
+        const result = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenAMint,
@@ -3755,14 +3989,14 @@ var Zap = class {
           tokenAProgram,
           tokenBProgram,
           maxTransferAmountA: getExtendMaxAmountTransfer(
-            jupiterQuoteToA.outAmount,
+            result.quoteResponse.outAmount,
             maxTransferAmountExtendPercentage
           ),
           swapType: 0 /* swapToA */,
           maxTransferAmountB: new BN5(0),
           preSqrtPrice: poolState.sqrtPrice,
           preInstructions,
-          swapTransactions: [swapTransaction],
+          swapTransactions: [result.transaction],
           cleanUpInstructions,
           swapInEstimate: {
             inAmountA: amountIn,
@@ -3773,7 +4007,8 @@ var Zap = class {
         };
       }
       if (jupiterQuoteToB && jupiterQuoteToA === null) {
-        const { transaction: swapTransaction } = yield buildJupiterSwapTransaction(
+        const result = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenBMint,
@@ -3802,13 +4037,13 @@ var Zap = class {
           tokenBProgram,
           maxTransferAmountA: new BN5(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 BN5(0),
@@ -3842,7 +4077,26 @@ var Zap = class {
           )
         );
         const swapAmountToB = amountIn.sub(swapAmountToA);
+        const baseParams = {
+          user,
+          pool,
+          position,
+          positionNftAccount,
+          maxSqrtPriceChangeBps,
+          amount: new BN5(0),
+          isDirectPool: false,
+          tokenAMint,
+          tokenBMint,
+          tokenAVault,
+          tokenBVault,
+          tokenAProgram,
+          tokenBProgram,
+          preInstructions,
+          preSqrtPrice: poolState.sqrtPrice,
+          cleanUpInstructions
+        };
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenAMint,
@@ -3856,6 +4110,7 @@ var Zap = class {
           }
         );
         const { transaction: swapToBTransaction, quoteResponse: swapToBQuote } = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenBMint,
@@ -3868,21 +4123,7 @@ var Zap = class {
             jupiterApiKey: this.jupiterApiKey
           }
         );
-        return {
-          user,
-          pool,
-          position,
-          positionNftAccount,
-          maxSqrtPriceChangeBps,
-          amount: new BN5(0),
-          isDirectPool: false,
-          tokenAMint,
-          tokenBMint,
-          tokenAVault,
-          tokenBVault,
-          tokenAProgram,
-          tokenBProgram,
-          preInstructions,
+        return __spreadProps(__spreadValues({}, baseParams), {
           maxTransferAmountA: getExtendMaxAmountTransfer(
             swapToAQuote.outAmount,
             maxTransferAmountExtendPercentage
@@ -3892,16 +4133,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"
@@ -3972,16 +4211,14 @@ var Zap = class {
           tokenBProgram
         )
       ]);
-      const setupTransaction = new Transaction2();
+      const setupTransaction = new Transaction();
       initializeTokenAIx && setupTransaction.add(initializeTokenAIx);
       initializeTokenBIx && setupTransaction.add(initializeTokenBIx);
       if (preInstructions.length > 0) {
         setupTransaction.add(...preInstructions);
       }
-      const ledgerTransaction = new Transaction2();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const ledgerTransaction = new Transaction();
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectPool) {
         const isTokenA = params.isTokenA;
@@ -4056,7 +4293,7 @@ var Zap = class {
         tokenAAccount,
         tokenBAccount
       });
-      const cleanUpTransaction = new Transaction2();
+      const cleanUpTransaction = new Transaction();
       const closeLedgerTransaction = yield this.closeLedgerAccount(user, user);
       cleanUpTransaction.add(closeLedgerTransaction);
       if (cleanUpInstructions.length > 0) {
@@ -4144,6 +4381,7 @@ var Zap = class {
         const swapQuote = directSwapEstimate.quote;
         if (swapQuote.route === 0 /* Jupiter */) {
           const { transaction: swapTx } = yield buildJupiterSwapTransaction(
+            this.connection,
             user,
             directSwapEstimate.swapType === 0 /* XToY */ ? tokenXMint : tokenYMint,
             directSwapEstimate.swapType === 0 /* XToY */ ? tokenYMint : tokenXMint,
@@ -4313,6 +4551,7 @@ var Zap = class {
       const swapAmountToYInLamports = indirectSwapEstimate.swapAmountToY;
       if (!indirectSwapEstimate.swapAmountToX.isZero() && indirectSwapEstimate.swapToX !== null) {
         const { transaction: swapToXTransaction } = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenXMint,
@@ -4329,6 +4568,7 @@ var Zap = class {
       }
       if (!indirectSwapEstimate.swapAmountToY.isZero() && indirectSwapEstimate.swapToY !== null) {
         const { transaction: swapToYTransaction } = yield buildJupiterSwapTransaction(
+          this.connection,
           user,
           inputTokenMint,
           tokenYMint,
@@ -4463,16 +4703,14 @@ var Zap = class {
           tokenYProgram
         )
       ]);
-      const setupTransaction = new Transaction2();
+      const setupTransaction = new Transaction();
       initializeTokenXIx && setupTransaction.add(initializeTokenXIx);
       initializeTokenYIx && setupTransaction.add(initializeTokenYIx);
       if (preInstructions.length > 0) {
         setupTransaction.add(...preInstructions);
       }
-      const ledgerTransaction = new Transaction2();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const ledgerTransaction = new Transaction();
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectRoute) {
         const { isTokenX, amount, maxTransferAmount } = params;
@@ -4592,7 +4830,7 @@ var Zap = class {
         strategy,
         remainingAccountInfo
       });
-      const cleanUpTransaction = new Transaction2();
+      const cleanUpTransaction = new Transaction();
       const closeLedgerTransaction = yield this.closeLedgerAccount(user, user);
       cleanUpTransaction.add(closeLedgerTransaction);
       if (cleanUpInstructions.length > 0) {
@@ -4665,7 +4903,7 @@ var Zap = class {
           tokenYProgram
         )
       ]);
-      const setupTransaction = new Transaction2();
+      const setupTransaction = new Transaction();
       userTokenXIx && setupTransaction.add(userTokenXIx);
       userTokenYIx && setupTransaction.add(userTokenYIx);
       const strategyParamBuilder = getLiquidityStrategyParameterBuilder(strategy);
@@ -4731,6 +4969,7 @@ var Zap = class {
         const swapQuote = directSwapEstimate.quote;
         if (swapQuote.route === 0 /* Jupiter */) {
           const { transaction: swapTx } = yield buildJupiterSwapTransaction(
+            this.connection,
             user,
             directSwapEstimate.swapType === 0 /* XToY */ ? dlmm.lbPair.tokenXMint : dlmm.lbPair.tokenYMint,
             directSwapEstimate.swapType === 0 /* XToY */ ? dlmm.lbPair.tokenYMint : dlmm.lbPair.tokenXMint,
@@ -4775,10 +5014,8 @@ 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 ledgerTransaction = new Transaction2();
+      const ledgerAccountInfo = yield this.connection.getAccountInfo(ledgerAddress);
+      const ledgerTransaction = new Transaction();
       if (!ledgerAccountInfo) {
         const initLedgerTx = yield this.initializeLedgerAccount(user, user);
         ledgerTransaction.add(...initLedgerTx.instructions);
@@ -4835,9 +5072,9 @@ var Zap = class {
       zapInTransaction.instructions.unshift(
         // based on 1 tx that consumed 462_610. Add 20% for safety and round up to nearest 100,000
         // 462_610 * 1.2 = 555_132 => 600_000
-        ComputeBudgetProgram.setComputeUnitLimit({ units: 6e5 })
+        ComputeBudgetProgram2.setComputeUnitLimit({ units: 6e5 })
       );
-      const cleanUpTransaction = new Transaction2();
+      const cleanUpTransaction = new Transaction();
       const closeLedgerTx = yield this.closeLedgerAccount(user, user);
       cleanUpTransaction.add(closeLedgerTx);
       if (dlmm.lbPair.tokenXMint.equals(NATIVE_MINT3) || dlmm.lbPair.tokenYMint.equals(NATIVE_MINT3)) {
@@ -4848,8 +5085,8 @@ var Zap = class {
       }
       return {
         setupTransaction,
-        initBinArrayTransaction: initBinArrayInstructions.length > 0 ? new Transaction2().add(...initBinArrayInstructions) : void 0,
-        rebalancePositionTransaction: rebalancePositionInstruction.length > 0 ? new Transaction2().add(...rebalancePositionInstruction) : void 0,
+        initBinArrayTransaction: initBinArrayInstructions.length > 0 ? new Transaction().add(...initBinArrayInstructions) : void 0,
+        rebalancePositionTransaction: rebalancePositionInstruction.length > 0 ? new Transaction().add(...rebalancePositionInstruction) : void 0,
         swapTransaction,
         ledgerTransaction,
         zapInTransaction,
@@ -4979,7 +5216,7 @@ var Zap = class {
           postInstructions.push(unwrapInstructions);
         }
       }
-      return yield this.zapOut({
+      const zapOutTransaction = yield this.zapOut({
         userTokenInAccount: inputTokenAccount,
         zapOutParams: {
           percentage: percentageToZapOut,
@@ -4993,6 +5230,22 @@ var Zap = class {
         preInstructions,
         postInstructions
       });
+      const lookupTableAccounts = yield getAddressLookupTableAccounts(
+        this.connection,
+        jupiterSwapResponse.addressLookupTableAddresses
+      );
+      const computeUnitLimit = Math.min(
+        (jupiterSwapResponse.computeUnitLimit || 6e5) + 2e5,
+        14e5
+      );
+      return buildVersionedTransaction(
+        user,
+        [
+          ComputeBudgetProgram2.setComputeUnitLimit({ units: computeUnitLimit }),
+          ...zapOutTransaction.instructions
+        ],
+        lookupTableAccounts
+      );
     });
   }
   /**
@@ -5214,6 +5467,8 @@ export {
   idl_default as ZapIdl,
   ZapInDammV2PoolSwapRoute,
   buildJupiterSwapTransaction,
+  buildVersionedJupiterSwapTransaction,
+  buildVersionedTransaction,
   convertAccountTypeToNumber,
   convertLamportsToUiAmount,
   convertUiAmountToLamports,
@@ -5227,6 +5482,7 @@ export {
   estimateDlmmIndirectSwap,
   estimateDlmmRebalanceSwap,
   filterOutCloseSplTokenAccountInstructions,
+  getAddressLookupTableAccounts,
   getBinArrayBitmapExtension,
   getBitFromBinArrayIndexInBitmapExtension,
   getDammV2Pool,
@@ -5240,6 +5496,8 @@ export {
   getOrCreateATAInstruction,
   getTokenAccountBalance,
   getTokenProgramFromMint,
+  isSingleSidedA,
+  isSingleSidedB,
   toProgramStrategyType,
   unwrapSOLInstruction,
   wrapSOLInstruction