@drift-labs/sdk 2.49.0-beta.8 → 2.52.0-beta.0

package/lib/userMap/userMap.d.ts

@@ -1,5 +1,6 @@
-import { User, DriftClient, UserAccount, OrderRecord, UserSubscriptionConfig, WrappedEvent, DLOB } from '..';
+import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB } from '..';
 import { PublicKey } from '@solana/web3.js';
+import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 export interface UserMapInterface {
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
@@ -11,33 +12,24 @@ export interface UserMapInterface {
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
     values(): IterableIterator<User>;
 }
-export type SyncCallbackCriteria = {
-    hasOpenOrders: boolean;
-};
 export declare class UserMap implements UserMapInterface {
     private userMap;
-    private driftClient;
-    private accountSubscription;
+    driftClient: DriftClient;
+    private connection;
+    private commitment;
     private includeIdle;
     private lastNumberOfSubAccounts;
+    private subscription;
     private stateAccountUpdateCallback;
-    private syncCallback;
-    private syncCallbackCriteria;
+    private decode;
     private syncPromise?;
     private syncPromiseResolver;
     /**
      * Constructs a new UserMap instance.
-     *
-     * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {UserSubscriptionConfig} accountSubscription - The UserSubscriptionConfig instance.
-     * @param {boolean} includeIdle - Whether idle users are subscribed to. Defaults to false to decrease # of user subscriptions.
-     * @param {(authorities: PublicKey[]) => Promise<void>} syncCallback - Called after `sync` completes, will pas in unique list of authorities. Useful for using it to sync UserStatsMap.
-     * @param {SyncCallbackCriteria} syncCallbackCriteria - The criteria for the sync callback. Defaults to having no filters
      */
-    constructor(driftClient: DriftClient, accountSubscription: UserSubscriptionConfig, includeIdle?: boolean, syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria);
-    addSyncCallback(syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria): void;
+    constructor(config: UserMapConfig);
     subscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number): Promise<void>;
     has(key: string): boolean;
     /**
      * gets the User for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -67,7 +59,13 @@ export declare class UserMap implements UserMapInterface {
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
     size(): number;
-    getUniqueAuthorities(useSyncCallbackCriteria?: boolean): PublicKey[];
+    /**
+     * Returns a unique list of authorities for all users in the UserMap that meet the filter criteria
+     * @param filterCriteria: Users must meet these criteria to be included
+     * @returns
+     */
+    getUniqueAuthorities(filterCriteria?: UserFilterCriteria): PublicKey[];
     sync(): Promise<void>;
     unsubscribe(): Promise<void>;
+    updateUserAccount(key: string, userAccount: UserAccount, slot: number): Promise<void>;
 }

package/lib/userMap/userMap.js

@@ -5,33 +5,57 @@ const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
 const memcmp_1 = require("../memcmp");
+const WebsocketSubscription_1 = require("./WebsocketSubscription");
+const PollingSubscription_1 = require("./PollingSubscription");
+const user_1 = require("../decode/user");
 class UserMap {
     /**
      * Constructs a new UserMap instance.
-     *
-     * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {UserSubscriptionConfig} accountSubscription - The UserSubscriptionConfig instance.
-     * @param {boolean} includeIdle - Whether idle users are subscribed to. Defaults to false to decrease # of user subscriptions.
-     * @param {(authorities: PublicKey[]) => Promise<void>} syncCallback - Called after `sync` completes, will pas in unique list of authorities. Useful for using it to sync UserStatsMap.
-     * @param {SyncCallbackCriteria} syncCallbackCriteria - The criteria for the sync callback. Defaults to having no filters
      */
-    constructor(driftClient, accountSubscription, includeIdle = false, syncCallback, syncCallbackCriteria = { hasOpenOrders: false }) {
+    constructor(config) {
+        var _a, _b, _c;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
-            if (state.numberOfSubAccounts !== this.lastNumberOfSubAccounts) {
+            if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
                 await this.sync();
                 this.lastNumberOfSubAccounts = state.numberOfSubAccounts;
             }
         };
-        this.driftClient = driftClient;
-        this.accountSubscription = accountSubscription;
-        this.includeIdle = includeIdle;
-        this.syncCallback = syncCallback;
-        this.syncCallbackCriteria = syncCallbackCriteria;
-    }
-    addSyncCallback(syncCallback, syncCallbackCriteria = { hasOpenOrders: false }) {
-        this.syncCallback = syncCallback;
-        this.syncCallbackCriteria = syncCallbackCriteria;
+        this.driftClient = config.driftClient;
+        if (config.connection) {
+            this.connection = config.connection;
+        }
+        else {
+            this.connection = this.driftClient.connection;
+        }
+        this.commitment =
+            (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment;
+        this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+        let decodeFn;
+        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
+            decodeFn = (name, buffer) => (0, user_1.decodeUser)(buffer);
+        }
+        else {
+            decodeFn =
+                this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
+        }
+        this.decode = decodeFn;
+        if (config.subscriptionConfig.type === 'polling') {
+            this.subscription = new PollingSubscription_1.PollingSubscription({
+                userMap: this,
+                frequency: config.subscriptionConfig.frequency,
+                skipInitialLoad: config.skipInitialLoad,
+            });
+        }
+        else {
+            this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
+                userMap: this,
+                commitment: this.commitment,
+                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                skipInitialLoad: config.skipInitialLoad,
+                decodeFn,
+            });
+        }
     }
     async subscribe() {
         if (this.size() > 0) {
@@ -41,13 +65,16 @@ class UserMap {
         this.lastNumberOfSubAccounts =
             this.driftClient.getStateAccount().numberOfSubAccounts;
         this.driftClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
-        await this.sync();
+        await this.subscription.subscribe();
     }
-    async addPubkey(userAccountPublicKey, userAccount) {
+    async addPubkey(userAccountPublicKey, userAccount, slot) {
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: this.accountSubscription,
+            accountSubscription: {
+                type: 'custom',
+                userAccountSubscriber: new __1.BasicUserAccountSubscriber(userAccountPublicKey, userAccount, slot),
+            },
         });
         await user.subscribe(userAccount);
         this.userMap.set(userAccountPublicKey.toString(), user);
@@ -148,11 +175,15 @@ class UserMap {
     size() {
         return this.userMap.size;
     }
-    getUniqueAuthorities(useSyncCallbackCriteria = true) {
+    /**
+     * Returns a unique list of authorities for all users in the UserMap that meet the filter criteria
+     * @param filterCriteria: Users must meet these criteria to be included
+     * @returns
+     */
+    getUniqueAuthorities(filterCriteria) {
         const usersMeetingCriteria = Array.from(this.userMap.values()).filter((user) => {
             let pass = true;
-            if (useSyncCallbackCriteria &&
-                this.syncCallbackCriteria.hasOpenOrders) {
+            if (filterCriteria && filterCriteria.hasOpenOrders) {
                 pass = pass && user.getUserAccount().hasOpenOrder;
             }
             return pass;
@@ -176,7 +207,7 @@ class UserMap {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
-                    commitment: this.driftClient.connection.commitment,
+                    commitment: this.commitment,
                     filters,
                     encoding: 'base64',
                     withContext: true,
@@ -184,7 +215,7 @@ class UserMap {
             ];
             const rpcJSONResponse = 
             // @ts-ignore
-            await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+            await this.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
             const rpcResponseAndContext = rpcJSONResponse.result;
             const slot = rpcResponseAndContext.context.slot;
             const programAccountBufferMap = new Map();
@@ -195,26 +226,24 @@ class UserMap {
             }
             for (const [key, buffer] of programAccountBufferMap.entries()) {
                 if (!this.has(key)) {
-                    const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
+                    const userAccount = this.decode('User', buffer);
                     await this.addPubkey(new web3_js_1.PublicKey(key), userAccount);
+                    this.userMap.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()) {
                 if (!programAccountBufferMap.has(key)) {
                     await user.unsubscribe();
                     this.userMap.delete(key);
                 }
-                else {
-                    const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', programAccountBufferMap.get(key));
-                    user.accountSubscriber.updateData(userAccount, slot);
-                }
-            }
-            if (this.syncCallback) {
-                await this.syncCallback(this.getUniqueAuthorities());
+                // give event loop a chance to breathe
+                await new Promise((resolve) => setTimeout(resolve, 0));
             }
         }
         catch (e) {
-            console.error(`Error in UserMap.sync()`);
+            console.error(`Error in UserMap.sync():`);
             console.error(e);
         }
         finally {
@@ -223,6 +252,7 @@ class UserMap {
         }
     }
     async unsubscribe() {
+        await this.subscription.unsubscribe();
         for (const [key, user] of this.userMap.entries()) {
             await user.unsubscribe();
             this.userMap.delete(key);
@@ -232,5 +262,14 @@ class UserMap {
             this.lastNumberOfSubAccounts = undefined;
         }
     }
+    async updateUserAccount(key, userAccount, slot) {
+        if (!this.userMap.has(key)) {
+            this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
+        }
+        else {
+            const user = this.userMap.get(key);
+            user.accountSubscriber.updateData(userAccount, slot);
+        }
+    }
 }
 exports.UserMap = UserMap;

package/lib/userMap/userMapConfig.d.ts

@@ -0,0 +1,21 @@
+import { Commitment, Connection } from '@solana/web3.js';
+import { DriftClient } from '../driftClient';
+export type UserAccountFilterCriteria = {
+    hasOpenOrders: boolean;
+};
+export type UserMapConfig = {
+    driftClient: DriftClient;
+    connection?: Connection;
+    subscriptionConfig: {
+        type: 'polling';
+        frequency: number;
+        commitment?: Commitment;
+    } | {
+        type: 'websocket';
+        resubTimeoutMs?: number;
+        commitment?: Commitment;
+    };
+    skipInitialLoad?: boolean;
+    includeIdle?: boolean;
+    fastDecode?: boolean;
+};

package/lib/userMap/userMapConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.49.0-beta.8",
+	"version": "2.52.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -44,6 +44,7 @@
 		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
+		"object-sizeof": "^2.6.3",
 		"@types/big.js": "^6.2.0",
 		"@types/bn.js": "^5.1.3",
 		"@types/chai": "^4.3.1",

package/src/accounts/{mockUserAccountSubscriber.ts → basicUserAccountSubscriber.ts}

@@ -4,7 +4,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
 
-export class MockUserAccountSubscriber implements UserAccountSubscriber {
+export class BasicUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
@@ -16,8 +16,8 @@ export class MockUserAccountSubscriber implements UserAccountSubscriber {
 
 	public constructor(
 		userAccountPublicKey: PublicKey,
-		data: UserAccount,
-		slot: number
+		data?: UserAccount,
+		slot?: number
 	) {
 		this.isSubscribed = true;
 		this.eventEmitter = new EventEmitter();
@@ -46,8 +46,10 @@ export class MockUserAccountSubscriber implements UserAccountSubscriber {
 	}
 
 	public updateData(userAccount: UserAccount, slot: number): void {
-		this.user = { data: userAccount, slot };
-		this.eventEmitter.emit('userAccountUpdate', userAccount);
-		this.eventEmitter.emit('update');
+		if (!this.user || slot >= (this.user.slot ?? 0)) {
+			this.user = { data: userAccount, slot };
+			this.eventEmitter.emit('userAccountUpdate', userAccount);
+			this.eventEmitter.emit('update');
+		}
 	}
 }

package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts

@@ -54,7 +54,6 @@ export class PollingInsuranceFundStakeAccountSubscriber
 
 		await this.addToAccountLoader();
 
-		await this.fetchIfUnloaded();
 		if (this.doesAccountExist()) {
 			this.eventEmitter.emit('update');
 		}

package/src/adminClient.ts

@@ -846,6 +846,20 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updateStateMaxInitializeUserFee(
+		maxInitializeUserFee: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateStateMaxInitializeUserFee(
+			maxInitializeUserFee,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateWithdrawGuardThreshold(
 		spotMarketIndex: number,
 		withdrawGuardThreshold: BN

package/src/constants/perpMarkets.ts

@@ -204,6 +204,26 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1700542800000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Celestia',
+		category: ['Data'],
+		symbol: 'TIA-PERP',
+		baseAssetSymbol: 'TIA',
+		marketIndex: 19,
+		oracle: new PublicKey('4GiL1Y6u6JkPb7ckakzJgc414h6P7qoYnEKFcd1YtSB9'),
+		launchTs: 1701880540000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'Jito',
+		category: ['MEV'],
+		symbol: 'JTO-PERP',
+		baseAssetSymbol: 'JTO',
+		marketIndex: 20,
+		oracle: new PublicKey('29xQnTzyyuRtgJ7RtSKEgBWwRzZqtrrKmyQQ5m3x629f'),
+		launchTs: 1701967240000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -397,6 +417,26 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1700542800000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Celestia',
+		category: ['Data'],
+		symbol: 'TIA-PERP',
+		baseAssetSymbol: 'TIA',
+		marketIndex: 19,
+		oracle: new PublicKey('funeUsHgi2QKkLdUPASRLuYkaK8JaazCEz3HikbkhVt'),
+		launchTs: 1701880540000,
+		oracleSource: OracleSource.PYTH,
+	},
+	{
+		fullName: 'Jito',
+		category: ['MEV'],
+		symbol: 'JTO-PERP',
+		baseAssetSymbol: 'JTO',
+		marketIndex: 20,
+		oracle: new PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
+		launchTs: 1701967240000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/constants/spotMarkets.ts

@@ -160,6 +160,16 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precisionExp: NINE,
 		serumMarket: new PublicKey('ARjaHVxGCQfTvvKjLd7U7srvk6orthZSE6uqWchCczZc'),
 	},
+	{
+		symbol: 'JTO',
+		marketIndex: 9,
+		oracle: new PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
+		oracleSource: OracleSource.PYTH,
+		mint: new PublicKey('jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		serumMarket: new PublicKey('H87FfmHABiZLRGrDsXRZtqq25YpARzaokCzL1vMYGiep'),
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {