@drift-labs/sdk 2.85.0-beta.0 → 2.85.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.85.0-beta.0
+2.85.0-beta.2

package/lib/driftClient.d.ts

@@ -649,7 +649,7 @@ export declare class DriftClient {
     getOracleDataForSpotMarket(marketIndex: number): OraclePriceData;
     initializeInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeInsuranceFundStakeIx(marketIndex: number): Promise<TransactionInstruction>;
-    getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
+    getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey, fromSubAccount?: boolean): Promise<TransactionInstruction>;
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */

package/lib/driftClient.js

@@ -2544,7 +2544,7 @@ class DriftClient {
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
                 const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, undefined, true, recentBlockHash));
-                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2);
+                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
                     earlyExitFailedPlaceAndTakeSim = true;
                     return;
@@ -3318,12 +3318,12 @@ class DriftClient {
             },
         });
     }
-    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
+    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey, fromSubAccount) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
+            userAccounts: fromSubAccount ? [this.getUserAccount()] : [],
+            useMarketLastSlotCache: fromSubAccount ? true : false,
             writableSpotMarketIndexes: [marketIndex],
         });
         const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
@@ -3371,7 +3371,7 @@ class DriftClient {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
             addIfStakeIxs.push(initializeIx);
         }
-        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
+        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount, fromSubaccount);
         addIfStakeIxs.push(addFundsIx);
         if (createWSOLTokenAccount) {
             addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
@@ -3384,8 +3384,7 @@ class DriftClient {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
-            useMarketLastSlotCache: true,
+            userAccounts: [],
             writableSpotMarketIndexes: [marketIndex],
         });
         const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
@@ -3427,7 +3426,6 @@ class DriftClient {
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, txParams) {
-        var _a, _b;
         const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
@@ -3450,11 +3448,8 @@ class DriftClient {
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
-        const userAccountExists = !!((_b = (_a = this.getUser()) === null || _a === void 0 ? void 0 : _a.accountSubscriber) === null || _b === void 0 ? void 0 : _b.isSubscribed) &&
-            (await this.checkIfAccountExists(this.getUser().userAccountPublicKey));
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: userAccountExists ? [this.getUserAccount()] : [],
-            useMarketLastSlotCache: false,
+            userAccounts: [],
             writableSpotMarketIndexes: [marketIndex],
         });
         const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {

package/lib/tx/txParamProcessor.d.ts

@@ -8,7 +8,8 @@ type TransactionBuildingProps = {
  */
 export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
-    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number): Promise<{
+    static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu?: number): Promise<{
         success: boolean;
         computeUnits: number;
     }>;

package/lib/tx/txParamProcessor.js

@@ -15,8 +15,8 @@ class TransactionParamProcessor {
         }
         return undefined;
     }
-    static async getTxSimComputeUnits(tx, connection, bufferMultiplier // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
-    ) {
+    static async getTxSimComputeUnits(tx, connection, bufferMultiplier, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+    lowerBoundCu) {
         var _a, _b, _c;
         try {
             if (TEST_SIMS_ALWAYS_FAIL)
@@ -29,7 +29,11 @@ class TransactionParamProcessor {
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
-            const bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            let bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
+            // If a lower bound CU is passed then enforce it
+            if (lowerBoundCu) {
+                bufferedComputeUnits = Math.max(bufferedComputeUnits, Math.min(lowerBoundCu, MAX_COMPUTE_UNITS));
+            }
             return {
                 success: true,
                 computeUnits: bufferedComputeUnits,

package/lib/types.d.ts

@@ -1085,6 +1085,7 @@ export type ProcessingTxParams = {
     computeUnitsBufferMultiplier?: number;
     useSimulatedComputeUnitsForCUPriceCalculation?: boolean;
     getCUPriceFromComputeUnits?: (computeUnits: number) => number;
+    lowerBoundCu?: number;
 };
 export type TxParams = BaseTxParams & ProcessingTxParams;
 export declare class SwapReduceOnly {

package/package.json

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

package/src/driftClient.ts

@@ -1527,6 +1527,7 @@ export class DriftClient {
 
 		if (params.useMarketLastSlotCache) {
 			const lastUserSlot = this.getUserAccountAndSlot()?.slot;
+
 			for (const [
 				marketIndex,
 				slot,
@@ -4663,7 +4664,8 @@ export class DriftClient {
 					await TransactionParamProcessor.getTxSimComputeUnits(
 						placeAndTakeTxToSim,
 						this.connection,
-						txParams.computeUnitsBufferMultiplier ?? 1.2
+						txParams.computeUnitsBufferMultiplier ?? 1.2,
+						txParams.lowerBoundCu
 					);
 
 				if (shouldExitIfSimulationFails && !simulationResult.success) {
@@ -6306,7 +6308,8 @@ export class DriftClient {
 	public async getAddInsuranceFundStakeIx(
 		marketIndex: number,
 		amount: BN,
-		collateralAccountPublicKey: PublicKey
+		collateralAccountPublicKey: PublicKey,
+		fromSubAccount?: boolean
 	): Promise<TransactionInstruction> {
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
@@ -6316,8 +6319,8 @@ export class DriftClient {
 		);
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
-			useMarketLastSlotCache: true,
+			userAccounts: fromSubAccount ? [this.getUserAccount()] : [],
+			useMarketLastSlotCache: fromSubAccount ? true : false,
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
@@ -6416,7 +6419,8 @@ export class DriftClient {
 		const addFundsIx = await this.getAddInsuranceFundStakeIx(
 			marketIndex,
 			amount,
-			tokenAccount
+			tokenAccount,
+			fromSubaccount
 		);
 
 		addIfStakeIxs.push(addFundsIx);
@@ -6456,8 +6460,7 @@ export class DriftClient {
 		);
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
-			useMarketLastSlotCache: true,
+			userAccounts: [],
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
@@ -6566,13 +6569,8 @@ export class DriftClient {
 			}
 		}
 
-		const userAccountExists =
-			!!this.getUser()?.accountSubscriber?.isSubscribed &&
-			(await this.checkIfAccountExists(this.getUser().userAccountPublicKey));
-
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: userAccountExists ? [this.getUserAccount()] : [],
-			useMarketLastSlotCache: false,
+			userAccounts: [],
 			writableSpotMarketIndexes: [marketIndex],
 		});
 

package/src/tx/txParamProcessor.ts

@@ -32,7 +32,8 @@ export class TransactionParamProcessor {
 	public static async getTxSimComputeUnits(
 		tx: VersionedTransaction,
 		connection: Connection,
-		bufferMultiplier: number // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+		bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
+		lowerBoundCu?: number
 	): Promise<{ success: boolean; computeUnits: number }> {
 		try {
 			if (TEST_SIMS_ALWAYS_FAIL)
@@ -49,10 +50,18 @@ export class TransactionParamProcessor {
 			const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
 
 			// Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
-			const bufferedComputeUnits = Math.ceil(
+			let bufferedComputeUnits = Math.ceil(
 				Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS)
 			);
 
+			// If a lower bound CU is passed then enforce it
+			if (lowerBoundCu) {
+				bufferedComputeUnits = Math.max(
+					bufferedComputeUnits,
+					Math.min(lowerBoundCu, MAX_COMPUTE_UNITS)
+				);
+			}
+
 			return {
 				success: true,
 				computeUnits: bufferedComputeUnits,

package/src/types.ts

@@ -1042,6 +1042,7 @@ export type ProcessingTxParams = {
 	computeUnitsBufferMultiplier?: number;
 	useSimulatedComputeUnitsForCUPriceCalculation?: boolean;
 	getCUPriceFromComputeUnits?: (computeUnits: number) => number;
+	lowerBoundCu?: number;
 };
 
 export type TxParams = BaseTxParams & ProcessingTxParams;