@drift-labs/sdk 2.43.0-beta.11 → 2.43.0-beta.13

package/VERSION

@@ -1 +1 @@
-2.43.0-beta.11
+2.43.0-beta.13

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -13,6 +13,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     onChange: (data: T) => void;
     listenerId?: number;
     resubTimeoutMs?: number;
+    isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     receivingData: boolean;
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number);

package/lib/accounts/webSocketAccountSubscriber.js

@@ -4,6 +4,7 @@ exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs) {
+        this.isUnsubscribing = false;
         this.accountName = accountName;
         this.program = program;
         this.accountPublicKey = accountPublicKey;
@@ -12,7 +13,7 @@ class WebSocketAccountSubscriber {
         this.receivingData = false;
     }
     async subscribe(onChange) {
-        if (this.listenerId) {
+        if (this.listenerId || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
@@ -49,6 +50,10 @@ class WebSocketAccountSubscriber {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            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`);
                 await this.unsubscribe();
@@ -108,11 +113,21 @@ class WebSocketAccountSubscriber {
         }
     }
     unsubscribe() {
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
         if (this.listenerId) {
-            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
-            this.listenerId = undefined;
+            const promise = this.program.provider.connection
+                .removeAccountChangeListener(this.listenerId)
+                .then(() => {
+                this.listenerId = undefined;
+                this.isUnsubscribing = false;
+            });
             return promise;
         }
+        else {
+            this.isUnsubscribing = false;
+        }
     }
 }
 exports.WebSocketAccountSubscriber = WebSocketAccountSubscriber;

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -15,6 +15,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     onChange: (accountId: PublicKey, data: T, context: Context) => void;
     listenerId?: number;
     resubTimeoutMs?: number;
+    isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     options: {
         filters: MemcmpFilter[];

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -5,6 +5,7 @@ class WebSocketProgramAccountSubscriber {
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
     }, resubTimeoutMs) {
+        this.isUnsubscribing = false;
         this.receivingData = false;
         this.subscriptionName = subscriptionName;
         this.accountDiscriminator = accountDiscriminator;
@@ -16,7 +17,7 @@ class WebSocketProgramAccountSubscriber {
     }
     async subscribe(onChange) {
         var _a;
-        if (this.listenerId) {
+        if (this.listenerId || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
@@ -40,6 +41,10 @@ class WebSocketProgramAccountSubscriber {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            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`);
                 await this.unsubscribe();
@@ -89,11 +94,21 @@ class WebSocketProgramAccountSubscriber {
         }
     }
     unsubscribe() {
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
         if (this.listenerId) {
-            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
-            this.listenerId = undefined;
+            const promise = this.program.provider.connection
+                .removeAccountChangeListener(this.listenerId)
+                .then(() => {
+                this.listenerId = undefined;
+                this.isUnsubscribing = false;
+            });
             return promise;
         }
+        else {
+            this.isUnsubscribing = false;
+        }
     }
 }
 exports.WebSocketProgramAccountSubscriber = WebSocketProgramAccountSubscriber;

package/lib/user.js

@@ -1677,14 +1677,13 @@ class User {
             withdrawLimit = _1.BN.max(withdrawLimit, userDepositAmount);
         }
         const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, oracleData.price, spotMarket, 'Initial');
-        const amountWithdrawable = assetWeight.eq(numericConstants_1.ZERO)
-            ? userDepositAmount
-            : freeCollateral
-                .mul(numericConstants_1.MARGIN_PRECISION)
-                .div(assetWeight)
-                .mul(numericConstants_1.PRICE_PRECISION)
-                .div(oracleData.price)
-                .mul(precisionIncrease);
+        let amountWithdrawable;
+        if (assetWeight.eq(numericConstants_1.ZERO)) {
+            amountWithdrawable = userDepositAmount;
+        }
+        else {
+            amountWithdrawable = (0, _1.divCeil)((0, _1.divCeil)(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION), assetWeight).mul(numericConstants_1.PRICE_PRECISION), oracleData.price).mul(precisionIncrease);
+        }
         const maxWithdrawValue = _1.BN.min(_1.BN.min(amountWithdrawable, userDepositAmount), withdrawLimit.abs());
         if (reduceOnly) {
             return _1.BN.max(maxWithdrawValue, numericConstants_1.ZERO);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.43.0-beta.11",
+	"version": "2.43.0-beta.13",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/webSocketAccountSubscriber.ts

@@ -14,6 +14,8 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	onChange: (data: T) => void;
 	listenerId?: number;
 	resubTimeoutMs?: number;
+	isUnsubscribing = false;
+
 	timeoutId?: NodeJS.Timeout;
 
 	receivingData: boolean;
@@ -34,7 +36,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
-		if (this.listenerId) {
+		if (this.listenerId || this.isUnsubscribing) {
 			return;
 		}
 
@@ -80,6 +82,11 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(async () => {
+			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`
@@ -154,13 +161,20 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	unsubscribe(): Promise<void> {
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+		this.timeoutId = undefined;
+
 		if (this.listenerId) {
-			const promise =
-				this.program.provider.connection.removeAccountChangeListener(
-					this.listenerId
-				);
-			this.listenerId = undefined;
+			const promise = this.program.provider.connection
+				.removeAccountChangeListener(this.listenerId)
+				.then(() => {
+					this.listenerId = undefined;
+					this.isUnsubscribing = false;
+				});
 			return promise;
+		} else {
+			this.isUnsubscribing = false;
 		}
 	}
 }

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -21,6 +21,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	onChange: (accountId: PublicKey, data: T, context: Context) => void;
 	listenerId?: number;
 	resubTimeoutMs?: number;
+	isUnsubscribing = false;
 	timeoutId?: NodeJS.Timeout;
 	options: { filters: MemcmpFilter[]; commitment?: Commitment };
 
@@ -48,7 +49,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	async subscribe(
 		onChange: (accountId: PublicKey, data: T, context: Context) => void
 	): Promise<void> {
-		if (this.listenerId) {
+		if (this.listenerId || this.isUnsubscribing) {
 			return;
 		}
 
@@ -81,6 +82,11 @@ export class WebSocketProgramAccountSubscriber<T>
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(async () => {
+			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`
@@ -140,13 +146,20 @@ export class WebSocketProgramAccountSubscriber<T>
 	}
 
 	unsubscribe(): Promise<void> {
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+		this.timeoutId = undefined;
+
 		if (this.listenerId) {
-			const promise =
-				this.program.provider.connection.removeAccountChangeListener(
-					this.listenerId
-				);
-			this.listenerId = undefined;
+			const promise = this.program.provider.connection
+				.removeAccountChangeListener(this.listenerId)
+				.then(() => {
+					this.listenerId = undefined;
+					this.isUnsubscribing = false;
+				});
 			return promise;
+		} else {
+			this.isUnsubscribing = false;
 		}
 	}
 }

package/src/user.ts

@@ -48,6 +48,7 @@ import {
 	calculateReservePrice,
 	calculateSpotMarketMarginRatio,
 	calculateUnrealizedAssetWeight,
+	divCeil,
 	getBalance,
 	getSignedTokenAmount,
 	getStrictTokenValue,
@@ -3054,14 +3055,17 @@ export class User {
 			'Initial'
 		);
 
-		const amountWithdrawable = assetWeight.eq(ZERO)
-			? userDepositAmount
-			: freeCollateral
-					.mul(MARGIN_PRECISION)
-					.div(assetWeight)
-					.mul(PRICE_PRECISION)
-					.div(oracleData.price)
-					.mul(precisionIncrease);
+		let amountWithdrawable;
+		if (assetWeight.eq(ZERO)) {
+			amountWithdrawable = userDepositAmount;
+		} else {
+			amountWithdrawable = divCeil(
+				divCeil(freeCollateral.mul(MARGIN_PRECISION), assetWeight).mul(
+					PRICE_PRECISION
+				),
+				oracleData.price
+			).mul(precisionIncrease);
+		}
 
 		const maxWithdrawValue = BN.min(
 			BN.min(amountWithdrawable, userDepositAmount),