@drift-labs/sdk 2.82.0-beta.0 → 2.82.0-beta.10

package/README.md

@@ -19,6 +19,13 @@ npm i @drift-labs/sdk
 
 ## Getting Started
 
+Documentation:
+
+- [API docs](https://drift-labs.github.io/v2-teacher/)
+- [overview docs](https://docs.drift.trade/)
+
+The below is a light overview of using solana and drift's typescript sdk, but not as comprehensive as the [API docs](https://drift-labs.github.io/v2-teacher/)
+
 ### Setting up a wallet for your program
 
 ```bash
@@ -77,8 +84,10 @@ convertToNumber(new BN(10500), new BN(1000)); // = 10.5
 ### Setting up an account and making a trade
 
 ```typescript
-import { AnchorProvider, BN } from '@coral-xyz/anchor';
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import * as anchor from '@coral-xyz/anchor';
+import { AnchorProvider } from '@coral-xyz/anchor';
+import { getAssociatedTokenAddress, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import {
 	calculateReservePrice,
@@ -95,16 +104,17 @@ import {
 	BASE_PRECISION,
 	getMarketOrderParams,
 	BulkAccountLoader,
-	getMarketsAndOraclesForSubscription
+	BN,
+	calculateBidAskPrice,
+	getMarketsAndOraclesForSubscription,
+	calculateEstimatedPerpEntryPrice,
 } from '../sdk';
 
 export const getTokenAddress = (
 	mintAddress: string,
 	userPubKey: string
 ): Promise<PublicKey> => {
-	return Token.getAssociatedTokenAddress(
-		new PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`),
-		TOKEN_PROGRAM_ID,
+	return getAssociatedTokenAddress(
 		new PublicKey(mintAddress),
 		new PublicKey(userPubKey)
 	);
@@ -112,49 +122,56 @@ export const getTokenAddress = (
 
 const main = async () => {
 	const env = 'devnet';
+	// const env = 'mainnet-beta';
+
 	// Initialize Drift SDK
 	const sdkConfig = initialize({ env });
 
 	// Set up the Wallet and Provider
-	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-	const keypair = Keypair.fromSecretKey(
-		Uint8Array.from(JSON.parse(privateKey))
-	);
-	const wallet = new Wallet(keypair);
+	if (!process.env.ANCHOR_WALLET) {
+		throw new Error('ANCHOR_WALLET env var must be set.');
+	}
 
-	// Set up the Connection
-	const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-	const connection = new Connection(rpcAddress);
+	if (!process.env.ANCHOR_PROVIDER_URL) {
+		throw new Error('ANCHOR_PROVIDER_URL env var must be set.');
+	}
 
-	// Set up the Provider
-	const provider = new AnchorProvider(
-		connection,
-		wallet,
-		AnchorProvider.defaultOptions()
+	const provider = anchor.AnchorProvider.local(
+		process.env.ANCHOR_PROVIDER_URL,
+		{
+			preflightCommitment: 'confirmed',
+			skipPreflight: false,
+			commitment: 'confirmed',
+		}
 	);
-
 	// Check SOL Balance
-	const lamportsBalance = await connection.getBalance(wallet.publicKey);
-	console.log('SOL balance:', lamportsBalance / 10 ** 9);
+	const lamportsBalance = await provider.connection.getBalance(
+		provider.wallet.publicKey
+	);
+	console.log(
+		provider.wallet.publicKey.toString(),
+		env,
+		'SOL balance:',
+		lamportsBalance / 10 ** 9
+	);
 
 	// Misc. other things to set up
 	const usdcTokenAddress = await getTokenAddress(
 		sdkConfig.USDC_MINT_ADDRESS,
-		wallet.publicKey.toString()
+		provider.wallet.publicKey.toString()
 	);
 
 	// Set up the Drift Client
 	const driftPublicKey = new PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
 	const bulkAccountLoader = new BulkAccountLoader(
-		connection,
+		provider.connection,
 		'confirmed',
 		1000
 	);
 	const driftClient = new DriftClient({
-		connection,
+		connection: provider.connection,
 		wallet: provider.wallet,
 		programID: driftPublicKey,
-		...getMarketsAndOraclesForSubscription(env),
 		accountSubscription: {
 			type: 'polling',
 			accountLoader: bulkAccountLoader,
@@ -162,6 +179,8 @@ const main = async () => {
 	});
 	await driftClient.subscribe();
 
+	console.log('subscribed to driftClient');
+
 	// Set up user client
 	const user = new User({
 		driftClient: driftClient,
@@ -176,13 +195,20 @@ const main = async () => {
 	const userAccountExists = await user.exists();
 
 	if (!userAccountExists) {
-		//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
+		console.log(
+			'initializing to',
+			env,
+			' drift account for',
+			provider.wallet.publicKey.toString()
+		);
+
+		//// Create a Drift V2 account by Depositing some USDC ($10,000 in this case)
 		const depositAmount = new BN(10000).mul(QUOTE_PRECISION);
 		await driftClient.initializeUserAccountAndDepositCollateral(
 			depositAmount,
 			await getTokenAddress(
 				usdcTokenAddress.toString(),
-				wallet.publicKey.toString()
+				provider.wallet.publicKey.toString()
 			)
 		);
 	}
@@ -194,6 +220,9 @@ const main = async () => {
 		(market) => market.baseAssetSymbol === 'SOL'
 	);
 
+	const marketIndex = solMarketInfo.marketIndex;
+
+	// Get vAMM bid and ask price
 	const [bid, ask] = calculateBidAskPrice(
 		driftClient.getPerpMarketAccount(marketIndex).amm,
 		driftClient.getOracleDataForPerpMarket(marketIndex)
@@ -203,35 +232,26 @@ const main = async () => {
 	const formattedAskPrice = convertToNumber(ask, PRICE_PRECISION);
 
 	console.log(
-		`Current amm bid and ask price are $${formattedBidPrice} and $${formattedAskPrice}`
+		env,
+		`vAMM bid: $${formattedBidPrice} and ask: $${formattedAskPrice}`
 	);
 
-	// Estimate the slippage for a $5000 LONG trade
 	const solMarketAccount = driftClient.getPerpMarketAccount(
 		solMarketInfo.marketIndex
 	);
+	console.log(env, `Placing a 1 SOL-PERP LONG order`);
 
-	const slippage = convertToNumber(
-		calculateTradeSlippage(
-			PositionDirection.LONG,
-			new BN(1).mul(BASE_PRECISION),
-			solMarketAccount,
-			'base',
-			driftClient.getOracleDataForPerpMarket(solMarketInfo.marketIndex)
-		)[0],
-		PRICE_PRECISION
-	);
-
-	console.log(`Slippage for a 1 SOL-PERP would be $${slippage}`);
-
-	await driftClient.placePerpOrder(
+	const txSig = await driftClient.placePerpOrder(
 		getMarketOrderParams({
 			baseAssetAmount: new BN(1).mul(BASE_PRECISION),
 			direction: PositionDirection.LONG,
 			marketIndex: solMarketAccount.marketIndex,
 		})
 	);
-	console.log(`Placed a 1 SOL-PERP LONG order`);
+	console.log(
+		env,
+		`Placed a 1 SOL-PERP LONG order. Tranaction signature: ${txSig}`
+	);
 };
 
 main();
@@ -244,5 +264,3 @@ Drift Protocol v2 is licensed under [Apache 2.0](./LICENSE).
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Drift SDK by you, as defined in the Apache-2.0 license, shall be
 licensed as above, without any additional terms or conditions.
-
-

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.0
+2.82.0-beta.10

package/lib/accounts/types.d.ts

@@ -126,6 +126,10 @@ export type DataAndSlot<T> = {
     data: T;
     slot: number;
 };
+export type ResubOpts = {
+    resubTimeoutMs?: number;
+    logResubMessages?: boolean;
+};
 export interface UserStatsAccountEvents {
     userStatsAccountUpdate: (payload: UserStatsAccount) => void;
     update: void;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
+import { DataAndSlot, BufferAndSlot, AccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
 export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
@@ -12,12 +12,12 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     decodeBufferFn: (buffer: Buffer) => T;
     onChange: (data: T) => void;
     listenerId?: number;
-    resubTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     commitment?: Commitment;
     isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     receivingData: boolean;
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number, commitment?: Commitment);
+    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
     private setTimeout;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
-    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs, commitment) {
+    constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment) {
+        var _a;
         this.isUnsubscribing = false;
         this.accountName = accountName;
         this.program = program;
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
-        this.resubTimeoutMs = resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        this.resubOpts = resubOpts;
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.receivingData = false;
@@ -18,6 +19,7 @@ class WebSocketAccountSubscriber {
             commitment !== null && commitment !== void 0 ? commitment : this.program.provider.opts.commitment;
     }
     async subscribe(onChange) {
+        var _a;
         if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
@@ -26,7 +28,8 @@ class WebSocketAccountSubscriber {
             await this.fetch();
         }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
-            if (this.resubTimeoutMs) {
+            var _a;
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
                 this.receivingData = true;
                 clearTimeout(this.timeoutId);
                 this.handleRpcResponse(context, accountInfo);
@@ -36,7 +39,7 @@ class WebSocketAccountSubscriber {
                 this.handleRpcResponse(context, accountInfo);
             }
         }, this.commitment);
-        if (this.resubTimeoutMs) {
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
             this.receivingData = true;
             this.setTimeout();
         }
@@ -52,21 +55,25 @@ class WebSocketAccountSubscriber {
         };
     }
     setTimeout() {
+        var _a;
         if (!this.onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            var _a;
             if (this.isUnsubscribing) {
                 // If we are in the process of unsubscribing, do not attempt to resubscribe
                 return;
             }
             if (this.receivingData) {
-                console.log(`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                    console.log(`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`);
+                }
                 await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
-        }, this.resubTimeoutMs);
+        }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
@@ -120,7 +127,7 @@ class WebSocketAccountSubscriber {
     }
     unsubscribe(onResub = false) {
         if (!onResub) {
-            this.resubTimeoutMs = undefined;
+            this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './types';
+import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot, ResubOpts } from './types';
 import { AccountSubscriber } from './types';
 import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
 import { Program } from '@coral-xyz/anchor';
@@ -16,7 +16,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
-    resubTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     shouldFindAllMarketsAndOracles: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
@@ -28,7 +28,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -10,7 +10,7 @@ const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 class WebSocketDriftClientAccountSubscriber {
-    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs, commitment) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.perpOracleMap = new Map();
@@ -25,7 +25,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = resubOpts;
         this.commitment = commitment;
     }
     async subscribe() {
@@ -74,7 +74,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -90,7 +90,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -110,7 +110,7 @@ class WebSocketDriftClientAccountSubscriber {
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
-        }, this.resubTimeoutMs, this.commitment);
+        }, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts

@@ -7,13 +7,13 @@ import { Commitment, PublicKey } from '@solana/web3.js';
 import { InsuranceFundStake } from '../types';
 export declare class WebSocketInsuranceFundStakeAccountSubscriber implements InsuranceFundStakeAccountSubscriber {
     isSubscribed: boolean;
-    reconnectTimeoutMs?: number;
+    resubTimeoutMs?: number;
     commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
     insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
-    constructor(program: Program, insuranceFundStakeAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(insuranceFundStakeAccount?: InsuranceFundStake): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketInsuranceFundStakeAccountSubscriber.js

@@ -5,13 +5,13 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
-    constructor(program, insuranceFundStakeAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.insuranceFundStakeAccountPublicKey =
             insuranceFundStakeAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
-        this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.resubTimeoutMs = resubTimeoutMs;
         this.commitment = commitment;
     }
     async subscribe(insuranceFundStakeAccount) {
@@ -19,7 +19,9 @@ class WebSocketInsuranceFundStakeAccountSubscriber {
             return true;
         }
         this.insuranceFundStakeDataAccountSubscriber =
-            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('insuranceFundStake', this.program, this.insuranceFundStakeAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
+            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('insuranceFundStake', this.program, this.insuranceFundStakeAccountPublicKey, undefined, {
+                resubTimeoutMs: this.resubTimeoutMs,
+            }, this.commitment);
         if (insuranceFundStakeAccount) {
             this.insuranceFundStakeDataAccountSubscriber.setData(insuranceFundStakeAccount);
         }

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
 export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {
@@ -14,7 +14,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     decodeBuffer: (accountName: string, ix: Buffer) => T;
     onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
     listenerId?: number;
-    resubTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     options: {
@@ -25,7 +25,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
         filters: MemcmpFilter[];
         commitment?: Commitment;
-    }, resubTimeoutMs?: number);
+    }, resubOpts?: ResubOpts);
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
     private setTimeout;
     handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -4,28 +4,30 @@ exports.WebSocketProgramAccountSubscriber = void 0;
 class WebSocketProgramAccountSubscriber {
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
-    }, resubTimeoutMs) {
+    }, resubOpts) {
+        var _a;
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.subscriptionName = subscriptionName;
         this.accountDiscriminator = accountDiscriminator;
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
-        this.resubTimeoutMs = resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        this.resubOpts = resubOpts;
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
         this.receivingData = false;
     }
     async subscribe(onChange) {
-        var _a;
+        var _a, _b;
         if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
         this.listenerId = this.program.provider.connection.onProgramAccountChange(this.program.programId, (keyedAccountInfo, context) => {
-            if (this.resubTimeoutMs) {
+            var _a;
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
                 this.receivingData = true;
                 clearTimeout(this.timeoutId);
                 this.handleRpcResponse(context, keyedAccountInfo);
@@ -35,27 +37,31 @@ class WebSocketProgramAccountSubscriber {
                 this.handleRpcResponse(context, keyedAccountInfo);
             }
         }, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : this.program.provider.opts.commitment, this.options.filters);
-        if (this.resubTimeoutMs) {
+        if ((_b = this.resubOpts) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs) {
             this.receivingData = true;
             this.setTimeout();
         }
     }
     setTimeout() {
+        var _a;
         if (!this.onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            var _a, _b;
             if (this.isUnsubscribing) {
                 // If we are in the process of unsubscribing, do not attempt to resubscribe
                 return;
             }
             if (this.receivingData) {
-                console.log(`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                    console.log(`No ws data from ${this.subscriptionName} in ${(_b = this.resubOpts) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs}ms, resubscribing`);
+                }
                 await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
-        }, this.resubTimeoutMs);
+        }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     handleRpcResponse(context, keyedAccountInfo) {
         const newSlot = context.slot;
@@ -99,7 +105,7 @@ class WebSocketProgramAccountSubscriber {
     }
     unsubscribe(onResub = false) {
         if (!onResub) {
-            this.resubTimeoutMs = undefined;
+            this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, UserAccountEvents, UserAccountSubscriber } from './types';
+import { DataAndSlot, AccountSubscriber, UserAccountEvents, UserAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -7,13 +7,13 @@ import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
-    reconnectTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -5,19 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, userAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, userAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;
+        this.resubOpts = resubOpts;
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
-        this.reconnectTimeoutMs = reconnectTimeoutMs;
         this.commitment = commitment;
     }
     async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.resubOpts, this.commitment);
         if (userAccount) {
             this.userDataAccountSubscriber.setData(userAccount);
         }

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, UserStatsAccountSubscriber, UserStatsAccountEvents } from './types';
+import { DataAndSlot, AccountSubscriber, UserStatsAccountSubscriber, UserStatsAccountEvents, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -7,13 +7,13 @@ import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
-    reconnectTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, userStatsAccountPublicKey: PublicKey, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,19 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
-    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, userStatsAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
-        this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.resubOpts = resubOpts;
         this.commitment = commitment;
     }
     async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
+        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.resubOpts, this.commitment);
         if (userStatsAccount) {
             this.userStatsAccountSubscriber.setData(userStatsAccount);
         }