@meteora-ag/zap-sdk 1.2.0-rc.1 → 1.2.0-rc.3

package/dist/index.js

@@ -1863,18 +1863,37 @@ function buildJupiterSwapTransaction(_0, _1, _2, _3, _4, _5, _6) {
       quoteResponse,
       config
     );
-    const instruction = new import_web32.TransactionInstruction({
-      keys: swapInstructionResponse.swapInstruction.accounts.map((item) => {
-        return {
-          pubkey: new import_web32.PublicKey(item.pubkey),
-          isSigner: item.isSigner,
-          isWritable: item.isWritable
-        };
-      }),
-      programId: new import_web32.PublicKey(swapInstructionResponse.swapInstruction.programId),
-      data: Buffer.from(swapInstructionResponse.swapInstruction.data, "base64")
-    });
-    return { transaction: new import_web32.Transaction().add(instruction), quoteResponse };
+    const toTxInstruction = (instruction) => {
+      if (!instruction) return null;
+      return new import_web32.TransactionInstruction({
+        keys: instruction.accounts.map((item) => {
+          return {
+            pubkey: new import_web32.PublicKey(item.pubkey),
+            isSigner: item.isSigner,
+            isWritable: item.isWritable
+          };
+        }),
+        programId: new import_web32.PublicKey(instruction.programId),
+        data: Buffer.from(instruction.data, "base64")
+      });
+    };
+    const transaction = new import_web32.Transaction();
+    const tokenLedgerInstruction = toTxInstruction(
+      swapInstructionResponse.tokenLedgerInstruction
+    );
+    if (tokenLedgerInstruction) {
+      transaction.add(tokenLedgerInstruction);
+    }
+    for (const setupInstruction of swapInstructionResponse.setupInstructions) {
+      const txInstruction = toTxInstruction(setupInstruction);
+      if (txInstruction) transaction.add(txInstruction);
+    }
+    const swapInstruction = toTxInstruction(swapInstructionResponse.swapInstruction);
+    if (!swapInstruction) {
+      throw new Error("Missing Jupiter swap instruction");
+    }
+    transaction.add(swapInstruction);
+    return { transaction, quoteResponse };
   });
 }
 
@@ -3863,21 +3882,103 @@ var Zap = class {
           )
         );
         const swapAmountToB = amountIn.sub(swapAmountToA);
-        const MIN_SWAP_AMOUNT = new import_anchor.BN(1e5);
-        let finalSwapAmountToA = swapAmountToA;
-        let finalSwapAmountToB = swapAmountToB;
-        if (swapAmountToB.lt(MIN_SWAP_AMOUNT) && amountIn.gt(MIN_SWAP_AMOUNT.muln(2))) {
-          finalSwapAmountToB = MIN_SWAP_AMOUNT;
-          finalSwapAmountToA = amountIn.sub(MIN_SWAP_AMOUNT);
-        } else if (swapAmountToA.lt(MIN_SWAP_AMOUNT) && amountIn.gt(MIN_SWAP_AMOUNT.muln(2))) {
-          finalSwapAmountToA = MIN_SWAP_AMOUNT;
-          finalSwapAmountToB = amountIn.sub(MIN_SWAP_AMOUNT);
+        if (swapAmountToA.isZero()) {
+          const { transaction: swapToBTransaction2, quoteResponse: swapToBQuote2 } = yield buildJupiterSwapTransaction(
+            user,
+            inputTokenMint,
+            tokenBMint,
+            swapAmountToB,
+            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(
+              swapToBQuote2.outAmount,
+              maxTransferAmountExtendPercentage
+            ),
+            swapType: 1 /* swapToB */,
+            preSqrtPrice: poolState.sqrtPrice,
+            preInstructions,
+            swapTransactions: [swapToBTransaction2],
+            cleanUpInstructions,
+            swapInEstimate: {
+              inAmountA: new import_anchor.BN(0),
+              inAmountB: swapAmountToB,
+              routeA: "dammV2" /* DammV2 */,
+              routeB: "jupiter" /* Jupiter */
+            }
+          };
+        }
+        if (swapAmountToB.isZero()) {
+          const { transaction: swapToATransaction2, quoteResponse: swapToAQuote2 } = yield buildJupiterSwapTransaction(
+            user,
+            inputTokenMint,
+            tokenAMint,
+            swapAmountToA,
+            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(
+              swapToAQuote2.outAmount,
+              maxTransferAmountExtendPercentage
+            ),
+            maxTransferAmountB: new import_anchor.BN(0),
+            swapType: 0 /* swapToA */,
+            preSqrtPrice: poolState.sqrtPrice,
+            preInstructions,
+            swapTransactions: [swapToATransaction2],
+            cleanUpInstructions,
+            swapInEstimate: {
+              inAmountA: swapAmountToA,
+              inAmountB: new import_anchor.BN(0),
+              routeA: "jupiter" /* Jupiter */,
+              routeB: "dammV2" /* DammV2 */
+            }
+          };
         }
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
           tokenAMint,
-          finalSwapAmountToA,
+          swapAmountToA,
           maxAccounts,
           slippageBps,
           void 0,
@@ -3890,7 +3991,7 @@ var Zap = class {
           user,
           inputTokenMint,
           tokenBMint,
-          finalSwapAmountToB,
+          swapAmountToB,
           maxAccounts,
           slippageBps,
           void 0,
@@ -3927,8 +4028,8 @@ var Zap = class {
           swapTransactions: [swapToATransaction, swapToBTransaction],
           cleanUpInstructions,
           swapInEstimate: {
-            inAmountA: finalSwapAmountToA,
-            inAmountB: finalSwapAmountToB,
+            inAmountA: swapAmountToA,
+            inAmountB: swapAmountToB,
             routeA: "jupiter" /* Jupiter */,
             routeB: "jupiter" /* Jupiter */
           }

package/dist/index.mjs

@@ -1793,18 +1793,37 @@ 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 toTxInstruction = (instruction) => {
+      if (!instruction) return null;
+      return new TransactionInstruction({
+        keys: instruction.accounts.map((item) => {
+          return {
+            pubkey: new PublicKey2(item.pubkey),
+            isSigner: item.isSigner,
+            isWritable: item.isWritable
+          };
+        }),
+        programId: new PublicKey2(instruction.programId),
+        data: Buffer.from(instruction.data, "base64")
+      });
+    };
+    const transaction = new Transaction();
+    const tokenLedgerInstruction = toTxInstruction(
+      swapInstructionResponse.tokenLedgerInstruction
+    );
+    if (tokenLedgerInstruction) {
+      transaction.add(tokenLedgerInstruction);
+    }
+    for (const setupInstruction of swapInstructionResponse.setupInstructions) {
+      const txInstruction = toTxInstruction(setupInstruction);
+      if (txInstruction) transaction.add(txInstruction);
+    }
+    const swapInstruction = toTxInstruction(swapInstructionResponse.swapInstruction);
+    if (!swapInstruction) {
+      throw new Error("Missing Jupiter swap instruction");
+    }
+    transaction.add(swapInstruction);
+    return { transaction, quoteResponse };
   });
 }
 
@@ -3842,21 +3861,103 @@ var Zap = class {
           )
         );
         const swapAmountToB = amountIn.sub(swapAmountToA);
-        const MIN_SWAP_AMOUNT = new BN5(1e5);
-        let finalSwapAmountToA = swapAmountToA;
-        let finalSwapAmountToB = swapAmountToB;
-        if (swapAmountToB.lt(MIN_SWAP_AMOUNT) && amountIn.gt(MIN_SWAP_AMOUNT.muln(2))) {
-          finalSwapAmountToB = MIN_SWAP_AMOUNT;
-          finalSwapAmountToA = amountIn.sub(MIN_SWAP_AMOUNT);
-        } else if (swapAmountToA.lt(MIN_SWAP_AMOUNT) && amountIn.gt(MIN_SWAP_AMOUNT.muln(2))) {
-          finalSwapAmountToA = MIN_SWAP_AMOUNT;
-          finalSwapAmountToB = amountIn.sub(MIN_SWAP_AMOUNT);
+        if (swapAmountToA.isZero()) {
+          const { transaction: swapToBTransaction2, quoteResponse: swapToBQuote2 } = yield buildJupiterSwapTransaction(
+            user,
+            inputTokenMint,
+            tokenBMint,
+            swapAmountToB,
+            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(
+              swapToBQuote2.outAmount,
+              maxTransferAmountExtendPercentage
+            ),
+            swapType: 1 /* swapToB */,
+            preSqrtPrice: poolState.sqrtPrice,
+            preInstructions,
+            swapTransactions: [swapToBTransaction2],
+            cleanUpInstructions,
+            swapInEstimate: {
+              inAmountA: new BN5(0),
+              inAmountB: swapAmountToB,
+              routeA: "dammV2" /* DammV2 */,
+              routeB: "jupiter" /* Jupiter */
+            }
+          };
+        }
+        if (swapAmountToB.isZero()) {
+          const { transaction: swapToATransaction2, quoteResponse: swapToAQuote2 } = yield buildJupiterSwapTransaction(
+            user,
+            inputTokenMint,
+            tokenAMint,
+            swapAmountToA,
+            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(
+              swapToAQuote2.outAmount,
+              maxTransferAmountExtendPercentage
+            ),
+            maxTransferAmountB: new BN5(0),
+            swapType: 0 /* swapToA */,
+            preSqrtPrice: poolState.sqrtPrice,
+            preInstructions,
+            swapTransactions: [swapToATransaction2],
+            cleanUpInstructions,
+            swapInEstimate: {
+              inAmountA: swapAmountToA,
+              inAmountB: new BN5(0),
+              routeA: "jupiter" /* Jupiter */,
+              routeB: "dammV2" /* DammV2 */
+            }
+          };
         }
         const { transaction: swapToATransaction, quoteResponse: swapToAQuote } = yield buildJupiterSwapTransaction(
           user,
           inputTokenMint,
           tokenAMint,
-          finalSwapAmountToA,
+          swapAmountToA,
           maxAccounts,
           slippageBps,
           void 0,
@@ -3869,7 +3970,7 @@ var Zap = class {
           user,
           inputTokenMint,
           tokenBMint,
-          finalSwapAmountToB,
+          swapAmountToB,
           maxAccounts,
           slippageBps,
           void 0,
@@ -3906,8 +4007,8 @@ var Zap = class {
           swapTransactions: [swapToATransaction, swapToBTransaction],
           cleanUpInstructions,
           swapInEstimate: {
-            inAmountA: finalSwapAmountToA,
-            inAmountB: finalSwapAmountToB,
+            inAmountA: swapAmountToA,
+            inAmountB: swapAmountToB,
             routeA: "jupiter" /* Jupiter */,
             routeB: "jupiter" /* Jupiter */
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.3",
   "description": "A Typescript SDK for interacting with the Zap program on Meteora.",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -32,17 +32,17 @@
     "@types/bn.js": "^5.1.0",
     "@types/bun": "latest",
     "@types/invariant": "^2.2.37",
-    "bip39": "^3.1.0",
-    "ed25519-hd-key": "^1.3.0",
     "tsup": "^8.4.0",
-    "tsx": "^4.20.3"
+    "tsx": "^4.20.3",
+    "bip39": "^3.1.0",
+    "ed25519-hd-key": "^1.3.0"
   },
   "peerDependencies": {
     "typescript": "^5"
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.31.1",
-    "@meteora-ag/cp-amm-sdk": "^1.3.6",
+    "@meteora-ag/cp-amm-sdk": "^1.2.3",
     "@meteora-ag/dlmm": "^1.9.0",
     "@solana/spl-token": "^0.4.13",
     "@solana/web3.js": "^1.98.2",