@drift-labs/sdk 2.84.0-beta.7 → 2.85.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.84.0-beta.7
+2.85.0-beta.1

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

@@ -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/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.83.0",
+    "version": "2.84.0",
     "name": "drift",
     "instructions": [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.84.0-beta.7",
+	"version": "2.85.0-beta.1",
 	"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,
@@ -6306,7 +6307,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 +6318,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 +6418,8 @@ export class DriftClient {
 		const addFundsIx = await this.getAddInsuranceFundStakeIx(
 			marketIndex,
 			amount,
-			tokenAccount
+			tokenAccount,
+			fromSubaccount
 		);
 
 		addIfStakeIxs.push(addFundsIx);
@@ -6456,8 +6459,7 @@ export class DriftClient {
 		);
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
-			useMarketLastSlotCache: true,
+			userAccounts: [],
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
@@ -6566,13 +6568,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/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.83.0",
+  "version": "2.84.0",
   "name": "drift",
   "instructions": [
     {