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

package/VERSION

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

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -21,7 +21,7 @@ export declare class OrderSubscriber {
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
-    tryUpdateUserAccount(key: string, userAccount: UserAccount, slot: number): void;
+    tryUpdateUserAccount(key: string, dataType: 'raw' | 'decoded', data: string[] | UserAccount, slot: number): void;
     getDLOB(slot: number): Promise<DLOB>;
     getSlot(): number;
     unsubscribe(): Promise<void>;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -55,11 +55,8 @@ class OrderSubscriber {
             const programAccountSet = new Set();
             for (const programAccount of rpcResponseAndContext.value) {
                 const key = programAccount.pubkey.toString();
-                // @ts-ignore
-                const buffer = buffer_1.Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
                 programAccountSet.add(key);
-                const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
-                this.tryUpdateUserAccount(key, userAccount, slot);
+                this.tryUpdateUserAccount(key, 'raw', programAccount.account.data, slot);
             }
             for (const key of this.usersAccounts.keys()) {
                 if (!programAccountSet.has(key)) {
@@ -75,12 +72,23 @@ class OrderSubscriber {
             this.fetchPromise = undefined;
         }
     }
-    tryUpdateUserAccount(key, userAccount, slot) {
+    tryUpdateUserAccount(key, dataType, data, slot) {
         if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
             this.mostRecentSlot = slot;
         }
         const slotAndUserAccount = this.usersAccounts.get(key);
         if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
+            let userAccount;
+            // Polling leads to a lot of redundant decoding, so we only decode if data is from a fresh slot
+            if (dataType === 'raw') {
+                // @ts-ignore
+                const buffer = buffer_1.Buffer.from(data[0], data[1]);
+                userAccount =
+                    this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+            }
+            else {
+                userAccount = data;
+            }
             const newOrders = userAccount.orders.filter((order) => {
                 var _a;
                 return order.slot.toNumber() > ((_a = slotAndUserAccount === null || slotAndUserAccount === void 0 ? void 0 : slotAndUserAccount.slot) !== null && _a !== void 0 ? _a : 0) &&

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -18,7 +18,7 @@ class WebsocketSubscription {
         }
         await this.subscriber.subscribe((accountId, account, context) => {
             const userKey = accountId.toBase58();
-            this.orderSubscriber.tryUpdateUserAccount(userKey, account, context.slot);
+            this.orderSubscriber.tryUpdateUserAccount(userKey, 'decoded', account, context.slot);
         });
         if (!this.skipInitialLoad) {
             await this.orderSubscriber.fetch();

package/package.json

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

package/src/orderSubscriber/OrderSubscriber.ts

@@ -83,18 +83,13 @@ export class OrderSubscriber {
 			const programAccountSet = new Set<string>();
 			for (const programAccount of rpcResponseAndContext.value) {
 				const key = programAccount.pubkey.toString();
-				// @ts-ignore
-				const buffer = Buffer.from(
-					programAccount.account.data[0],
-					programAccount.account.data[1]
-				);
 				programAccountSet.add(key);
-				const userAccount =
-					this.driftClient.program.account.user.coder.accounts.decode(
-						'User',
-						buffer
-					) as UserAccount;
-				this.tryUpdateUserAccount(key, userAccount, slot);
+				this.tryUpdateUserAccount(
+					key,
+					'raw',
+					programAccount.account.data,
+					slot
+				);
 			}
 
 			for (const key of this.usersAccounts.keys()) {
@@ -112,7 +107,8 @@ export class OrderSubscriber {
 
 	tryUpdateUserAccount(
 		key: string,
-		userAccount: UserAccount,
+		dataType: 'raw' | 'decoded',
+		data: string[] | UserAccount,
 		slot: number
 	): void {
 		if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
@@ -121,6 +117,21 @@ export class OrderSubscriber {
 
 		const slotAndUserAccount = this.usersAccounts.get(key);
 		if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
+			let userAccount: UserAccount;
+			// Polling leads to a lot of redundant decoding, so we only decode if data is from a fresh slot
+			if (dataType === 'raw') {
+				// @ts-ignore
+				const buffer = Buffer.from(data[0], data[1]);
+
+				userAccount =
+					this.driftClient.program.account.user.coder.accounts.decodeUnchecked(
+						'User',
+						buffer
+					) as UserAccount;
+			} else {
+				userAccount = data as UserAccount;
+			}
+
 			const newOrders = userAccount.orders.filter(
 				(order) =>
 					order.slot.toNumber() > (slotAndUserAccount?.slot ?? 0) &&

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -47,6 +47,7 @@ export class WebsocketSubscription {
 				const userKey = accountId.toBase58();
 				this.orderSubscriber.tryUpdateUserAccount(
 					userKey,
+					'decoded',
 					account,
 					context.slot
 				);