@drift-labs/sdk 2.65.0-beta.0 → 2.65.0-beta.10

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/lib/jupiter/jupiterClient.js

@@ -54,8 +54,11 @@ class JupiterClient {
             onlyDirectRoutes: onlyDirectRoutes.toString(),
             maxAccounts: maxAccounts.toString(),
             ...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
-        }).toString();
-        const quote = await (await (0, node_fetch_1.default)(`${this.url}/v6/quote?${params}`)).json();
+        });
+        if (swapMode === 'ExactOut') {
+            params.delete('maxAccounts');
+        }
+        const quote = await (await (0, node_fetch_1.default)(`${this.url}/v6/quote?${params.toString()}`)).json();
         return quote;
     }
     /**

package/lib/userMap/userMap.d.ts

@@ -1,16 +1,21 @@
-import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB, UserSubscriptionConfig } from '..';
+import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB, UserSubscriptionConfig, DataAndSlot } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 export interface UserMapInterface {
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number, accountSubscription?: UserSubscriptionConfig): Promise<void>;
     has(key: string): boolean;
     get(key: string): User | undefined;
-    mustGet(key: string): Promise<User>;
+    getWithSlot(key: string): DataAndSlot<User> | undefined;
+    mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
+    mustGetWithSlot(key: string, accountSubscription?: UserSubscriptionConfig): Promise<DataAndSlot<User>>;
     getUserAuthority(key: string): PublicKey | undefined;
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
     values(): IterableIterator<User>;
+    valuesWithSlot(): IterableIterator<DataAndSlot<User>>;
+    entries(): IterableIterator<[string, User]>;
+    entriesWithSlot(): IterableIterator<[string, DataAndSlot<User>]>;
 }
 export declare class UserMap implements UserMapInterface {
     private userMap;
@@ -39,12 +44,14 @@ export declare class UserMap implements UserMapInterface {
      * @returns user User | undefined
      */
     get(key: string): User | undefined;
+    getWithSlot(key: string): DataAndSlot<User> | undefined;
     /**
      * gets the User for a particular userAccountPublicKey, if no User exists, new one is created
      * @param key userAccountPublicKey to get User for
      * @returns  User
      */
     mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
+    mustGetWithSlot(key: string, accountSubscription?: UserSubscriptionConfig): Promise<DataAndSlot<User>>;
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for
@@ -60,6 +67,9 @@ export declare class UserMap implements UserMapInterface {
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
+    valuesWithSlot(): IterableIterator<DataAndSlot<User>>;
+    entries(): IterableIterator<[string, User]>;
+    entriesWithSlot(): IterableIterator<[string, DataAndSlot<User>]>;
     size(): number;
     /**
      * Returns a unique list of authorities for all users in the UserMap that meet the filter criteria

package/lib/userMap/userMap.js

@@ -73,16 +73,21 @@ class UserMap {
         await this.subscription.subscribe();
     }
     async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
+        var _a;
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
             accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
                 type: 'custom',
+                // OneShotUserAccountSubscriber used here so we don't load up the RPC with AccountSubscribes
                 userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
             },
         });
         await user.subscribe(userAccount);
-        this.userMap.set(userAccountPublicKey.toString(), user);
+        this.userMap.set(userAccountPublicKey.toString(), {
+            data: user,
+            slot: slot !== null && slot !== void 0 ? slot : (_a = user.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.slot,
+        });
     }
     has(key) {
         return this.userMap.has(key);
@@ -93,6 +98,10 @@ class UserMap {
      * @returns user User | undefined
      */
     get(key) {
+        var _a;
+        return (_a = this.userMap.get(key)) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    getWithSlot(key) {
         return this.userMap.get(key);
     }
     /**
@@ -104,8 +113,13 @@ class UserMap {
         if (!this.has(key)) {
             await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
         }
-        const user = this.userMap.get(key);
-        return user;
+        return this.userMap.get(key).data;
+    }
+    async mustGetWithSlot(key, accountSubscription) {
+        if (!this.has(key)) {
+            await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
+        }
+        return this.userMap.get(key);
     }
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -113,11 +127,11 @@ class UserMap {
      * @returns authority PublicKey | undefined
      */
     getUserAuthority(key) {
-        const chUser = this.userMap.get(key);
-        if (!chUser) {
+        const user = this.userMap.get(key);
+        if (!user) {
             return undefined;
         }
-        return chUser.getUserAccount().authority;
+        return user.data.getUserAccount().authority;
     }
     /**
      * implements the {@link DLOBSource} interface
@@ -174,9 +188,22 @@ class UserMap {
             await this.mustGet(lpRecord.user.toString());
         }
     }
-    values() {
+    *values() {
+        for (const dataAndSlot of this.userMap.values()) {
+            yield dataAndSlot.data;
+        }
+    }
+    valuesWithSlot() {
         return this.userMap.values();
     }
+    *entries() {
+        for (const [key, dataAndSlot] of this.userMap.entries()) {
+            yield [key, dataAndSlot.data];
+        }
+    }
+    entriesWithSlot() {
+        return this.userMap.entries();
+    }
     size() {
         return this.userMap.size;
     }
@@ -186,7 +213,7 @@ class UserMap {
      * @returns
      */
     getUniqueAuthorities(filterCriteria) {
-        const usersMeetingCriteria = Array.from(this.userMap.values()).filter((user) => {
+        const usersMeetingCriteria = Array.from(this.values()).filter((user) => {
             let pass = true;
             if (filterCriteria && filterCriteria.hasOpenOrders) {
                 pass = pass && user.getUserAccount().hasOpenOrder;
@@ -233,17 +260,17 @@ class UserMap {
             for (const [key, buffer] of programAccountBufferMap.entries()) {
                 if (!this.has(key)) {
                     const userAccount = this.decode('User', buffer);
-                    await this.addPubkey(new web3_js_1.PublicKey(key), userAccount);
-                    this.userMap.get(key).accountSubscriber.updateData(userAccount, slot);
+                    await this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
+                    this.get(key).accountSubscriber.updateData(userAccount, slot);
                 }
                 else {
                     const userAccount = this.decode('User', buffer);
-                    this.userMap.get(key).accountSubscriber.updateData(userAccount, slot);
+                    this.get(key).accountSubscriber.updateData(userAccount, slot);
                 }
                 // give event loop a chance to breathe
                 await new Promise((resolve) => setTimeout(resolve, 0));
             }
-            for (const [key, user] of this.userMap.entries()) {
+            for (const [key, user] of this.entries()) {
                 if (!programAccountBufferMap.has(key)) {
                     await user.unsubscribe();
                     this.userMap.delete(key);
@@ -263,7 +290,7 @@ class UserMap {
     }
     async unsubscribe() {
         await this.subscription.unsubscribe();
-        for (const [key, user] of this.userMap.entries()) {
+        for (const [key, user] of this.entries()) {
             await user.unsubscribe();
             this.userMap.delete(key);
         }
@@ -276,12 +303,16 @@ class UserMap {
     }
     async updateUserAccount(key, userAccount, slot) {
         this.updateLatestSlot(slot);
-        if (!this.userMap.has(key)) {
+        if (!this.has(key)) {
             this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
         }
         else {
-            const user = this.userMap.get(key);
+            const user = this.get(key);
             user.accountSubscriber.updateData(userAccount, slot);
+            this.userMap.set(key, {
+                data: user,
+                slot,
+            });
         }
     }
     updateLatestSlot(slot) {

package/package.json

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