anchor: api integ test swap with quote response

anchor/src/client/base.ts

@@ -51,7 +51,10 @@ export class BaseClient {
     } else {
       const defaultProvider = anchor.AnchorProvider.env();
       const url = defaultProvider.connection.rpcEndpoint;
-      const connection = new Connection(url, "confirmed");
+      const connection = new Connection(url, {
+        commitment: "confirmed",
+        confirmTransactionInitialTimeout: 45000 // default timeout is 30s, we extend it to 45s
+      });
       this.provider = new anchor.AnchorProvider(
         connection,
         defaultProvider.wallet,

anchor/tests/glam_api_tx.spec.ts

@@ -78,7 +78,7 @@ describe("glam_api_tx", () => {
     }
   }, 30_000);
 
-  it("Jupiter swap", async () => {
+  it("Jupiter swap with quote params", async () => {
     const response = await fetch(`${API}/tx/jupiter/swap`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -109,7 +109,54 @@ describe("glam_api_tx", () => {
       console.error("Error", error);
       throw error;
     }
-  }, 30_000);
+  }, 60_000);
+
+  it("Jupiter swap with quote response", async () => {
+    const quoteParams: any = {
+      inputMint: msol.toBase58(),
+      outputMint: wsol.toBase58(),
+      amount: 50000000,
+      autoSlippage: true,
+      autoSlippageCollisionUsdValue: 1000,
+      swapMode: "ExactIn",
+      onlyDirectRoutes: false,
+      asLegacyTransaction: false,
+      maxAccounts: 20
+    };
+    const quoteResponse = await (
+      await fetch(
+        `${glamClient.jupiterApi}/quote?${new URLSearchParams(
+          Object.entries(quoteParams)
+        )}`
+      )
+    ).json();
+
+    console.log("quoteResponse", quoteResponse);
+
+    const response = await fetch(`${API}/tx/jupiter/swap`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        fund,
+        manager,
+        quoteResponse
+      })
+    });
+
+    const { tx } = await response.json();
+    console.log("tx", tx);
+
+    const vTx = VersionedTransaction.deserialize(Buffer.from(tx, "hex"));
+    try {
+      const txId = await (
+        glamClient.provider as anchor.AnchorProvider
+      ).sendAndConfirm(vTx, [glamClient.getWalletSigner()], confirmOptions);
+      console.log("jupiter swap txId", txId);
+    } catch (error) {
+      console.error("Error", error);
+      throw error;
+    }
+  }, 60_000);
 
   it("Stake 0.1 sol", async () => {
     const response = await fetch(`${API}/tx/marinade/stake`, {

api/src/routers/tx.ts

@@ -2,33 +2,6 @@ import { Router } from "express";
 import { validatePubkey, validateBN } from "../validation";
 import { Transaction, VersionedTransaction } from "@solana/web3.js";
 
-/*
- * Jupiter
- */
-
-const jupiterSwapTx = async (client, req, res) => {
-  const fund = validatePubkey(req.body.fund);
-  const manager = validatePubkey(req.body.manager);
-
-  if (!fund || !manager) {
-    return res.sendStatus(400);
-  }
-
-  try {
-    const tx = await client.jupiter.swapTx(
-      fund,
-      manager,
-      req.body.quote,
-      req.body.quoteResponse,
-      req.body.swapInstruction
-    );
-    return serializeVersionedTx(tx, res);
-  } catch (err) {
-    console.log(err);
-    return res.status(400).send({ error: err.message });
-  }
-};
-
 /*
  * Marinade
  */
@@ -119,7 +92,41 @@ const router = Router();
 
 router.post("/tx/jupiter/swap", async (req, res) => {
   res.set("content-type", "application/json");
-  return jupiterSwapTx(req.client, req, res);
+
+  const fund = validatePubkey(req.body.fund);
+  const manager = validatePubkey(req.body.manager);
+
+  if (!fund || !manager) {
+    return res.status(400).send({ error: "Invalid fund or manager" });
+  }
+
+  const { quote, quoteResponse, swapInstruction, addressLookupTableAddresses } =
+    req.body;
+
+  if (!quote && !quoteResponse) {
+    // If quote and quoteResponse are not provided, swapInstruction and addressLookupTableAddresses must be provided
+    if (!swapInstruction || !addressLookupTableAddresses) {
+      return res.status(400).send({
+        error:
+          "Both swapInstruction and addressLookupTableAddresses must be provided"
+      });
+    }
+  }
+
+  try {
+    const tx = await req.client.jupiter.swapTx(
+      fund,
+      manager,
+      quote,
+      quoteResponse,
+      swapInstruction,
+      addressLookupTableAddresses
+    );
+    return serializeVersionedTx(tx, res);
+  } catch (err) {
+    console.log(err);
+    return res.status(400).send({ error: err.message });
+  }
 });
 
 router.post("/tx/marinade/stake", async (req, res) => {

api/tests/server.test.ts

@@ -85,3 +85,31 @@ describe("Test /prices", () => {
     });
   });
 });
+
+describe("Test /tx/jupiter/swap", () => {
+  afterAll(() => {
+    server.close();
+  });
+
+  it("Invalid manager/fund params", async () => {
+    const res = await requestWithSupertest.post("/tx/jupiter/swap").send({
+      fund: "xyz",
+      manager: "abc"
+    });
+    expect(res.status).toEqual(400);
+    expect(res.body).toEqual({ error: "Invalid fund or manager" });
+  });
+
+  it("Invalid swap params", async () => {
+    const res = await requestWithSupertest.post("/tx/jupiter/swap").send({
+      fund: "11111111111111111111111111111111",
+      manager: "11111111111111111111111111111111",
+      swapInstruction: "abc"
+    });
+    expect(res.status).toEqual(400);
+    expect(res.body).toEqual({
+      error:
+        "Both swapInstruction and addressLookupTableAddresses must be provided"
+    });
+  });
+});