@drift-labs/sdk 2.32.1-beta.6 → 2.32.1-beta.8

package/VERSION

@@ -1 +1 @@
-2.32.1-beta.6
+2.32.1-beta.8

package/lib/math/superStake.d.ts

@@ -4,10 +4,11 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, }: {
+export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
+    marinadePrice?: number;
     userAccountPublicKey?: PublicKey;
 }): Promise<{
     ixs: TransactionInstruction[];

package/lib/math/superStake.js

@@ -10,19 +10,28 @@ const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, }) {
-    const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
-    const marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
+async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, }) {
+    if (!marinadePrice) {
+        const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
+        marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
+    }
     const solMint = driftClient.getSpotMarketAccount(1).mint;
     const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
-    const jupiterRoutes = await jupiterClient.getRoutes({
-        inputMint: solMint,
-        outputMint: mSOLMint,
-        amount,
-    });
-    const bestRoute = jupiterRoutes[0];
-    const jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-    if (marinadePrice <= jupiterPrice) {
+    let jupiterPrice;
+    let bestRoute;
+    try {
+        const jupiterRoutes = await jupiterClient.getRoutes({
+            inputMint: solMint,
+            outputMint: mSOLMint,
+            amount,
+        });
+        bestRoute = jupiterRoutes[0];
+        jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+    }
+    catch (e) {
+        console.error('Error getting jupiter price', e);
+    }
+    if (!jupiterPrice || marinadePrice <= jupiterPrice) {
         const ixs = await driftClient.getStakeForMSOLIx({ amount });
         return {
             method: 'marinade',

package/lib/user.js

@@ -1151,7 +1151,7 @@ class User {
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.div(new _1.BN(100)))
                 .div(inOraclePrice); // just assume user can go 100x
             inSwap = maxSwap.div(numericConstants_1.TWO);
-            const error = _1.BN.min(numericConstants_1.QUOTE_PRECISION, freeCollateral.div(new _1.BN(100)));
+            const error = freeCollateral.div(new _1.BN(10000));
             let i = 0;
             let freeCollateralAfter = freeCollateral;
             while (freeCollateralAfter.gt(error) || freeCollateralAfter.isNeg()) {

package/package.json

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

package/src/math/superStake.ts

@@ -18,10 +18,12 @@ export async function findBestSuperStakeIxs({
 	jupiterClient,
 	driftClient,
 	userAccountPublicKey,
+	marinadePrice,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
 	driftClient: DriftClient;
+	marinadePrice?: number;
 	userAccountPublicKey?: PublicKey;
 }): Promise<{
 	ixs: TransactionInstruction[];
@@ -29,21 +31,30 @@ export async function findBestSuperStakeIxs({
 	method: 'jupiter' | 'marinade';
 	price: number;
 }> {
-	const marinadeProgram = getMarinadeFinanceProgram(driftClient.provider);
-	const marinadePrice = await getMarinadeMSolPrice(marinadeProgram);
+	if (!marinadePrice) {
+		const marinadeProgram = getMarinadeFinanceProgram(driftClient.provider);
+		marinadePrice = await getMarinadeMSolPrice(marinadeProgram);
+	}
 
 	const solMint = driftClient.getSpotMarketAccount(1).mint;
 	const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
-	const jupiterRoutes = await jupiterClient.getRoutes({
-		inputMint: solMint,
-		outputMint: mSOLMint,
-		amount,
-	});
 
-	const bestRoute = jupiterRoutes[0];
-	const jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+	let jupiterPrice;
+	let bestRoute;
+	try {
+		const jupiterRoutes = await jupiterClient.getRoutes({
+			inputMint: solMint,
+			outputMint: mSOLMint,
+			amount,
+		});
+
+		bestRoute = jupiterRoutes[0];
+		jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
+	} catch (e) {
+		console.error('Error getting jupiter price', e);
+	}
 
-	if (marinadePrice <= jupiterPrice) {
+	if (!jupiterPrice || marinadePrice <= jupiterPrice) {
 		const ixs = await driftClient.getStakeForMSOLIx({ amount });
 		return {
 			method: 'marinade',

package/src/user.ts

@@ -2066,7 +2066,7 @@ export class User {
 				.div(SPOT_MARKET_WEIGHT_PRECISION.div(new BN(100)))
 				.div(inOraclePrice); // just assume user can go 100x
 			inSwap = maxSwap.div(TWO);
-			const error = BN.min(QUOTE_PRECISION, freeCollateral.div(new BN(100)));
+			const error = freeCollateral.div(new BN(10000));
 
 			let i = 0;
 			let freeCollateralAfter = freeCollateral;