@drift-labs/vaults-sdk 0.1.2 → 0.1.4

package/lib/accountSubscribers/pollingVaultDepositorSubscriber.js

@@ -26,11 +26,13 @@ class PollingVaultDepositorSubscriber extends pollingVaultsProgramAccountSubscri
     async fetch() {
         var _a, _b;
         await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.pubkey);
+        const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.pubkey);
+        if (!bufferAndSlot)
+            return;
         const currentSlot = (_b = (_a = this.account) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0;
-        if (buffer && slot > currentSlot) {
-            const account = this.program.account.vaultDepositor.coder.accounts.decode('vaultDepositor', buffer);
-            this.account = { data: account, slot };
+        if (bufferAndSlot.buffer && bufferAndSlot.slot > currentSlot) {
+            const account = this.program.account.vaultDepositor.coder.accounts.decode('vaultDepositor', bufferAndSlot.buffer);
+            this.account = { data: account, slot: bufferAndSlot.slot };
         }
     }
     updateData(vaultDepositorAcc, slot) {

package/lib/accountSubscribers/pollingVaultSubscriber.js

@@ -26,11 +26,13 @@ class PollingVaultSubscriber extends pollingVaultsProgramAccountSubscriber_1.Pol
     async fetch() {
         var _a, _b;
         await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.pubkey);
+        const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.pubkey);
+        if (!bufferAndSlot)
+            return;
         const currentSlot = (_b = (_a = this.account) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0;
-        if (buffer && slot > currentSlot) {
-            const account = this.program.account.vault.coder.accounts.decode('vault', buffer);
-            this.account = { data: account, slot };
+        if (bufferAndSlot.buffer && bufferAndSlot.slot > currentSlot) {
+            const account = this.program.account.vault.coder.accounts.decode('vault', bufferAndSlot.buffer);
+            this.account = { data: account, slot: bufferAndSlot.slot };
         }
     }
     updateData(vaultAcc, slot) {

package/lib/accountSubscribers/pollingVaultsProgramAccountSubscriber.js

@@ -45,9 +45,9 @@ class PollingVaultsProgramAccountSubscriber {
             return;
         }
         this.accountLoader.removeAccount(this.pubkey, this.callbackId);
-        this.callbackId = undefined;
+        this.callbackId = null;
         this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-        this.errorCallbackId = undefined;
+        this.errorCallbackId = null;
         this._isSubscribed = false;
     }
     async fetchIfUnloaded() {
@@ -62,6 +62,9 @@ class PollingVaultsProgramAccountSubscriber {
     }
     getAccountAndSlot() {
         this.assertIsSubscribed();
+        if (!this.account) {
+            throw new Error('Account not loaded');
+        }
         return this.account;
     }
 }

package/lib/accounts/vaultAccount.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
-import { BN, Program } from '@coral-xyz/anchor';
-import { BulkAccountLoader } from '@drift-labs/sdk';
+import { Program } from '@coral-xyz/anchor';
+import { BulkAccountLoader, BN } from '@drift-labs/sdk';
 import { PublicKey } from '@solana/web3.js';
 import { DriftVaults } from '../types/drift_vaults';
 import { Vault, VaultAccountEvents } from '../types/types';

package/lib/accounts/vaultAccount.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultAccount = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
 const sdk_1 = require("@drift-labs/sdk");
 const accountSubscribers_1 = require("../accountSubscribers");
 const vaultsProgramAccount_1 = require("./vaultsProgramAccount");
@@ -31,21 +30,21 @@ class VaultAccount extends vaultsProgramAccount_1.VaultsProgramAccount {
                 managementFeeShares: sdk_1.ZERO,
             };
         }
-        const now = new anchor_1.BN(Date.now() / 1000);
+        const now = new sdk_1.BN(Date.now() / 1000);
         const sinceLast = now.sub(accountData.lastFeeUpdateTs);
         let managementFeeAmount = depositorsEquity
             .mul(accountData.managementFee)
             .div(sdk_1.PERCENTAGE_PRECISION)
             .mul(sinceLast)
             .div(sdk_1.ONE_YEAR);
-        managementFeeAmount = anchor_1.BN.min(managementFeeAmount, depositorsEquity.sub(sdk_1.ONE));
+        managementFeeAmount = sdk_1.BN.min(managementFeeAmount, depositorsEquity.sub(sdk_1.ONE));
         const newTotalSharesFactor = depositorsEquity
             .mul(sdk_1.PERCENTAGE_PRECISION)
             .div(depositorsEquity.sub(managementFeeAmount));
         let newTotalShares = accountData.totalShares
             .mul(newTotalSharesFactor)
             .div(sdk_1.PERCENTAGE_PRECISION);
-        newTotalShares = anchor_1.BN.max(newTotalShares, accountData.userShares);
+        newTotalShares = sdk_1.BN.max(newTotalShares, accountData.userShares);
         const managementFeeShares = newTotalShares.sub(accountData.totalShares);
         return { totalShares: newTotalShares, managementFeeShares };
     }

package/lib/accounts/vaultDepositorAccount.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
-import { BN, Program } from '@coral-xyz/anchor';
-import { BulkAccountLoader } from '@drift-labs/sdk';
+import { Program } from '@coral-xyz/anchor';
+import { BN, BulkAccountLoader } from '@drift-labs/sdk';
 import { PublicKey } from '@solana/web3.js';
 import { DriftVaults } from '../types/drift_vaults';
 import { VaultDepositor, VaultDepositorAccountEvents } from '../types/types';

package/lib/accounts/vaultDepositorAccount.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultDepositorAccount = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
 const sdk_1 = require("@drift-labs/sdk");
 const accountSubscribers_1 = require("../accountSubscribers");
 const vaultsProgramAccount_1 = require("./vaultsProgramAccount");
@@ -30,7 +29,7 @@ class VaultDepositorAccount extends vaultsProgramAccount_1.VaultsProgramAccount
         const profit = depositorEquity
             .sub(accountData.netDeposits)
             .sub(accountData.cumulativeProfitShareAmount);
-        if (profit.lte(new anchor_1.BN(0))) {
+        if (profit.lte(new sdk_1.BN(0))) {
             return sdk_1.ZERO;
         }
         const profitShareAmount = profit

package/lib/vaultClient.d.ts

@@ -2,7 +2,7 @@
 import { BN, DriftClient } from '@drift-labs/sdk';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
-import { CompetitionsClient } from '@drift-labs/competitions-sdk/lib/competitionClient';
+import { CompetitionsClient } from '@drift-labs/competitions-sdk';
 import { PublicKey, SetComputeUnitLimitParams, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { Vault, VaultDepositor, WithdrawUnit } from './types/types';
 export declare class VaultClient {

package/lib/vaultClient.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultClient = void 0;
 const sdk_1 = require("@drift-labs/sdk");
 const anchor_1 = require("@coral-xyz/anchor");
-const addresses_1 = require("@drift-labs/competitions-sdk/lib/addresses");
-const addresses_2 = require("./addresses");
+const competitions_sdk_1 = require("@drift-labs/competitions-sdk");
+const addresses_1 = require("./addresses");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
@@ -15,6 +15,7 @@ class VaultClient {
         this.cliMode = !!cliMode;
     }
     async getVault(vault) {
+        // @ts-ignore
         return await this.program.account.vault.fetch(vault);
     }
     async getVaultDepositor(vaultDepositor) {
@@ -55,6 +56,7 @@ class VaultClient {
     async calculateVaultEquity(params) {
         let vaultAccount;
         if (params.address !== undefined) {
+            // @ts-ignore
             vaultAccount = await this.program.account.vault.fetch(params.address);
         }
         else if (params.vault !== undefined) {
@@ -73,10 +75,13 @@ class VaultClient {
         return netSpotValue.add(unrealizedPnl);
     }
     async initializeVault(params) {
-        const vault = (0, addresses_2.getVaultAddressSync)(this.program.programId, params.name);
-        const tokenAccount = (0, addresses_2.getTokenVaultAddressSync)(this.program.programId, vault);
+        const vault = (0, addresses_1.getVaultAddressSync)(this.program.programId, params.name);
+        const tokenAccount = (0, addresses_1.getTokenVaultAddressSync)(this.program.programId, vault);
         const driftState = await this.driftClient.getStatePublicKey();
         const spotMarket = this.driftClient.getSpotMarketAccount(params.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error(`Spot market ${params.spotMarketIndex} not found on driftClient`);
+        }
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userKey = (0, sdk_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, vault);
         const accounts = {
@@ -138,6 +143,9 @@ class VaultClient {
     async managerDeposit(vault, amount) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const driftSpotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!driftSpotMarket) {
+            throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
+        }
         const user = new sdk_1.User({
             driftClient: this.driftClient,
             userAccountPublicKey: vaultAccount.user,
@@ -164,6 +172,7 @@ class VaultClient {
             .rpc();
     }
     async managerRequestWithdraw(vault, amount, withdrawUnit) {
+        // @ts-ignore
         const vaultAccount = (await this.program.account.vault.fetch(vault));
         if (!this.driftClient.wallet.publicKey.equals(vaultAccount.manager)) {
             throw new Error(`Only the manager of the vault can request a withdraw.`);
@@ -232,8 +241,8 @@ class VaultClient {
         else {
             const cancelRequestWithdrawIx = this.program.instruction.mangerCancelWithdrawRequest({
                 accounts: {
-                    manager: this.driftClient.wallet.publicKey,
                     ...accounts,
+                    manager: this.driftClient.wallet.publicKey,
                 },
                 remainingAccounts,
             });
@@ -320,7 +329,7 @@ class VaultClient {
         });
     }
     createInitVaultDepositorIx(vault, authority) {
-        const vaultDepositor = (0, addresses_2.getVaultDepositorAddressSync)(this.program.programId, vault, authority);
+        const vaultDepositor = (0, addresses_1.getVaultDepositorAddressSync)(this.program.programId, vault, authority || this.driftClient.wallet.publicKey);
         const accounts = {
             vaultDepositor,
             vault,
@@ -343,7 +352,7 @@ class VaultClient {
      * @returns
      */
     async initializeVaultDepositor(vault, authority) {
-        const vaultDepositor = (0, addresses_2.getVaultDepositorAddressSync)(this.program.programId, vault, authority);
+        const vaultDepositor = (0, addresses_1.getVaultDepositorAddressSync)(this.program.programId, vault, authority || this.driftClient.wallet.publicKey);
         const accounts = {
             vaultDepositor,
             vault,
@@ -389,6 +398,9 @@ class VaultClient {
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultPubKey);
         const driftStateKey = await this.driftClient.getStatePublicKey();
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
+        }
         const accounts = {
             vault: vaultPubKey,
             vaultDepositor,
@@ -481,6 +493,9 @@ class VaultClient {
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const driftStateKey = await this.driftClient.getStatePublicKey();
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
+        }
         const accounts = {
             vault: vaultDepositorAccount.vault,
             vaultDepositor,
@@ -619,11 +634,15 @@ class VaultClient {
     async initializeInsuranceFundStake(vault, spotMarketIndex) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const ifStakeAccountPublicKey = (0, sdk_1.getInsuranceFundStakeAccountPublicKey)(this.driftClient.program.programId, vault, spotMarketIndex);
+        const spotMarket = this.driftClient.getSpotMarketAccount(spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error(`Spot market ${spotMarketIndex} not found on driftClient`);
+        }
         return await this.program.methods
             .initializeInsuranceFundStake(spotMarketIndex)
             .accounts({
             vault: vault,
-            driftSpotMarket: this.driftClient.getSpotMarketAccount(spotMarketIndex).pubkey,
+            driftSpotMarket: spotMarket.pubkey,
             insuranceFundStake: ifStakeAccountPublicKey,
             driftUserStats: vaultAccount.userStats,
             driftState: await this.driftClient.getStatePublicKey(),
@@ -640,8 +659,8 @@ class VaultClient {
     async initializeCompetitor(vault, competitionsClient, competitionName) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const encodedName = (0, sdk_1.encodeName)(competitionName);
-        const competitionAddress = (0, addresses_1.getCompetitionAddressSync)(competitionsClient.program.programId, encodedName);
-        const competitorAddress = (0, addresses_1.getCompetitorAddressSync)(competitionsClient.program.programId, competitionAddress, vault);
+        const competitionAddress = (0, competitions_sdk_1.getCompetitionAddressSync)(competitionsClient.program.programId, encodedName);
+        const competitorAddress = (0, competitions_sdk_1.getCompetitorAddressSync)(competitionsClient.program.programId, competitionAddress, vault);
         return await this.program.methods
             .initializeCompetitor()
             .accounts({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/vaults-sdk",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "^0.26.0",
-    "@drift-labs/sdk": "2.43.0-beta.5",
+    "@drift-labs/competitions-sdk": "^0.2.5",
+    "@drift-labs/sdk": "2.43.0-beta.17",
     "@solana/web3.js": "1.73.2",
     "commander": "^11.0.0",
     "dotenv": "^16.3.1",

package/src/accountSubscribers/pollingVaultDepositorSubscriber.ts

@@ -47,14 +47,15 @@ export class PollingVaultDepositorSubscriber
 
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
-		const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.pubkey);
+		const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.pubkey);
+		if (!bufferAndSlot) return;
 		const currentSlot = this.account?.slot ?? 0;
-		if (buffer && slot > currentSlot) {
+		if (bufferAndSlot.buffer && bufferAndSlot.slot > currentSlot) {
 			const account = this.program.account.vaultDepositor.coder.accounts.decode(
 				'vaultDepositor',
-				buffer
+				bufferAndSlot.buffer
 			);
-			this.account = { data: account, slot };
+			this.account = { data: account, slot: bufferAndSlot.slot };
 		}
 	}
 

package/src/accountSubscribers/pollingVaultSubscriber.ts

@@ -41,14 +41,15 @@ export class PollingVaultSubscriber
 
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
-		const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.pubkey);
+		const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.pubkey);
+		if (!bufferAndSlot) return;
 		const currentSlot = this.account?.slot ?? 0;
-		if (buffer && slot > currentSlot) {
+		if (bufferAndSlot.buffer && bufferAndSlot.slot > currentSlot) {
 			const account = this.program.account.vault.coder.accounts.decode(
 				'vault',
-				buffer
+				bufferAndSlot.buffer
 			);
-			this.account = { data: account, slot };
+			this.account = { data: account, slot: bufferAndSlot.slot };
 		}
 	}
 

package/src/accountSubscribers/pollingVaultsProgramAccountSubscriber.ts

@@ -77,11 +77,11 @@ export abstract class PollingVaultsProgramAccountSubscriber<
 			return;
 		}
 
-		this.accountLoader.removeAccount(this.pubkey, this.callbackId);
-		this.callbackId = undefined;
+		this.accountLoader.removeAccount(this.pubkey, this.callbackId!);
+		this.callbackId = null;
 
-		this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-		this.errorCallbackId = undefined;
+		this.accountLoader.removeErrorCallbacks(this.errorCallbackId!);
+		this.errorCallbackId = null;
 
 		this._isSubscribed = false;
 	}
@@ -102,6 +102,9 @@ export abstract class PollingVaultsProgramAccountSubscriber<
 
 	getAccountAndSlot(): DataAndSlot<Account> {
 		this.assertIsSubscribed();
+		if (!this.account) {
+			throw new Error('Account not loaded');
+		}
 		return this.account;
 	}
 

package/src/accounts/vaultAccount.ts

@@ -1,10 +1,11 @@
-import { BN, Program } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import {
 	BulkAccountLoader,
 	ONE,
 	ONE_YEAR,
 	PERCENTAGE_PRECISION,
 	ZERO,
+	BN,
 } from '@drift-labs/sdk';
 import { PublicKey } from '@solana/web3.js';
 import { DriftVaults } from '../types/drift_vaults';

package/src/accounts/vaultDepositorAccount.ts

@@ -1,5 +1,10 @@
-import { BN, Program } from '@coral-xyz/anchor';
-import { BulkAccountLoader, PERCENTAGE_PRECISION, ZERO } from '@drift-labs/sdk';
+import { Program } from '@coral-xyz/anchor';
+import {
+	BN,
+	BulkAccountLoader,
+	PERCENTAGE_PRECISION,
+	ZERO,
+} from '@drift-labs/sdk';
 import { PublicKey } from '@solana/web3.js';
 import { DriftVaults } from '../types/drift_vaults';
 import { VaultDepositor, VaultDepositorAccountEvents } from '../types/types';

package/src/accounts/vaultsProgramAccount.ts

@@ -9,6 +9,7 @@ export abstract class VaultsProgramAccount<
 	Account,
 	AccountEvents extends VaultsProgramAccountBaseEvents
 > {
+	// @ts-ignore
 	accountSubscriber: VaultsProgramAccountSubscriber<Account, AccountEvents>;
 
 	get isSubscribed(): boolean {

package/src/vaultClient.ts

@@ -11,10 +11,10 @@ import {
 import { BorshAccountsCoder, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
 import {
+	CompetitionsClient,
 	getCompetitionAddressSync,
 	getCompetitorAddressSync,
-} from '@drift-labs/competitions-sdk/lib/addresses';
-import { CompetitionsClient } from '@drift-labs/competitions-sdk/lib/competitionClient';
+} from '@drift-labs/competitions-sdk';
 import {
 	getTokenVaultAddressSync,
 	getVaultAddressSync,
@@ -57,6 +57,7 @@ export class VaultClient {
 	}
 
 	public async getVault(vault: PublicKey): Promise<Vault> {
+		// @ts-ignore
 		return await this.program.account.vault.fetch(vault);
 	}
 
@@ -109,6 +110,7 @@ export class VaultClient {
 	}): Promise<BN> {
 		let vaultAccount: Vault;
 		if (params.address !== undefined) {
+			// @ts-ignore
 			vaultAccount = await this.program.account.vault.fetch(params.address);
 		} else if (params.vault !== undefined) {
 			vaultAccount = params.vault;
@@ -149,6 +151,11 @@ export class VaultClient {
 		const spotMarket = this.driftClient.getSpotMarketAccount(
 			params.spotMarketIndex
 		);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market ${params.spotMarketIndex} not found on driftClient`
+			);
+		}
 
 		const userStatsKey = getUserStatsAccountPublicKey(
 			this.driftClient.program.programId,
@@ -233,6 +240,11 @@ export class VaultClient {
 		const driftSpotMarket = this.driftClient.getSpotMarketAccount(
 			vaultAccount.spotMarketIndex
 		);
+		if (!driftSpotMarket) {
+			throw new Error(
+				`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`
+			);
+		}
 
 		const user = new User({
 			driftClient: this.driftClient,
@@ -276,6 +288,7 @@ export class VaultClient {
 		amount: BN,
 		withdrawUnit: WithdrawUnit
 	): Promise<TransactionSignature> {
+		// @ts-ignore
 		const vaultAccount = (await this.program.account.vault.fetch(
 			vault
 		)) as Vault;
@@ -370,8 +383,8 @@ export class VaultClient {
 			const cancelRequestWithdrawIx =
 				this.program.instruction.mangerCancelWithdrawRequest({
 					accounts: {
-						manager: this.driftClient.wallet.publicKey,
 						...accounts,
+						manager: this.driftClient.wallet.publicKey,
 					},
 					remainingAccounts,
 				});
@@ -515,7 +528,7 @@ export class VaultClient {
 		const vaultDepositor = getVaultDepositorAddressSync(
 			this.program.programId,
 			vault,
-			authority
+			authority || this.driftClient.wallet.publicKey
 		);
 
 		const accounts = {
@@ -549,7 +562,7 @@ export class VaultClient {
 		const vaultDepositor = getVaultDepositorAddressSync(
 			this.program.programId,
 			vault,
-			authority
+			authority || this.driftClient.wallet.publicKey
 		);
 
 		const accounts = {
@@ -615,6 +628,11 @@ export class VaultClient {
 		const spotMarket = this.driftClient.getSpotMarketAccount(
 			vaultAccount.spotMarketIndex
 		);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`
+			);
+		}
 
 		const accounts = {
 			vault: vaultPubKey,
@@ -753,6 +771,11 @@ export class VaultClient {
 		const spotMarket = this.driftClient.getSpotMarketAccount(
 			vaultAccount.spotMarketIndex
 		);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`
+			);
+		}
 
 		const accounts = {
 			vault: vaultDepositorAccount.vault,
@@ -948,12 +971,18 @@ export class VaultClient {
 			spotMarketIndex
 		);
 
+		const spotMarket = this.driftClient.getSpotMarketAccount(spotMarketIndex);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market ${spotMarketIndex} not found on driftClient`
+			);
+		}
+
 		return await this.program.methods
 			.initializeInsuranceFundStake(spotMarketIndex)
 			.accounts({
 				vault: vault,
-				driftSpotMarket:
-					this.driftClient.getSpotMarketAccount(spotMarketIndex).pubkey,
+				driftSpotMarket: spotMarket.pubkey,
 				insuranceFundStake: ifStakeAccountPublicKey,
 				driftUserStats: vaultAccount.userStats,
 				driftState: await this.driftClient.getStatePublicKey(),

package/tsconfig.json

@@ -6,8 +6,14 @@
 		"declaration": true,
 		"outDir": "./lib",
 		"resolveJsonModule": true,
-		"skipLibCheck": true
+		"skipLibCheck": true,
+		"strict": true
 	},
-	"include": ["src"],
-	"exclude": ["node_modules", "tests"]
-}
+	"include": [
+		"src"
+	],
+	"exclude": [
+		"node_modules",
+		"tests"
+	]
+}