@drift-labs/sdk 2.65.0-beta.6 → 2.65.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.65.0-beta.6
+2.65.0-beta.7

package/lib/driftClient.js

@@ -395,7 +395,7 @@ class DriftClient {
      * Adds and subscribes to users based on params set by the constructor or by updateWallet.
      */
     async addAndSubscribeToUsers() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g;
         // save the rpc calls if driftclient is initialized without a real wallet
         if (this.skipLoadUsers)
             return true;
@@ -412,19 +412,27 @@ class DriftClient {
             }
         }
         else {
-            const userAccounts = (_c = (await this.getUserAccountsForAuthority(this.wallet.publicKey))) !== null && _c !== void 0 ? _c : [];
+            let userAccounts = [];
             let delegatedAccounts = [];
+            const userAccountsPromise = this.getUserAccountsForAuthority(this.wallet.publicKey);
             if (this.includeDelegates) {
-                delegatedAccounts =
-                    (_d = (await this.getUserAccountsForDelegate(this.wallet.publicKey))) !== null && _d !== void 0 ? _d : [];
+                const delegatedAccountsPromise = this.getUserAccountsForDelegate(this.wallet.publicKey);
+                [userAccounts, delegatedAccounts] = await Promise.all([
+                    userAccountsPromise,
+                    delegatedAccountsPromise,
+                ]);
+                !userAccounts && (userAccounts = []);
+                !delegatedAccounts && (delegatedAccounts = []);
             }
-            for (const account of userAccounts.concat(delegatedAccounts)) {
-                result =
-                    result &&
-                        (await this.addUser(account.subAccountId, account.authority, account));
+            else {
+                userAccounts = (_c = (await userAccountsPromise)) !== null && _c !== void 0 ? _c : [];
             }
+            const allAccounts = userAccounts.concat(delegatedAccounts);
+            const addAllAccountsPromise = allAccounts.map((acc) => this.addUser(acc.subAccountId, acc.authority, acc));
+            const addAllAccountsResults = await Promise.all(addAllAccountsPromise);
+            result = addAllAccountsResults.every((res) => !!res);
             if (this.activeSubAccountId == undefined) {
-                this.switchActiveUser((_f = (_e = userAccounts.concat(delegatedAccounts)[0]) === null || _e === void 0 ? void 0 : _e.subAccountId) !== null && _f !== void 0 ? _f : 0, (_h = (_g = userAccounts.concat(delegatedAccounts)[0]) === null || _g === void 0 ? void 0 : _g.authority) !== null && _h !== void 0 ? _h : this.authority);
+                this.switchActiveUser((_e = (_d = userAccounts.concat(delegatedAccounts)[0]) === null || _d === void 0 ? void 0 : _d.subAccountId) !== null && _e !== void 0 ? _e : 0, (_g = (_f = userAccounts.concat(delegatedAccounts)[0]) === null || _f === void 0 ? void 0 : _f.authority) !== null && _g !== void 0 ? _g : this.authority);
             }
         }
         return result;

package/package.json

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

package/src/driftClient.ts

@@ -693,25 +693,36 @@ export class DriftClient {
 				);
 			}
 		} else {
-			const userAccounts =
-				(await this.getUserAccountsForAuthority(this.wallet.publicKey)) ?? [];
+			let userAccounts = [];
 			let delegatedAccounts = [];
 
+			const userAccountsPromise = this.getUserAccountsForAuthority(
+				this.wallet.publicKey
+			);
+
 			if (this.includeDelegates) {
-				delegatedAccounts =
-					(await this.getUserAccountsForDelegate(this.wallet.publicKey)) ?? [];
-			}
+				const delegatedAccountsPromise = this.getUserAccountsForDelegate(
+					this.wallet.publicKey
+				);
+				[userAccounts, delegatedAccounts] = await Promise.all([
+					userAccountsPromise,
+					delegatedAccountsPromise,
+				]);
 
-			for (const account of userAccounts.concat(delegatedAccounts)) {
-				result =
-					result &&
-					(await this.addUser(
-						account.subAccountId,
-						account.authority,
-						account
-					));
+				!userAccounts && (userAccounts = []);
+				!delegatedAccounts && (delegatedAccounts = []);
+			} else {
+				userAccounts = (await userAccountsPromise) ?? [];
 			}
 
+			const allAccounts = userAccounts.concat(delegatedAccounts);
+			const addAllAccountsPromise = allAccounts.map((acc) =>
+				this.addUser(acc.subAccountId, acc.authority, acc)
+			);
+
+			const addAllAccountsResults = await Promise.all(addAllAccountsPromise);
+			result = addAllAccountsResults.every((res) => !!res);
+
 			if (this.activeSubAccountId == undefined) {
 				this.switchActiveUser(
 					userAccounts.concat(delegatedAccounts)[0]?.subAccountId ?? 0,

package/tests/dlob/test.ts

@@ -6613,53 +6613,50 @@ describe('Uncross L2', () => {
 			new BN(1).mul(BASE_PRECISION).toString()
 		);
 	});
-	
-	it('Handles edge case bide and asks with large cross and an overlapping level', () => {
 
+	it('Handles edge case bide and asks with large cross and an overlapping level', () => {
 		const bids = [
-			"104411000",
-			"103835800",
-			"103826259",
-			"103825000",
-			"103822000",
-			"103821500",
-			"103820283",
-			"103816900",
-			"103816000",
-			"103815121",
-		  ].map(priceStr => (
-			{
-				price: new BN(priceStr),
-				size: new BN(1).mul(BASE_PRECISION),
-				sources: { vamm: new BN(1).mul(BASE_PRECISION) },
-			}
-		));
+			'104411000',
+			'103835800',
+			'103826259',
+			'103825000',
+			'103822000',
+			'103821500',
+			'103820283',
+			'103816900',
+			'103816000',
+			'103815121',
+		].map((priceStr) => ({
+			price: new BN(priceStr),
+			size: new BN(1).mul(BASE_PRECISION),
+			sources: { vamm: new BN(1).mul(BASE_PRECISION) },
+		}));
 
 		const asks = [
-			"103822000",
-			"103838354",
-			"103843087",
-			"103843351",
-			"103843880",
-			"103845114",
-			"103846148",
-			"103850100",
-			"103851300",
-			"103854304",
-		  ].map(priceStr => ({
+			'103822000',
+			'103838354',
+			'103843087',
+			'103843351',
+			'103843880',
+			'103845114',
+			'103846148',
+			'103850100',
+			'103851300',
+			'103854304',
+		].map((priceStr) => ({
 			price: new BN(priceStr),
 			size: new BN(1).mul(BASE_PRECISION),
 			sources: { vamm: new BN(1).mul(BASE_PRECISION) },
 		}));
 
-		expect(asksAreSortedAsc(asks), "Input asks are ascending").to.be.true;
-		expect(bidsAreSortedDesc(bids), "Input bids are descending").to.be.true;
+		expect(asksAreSortedAsc(asks), 'Input asks are ascending').to.be.true;
+		expect(bidsAreSortedDesc(bids), 'Input bids are descending').to.be.true;
 
-		const oraclePrice = new BN("103649895");
-		const oraclePrice5Min = new BN("103285000");
-		const markPrice5Min = new BN("103371000");
+		const oraclePrice = new BN('103649895');
+		const oraclePrice5Min = new BN('103285000');
+		const markPrice5Min = new BN('103371000');
 
-		const groupingSize = new BN("100");
+		const groupingSize = new BN('100');
 
 		const userAsks = new Set<string>();
 
@@ -6674,55 +6671,55 @@ describe('Uncross L2', () => {
 			userAsks
 		);
 
-		expect(asksAreSortedAsc(newAsks), "Uncrossed asks are ascending").to.be.true;
-		expect(bidsAreSortedDesc(newBids), "Uncrossed bids are descending").to.be.true;
+		expect(asksAreSortedAsc(newAsks), 'Uncrossed asks are ascending').to.be
+			.true;
+		expect(bidsAreSortedDesc(newBids), 'Uncrossed bids are descending').to.be
+			.true;
 	});
-	
+
 	it('Crossing edge case : top bid and ask have a big cross, following ones dont - shouldnt get uncrossed out of order', () => {
 		const bids = [
-			"101825900",
-			"101783900",
-			"101783000",
-			"101782600",
-			"101770700",
-			"101770200",
-			"101749857",
-			"101735900",
-			"101729994",
-			"101726900",
-		  ].map(priceStr => (
-			{
-				price: new BN(priceStr),
-				size: new BN(1).mul(BASE_PRECISION),
-				sources: { vamm: new BN(1).mul(BASE_PRECISION) },
-			}
-		));
+			'101825900',
+			'101783900',
+			'101783000',
+			'101782600',
+			'101770700',
+			'101770200',
+			'101749857',
+			'101735900',
+			'101729994',
+			'101726900',
+		].map((priceStr) => ({
+			price: new BN(priceStr),
+			size: new BN(1).mul(BASE_PRECISION),
+			sources: { vamm: new BN(1).mul(BASE_PRECISION) },
+		}));
 
 		const asks = [
-			"101750700",
-			"101790467",
-			"101793400",
-			"101794116",
-			"101798548",
-			"101799532",
-			"101803500",
-			"101820927",
-			"101823900",
-			"101827638",
-		  ].map(priceStr => ({
+			'101750700',
+			'101790467',
+			'101793400',
+			'101794116',
+			'101798548',
+			'101799532',
+			'101803500',
+			'101820927',
+			'101823900',
+			'101827638',
+		].map((priceStr) => ({
 			price: new BN(priceStr),
 			size: new BN(1).mul(BASE_PRECISION),
 			sources: { vamm: new BN(1).mul(BASE_PRECISION) },
 		}));
 
-		expect(asksAreSortedAsc(asks), "Input asks are ascending").to.be.true;
-		expect(bidsAreSortedDesc(bids), "Input bids are descending").to.be.true;
+		expect(asksAreSortedAsc(asks), 'Input asks are ascending').to.be.true;
+		expect(bidsAreSortedDesc(bids), 'Input bids are descending').to.be.true;
 
-		const oraclePrice = new BN("101711384");
-		const oraclePrice5Min = new BN("101805000");
-		const markPrice5Min = new BN("101867000");
+		const oraclePrice = new BN('101711384');
+		const oraclePrice5Min = new BN('101805000');
+		const markPrice5Min = new BN('101867000');
 
-		const groupingSize = new BN("100");
+		const groupingSize = new BN('100');
 
 		const userAsks = new Set<string>();
 
@@ -6737,7 +6734,9 @@ describe('Uncross L2', () => {
 			userAsks
 		);
 
-		expect(asksAreSortedAsc(newAsks), "Uncrossed asks are ascending").to.be.true;
-		expect(bidsAreSortedDesc(newBids), "Uncrossed bids are descending").to.be.true;
+		expect(asksAreSortedAsc(newAsks), 'Uncrossed asks are ascending').to.be
+			.true;
+		expect(bidsAreSortedDesc(newBids), 'Uncrossed bids are descending').to.be
+			.true;
 	});
 });