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

package/VERSION

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

package/lib/accounts/webSocketAccountSubscriber.js

@@ -126,7 +126,7 @@ class WebSocketAccountSubscriber {
         }
     }
     unsubscribe(onResub = false) {
-        if (!onResub) {
+        if (!onResub && this.resubOpts) {
             this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;

package/lib/dlob/DLOB.js

@@ -528,7 +528,7 @@ class DLOB {
         ];
         for (const bidGenerator of bidGenerators) {
             for (const bid of bidGenerator) {
-                if ((0, __1.isOrderExpired)(bid.order, ts, true)) {
+                if ((0, __1.isOrderExpired)(bid.order, ts, true, 25)) {
                     nodesToFill.push({
                         node: bid,
                         makerNodes: [],
@@ -538,7 +538,7 @@ class DLOB {
         }
         for (const askGenerator of askGenerators) {
             for (const ask of askGenerator) {
-                if ((0, __1.isOrderExpired)(ask.order, ts, true)) {
+                if ((0, __1.isOrderExpired)(ask.order, ts, true, 25)) {
                     nodesToFill.push({
                         node: ask,
                         makerNodes: [],

package/lib/math/orders.d.ts

@@ -14,7 +14,7 @@ export declare function hasAuctionPrice(order: Order, slot: number): boolean;
 export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number, ts: number, minAuctionDuration: number): boolean;
 export declare function calculateBaseAssetAmountForAmmToFulfill(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number): BN;
 export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, amm: AMM, limitPrice: BN, oraclePriceData: OraclePriceData): BN;
-export declare function isOrderExpired(order: Order, ts: number, enforceBuffer?: boolean): boolean;
+export declare function isOrderExpired(order: Order, ts: number, enforceBuffer?: boolean, bufferSeconds?: number): boolean;
 export declare function isMarketOrder(order: Order): boolean;
 export declare function isLimitOrder(order: Order): boolean;
 export declare function mustBeTriggered(order: Order): boolean;

package/lib/math/orders.js

@@ -168,7 +168,7 @@ function isSameDirection(firstDirection, secondDirection) {
     return (((0, types_1.isVariant)(firstDirection, 'long') && (0, types_1.isVariant)(secondDirection, 'long')) ||
         ((0, types_1.isVariant)(firstDirection, 'short') && (0, types_1.isVariant)(secondDirection, 'short')));
 }
-function isOrderExpired(order, ts, enforceBuffer = false) {
+function isOrderExpired(order, ts, enforceBuffer = false, bufferSeconds = 15) {
     if (mustBeTriggered(order) ||
         !(0, types_1.isVariant)(order.status, 'open') ||
         order.maxTs.eq(numericConstants_1.ZERO)) {
@@ -176,7 +176,7 @@ function isOrderExpired(order, ts, enforceBuffer = false) {
     }
     let maxTs;
     if (enforceBuffer && isLimitOrder(order)) {
-        maxTs = order.maxTs.addn(15);
+        maxTs = order.maxTs.addn(bufferSeconds);
     }
     else {
         maxTs = order.maxTs;

package/lib/types.d.ts

@@ -46,7 +46,8 @@ export declare enum PerpOperation {
     AMM_FILL = 2,
     FILL = 4,
     SETTLE_PNL = 8,
-    SETTLE_PNL_WITH_POSITION = 16
+    SETTLE_PNL_WITH_POSITION = 16,
+    LIQUIDATION = 32
 }
 export declare enum SpotOperation {
     UPDATE_CUMULATIVE_INTEREST = 1,

package/lib/types.js

@@ -34,6 +34,7 @@ var PerpOperation;
     PerpOperation[PerpOperation["FILL"] = 4] = "FILL";
     PerpOperation[PerpOperation["SETTLE_PNL"] = 8] = "SETTLE_PNL";
     PerpOperation[PerpOperation["SETTLE_PNL_WITH_POSITION"] = 16] = "SETTLE_PNL_WITH_POSITION";
+    PerpOperation[PerpOperation["LIQUIDATION"] = 32] = "LIQUIDATION";
 })(PerpOperation = exports.PerpOperation || (exports.PerpOperation = {}));
 var SpotOperation;
 (function (SpotOperation) {

package/package.json

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

package/src/accounts/webSocketAccountSubscriber.ts

@@ -183,7 +183,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	unsubscribe(onResub = false): Promise<void> {
-		if (!onResub) {
+		if (!onResub && this.resubOpts) {
 			this.resubOpts.resubTimeoutMs = undefined;
 		}
 		this.isUnsubscribing = true;

package/src/dlob/DLOB.ts

@@ -985,7 +985,7 @@ export class DLOB {
 
 		for (const bidGenerator of bidGenerators) {
 			for (const bid of bidGenerator) {
-				if (isOrderExpired(bid.order, ts, true)) {
+				if (isOrderExpired(bid.order, ts, true, 25)) {
 					nodesToFill.push({
 						node: bid,
 						makerNodes: [],
@@ -996,7 +996,7 @@ export class DLOB {
 
 		for (const askGenerator of askGenerators) {
 			for (const ask of askGenerator) {
-				if (isOrderExpired(ask.order, ts, true)) {
+				if (isOrderExpired(ask.order, ts, true, 25)) {
 					nodesToFill.push({
 						node: ask,
 						makerNodes: [],

package/src/math/orders.ts

@@ -287,7 +287,8 @@ function isSameDirection(
 export function isOrderExpired(
 	order: Order,
 	ts: number,
-	enforceBuffer = false
+	enforceBuffer = false,
+	bufferSeconds = 15
 ): boolean {
 	if (
 		mustBeTriggered(order) ||
@@ -299,7 +300,7 @@ export function isOrderExpired(
 
 	let maxTs;
 	if (enforceBuffer && isLimitOrder(order)) {
-		maxTs = order.maxTs.addn(15);
+		maxTs = order.maxTs.addn(bufferSeconds);
 	} else {
 		maxTs = order.maxTs;
 	}

package/src/types.ts

@@ -33,6 +33,7 @@ export enum PerpOperation {
 	FILL = 4,
 	SETTLE_PNL = 8,
 	SETTLE_PNL_WITH_POSITION = 16,
+	LIQUIDATION = 32,
 }
 
 export enum SpotOperation {