@meteora-ag/zap-sdk 1.2.0-rc.2 → 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 };
   });
 }
 

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 };
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteora-ag/zap-sdk",
-  "version": "1.2.0-rc.2",
+  "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",