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

package/VERSION

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

package/lib/browser/orderSubscriber/OrderSubscriber.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
-import { Commitment } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
@@ -26,6 +26,7 @@ export declare class OrderSubscriber {
     mostRecentSlot: number;
     decodeFn: (name: string, data: Buffer) => UserAccount;
     decodeData?: boolean;
+    fetchAllNonIdleUsers?: boolean;
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
@@ -38,5 +39,7 @@ export declare class OrderSubscriber {
     protected createDLOB(protectedMakerView?: boolean): DLOB;
     getDLOB(slot: number, protectedMakerView?: boolean): Promise<DLOB>;
     getSlot(): number;
+    addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+    mustGetUserAccount(key: string): Promise<UserAccount>;
     unsubscribe(): Promise<void>;
 }

package/lib/browser/orderSubscriber/OrderSubscriber.js

@@ -58,6 +58,7 @@ class OrderSubscriber {
                 this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
         }
         this.eventEmitter = new events_1.EventEmitter();
+        this.fetchAllNonIdleUsers = config.fetchAllNonIdleUsers;
     }
     async subscribe() {
         await this.subscription.subscribe();
@@ -69,12 +70,15 @@ class OrderSubscriber {
         this.fetchPromise = new Promise((resolver) => {
             this.fetchPromiseResolver = resolver;
         });
+        const filters = this.fetchAllNonIdleUsers
+            ? [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()]
+            : [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()];
         try {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
-                    filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()],
+                    filters,
                     encoding: 'base64',
                     withContext: true,
                 },
@@ -164,6 +168,18 @@ class OrderSubscriber {
         var _a;
         return (_a = this.mostRecentSlot) !== null && _a !== void 0 ? _a : 0;
     }
+    async addPubkey(userAccountPublicKey) {
+        const accountInfo = await this.driftClient.connection.getAccountInfoAndContext(userAccountPublicKey, this.commitment);
+        if (accountInfo) {
+            this.tryUpdateUserAccount(userAccountPublicKey.toString(), 'buffer', accountInfo.value.data, accountInfo.context.slot);
+        }
+    }
+    async mustGetUserAccount(key) {
+        if (!this.usersAccounts.has(key)) {
+            await this.addPubkey(new web3_js_1.PublicKey(key));
+        }
+        return this.usersAccounts.get(key).userAccount;
+    }
     async unsubscribe() {
         this.usersAccounts.clear();
         await this.subscription.unsubscribe();

package/lib/browser/orderSubscriber/types.d.ts

@@ -26,6 +26,7 @@ export type OrderSubscriberConfig = {
     };
     fastDecode?: boolean;
     decodeData?: boolean;
+    fetchAllNonIdleUsers?: boolean;
 };
 export interface OrderSubscriberEvents {
     orderCreated: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded' | 'buffer') => void;

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -1,8 +1,11 @@
-import { DriftClient, DriftEnv, OptionalOrderParams, SignedMsgOrderParamsMessage, UserMap } from '..';
+import { DriftClient, DriftEnv, OptionalOrderParams, SignedMsgOrderParamsMessage, UserAccount } from '..';
 import { Keypair, TransactionInstruction } from '@solana/web3.js';
+export interface AccountGetter {
+    mustGetUserAccount(publicKey: string): Promise<UserAccount>;
+}
 export type SwiftOrderSubscriberConfig = {
     driftClient: DriftClient;
-    userMap: UserMap;
+    userAccountGetter?: AccountGetter;
     driftEnv: DriftEnv;
     endpoint?: string;
     marketIndexes: number[];
@@ -19,7 +22,7 @@ export declare class SwiftOrderSubscriber {
     private readonly heartbeatIntervalMs;
     private ws;
     private driftClient;
-    userMap: UserMap;
+    userAccountGetter?: AccountGetter;
     onOrder: (orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage) => Promise<void>;
     subscribed: boolean;
     constructor(config: SwiftOrderSubscriberConfig);

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -17,7 +17,7 @@ class SwiftOrderSubscriber {
         this.ws = null;
         this.subscribed = false;
         this.driftClient = config.driftClient;
-        this.userMap = config.userMap;
+        this.userAccountGetter = config.userAccountGetter;
     }
     getSymbolForMarketIndex(marketIndex) {
         const markets = this.config.driftEnv === 'devnet'
@@ -91,11 +91,14 @@ class SwiftOrderSubscriber {
         });
     }
     async getPlaceAndMakeSignedMsgOrderIxs(orderMessageRaw, signedMsgOrderParamsMessage, makerOrderParams) {
+        if (!this.userAccountGetter) {
+            throw new Error('userAccountGetter must be set to use this function');
+        }
         const signedMsgOrderParamsBuf = Buffer.from(orderMessageRaw['order_message'], 'hex');
         const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw['taker_authority']);
         const signingAuthority = new web3_js_1.PublicKey(orderMessageRaw['signing_authority']);
         const takerUserPubkey = await (0, __1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, signedMsgOrderParamsMessage.subAccountId);
-        const takerUserAccount = (await this.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
+        const takerUserAccount = await this.userAccountGetter.mustGetUserAccount(takerUserPubkey.toString());
         const ixs = await this.driftClient.getPlaceAndMakeSignedMsgPerpOrderIxs({
             orderParams: signedMsgOrderParamsBuf,
             signature: Buffer.from(orderMessageRaw['order_signature'], 'base64'),

package/lib/browser/types.d.ts

@@ -346,6 +346,9 @@ export declare class OrderActionExplanation {
     static readonly DERISK_LP: {
         deriskLp: {};
     };
+    static readonly TRANSFER_PERP_POSITION: {
+        transferPerpPosition: {};
+    };
 }
 export declare class OrderTriggerCondition {
     static readonly ABOVE: {

package/lib/browser/types.js

@@ -232,6 +232,9 @@ OrderActionExplanation.REDUCE_ONLY_ORDER_INCREASED_POSITION = {
 OrderActionExplanation.DERISK_LP = {
     deriskLp: {},
 };
+OrderActionExplanation.TRANSFER_PERP_POSITION = {
+    transferPerpPosition: {},
+};
 class OrderTriggerCondition {
 }
 exports.OrderTriggerCondition = OrderTriggerCondition;

package/lib/browser/userMap/userMap.d.ts

@@ -55,6 +55,7 @@ export declare class UserMap implements UserMapInterface {
      */
     mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
     mustGetWithSlot(key: string, accountSubscription?: UserSubscriptionConfig): Promise<DataAndSlot<User>>;
+    mustGetUserAccount(key: string): Promise<UserAccount>;
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/lib/browser/userMap/userMap.js

@@ -148,6 +148,10 @@ class UserMap {
         }
         return this.userMap.get(key);
     }
+    async mustGetUserAccount(key) {
+        const user = await this.mustGet(key);
+        return user.getUserAccount();
+    }
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/lib/node/orderSubscriber/OrderSubscriber.d.ts

@@ -3,7 +3,7 @@
 /// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
-import { Commitment } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
@@ -26,6 +26,7 @@ export declare class OrderSubscriber {
     mostRecentSlot: number;
     decodeFn: (name: string, data: Buffer) => UserAccount;
     decodeData?: boolean;
+    fetchAllNonIdleUsers?: boolean;
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
@@ -38,5 +39,7 @@ export declare class OrderSubscriber {
     protected createDLOB(protectedMakerView?: boolean): DLOB;
     getDLOB(slot: number, protectedMakerView?: boolean): Promise<DLOB>;
     getSlot(): number;
+    addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+    mustGetUserAccount(key: string): Promise<UserAccount>;
     unsubscribe(): Promise<void>;
 }

package/lib/node/orderSubscriber/OrderSubscriber.js

@@ -58,6 +58,7 @@ class OrderSubscriber {
                 this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
         }
         this.eventEmitter = new events_1.EventEmitter();
+        this.fetchAllNonIdleUsers = config.fetchAllNonIdleUsers;
     }
     async subscribe() {
         await this.subscription.subscribe();
@@ -69,12 +70,15 @@ class OrderSubscriber {
         this.fetchPromise = new Promise((resolver) => {
             this.fetchPromiseResolver = resolver;
         });
+        const filters = this.fetchAllNonIdleUsers
+            ? [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()]
+            : [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()];
         try {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
-                    filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()],
+                    filters,
                     encoding: 'base64',
                     withContext: true,
                 },
@@ -164,6 +168,18 @@ class OrderSubscriber {
         var _a;
         return (_a = this.mostRecentSlot) !== null && _a !== void 0 ? _a : 0;
     }
+    async addPubkey(userAccountPublicKey) {
+        const accountInfo = await this.driftClient.connection.getAccountInfoAndContext(userAccountPublicKey, this.commitment);
+        if (accountInfo) {
+            this.tryUpdateUserAccount(userAccountPublicKey.toString(), 'buffer', accountInfo.value.data, accountInfo.context.slot);
+        }
+    }
+    async mustGetUserAccount(key) {
+        if (!this.usersAccounts.has(key)) {
+            await this.addPubkey(new web3_js_1.PublicKey(key));
+        }
+        return this.usersAccounts.get(key).userAccount;
+    }
     async unsubscribe() {
         this.usersAccounts.clear();
         await this.subscription.unsubscribe();

package/lib/node/orderSubscriber/types.d.ts

@@ -26,6 +26,7 @@ export type OrderSubscriberConfig = {
     };
     fastDecode?: boolean;
     decodeData?: boolean;
+    fetchAllNonIdleUsers?: boolean;
 };
 export interface OrderSubscriberEvents {
     orderCreated: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded' | 'buffer') => void;

package/lib/node/swift/swiftOrderSubscriber.d.ts

@@ -1,8 +1,11 @@
-import { DriftClient, DriftEnv, OptionalOrderParams, SignedMsgOrderParamsMessage, UserMap } from '..';
+import { DriftClient, DriftEnv, OptionalOrderParams, SignedMsgOrderParamsMessage, UserAccount } from '..';
 import { Keypair, TransactionInstruction } from '@solana/web3.js';
+export interface AccountGetter {
+    mustGetUserAccount(publicKey: string): Promise<UserAccount>;
+}
 export type SwiftOrderSubscriberConfig = {
     driftClient: DriftClient;
-    userMap: UserMap;
+    userAccountGetter?: AccountGetter;
     driftEnv: DriftEnv;
     endpoint?: string;
     marketIndexes: number[];
@@ -19,7 +22,7 @@ export declare class SwiftOrderSubscriber {
     private readonly heartbeatIntervalMs;
     private ws;
     private driftClient;
-    userMap: UserMap;
+    userAccountGetter?: AccountGetter;
     onOrder: (orderMessageRaw: any, signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage) => Promise<void>;
     subscribed: boolean;
     constructor(config: SwiftOrderSubscriberConfig);

package/lib/node/swift/swiftOrderSubscriber.js

@@ -17,7 +17,7 @@ class SwiftOrderSubscriber {
         this.ws = null;
         this.subscribed = false;
         this.driftClient = config.driftClient;
-        this.userMap = config.userMap;
+        this.userAccountGetter = config.userAccountGetter;
     }
     getSymbolForMarketIndex(marketIndex) {
         const markets = this.config.driftEnv === 'devnet'
@@ -91,11 +91,14 @@ class SwiftOrderSubscriber {
         });
     }
     async getPlaceAndMakeSignedMsgOrderIxs(orderMessageRaw, signedMsgOrderParamsMessage, makerOrderParams) {
+        if (!this.userAccountGetter) {
+            throw new Error('userAccountGetter must be set to use this function');
+        }
         const signedMsgOrderParamsBuf = Buffer.from(orderMessageRaw['order_message'], 'hex');
         const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw['taker_authority']);
         const signingAuthority = new web3_js_1.PublicKey(orderMessageRaw['signing_authority']);
         const takerUserPubkey = await (0, __1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, signedMsgOrderParamsMessage.subAccountId);
-        const takerUserAccount = (await this.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
+        const takerUserAccount = await this.userAccountGetter.mustGetUserAccount(takerUserPubkey.toString());
         const ixs = await this.driftClient.getPlaceAndMakeSignedMsgPerpOrderIxs({
             orderParams: signedMsgOrderParamsBuf,
             signature: Buffer.from(orderMessageRaw['order_signature'], 'base64'),

package/lib/node/types.d.ts

@@ -346,6 +346,9 @@ export declare class OrderActionExplanation {
     static readonly DERISK_LP: {
         deriskLp: {};
     };
+    static readonly TRANSFER_PERP_POSITION: {
+        transferPerpPosition: {};
+    };
 }
 export declare class OrderTriggerCondition {
     static readonly ABOVE: {

package/lib/node/types.js

@@ -232,6 +232,9 @@ OrderActionExplanation.REDUCE_ONLY_ORDER_INCREASED_POSITION = {
 OrderActionExplanation.DERISK_LP = {
     deriskLp: {},
 };
+OrderActionExplanation.TRANSFER_PERP_POSITION = {
+    transferPerpPosition: {},
+};
 class OrderTriggerCondition {
 }
 exports.OrderTriggerCondition = OrderTriggerCondition;

package/lib/node/userMap/userMap.d.ts

@@ -55,6 +55,7 @@ export declare class UserMap implements UserMapInterface {
      */
     mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
     mustGetWithSlot(key: string, accountSubscription?: UserSubscriptionConfig): Promise<DataAndSlot<User>>;
+    mustGetUserAccount(key: string): Promise<UserAccount>;
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/lib/node/userMap/userMap.js

@@ -148,6 +148,10 @@ class UserMap {
         }
         return this.userMap.get(key);
     }
+    async mustGetUserAccount(key) {
+        const user = await this.mustGet(key);
+        return user.getUserAccount();
+    }
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/package.json

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

package/src/orderSubscriber/OrderSubscriber.ts

@@ -1,6 +1,10 @@
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
-import { getUserFilter, getUserWithOrderFilter } from '../memcmp';
+import {
+	getNonIdleUserFilter,
+	getUserFilter,
+	getUserWithOrderFilter,
+} from '../memcmp';
 import { Commitment, PublicKey, RpcResponseAndContext } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
@@ -28,6 +32,8 @@ export class OrderSubscriber {
 	decodeFn: (name: string, data: Buffer) => UserAccount;
 	decodeData?: boolean;
 
+	fetchAllNonIdleUsers?: boolean;
+
 	constructor(config: OrderSubscriberConfig) {
 		this.driftClient = config.driftClient;
 		this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -70,6 +76,7 @@ export class OrderSubscriber {
 				);
 		}
 		this.eventEmitter = new EventEmitter();
+		this.fetchAllNonIdleUsers = config.fetchAllNonIdleUsers;
 	}
 
 	public async subscribe(): Promise<void> {
@@ -85,12 +92,16 @@ export class OrderSubscriber {
 			this.fetchPromiseResolver = resolver;
 		});
 
+		const filters = this.fetchAllNonIdleUsers
+			? [getUserFilter(), getNonIdleUserFilter()]
+			: [getUserFilter(), getUserWithOrderFilter()];
+
 		try {
 			const rpcRequestArgs = [
 				this.driftClient.program.programId.toBase58(),
 				{
 					commitment: this.commitment,
-					filters: [getUserFilter(), getUserWithOrderFilter()],
+					filters,
 					encoding: 'base64',
 					withContext: true,
 				},
@@ -245,6 +256,29 @@ export class OrderSubscriber {
 		return this.mostRecentSlot ?? 0;
 	}
 
+	public async addPubkey(userAccountPublicKey: PublicKey): Promise<void> {
+		const accountInfo =
+			await this.driftClient.connection.getAccountInfoAndContext(
+				userAccountPublicKey,
+				this.commitment
+			);
+		if (accountInfo) {
+			this.tryUpdateUserAccount(
+				userAccountPublicKey.toString(),
+				'buffer',
+				accountInfo.value.data,
+				accountInfo.context.slot
+			);
+		}
+	}
+
+	public async mustGetUserAccount(key: string): Promise<UserAccount> {
+		if (!this.usersAccounts.has(key)) {
+			await this.addPubkey(new PublicKey(key));
+		}
+		return this.usersAccounts.get(key).userAccount;
+	}
+
 	public async unsubscribe(): Promise<void> {
 		this.usersAccounts.clear();
 		await this.subscription.unsubscribe();

package/src/orderSubscriber/types.ts

@@ -30,6 +30,7 @@ export type OrderSubscriberConfig = {
 		  };
 	fastDecode?: boolean;
 	decodeData?: boolean;
+	fetchAllNonIdleUsers?: boolean;
 };
 
 export interface OrderSubscriberEvents {

package/src/swift/swiftOrderSubscriber.ts

@@ -9,16 +9,21 @@ import {
 	OptionalOrderParams,
 	PostOnlyParams,
 	SignedMsgOrderParamsMessage,
-	UserMap,
+	UserAccount,
 } from '..';
 import { Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import nacl from 'tweetnacl';
 import { decodeUTF8 } from 'tweetnacl-util';
 import WebSocket from 'ws';
 
+// In practice, this for now is just an OrderSubscriber or a UserMap
+export interface AccountGetter {
+	mustGetUserAccount(publicKey: string): Promise<UserAccount>;
+}
+
 export type SwiftOrderSubscriberConfig = {
 	driftClient: DriftClient;
-	userMap: UserMap;
+	userAccountGetter?: AccountGetter;
 	driftEnv: DriftEnv;
 	endpoint?: string;
 	marketIndexes: number[];
@@ -35,7 +40,7 @@ export class SwiftOrderSubscriber {
 	private readonly heartbeatIntervalMs = 60000;
 	private ws: WebSocket | null = null;
 	private driftClient: DriftClient;
-	public userMap: UserMap;
+	public userAccountGetter?: AccountGetter; // In practice, this for now is just an OrderSubscriber or a UserMap
 	public onOrder: (
 		orderMessageRaw: any,
 		signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage
@@ -45,7 +50,7 @@ export class SwiftOrderSubscriber {
 
 	constructor(private config: SwiftOrderSubscriberConfig) {
 		this.driftClient = config.driftClient;
-		this.userMap = config.userMap;
+		this.userAccountGetter = config.userAccountGetter;
 	}
 
 	getSymbolForMarketIndex(marketIndex: number): string {
@@ -163,6 +168,10 @@ export class SwiftOrderSubscriber {
 		signedMsgOrderParamsMessage: SignedMsgOrderParamsMessage,
 		makerOrderParams: OptionalOrderParams
 	): Promise<TransactionInstruction[]> {
+		if (!this.userAccountGetter) {
+			throw new Error('userAccountGetter must be set to use this function');
+		}
+
 		const signedMsgOrderParamsBuf = Buffer.from(
 			orderMessageRaw['order_message'],
 			'hex'
@@ -176,9 +185,9 @@ export class SwiftOrderSubscriber {
 			takerAuthority,
 			signedMsgOrderParamsMessage.subAccountId
 		);
-		const takerUserAccount = (
-			await this.userMap.mustGet(takerUserPubkey.toString())
-		).getUserAccount();
+		const takerUserAccount = await this.userAccountGetter.mustGetUserAccount(
+			takerUserPubkey.toString()
+		);
 		const ixs = await this.driftClient.getPlaceAndMakeSignedMsgPerpOrderIxs(
 			{
 				orderParams: signedMsgOrderParamsBuf,

package/src/types.ts

@@ -242,6 +242,9 @@ export class OrderActionExplanation {
 	static readonly DERISK_LP = {
 		deriskLp: {},
 	};
+	static readonly TRANSFER_PERP_POSITION = {
+		transferPerpPosition: {},
+	};
 }
 
 export class OrderTriggerCondition {

package/src/userMap/userMap.ts

@@ -263,6 +263,11 @@ export class UserMap implements UserMapInterface {
 		return this.userMap.get(key);
 	}
 
+	public async mustGetUserAccount(key: string): Promise<UserAccount> {
+		const user = await this.mustGet(key);
+		return user.getUserAccount();
+	}
+
 	/**
 	 * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
 	 * @param key userAccountPublicKey to get User for