@drift-labs/sdk 2.38.1-beta.6 → 2.38.1-beta.7

package/VERSION

@@ -1 +1 @@
-2.38.1-beta.6
+2.38.1-beta.7

package/lib/jupiter/jupiterClient.d.ts

@@ -28,6 +28,173 @@ export interface Route {
     slippageBps: number;
     swapMode: SwapMode;
 }
+/**
+ *
+ * @export
+ * @interface RoutePlanStep
+ */
+export interface RoutePlanStep {
+    /**
+     *
+     * @type {SwapInfo}
+     * @memberof RoutePlanStep
+     */
+    swapInfo: SwapInfo;
+    /**
+     *
+     * @type {number}
+     * @memberof RoutePlanStep
+     */
+    percent: number;
+}
+export interface SwapInfo {
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    ammKey: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    label?: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    inputMint: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    outputMint: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    inAmount: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    outAmount: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    feeAmount: string;
+    /**
+     *
+     * @type {string}
+     * @memberof SwapInfo
+     */
+    feeMint: string;
+}
+/**
+ *
+ * @export
+ * @interface PlatformFee
+ */
+export interface PlatformFee {
+    /**
+     *
+     * @type {string}
+     * @memberof PlatformFee
+     */
+    amount?: string;
+    /**
+     *
+     * @type {number}
+     * @memberof PlatformFee
+     */
+    feeBps?: number;
+}
+/**
+ *
+ * @export
+ * @interface QuoteResponse
+ */
+export interface QuoteResponse {
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    inputMint: string;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    inAmount: string;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    outputMint: string;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    outAmount: string;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    otherAmountThreshold: string;
+    /**
+     *
+     * @type {SwapMode}
+     * @memberof QuoteResponse
+     */
+    swapMode: SwapMode;
+    /**
+     *
+     * @type {number}
+     * @memberof QuoteResponse
+     */
+    slippageBps: number;
+    /**
+     *
+     * @type {PlatformFee}
+     * @memberof QuoteResponse
+     */
+    platformFee?: PlatformFee;
+    /**
+     *
+     * @type {string}
+     * @memberof QuoteResponse
+     */
+    priceImpactPct: string;
+    /**
+     *
+     * @type {Array<RoutePlanStep>}
+     * @memberof QuoteResponse
+     */
+    routePlan: Array<RoutePlanStep>;
+    /**
+     *
+     * @type {number}
+     * @memberof QuoteResponse
+     */
+    contextSlot?: number;
+    /**
+     *
+     * @type {number}
+     * @memberof QuoteResponse
+     */
+    timeTaken?: number;
+}
 export declare class JupiterClient {
     url: string;
     connection: Connection;
@@ -36,6 +203,7 @@ export declare class JupiterClient {
         connection: Connection;
     });
     /**
+     * ** @deprecated - use getQuote
      * Get routes for a swap
      * @param inputMint the mint of the input token
      * @param outputMint the mint of the output token
@@ -53,6 +221,35 @@ export declare class JupiterClient {
         onlyDirectRoutes?: boolean;
     }): Promise<Route[]>;
     /**
+     * Get routes for a swap
+     * @param inputMint the mint of the input token
+     * @param outputMint the mint of the output token
+     * @param amount the amount of the input token
+     * @param slippageBps the slippage tolerance in basis points
+     * @param swapMode the swap mode (ExactIn or ExactOut)
+     * @param onlyDirectRoutes whether to only return direct routes
+     */
+    getQuote({ inputMint, outputMint, amount, slippageBps, swapMode, onlyDirectRoutes, }: {
+        inputMint: PublicKey;
+        outputMint: PublicKey;
+        amount: BN;
+        slippageBps?: number;
+        swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
+    }): Promise<QuoteResponse>;
+    /**
+     * Get a swap transaction for quote
+     * @param quoteResponse quote to perform swap
+     * @param userPublicKey the signer's wallet public key
+     * @param slippageBps the slippage tolerance in basis points
+     */
+    getSwap({ quote, userPublicKey, slippageBps, }: {
+        quote: QuoteResponse;
+        userPublicKey: PublicKey;
+        slippageBps?: number;
+    }): Promise<VersionedTransaction>;
+    /**
+     * ** @deprecated - use getSwap
      * Get a swap transaction for a route
      * @param route the route to perform swap
      * @param userPublicKey the signer's wallet public key

package/lib/jupiter/jupiterClient.js

@@ -8,11 +8,12 @@ const web3_js_1 = require("@solana/web3.js");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 class JupiterClient {
     constructor({ connection }) {
-        this.url = 'https://quote-api.jup.ag/v4';
+        this.url = 'https://quote-api.jup.ag';
         this.lookupTableCahce = new Map();
         this.connection = connection;
     }
     /**
+     * ** @deprecated - use getQuote
      * Get routes for a swap
      * @param inputMint the mint of the input token
      * @param outputMint the mint of the output token
@@ -30,17 +31,61 @@ class JupiterClient {
             swapMode,
             onlyDirectRoutes: onlyDirectRoutes.toString(),
         }).toString();
-        const { data: routes } = await (await (0, node_fetch_1.default)(`https://quote-api.jup.ag/v4/quote?${params}`)).json();
+        const { data: routes } = await (await (0, node_fetch_1.default)(`${this.url}/v4/quote?${params}`)).json();
         return routes;
     }
     /**
+     * Get routes for a swap
+     * @param inputMint the mint of the input token
+     * @param outputMint the mint of the output token
+     * @param amount the amount of the input token
+     * @param slippageBps the slippage tolerance in basis points
+     * @param swapMode the swap mode (ExactIn or ExactOut)
+     * @param onlyDirectRoutes whether to only return direct routes
+     */
+    async getQuote({ inputMint, outputMint, amount, slippageBps = 50, swapMode = 'ExactIn', onlyDirectRoutes = false, }) {
+        const params = new URLSearchParams({
+            inputMint: inputMint.toString(),
+            outputMint: outputMint.toString(),
+            amount: amount.toString(),
+            slippageBps: slippageBps.toString(),
+            swapMode,
+            onlyDirectRoutes: onlyDirectRoutes.toString(),
+        }).toString();
+        const quote = await (await (0, node_fetch_1.default)(`${this.url}/v6/quote?${params}`)).json();
+        return quote;
+    }
+    /**
+     * Get a swap transaction for quote
+     * @param quoteResponse quote to perform swap
+     * @param userPublicKey the signer's wallet public key
+     * @param slippageBps the slippage tolerance in basis points
+     */
+    async getSwap({ quote, userPublicKey, slippageBps = 50, }) {
+        const resp = await (await (0, node_fetch_1.default)(`${this.url}/v6/swap`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                quoteResponse: quote,
+                userPublicKey,
+                slippageBps,
+            }),
+        })).json();
+        const { swapTransaction } = resp;
+        const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
+        return web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
+    }
+    /**
+     * ** @deprecated - use getSwap
      * Get a swap transaction for a route
      * @param route the route to perform swap
      * @param userPublicKey the signer's wallet public key
      * @param slippageBps the slippage tolerance in basis points
      */
     async getSwapTransaction({ route, userPublicKey, slippageBps = 50, }) {
-        const resp = await (await (0, node_fetch_1.default)(`${this.url}/swap`, {
+        const resp = await (await (0, node_fetch_1.default)(`${this.url}/v4/swap`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.38.1-beta.6",
+	"version": "2.38.1-beta.7",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/jupiter/jupiterClient.ts

@@ -41,8 +41,179 @@ export interface Route {
 	swapMode: SwapMode;
 }
 
+/**
+ *
+ * @export
+ * @interface RoutePlanStep
+ */
+export interface RoutePlanStep {
+	/**
+	 *
+	 * @type {SwapInfo}
+	 * @memberof RoutePlanStep
+	 */
+	swapInfo: SwapInfo;
+	/**
+	 *
+	 * @type {number}
+	 * @memberof RoutePlanStep
+	 */
+	percent: number;
+}
+
+export interface SwapInfo {
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	ammKey: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	label?: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	inputMint: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	outputMint: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	inAmount: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	outAmount: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	feeAmount: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof SwapInfo
+	 */
+	feeMint: string;
+}
+
+/**
+ *
+ * @export
+ * @interface PlatformFee
+ */
+export interface PlatformFee {
+	/**
+	 *
+	 * @type {string}
+	 * @memberof PlatformFee
+	 */
+	amount?: string;
+	/**
+	 *
+	 * @type {number}
+	 * @memberof PlatformFee
+	 */
+	feeBps?: number;
+}
+
+/**
+ *
+ * @export
+ * @interface QuoteResponse
+ */
+export interface QuoteResponse {
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	inputMint: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	inAmount: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	outputMint: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	outAmount: string;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	otherAmountThreshold: string;
+	/**
+	 *
+	 * @type {SwapMode}
+	 * @memberof QuoteResponse
+	 */
+	swapMode: SwapMode;
+	/**
+	 *
+	 * @type {number}
+	 * @memberof QuoteResponse
+	 */
+	slippageBps: number;
+	/**
+	 *
+	 * @type {PlatformFee}
+	 * @memberof QuoteResponse
+	 */
+	platformFee?: PlatformFee;
+	/**
+	 *
+	 * @type {string}
+	 * @memberof QuoteResponse
+	 */
+	priceImpactPct: string;
+	/**
+	 *
+	 * @type {Array<RoutePlanStep>}
+	 * @memberof QuoteResponse
+	 */
+	routePlan: Array<RoutePlanStep>;
+	/**
+	 *
+	 * @type {number}
+	 * @memberof QuoteResponse
+	 */
+	contextSlot?: number;
+	/**
+	 *
+	 * @type {number}
+	 * @memberof QuoteResponse
+	 */
+	timeTaken?: number;
+}
+
 export class JupiterClient {
-	url = 'https://quote-api.jup.ag/v4';
+	url = 'https://quote-api.jup.ag';
 	connection: Connection;
 	lookupTableCahce = new Map<string, AddressLookupTableAccount>();
 
@@ -51,6 +222,7 @@ export class JupiterClient {
 	}
 
 	/**
+	 * ** @deprecated - use getQuote
 	 * Get routes for a swap
 	 * @param inputMint the mint of the input token
 	 * @param outputMint the mint of the output token
@@ -84,13 +256,84 @@ export class JupiterClient {
 		}).toString();
 
 		const { data: routes } = await (
-			await fetch(`https://quote-api.jup.ag/v4/quote?${params}`)
+			await fetch(`${this.url}/v4/quote?${params}`)
 		).json();
 
 		return routes;
 	}
 
 	/**
+	 * Get routes for a swap
+	 * @param inputMint the mint of the input token
+	 * @param outputMint the mint of the output token
+	 * @param amount the amount of the input token
+	 * @param slippageBps the slippage tolerance in basis points
+	 * @param swapMode the swap mode (ExactIn or ExactOut)
+	 * @param onlyDirectRoutes whether to only return direct routes
+	 */
+	public async getQuote({
+		inputMint,
+		outputMint,
+		amount,
+		slippageBps = 50,
+		swapMode = 'ExactIn',
+		onlyDirectRoutes = false,
+	}: {
+		inputMint: PublicKey;
+		outputMint: PublicKey;
+		amount: BN;
+		slippageBps?: number;
+		swapMode?: SwapMode;
+		onlyDirectRoutes?: boolean;
+	}): Promise<QuoteResponse> {
+		const params = new URLSearchParams({
+			inputMint: inputMint.toString(),
+			outputMint: outputMint.toString(),
+			amount: amount.toString(),
+			slippageBps: slippageBps.toString(),
+			swapMode,
+			onlyDirectRoutes: onlyDirectRoutes.toString(),
+		}).toString();
+		const quote = await (await fetch(`${this.url}/v6/quote?${params}`)).json();
+		return quote;
+	}
+
+	/**
+	 * Get a swap transaction for quote
+	 * @param quoteResponse quote to perform swap
+	 * @param userPublicKey the signer's wallet public key
+	 * @param slippageBps the slippage tolerance in basis points
+	 */
+	public async getSwap({
+		quote,
+		userPublicKey,
+		slippageBps = 50,
+	}: {
+		quote: QuoteResponse;
+		userPublicKey: PublicKey;
+		slippageBps?: number;
+	}): Promise<VersionedTransaction> {
+		const resp = await (
+			await fetch(`${this.url}/v6/swap`, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+				},
+				body: JSON.stringify({
+					quoteResponse: quote,
+					userPublicKey,
+					slippageBps,
+				}),
+			})
+		).json();
+		const { swapTransaction } = resp;
+
+		const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
+		return VersionedTransaction.deserialize(swapTransactionBuf);
+	}
+
+	/**
+	 * ** @deprecated - use getSwap
 	 * Get a swap transaction for a route
 	 * @param route the route to perform swap
 	 * @param userPublicKey the signer's wallet public key
@@ -106,7 +349,7 @@ export class JupiterClient {
 		slippageBps?: number;
 	}): Promise<VersionedTransaction> {
 		const resp = await (
-			await fetch(`${this.url}/swap`, {
+			await fetch(`${this.url}/v4/swap`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',