@drift-labs/sdk 2.86.0-beta.2 → 2.86.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.2
+2.86.0-beta.3

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -47,7 +47,7 @@ class PollingDriftClientAccountSubscriber {
             this.oracleInfos = oracleInfos;
         }
         await this.updateAccountsToPoll();
-        await this.updateOraclesToPoll();
+        this.updateOraclesToPoll();
         await this.addToAccountLoader();
         let subscriptionSucceeded = false;
         let retries = 0;
@@ -59,8 +59,7 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
-        await this.setPerpOracleMap();
-        await this.setSpotOracleMap();
+        await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
         this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -76,13 +75,15 @@ class PollingDriftClientAccountSubscriber {
             publicKey: statePublicKey,
             eventType: 'stateAccountUpdate',
         });
-        await this.updatePerpMarketAccountsToPoll();
-        await this.updateSpotMarketAccountsToPoll();
+        await Promise.all([
+            this.updatePerpMarketAccountsToPoll(),
+            this.updateSpotMarketAccountsToPoll(),
+        ]);
     }
     async updatePerpMarketAccountsToPoll() {
-        for (const marketIndex of this.perpMarketIndexes) {
-            await this.addPerpMarketAccountToPoll(marketIndex);
-        }
+        await Promise.all(this.perpMarketIndexes.map((marketIndex) => {
+            return this.addPerpMarketAccountToPoll(marketIndex);
+        }));
         return true;
     }
     async addPerpMarketAccountToPoll(marketIndex) {
@@ -96,9 +97,9 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async updateSpotMarketAccountsToPoll() {
-        for (const marketIndex of this.spotMarketIndexes) {
+        await Promise.all(this.spotMarketIndexes.map(async (marketIndex) => {
             await this.addSpotMarketAccountToPoll(marketIndex);
-        }
+        }));
         return true;
     }
     async addSpotMarketAccountToPoll(marketIndex) {
@@ -127,12 +128,15 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addToAccountLoader() {
+        const accountPromises = [];
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            await this.addAccountToAccountLoader(accountToPoll);
+            accountPromises.push(this.addAccountToAccountLoader(accountToPoll));
         }
+        const oraclePromises = [];
         for (const [_, oracleToPoll] of this.oraclesToPoll) {
-            await this.addOracleToAccountLoader(oracleToPoll);
+            oraclePromises.push(this.addOracleToAccountLoader(oracleToPoll));
         }
+        await Promise.all([...accountPromises, ...oraclePromises]);
         this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
             this.eventEmitter.emit('error', error);
         });
@@ -284,33 +288,37 @@ class PollingDriftClientAccountSubscriber {
     }
     async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
+        const oraclePromises = [];
         for (const perpMarket of perpMarkets) {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             if (!this.oracles.has(oracle.toBase58())) {
-                await this.addOracle({
+                oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarketAccount.amm.oracleSource,
-                });
+                }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
+        await Promise.all(oraclePromises);
     }
     async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        const oraclePromises = [];
         for (const spotMarket of spotMarkets) {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             if (!this.oracles.has(oracle.toBase58())) {
-                await this.addOracle({
+                oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
-                });
+                }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
+        await Promise.all(oraclePromises);
     }
     assertIsSubscribed() {
         if (!this.isSubscribed) {

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -52,24 +52,23 @@ class WebSocketDriftClientAccountSubscriber {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
         });
-        // subscribe to market accounts
-        await this.subscribeToPerpMarketAccounts();
-        // subscribe to spot market accounts
-        await this.subscribeToSpotMarketAccounts();
-        // subscribe to oracles
-        await this.subscribeToOracles();
+        await Promise.all([
+            // subscribe to market accounts
+            this.subscribeToPerpMarketAccounts(),
+            // subscribe to spot market accounts
+            this.subscribeToSpotMarketAccounts(),
+            // subscribe to oracles
+            this.subscribeToOracles(),
+        ]);
         this.eventEmitter.emit('update');
-        await this.setPerpOracleMap();
-        await this.setSpotOracleMap();
+        await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
         return true;
     }
     async subscribeToPerpMarketAccounts() {
-        for (const marketIndex of this.perpMarketIndexes) {
-            await this.subscribeToPerpMarketAccount(marketIndex);
-        }
+        await Promise.all(this.perpMarketIndexes.map((marketIndex) => this.subscribeToPerpMarketAccount(marketIndex)));
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
@@ -83,9 +82,7 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToSpotMarketAccounts() {
-        for (const marketIndex of this.spotMarketIndexes) {
-            await this.subscribeToSpotMarketAccount(marketIndex);
-        }
+        await Promise.all(this.spotMarketIndexes.map((marketIndex) => this.subscribeToSpotMarketAccount(marketIndex)));
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
@@ -99,11 +96,9 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToOracles() {
-        for (const oracleInfo of this.oracleInfos) {
-            if (!oracleInfo.publicKey.equals(web3_js_1.PublicKey.default)) {
-                await this.subscribeToOracle(oracleInfo);
-            }
-        }
+        await Promise.all(this.oracleInfos
+            .filter((oracleInfo) => !oracleInfo.publicKey.equals(web3_js_1.PublicKey.default))
+            .map((oracleInfo) => this.subscribeToOracle(oracleInfo)));
         return true;
     }
     async subscribeToOracle(oracleInfo) {
@@ -119,19 +114,13 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async unsubscribeFromMarketAccounts() {
-        for (const accountSubscriber of this.perpMarketAccountSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.perpMarketAccountSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async unsubscribeFromSpotMarketAccounts() {
-        for (const accountSubscriber of this.spotMarketAccountSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.spotMarketAccountSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async unsubscribeFromOracles() {
-        for (const accountSubscriber of this.oracleSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.oracleSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async fetch() {
         if (!this.isSubscribed) {
@@ -179,6 +168,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
+        const addOraclePromises = [];
         for (const perpMarket of perpMarkets) {
             if (!perpMarket) {
                 continue;
@@ -187,16 +177,18 @@ class WebSocketDriftClientAccountSubscriber {
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             if (!this.oracleSubscribers.has(oracle.toBase58())) {
-                await this.addOracle({
+                addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.amm.oracleSource,
-                });
+                }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
+        await Promise.all(addOraclePromises);
     }
     async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        const addOraclePromises = [];
         for (const spotMarket of spotMarkets) {
             if (!spotMarket) {
                 continue;
@@ -205,13 +197,14 @@ class WebSocketDriftClientAccountSubscriber {
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             if (!this.oracleSubscribers.has(oracle.toBase58())) {
-                await this.addOracle({
+                addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
-                });
+                }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
+        await Promise.all(addOraclePromises);
     }
     assertIsSubscribed() {
         if (!this.isSubscribed) {

package/package.json

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

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -101,7 +101,7 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		await this.updateAccountsToPoll();
-		await this.updateOraclesToPoll();
+		this.updateOraclesToPoll();
 		await this.addToAccountLoader();
 
 		let subscriptionSucceeded = false;
@@ -116,8 +116,7 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
-		await this.setPerpOracleMap();
-		await this.setSpotOracleMap();
+		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
 
 		this.isSubscribing = false;
 		this.isSubscribed = subscriptionSucceeded;
@@ -141,14 +140,18 @@ export class PollingDriftClientAccountSubscriber
 			eventType: 'stateAccountUpdate',
 		});
 
-		await this.updatePerpMarketAccountsToPoll();
-		await this.updateSpotMarketAccountsToPoll();
+		await Promise.all([
+			this.updatePerpMarketAccountsToPoll(),
+			this.updateSpotMarketAccountsToPoll(),
+		]);
 	}
 
 	async updatePerpMarketAccountsToPoll(): Promise<boolean> {
-		for (const marketIndex of this.perpMarketIndexes) {
-			await this.addPerpMarketAccountToPoll(marketIndex);
-		}
+		await Promise.all(
+			this.perpMarketIndexes.map((marketIndex) => {
+				return this.addPerpMarketAccountToPoll(marketIndex);
+			})
+		);
 		return true;
 	}
 
@@ -169,9 +172,11 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	async updateSpotMarketAccountsToPoll(): Promise<boolean> {
-		for (const marketIndex of this.spotMarketIndexes) {
-			await this.addSpotMarketAccountToPoll(marketIndex);
-		}
+		await Promise.all(
+			this.spotMarketIndexes.map(async (marketIndex) => {
+				await this.addSpotMarketAccountToPoll(marketIndex);
+			})
+		);
 
 		return true;
 	}
@@ -209,16 +214,19 @@ export class PollingDriftClientAccountSubscriber
 
 		return true;
 	}
-
 	async addToAccountLoader(): Promise<void> {
+		const accountPromises = [];
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			await this.addAccountToAccountLoader(accountToPoll);
+			accountPromises.push(this.addAccountToAccountLoader(accountToPoll));
 		}
 
+		const oraclePromises = [];
 		for (const [_, oracleToPoll] of this.oraclesToPoll) {
-			await this.addOracleToAccountLoader(oracleToPoll);
+			oraclePromises.push(this.addOracleToAccountLoader(oracleToPoll));
 		}
 
+		await Promise.all([...accountPromises, ...oraclePromises]);
+
 		this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
 			this.eventEmitter.emit('error', error);
 		});
@@ -446,37 +454,44 @@ export class PollingDriftClientAccountSubscriber
 		}
 		console.log(`Pausing to find oracle ${oracle} failed`);
 	}
-
 	async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
+		const oraclePromises = [];
 		for (const perpMarket of perpMarkets) {
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
 			if (!this.oracles.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: perpMarketAccount.amm.oracleSource,
-				});
+				oraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: perpMarketAccount.amm.oracleSource,
+					})
+				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
+		await Promise.all(oraclePromises);
 	}
 
 	async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
+		const oraclePromises = [];
 		for (const spotMarket of spotMarkets) {
 			const spotMarketAccount = spotMarket.data;
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
 			if (!this.oracles.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: spotMarketAccount.oracleSource,
-				});
+				oraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: spotMarketAccount.oracleSource,
+					})
+				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
+		await Promise.all(oraclePromises);
 	}
 
 	assertIsSubscribed(): void {

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -115,19 +115,18 @@ export class WebSocketDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		});
 
-		// subscribe to market accounts
-		await this.subscribeToPerpMarketAccounts();
-
-		// subscribe to spot market accounts
-		await this.subscribeToSpotMarketAccounts();
-
-		// subscribe to oracles
-		await this.subscribeToOracles();
+		await Promise.all([
+			// subscribe to market accounts
+			this.subscribeToPerpMarketAccounts(),
+			// subscribe to spot market accounts
+			this.subscribeToSpotMarketAccounts(),
+			// subscribe to oracles
+			this.subscribeToOracles(),
+		]);
 
 		this.eventEmitter.emit('update');
 
-		await this.setPerpOracleMap();
-		await this.setSpotOracleMap();
+		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
 
 		this.isSubscribing = false;
 		this.isSubscribed = true;
@@ -137,9 +136,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToPerpMarketAccounts(): Promise<boolean> {
-		for (const marketIndex of this.perpMarketIndexes) {
-			await this.subscribeToPerpMarketAccount(marketIndex);
-		}
+		await Promise.all(
+			this.perpMarketIndexes.map((marketIndex) =>
+				this.subscribeToPerpMarketAccount(marketIndex)
+			)
+		);
 		return true;
 	}
 
@@ -165,9 +166,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToSpotMarketAccounts(): Promise<boolean> {
-		for (const marketIndex of this.spotMarketIndexes) {
-			await this.subscribeToSpotMarketAccount(marketIndex);
-		}
+		await Promise.all(
+			this.spotMarketIndexes.map((marketIndex) =>
+				this.subscribeToSpotMarketAccount(marketIndex)
+			)
+		);
 		return true;
 	}
 
@@ -193,11 +196,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToOracles(): Promise<boolean> {
-		for (const oracleInfo of this.oracleInfos) {
-			if (!oracleInfo.publicKey.equals(PublicKey.default)) {
-				await this.subscribeToOracle(oracleInfo);
-			}
-		}
+		await Promise.all(
+			this.oracleInfos
+				.filter((oracleInfo) => !oracleInfo.publicKey.equals(PublicKey.default))
+				.map((oracleInfo) => this.subscribeToOracle(oracleInfo))
+		);
 
 		return true;
 	}
@@ -232,21 +235,27 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async unsubscribeFromMarketAccounts(): Promise<void> {
-		for (const accountSubscriber of this.perpMarketAccountSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.perpMarketAccountSubscribers.values()).map(
+				(accountSubscriber) => accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	async unsubscribeFromSpotMarketAccounts(): Promise<void> {
-		for (const accountSubscriber of this.spotMarketAccountSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.spotMarketAccountSubscribers.values()).map(
+				(accountSubscriber) => accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	async unsubscribeFromOracles(): Promise<void> {
-		for (const accountSubscriber of this.oracleSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.oracleSubscribers.values()).map((accountSubscriber) =>
+				accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	public async fetch(): Promise<void> {
@@ -315,6 +324,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 	async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
+		const addOraclePromises = [];
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket) {
 				continue;
@@ -323,17 +333,21 @@ export class WebSocketDriftClientAccountSubscriber
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
 			if (!this.oracleSubscribers.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: perpMarket.data.amm.oracleSource,
-				});
+				addOraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: perpMarket.data.amm.oracleSource,
+					})
+				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
+		await Promise.all(addOraclePromises);
 	}
 
 	async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
+		const addOraclePromises = [];
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket) {
 				continue;
@@ -342,13 +356,16 @@ export class WebSocketDriftClientAccountSubscriber
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
 			if (!this.oracleSubscribers.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: spotMarketAccount.oracleSource,
-				});
+				addOraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: spotMarketAccount.oracleSource,
+					})
+				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
+		await Promise.all(addOraclePromises);
 	}
 
 	assertIsSubscribed(): void {