@drift-labs/sdk 2.4.0 → 2.6.0-beta.0

package/lib/dlob/DLOB.js

@@ -171,8 +171,11 @@ class DLOB {
         if (order.baseAssetAmountFilled.eq(cumulativeBaseAssetAmountFilled)) {
             return;
         }
-        order.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
-        (_a = this.getListForOrder(order)) === null || _a === void 0 ? void 0 : _a.update(order, userAccount);
+        const newOrder = {
+            ...order,
+        };
+        newOrder.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
+        (_a = this.getListForOrder(order)) === null || _a === void 0 ? void 0 : _a.update(newOrder, userAccount);
         if (onUpdate) {
             onUpdate();
         }

package/lib/dlob/dlobIdl.json

@@ -187,6 +187,9 @@
                     },
                     {
                         "name": "TriggerLimit"
+                    },
+                    {
+                        "name": "Oracle"
                     }
                 ]
             }

package/lib/driftClient.js

@@ -358,9 +358,10 @@ class DriftClient {
         });
     }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         return await this.program.rpc.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
             accounts: {
-                user: await this.getUserAccountPublicKey(),
+                user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
             },
         });

package/lib/events/eventSubscriber.js

@@ -63,7 +63,7 @@ class EventSubscriber {
             this.awaitTxResolver.get(txSig)();
             this.awaitTxResolver.delete(txSig);
         }
-        if (slot > this.lastSeenSlot) {
+        if (!this.lastSeenSlot || slot > this.lastSeenSlot) {
             this.lastSeenTxSig = txSig;
         }
         if (this.lastSeenBlockTime === undefined ||

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.4.0",
+    "version": "2.6.0-beta.0",
     "name": "drift",
     "instructions": [
         {

package/lib/math/position.js

@@ -87,9 +87,7 @@ function calculateClaimablePnl(market, spotMarket, perpPosition, oraclePriceData
     let unsettledPnl = unrealizedPnl.add(fundingPnL);
     if (unrealizedPnl.gt(numericConstants_1.ZERO)) {
         const excessPnlPool = __1.BN.max(numericConstants_1.ZERO, (0, market_1.calculateNetUserPnlImbalance)(market, spotMarket, oraclePriceData).mul(new __1.BN(-1)));
-        const maxPositivePnl = __1.BN.max(perpPosition.quoteAssetAmount
-            .sub(perpPosition.quoteEntryAmount)
-            .add(excessPnlPool), numericConstants_1.ZERO);
+        const maxPositivePnl = __1.BN.max(perpPosition.quoteAssetAmount.sub(perpPosition.quoteEntryAmount), numericConstants_1.ZERO).add(excessPnlPool);
         unsettledPnl = __1.BN.min(maxPositivePnl, unrealizedPnl);
     }
     return unsettledPnl;

package/lib/types.d.ts

@@ -855,6 +855,7 @@ export declare type UserAccount = {
     cumulativePerpFunding: BN;
     liquidationMarginFreed: BN;
     liquidationStartSlot: BN;
+    isMarginTradingEnabled: boolean;
 };
 export declare type SpotPosition = {
     marketIndex: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.4.0",
+	"version": "2.6.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -57,7 +57,7 @@
 		"prettier": "^2.4.1",
 		"ts-node": "^10.8.0"
 	},
-	"description": "SDK for Drift Protocol v1",
+	"description": "SDK for Drift Protocol",
 	"engines": {
 		"node": ">=12"
 	}

package/src/dlob/DLOB.ts

@@ -270,8 +270,12 @@ export class DLOB {
 			return;
 		}
 
-		order.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
-		this.getListForOrder(order)?.update(order, userAccount);
+		const newOrder = {
+			...order,
+		};
+		newOrder.baseAssetAmountFilled = cumulativeBaseAssetAmountFilled;
+
+		this.getListForOrder(order)?.update(newOrder, userAccount);
 
 		if (onUpdate) {
 			onUpdate();

package/src/dlob/dlobIdl.json

@@ -187,6 +187,9 @@
           },
           {
             "name": "TriggerLimit"
+          },
+          {
+            "name": "Oracle"
           }
         ]
       }

package/src/driftClient.ts

@@ -590,12 +590,17 @@ export class DriftClient {
 		marginTradingEnabled: boolean,
 		subAccountId = 0
 	): Promise<TransactionSignature> {
+		const userAccountPublicKey = getUserAccountPublicKeySync(
+			this.program.programId,
+			this.wallet.publicKey,
+			subAccountId
+		);
 		return await this.program.rpc.updateUserMarginTradingEnabled(
 			subAccountId,
 			marginTradingEnabled,
 			{
 				accounts: {
-					user: await this.getUserAccountPublicKey(),
+					user: userAccountPublicKey,
 					authority: this.wallet.publicKey,
 				},
 			}

package/src/events/eventSubscriber.ts

@@ -109,7 +109,7 @@ export class EventSubscriber {
 			this.awaitTxResolver.delete(txSig);
 		}
 
-		if (slot > this.lastSeenSlot) {
+		if (!this.lastSeenSlot || slot > this.lastSeenSlot) {
 			this.lastSeenTxSig = txSig;
 		}
 

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.4.0",
+  "version": "2.6.0-beta.0",
   "name": "drift",
   "instructions": [
     {

package/src/math/position.ts

@@ -151,11 +151,9 @@ export function calculateClaimablePnl(
 		);
 
 		const maxPositivePnl = BN.max(
-			perpPosition.quoteAssetAmount
-				.sub(perpPosition.quoteEntryAmount)
-				.add(excessPnlPool),
+			perpPosition.quoteAssetAmount.sub(perpPosition.quoteEntryAmount),
 			ZERO
-		);
+		).add(excessPnlPool);
 
 		unsettledPnl = BN.min(maxPositivePnl, unrealizedPnl);
 	}

package/src/types.ts

@@ -795,6 +795,7 @@ export type UserAccount = {
 	cumulativePerpFunding: BN;
 	liquidationMarginFreed: BN;
 	liquidationStartSlot: BN;
+	isMarginTradingEnabled: boolean;
 };
 
 export type SpotPosition = {