@drift-labs/sdk 2.48.0-beta.8 → 2.49.0-beta.0

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -2,10 +2,11 @@ import { OrderSubscriber } from './OrderSubscriber';
 import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
 import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from '../types';
-import { Context, PublicKey } from '@solana/web3.js';
+import { Commitment, Context, PublicKey } from '@solana/web3.js';
 
 export class WebsocketSubscription {
 	private orderSubscriber: OrderSubscriber;
+	private commitment: Commitment;
 	private skipInitialLoad: boolean;
 	private resubTimeoutMs?: number;
 
@@ -13,14 +14,17 @@ export class WebsocketSubscription {
 
 	constructor({
 		orderSubscriber,
+		commitment,
 		skipInitialLoad = false,
 		resubTimeoutMs,
 	}: {
 		orderSubscriber: OrderSubscriber;
+		commitment: Commitment;
 		skipInitialLoad?: boolean;
 		resubTimeoutMs?: number;
 	}) {
 		this.orderSubscriber = orderSubscriber;
+		this.commitment = commitment;
 		this.skipInitialLoad = skipInitialLoad;
 		this.resubTimeoutMs = resubTimeoutMs;
 	}
@@ -36,7 +40,7 @@ export class WebsocketSubscription {
 				),
 				{
 					filters: [getUserFilter(), getNonIdleUserFilter()],
-					commitment: this.orderSubscriber.driftClient.opts.commitment,
+					commitment: this.commitment,
 				},
 				this.resubTimeoutMs
 			);
@@ -47,6 +51,7 @@ export class WebsocketSubscription {
 				const userKey = accountId.toBase58();
 				this.orderSubscriber.tryUpdateUserAccount(
 					userKey,
+					'decoded',
 					account,
 					context.slot
 				);

package/src/orderSubscriber/types.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 
@@ -8,11 +8,13 @@ export type OrderSubscriberConfig = {
 		| {
 				type: 'polling';
 				frequency: number;
+				commitment?: Commitment;
 		  }
 		| {
 				type: 'websocket';
 				skipInitialLoad?: boolean;
 				resubTimeoutMs?: number;
+				commitment?: Commitment;
 		  };
 };
 

package/src/slot/SlotSubscriber.ts

@@ -29,8 +29,10 @@ export class SlotSubscriber {
 		this.currentSlot = await this.connection.getSlot('confirmed');
 
 		this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
-			this.currentSlot = slotInfo.slot;
-			this.eventEmitter.emit('newSlot', slotInfo.slot);
+			if (!this.currentSlot || this.currentSlot < slotInfo.slot) {
+				this.currentSlot = slotInfo.slot;
+				this.eventEmitter.emit('newSlot', slotInfo.slot);
+			}
 		});
 	}
 

package/src/user.ts

@@ -113,8 +113,8 @@ export class User {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
 				config.userAccountPublicKey,
-				config.accountSubscription.resubTimeoutMs,
-				config.accountSubscription.commitment
+				config.accountSubscription?.resubTimeoutMs,
+				config.accountSubscription?.commitment
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
@@ -3041,6 +3041,7 @@ export class User {
 		);
 
 		const freeCollateral = this.getFreeCollateral();
+		const initialMarginRequirement = this.getInitialMarginRequirement();
 		const oracleData = this.getOracleDataForSpotMarket(marketIndex);
 		const precisionIncrease = TEN.pow(new BN(spotMarket.decimals - 6));
 
@@ -3060,6 +3061,8 @@ export class User {
 		let amountWithdrawable;
 		if (assetWeight.eq(ZERO)) {
 			amountWithdrawable = userDepositAmount;
+		} else if (initialMarginRequirement.eq(ZERO)) {
+			amountWithdrawable = userDepositAmount;
 		} else {
 			amountWithdrawable = divCeil(
 				divCeil(freeCollateral.mul(MARGIN_PRECISION), assetWeight).mul(