@drift-labs/sdk 2.62.0-beta.0 → 2.62.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.62.0-beta.0
+2.62.0-beta.2

package/lib/accounts/webSocketAccountSubscriber.js

@@ -10,6 +10,9 @@ class WebSocketAccountSubscriber {
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
         this.resubTimeoutMs = resubTimeoutMs;
+        if (this.resubTimeoutMs < 1000) {
+            console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
+        }
         this.receivingData = false;
         this.commitment =
             commitment !== null && commitment !== void 0 ? commitment : this.program.provider.opts.commitment;
@@ -34,6 +37,7 @@ class WebSocketAccountSubscriber {
             }
         }, this.commitment);
         if (this.resubTimeoutMs) {
+            this.receivingData = true;
             this.setTimeout();
         }
     }

package/lib/driftClient.d.ts

@@ -129,7 +129,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
-    updateUserAdvancedLp(advancedLp: boolean, subAccountId?: number): Promise<TransactionSignature>;
+    updateUserAdvancedLp(updates: {
+        advancedLp: boolean;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateAdvancedDlpIx(advancedLp: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/driftClient.js

@@ -600,15 +600,22 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateUserAdvancedLp(advancedLp, subAccountId = 0) {
-        const tx = await this.program.transaction.updateUserAdvancedLp(subAccountId, advancedLp, {
+    async updateUserAdvancedLp(updates) {
+        const ixs = await Promise.all(updates.map(async ({ advancedLp, subAccountId }) => {
+            return await this.getUpdateAdvancedDlpIx(advancedLp, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateAdvancedDlpIx(advancedLp, subAccountId) {
+        const ix = await this.program.instruction.updateUserAdvancedLp(subAccountId, advancedLp, {
             accounts: {
-                user: await this.getUserAccountPublicKey(),
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
                 authority: this.wallet.publicKey,
             },
         });
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
+        return ix;
     }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;

package/lib/slot/SlotSubscriber.js

@@ -9,6 +9,9 @@ class SlotSubscriber {
         this.receivingData = false;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
+        if (this.resubTimeoutMs < 1000) {
+            console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
+        }
     }
     async subscribe() {
         if (this.subscriptionId != null) {
@@ -27,6 +30,7 @@ class SlotSubscriber {
             }
         });
         if (this.resubTimeoutMs) {
+            this.receivingData = true;
             this.setTimeout();
         }
     }

package/package.json

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

package/src/accounts/webSocketAccountSubscriber.ts

@@ -34,6 +34,11 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		this.accountPublicKey = accountPublicKey;
 		this.decodeBufferFn = decodeBuffer;
 		this.resubTimeoutMs = resubTimeoutMs;
+		if (this.resubTimeoutMs < 1000) {
+			console.log(
+				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
+			);
+		}
 		this.receivingData = false;
 		this.commitment =
 			commitment ?? (this.program.provider as AnchorProvider).opts.commitment;
@@ -65,6 +70,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		);
 
 		if (this.resubTimeoutMs) {
+			this.receivingData = true;
 			this.setTimeout();
 		}
 	}

package/src/driftClient.ts

@@ -1025,22 +1025,40 @@ export class DriftClient {
 	}
 
 	public async updateUserAdvancedLp(
-		advancedLp: boolean,
-		subAccountId = 0
+		updates: { advancedLp: boolean; subAccountId: number }[]
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateUserAdvancedLp(
+		const ixs = await Promise.all(
+			updates.map(async ({ advancedLp, subAccountId }) => {
+				return await this.getUpdateAdvancedDlpIx(advancedLp, subAccountId);
+			})
+		);
+
+		const tx = await this.buildTransaction(ixs, this.txParams);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getUpdateAdvancedDlpIx(
+		advancedLp: boolean,
+		subAccountId: number
+	) {
+		const ix = await this.program.instruction.updateUserAdvancedLp(
 			subAccountId,
 			advancedLp,
 			{
 				accounts: {
-					user: await this.getUserAccountPublicKey(),
+					user: getUserAccountPublicKeySync(
+						this.program.programId,
+						this.wallet.publicKey,
+						subAccountId
+					),
 					authority: this.wallet.publicKey,
 				},
 			}
 		);
 
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
+		return ix;
 	}
 
 	public async fetchAllUserAccounts(

package/src/slot/SlotSubscriber.ts

@@ -28,6 +28,11 @@ export class SlotSubscriber {
 	) {
 		this.eventEmitter = new EventEmitter();
 		this.resubTimeoutMs = config?.resubTimeoutMs;
+		if (this.resubTimeoutMs < 1000) {
+			console.log(
+				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
+			);
+		}
 	}
 
 	public async subscribe(): Promise<void> {
@@ -50,6 +55,7 @@ export class SlotSubscriber {
 		});
 
 		if (this.resubTimeoutMs) {
+			this.receivingData = true;
 			this.setTimeout();
 		}
 	}