@drift-labs/sdk 2.82.0-beta.1 → 2.82.0-beta.11

package/src/userMap/WebsocketSubscription.ts

@@ -3,12 +3,13 @@ import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
 import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
+import { ResubOpts } from '../accounts/types';
 
 export class WebsocketSubscription {
 	private userMap: UserMap;
 	private commitment: Commitment;
 	private skipInitialLoad: boolean;
-	private resubTimeoutMs?: number;
+	private resubOpts?: ResubOpts;
 	private includeIdle?: boolean;
 	private decodeFn: (name: string, data: Buffer) => UserAccount;
 
@@ -18,21 +19,21 @@ export class WebsocketSubscription {
 		userMap,
 		commitment,
 		skipInitialLoad = false,
-		resubTimeoutMs,
+		resubOpts,
 		includeIdle = false,
 		decodeFn,
 	}: {
 		userMap: UserMap;
 		commitment: Commitment;
 		skipInitialLoad?: boolean;
-		resubTimeoutMs?: number;
+		resubOpts?: ResubOpts;
 		includeIdle?: boolean;
 		decodeFn: (name: string, data: Buffer) => UserAccount;
 	}) {
 		this.userMap = userMap;
 		this.commitment = commitment;
 		this.skipInitialLoad = skipInitialLoad;
-		this.resubTimeoutMs = resubTimeoutMs;
+		this.resubOpts = resubOpts;
 		this.includeIdle = includeIdle || false;
 		this.decodeFn = decodeFn;
 	}
@@ -52,7 +53,7 @@ export class WebsocketSubscription {
 					filters,
 					commitment: this.commitment,
 				},
-				this.resubTimeoutMs
+				this.resubOpts
 			);
 		}
 

package/src/userMap/userMap.ts

@@ -124,7 +124,10 @@ export class UserMap implements UserMapInterface {
 			this.subscription = new WebsocketSubscription({
 				userMap: this,
 				commitment: this.commitment,
-				resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+				resubOpts: {
+					resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+					logResubMessages: config.subscriptionConfig.logResubMessages,
+				},
 				skipInitialLoad: config.skipInitialLoad,
 				decodeFn,
 			});

package/src/userMap/userMapConfig.ts

@@ -20,6 +20,7 @@ export type UserMapConfig = {
 		| {
 				type: 'websocket';
 				resubTimeoutMs?: number;
+				logResubMessages?: boolean;
 				commitment?: Commitment;
 		  };
 

package/src/userStats.ts

@@ -29,7 +29,10 @@ export class UserStats {
 			this.accountSubscriber = new WebSocketUserStatsAccountSubscriber(
 				config.driftClient.program,
 				config.userStatsAccountPublicKey,
-				config.accountSubscription.resubTimeoutMs,
+				{
+					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
+					logResubMessages: config.accountSubscription?.logResubMessages,
+				},
 				config.accountSubscription.commitment
 			);
 		} else {

package/src/userStatsConfig.ts

@@ -12,6 +12,7 @@ export type UserStatsSubscriptionConfig =
 	| {
 			type: 'websocket';
 			resubTimeoutMs?: number;
+			logResubMessages?: boolean;
 			commitment?: Commitment;
 	  }
 	| {

package/tests/dlob/helpers.ts

@@ -142,6 +142,10 @@ export const mockAMM: AMM = {
 	bidQuoteAssetReserve: new BN(0),
 	askBaseAssetReserve: new BN(0),
 	askQuoteAssetReserve: new BN(0),
+
+	netUnsettledFundingPnl: new BN(0),
+	quoteAssetAmountWithUnsettledLp: new BN(0),
+	referencePriceOffset: 0,
 };
 
 export const mockPerpMarkets: Array<PerpMarketAccount> = [