@meteora-ag/zap-sdk 1.2.0 → 1.3.0

package/dist/index.mjs

@@ -1722,9 +1722,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 +1732,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) {
@@ -1810,7 +1809,11 @@ function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6) {
 
 // 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 +1926,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),
@@ -3505,30 +3514,76 @@ 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(
+            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 +3597,13 @@ var Zap = class {
             new Decimal4(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,
@@ -3564,7 +3619,7 @@ var Zap = class {
           maxTransferAmountExtendPercentage
         );
         swapRoute = "jupiter" /* Jupiter */;
-      } else {
+      } else if (dammV2Quote !== null) {
         const quote = dammV2Quote;
         amount = amountIn;
         const price = convertLamportsToUiAmount(
@@ -3583,13 +3638,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 +3660,7 @@ var Zap = class {
         position,
         positionNftAccount,
         isDirectPool: true,
-        isTokenA: tokenAMint.equals(inputTokenMint),
+        isTokenA: isInputTokenA,
         tokenAMint,
         tokenBMint,
         tokenAVault,
@@ -3714,20 +3771,131 @@ 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(
+          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(
+          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(
           user,
           inputTokenMint,
           tokenAMint,
@@ -3755,14 +3923,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 +3941,7 @@ var Zap = class {
         };
       }
       if (jupiterQuoteToB && jupiterQuoteToA === null) {
-        const { transaction: swapTransaction } = yield buildJupiterSwapTransaction(
+        const result = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
           tokenBMint,
@@ -3802,13 +3970,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,6 +4010,24 @@ 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(
           user,
           inputTokenMint,
@@ -3868,21 +4054,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 +4064,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"
@@ -3979,9 +4149,7 @@ var Zap = class {
         setupTransaction.add(...preInstructions);
       }
       const ledgerTransaction = new Transaction2();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectPool) {
         const isTokenA = params.isTokenA;
@@ -4470,9 +4638,7 @@ var Zap = class {
         setupTransaction.add(...preInstructions);
       }
       const ledgerTransaction = new Transaction2();
-      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(
-        user
-      );
+      const resetOrInitializeLedgerTx = yield this.resetOrInitializeLedgerAccount(user);
       ledgerTransaction.add(resetOrInitializeLedgerTx);
       if (isDirectRoute) {
         const { isTokenX, amount, maxTransferAmount } = params;
@@ -4775,9 +4941,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 Transaction2();
       if (!ledgerAccountInfo) {
         const initLedgerTx = yield this.initializeLedgerAccount(user, user);
@@ -5240,6 +5404,8 @@ export {
   getOrCreateATAInstruction,
   getTokenAccountBalance,
   getTokenProgramFromMint,
+  isSingleSidedA,
+  isSingleSidedB,
   toProgramStrategyType,
   unwrapSOLInstruction,
   wrapSOLInstruction

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "A Typescript SDK for interacting with the Zap program on Meteora.",
-  "main": "dist/index.cjs",
+  "main": "dist/index.js",
   "module": "dist/index.js",
   "source": "src/index.ts",
   "types": "dist/index.d.ts",
@@ -21,37 +21,46 @@
   "files": [
     "dist/**"
   ],
-  "scripts": {
-    "build": "rm -rf dist && tsup src/index.ts --format esm,cjs --dts",
-    "clean": "rm -rf dist && rm -rf node_modules rm -rf pnpm-lock.yaml"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "require": "./dist/index.js"
     }
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",
-    "@types/bun": "latest",
+    "@types/chai": "^4.3.0",
     "@types/invariant": "^2.2.37",
-    "tsup": "^8.4.0",
-    "tsx": "^4.20.3",
+    "@types/mocha": "^9.0.0",
     "bip39": "^3.1.0",
-    "ed25519-hd-key": "^1.3.0"
+    "chai": "^4.3.4",
+    "ed25519-hd-key": "^1.3.0",
+    "litesvm": "^0.6.0",
+    "mocha": "^9.0.3",
+    "prettier": "^3.8.2",
+    "ts-mocha": "^10.0.0",
+    "tsup": "^8.5.1",
+    "tsx": "^4.20.3"
   },
   "peerDependencies": {
     "typescript": "^5"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@meteora-ag/cp-amm-sdk": "^1.2.3",
-    "@meteora-ag/dlmm": "^1.9.0",
+    "@meteora-ag/cp-amm-sdk": "^1.4.0",
+    "@meteora-ag/dlmm": "^1.9.7",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",
     "bn.js": "^5.2.2",
     "decimal.js": "^10.4.2",
     "invariant": "^2.2.4"
+  },
+  "scripts": {
+    "build": "rm -rf dist && tsup src/index.ts --format esm,cjs --dts",
+    "clean": "rm -rf dist && rm -rf node_modules rm -rf pnpm-lock.yaml",
+    "typecheck": "tsc",
+    "format": "prettier --check .",
+    "test": "ts-mocha --no-experimental-strip-types -p ./tsconfig.json -t 1000000 'tests/**/*.test.ts'"
   }
-}
+}