@drift-labs/sdk 2.21.0-beta.1 → 2.21.0-beta.2

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -14,9 +14,8 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     accountLoader: BulkAccountLoader;
     accountsToPoll: Map<string, AccountToPoll>;
     errorCallbackId?: string;
-    lazyDecode: boolean;
     user?: DataAndSlot<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader, lazyDecode?: boolean);
+    constructor(program: Program, userAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -5,14 +5,13 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const utils_1 = require("./utils");
 class PollingUserAccountSubscriber {
-    constructor(program, userAccountPublicKey, accountLoader, lazyDecode = false) {
+    constructor(program, userAccountPublicKey, accountLoader) {
         this.accountsToPoll = new Map();
         this.isSubscribed = false;
         this.program = program;
         this.accountLoader = accountLoader;
         this.eventEmitter = new events_1.EventEmitter();
         this.userAccountPublicKey = userAccountPublicKey;
-        this.lazyDecode = lazyDecode;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -41,9 +40,7 @@ class PollingUserAccountSubscriber {
                     return;
                 }
                 const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
-                if (!this.lazyDecode) {
-                    this[accountToPoll.key] = { data: account, slot };
-                }
+                this[accountToPoll.key] = { data: account, slot };
                 // @ts-ignore
                 this.eventEmitter.emit(accountToPoll.eventType, account);
                 this.eventEmitter.emit('update');
@@ -56,12 +53,7 @@ class PollingUserAccountSubscriber {
     async fetchIfUnloaded() {
         let shouldFetch = false;
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            if (!this.lazyDecode && this[accountToPoll.key] === undefined) {
-                shouldFetch = true;
-                break;
-            }
-            else if (this.lazyDecode &&
-                this.accountLoader.bufferAndSlotMap.has(accountToPoll.publicKey.toString())) {
+            if (this[accountToPoll.key] === undefined) {
                 shouldFetch = true;
                 break;
             }
@@ -74,7 +66,7 @@ class PollingUserAccountSubscriber {
         await this.accountLoader.load();
         for (const [_, accountToPoll] of this.accountsToPoll) {
             const { buffer, slot } = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey);
-            if (buffer && !this.lazyDecode) {
+            if (buffer) {
                 const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 this[accountToPoll.key] = { data: account, slot };
             }
@@ -83,7 +75,7 @@ class PollingUserAccountSubscriber {
     doAccountsExist() {
         let success = true;
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            if (!this.accountLoader.bufferAndSlotMap.has(accountToPoll.publicKey.toString())) {
+            if (!this[accountToPoll.key]) {
                 success = false;
                 break;
             }
@@ -109,14 +101,7 @@ class PollingUserAccountSubscriber {
     }
     getUserAccountAndSlot() {
         this.assertIsSubscribed();
-        if (!this.lazyDecode) {
-            return this.user;
-        }
-        else {
-            const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.userAccountPublicKey);
-            const account = this.program.account.user.coder.accounts.decode('User', buffer);
-            return { data: account, slot };
-        }
+        return this.user;
     }
 }
 exports.PollingUserAccountSubscriber = PollingUserAccountSubscriber;

package/lib/dlob/DLOB.js

@@ -633,8 +633,10 @@ class DLOB {
      * @returns
      */
     *getMakerLimitAsks(marketIndex, slot, marketType, oraclePriceData, fallbackBid) {
+        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
         for (const node of this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)) {
-            if (fallbackBid &&
+            if (isPerpMarket &&
+                fallbackBid &&
                 node.getPrice(oraclePriceData, slot).lte(fallbackBid)) {
                 continue;
             }
@@ -668,8 +670,10 @@ class DLOB {
      * @returns
      */
     *getMakerLimitBids(marketIndex, slot, marketType, oraclePriceData, fallbackAsk) {
+        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
         for (const node of this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)) {
-            if (fallbackAsk &&
+            if (isPerpMarket &&
+                fallbackAsk &&
                 node.getPrice(oraclePriceData, slot).gte(fallbackAsk)) {
                 continue;
             }

package/lib/driftClient.d.ts

@@ -145,7 +145,7 @@ export declare class DriftClient {
      * @param fromSubAccountId
      * @returns
      */
-    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
+    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     initializeUserAccountForDevnet(subAccountId: number, name: string, marketIndex: number, tokenFaucet: TokenFaucet, amount: BN, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     withdraw(amount: BN, marketIndex: number, userTokenAccount: PublicKey, reduceOnly?: boolean): Promise<TransactionSignature>;
     getWithdrawIx(amount: BN, marketIndex: number, userTokenAccount: PublicKey, reduceOnly?: boolean): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -79,7 +79,6 @@ class DriftClient {
                 ? {
                     type: 'polling',
                     accountLoader: config.accountSubscription.accountLoader,
-                    lazyDecode: config.accountSubscription.lazyDecode,
                 }
                 : {
                     type: 'websocket',
@@ -821,12 +820,21 @@ class DriftClient {
      * @param fromSubAccountId
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo) {
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo, txParams) {
+        var _a;
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const tx = new web3_js_1.Transaction();
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
+        }));
+        if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
+            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: txParams.computeUnitsPrice,
+            }));
+        }
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
         if (createWSOLTokenAccount) {

package/lib/driftClientConfig.d.ts

@@ -25,7 +25,6 @@ export type DriftClientSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
-    lazyDecode?: boolean;
 };
 type TxSenderConfig = {
     type: 'retry';

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.21.0-beta.1",
+    "version": "2.21.0-beta.2",
     "name": "drift",
     "instructions": [
         {

package/lib/user.js

@@ -25,7 +25,7 @@ class User {
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
-            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader, config.accountSubscription.lazyDecode);
+            this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
         }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey);

package/lib/userConfig.d.ts

@@ -11,5 +11,4 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
-    lazyDecode?: boolean;
 };

package/lib/userMap/userMap.d.ts

@@ -40,4 +40,5 @@ export declare class UserMap implements UserMapInterface {
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
     size(): number;
+    sync(includeIdle?: boolean): Promise<void>;
 }

package/lib/userMap/userMap.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMap = void 0;
 const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
 class UserMap {
     constructor(driftClient, accountSubscription) {
         this.userMap = new Map();
@@ -131,5 +135,42 @@ class UserMap {
     size() {
         return this.userMap.size;
     }
+    async sync(includeIdle = true) {
+        let filters = undefined;
+        if (!includeIdle) {
+            filters = [
+                {
+                    memcmp: {
+                        offset: 4350,
+                        bytes: bs58_1.default.encode(Uint8Array.from([0])),
+                    },
+                },
+            ];
+        }
+        const programAccounts = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+            commitment: this.driftClient.connection.commitment,
+            filters: [
+                {
+                    memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
+                },
+                ...(Array.isArray(filters) ? filters : []),
+            ],
+        });
+        const programAccountMap = new Map();
+        for (const programAccount of programAccounts) {
+            programAccountMap.set(programAccount.pubkey.toString(), programAccount.account);
+        }
+        for (const key of programAccountMap.keys()) {
+            if (!this.has(key)) {
+                await this.addPubkey(new web3_js_1.PublicKey(key));
+            }
+        }
+        for (const [key, user] of this.userMap.entries()) {
+            if (!programAccountMap.has(key)) {
+                await user.unsubscribe();
+                this.userMap.delete(key);
+            }
+        }
+    }
 }
 exports.UserMap = UserMap;

package/lib/userMap/userStatsMap.d.ts

@@ -18,4 +18,5 @@ export declare class UserStatsMap {
     mustGet(authorityPublicKey: string): Promise<UserStats>;
     values(): IterableIterator<UserStats>;
     size(): number;
+    sync(): Promise<void>;
 }

package/lib/userMap/userStatsMap.js

@@ -137,5 +137,24 @@ class UserStatsMap {
     size() {
         return this.userStatsMap.size;
     }
+    async sync() {
+        const programAccounts = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+            commitment: this.driftClient.connection.commitment,
+            filters: [
+                {
+                    memcmp: this.driftClient.program.coder.accounts.memcmp('UserStats'),
+                },
+            ],
+        });
+        const programAccountMap = new Map();
+        for (const programAccount of programAccounts) {
+            programAccountMap.set(new web3_js_1.PublicKey(programAccount.account.data.slice(8, 40)).toString(), programAccount.account);
+        }
+        for (const key of programAccountMap.keys()) {
+            if (!this.has(key)) {
+                await this.addUserStat(new web3_js_1.PublicKey(key));
+            }
+        }
+    }
 }
 exports.UserStatsMap = UserStatsMap;

package/package.json

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

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -23,22 +23,18 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	accountsToPoll = new Map<string, AccountToPoll>();
 	errorCallbackId?: string;
 
-	lazyDecode: boolean;
-
 	user?: DataAndSlot<UserAccount>;
 
 	public constructor(
 		program: Program,
 		userAccountPublicKey: PublicKey,
-		accountLoader: BulkAccountLoader,
-		lazyDecode = false
+		accountLoader: BulkAccountLoader
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.accountLoader = accountLoader;
 		this.eventEmitter = new EventEmitter();
 		this.userAccountPublicKey = userAccountPublicKey;
-		this.lazyDecode = lazyDecode;
 	}
 
 	async subscribe(): Promise<boolean> {
@@ -79,9 +75,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					const account = this.program.account[
 						accountToPoll.key
 					].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
-					if (!this.lazyDecode) {
-						this[accountToPoll.key] = { data: account, slot };
-					}
+					this[accountToPoll.key] = { data: account, slot };
 					// @ts-ignore
 					this.eventEmitter.emit(accountToPoll.eventType, account);
 					this.eventEmitter.emit('update');
@@ -97,15 +91,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	async fetchIfUnloaded(): Promise<void> {
 		let shouldFetch = false;
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			if (!this.lazyDecode && this[accountToPoll.key] === undefined) {
-				shouldFetch = true;
-				break;
-			} else if (
-				this.lazyDecode &&
-				this.accountLoader.bufferAndSlotMap.has(
-					accountToPoll.publicKey.toString()
-				)
-			) {
+			if (this[accountToPoll.key] === undefined) {
 				shouldFetch = true;
 				break;
 			}
@@ -122,7 +108,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
 				accountToPoll.publicKey
 			);
-			if (buffer && !this.lazyDecode) {
+			if (buffer) {
 				const account = this.program.account[
 					accountToPoll.key
 				].coder.accounts.decode(capitalize(accountToPoll.key), buffer);
@@ -134,11 +120,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	doAccountsExist(): boolean {
 		let success = true;
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			if (
-				!this.accountLoader.bufferAndSlotMap.has(
-					accountToPoll.publicKey.toString()
-				)
-			) {
+			if (!this[accountToPoll.key]) {
 				success = false;
 				break;
 			}
@@ -176,17 +158,6 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 
 	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
 		this.assertIsSubscribed();
-		if (!this.lazyDecode) {
-			return this.user;
-		} else {
-			const { buffer, slot } = this.accountLoader.getBufferAndSlot(
-				this.userAccountPublicKey
-			);
-			const account = this.program.account.user.coder.accounts.decode(
-				'User',
-				buffer
-			);
-			return { data: account, slot };
-		}
+		return this.user;
 	}
 }

package/src/dlob/DLOB.ts

@@ -1148,6 +1148,7 @@ export class DLOB {
 		oraclePriceData: OraclePriceData,
 		fallbackBid?: BN
 	): Generator<DLOBNode> {
+		const isPerpMarket = isVariant(marketType, 'perp');
 		for (const node of this.getRestingLimitAsks(
 			marketIndex,
 			slot,
@@ -1155,6 +1156,7 @@ export class DLOB {
 			oraclePriceData
 		)) {
 			if (
+				isPerpMarket &&
 				fallbackBid &&
 				node.getPrice(oraclePriceData, slot).lte(fallbackBid)
 			) {
@@ -1213,6 +1215,7 @@ export class DLOB {
 		oraclePriceData: OraclePriceData,
 		fallbackAsk?: BN
 	): Generator<DLOBNode> {
+		const isPerpMarket = isVariant(marketType, 'perp');
 		for (const node of this.getRestingLimitBids(
 			marketIndex,
 			slot,
@@ -1220,6 +1223,7 @@ export class DLOB {
 			oraclePriceData
 		)) {
 			if (
+				isPerpMarket &&
 				fallbackAsk &&
 				node.getPrice(oraclePriceData, slot).gte(fallbackAsk)
 			) {

package/src/driftClient.ts

@@ -160,7 +160,6 @@ export class DriftClient {
 				? {
 						type: 'polling',
 						accountLoader: config.accountSubscription.accountLoader,
-						lazyDecode: config.accountSubscription.lazyDecode,
 				  }
 				: {
 						type: 'websocket',
@@ -1330,7 +1329,8 @@ export class DriftClient {
 		subAccountId = 0,
 		name = DEFAULT_USER_NAME,
 		fromSubAccountId?: number,
-		referrerInfo?: ReferrerInfo
+		referrerInfo?: ReferrerInfo,
+		txParams?: TxParams
 	): Promise<[TransactionSignature, PublicKey]> {
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
@@ -1347,6 +1347,20 @@ export class DriftClient {
 
 		const tx = new Transaction();
 
+		tx.add(
+			ComputeBudgetProgram.setComputeUnitLimit({
+				units: txParams?.computeUnits ?? 600_000,
+			})
+		);
+
+		if (txParams?.computeUnitsPrice) {
+			tx.add(
+				ComputeBudgetProgram.setComputeUnitPrice({
+					microLamports: txParams.computeUnitsPrice,
+				})
+			);
+		}
+
 		const authority = this.wallet.publicKey;
 
 		const createWSOLTokenAccount =

package/src/driftClientConfig.ts

@@ -29,7 +29,6 @@ export type DriftClientSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
-			lazyDecode?: boolean;
 	  };
 
 type TxSenderConfig = {

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.21.0-beta.1",
+  "version": "2.21.0-beta.2",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -95,8 +95,7 @@ export class User {
 			this.accountSubscriber = new PollingUserAccountSubscriber(
 				config.driftClient.program,
 				config.userAccountPublicKey,
-				config.accountSubscription.accountLoader,
-				config.accountSubscription.lazyDecode
+				config.accountSubscription.accountLoader
 			);
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(

package/src/userConfig.ts

@@ -15,5 +15,4 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
-			lazyDecode?: boolean;
 	  };

package/src/userMap/userMap.ts

@@ -15,7 +15,9 @@ import {
 	LPRecord,
 } from '..';
 
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
+import { Buffer } from 'buffer';
+import bs58 from 'bs58';
 
 export interface UserMapInterface {
 	fetchAllUsers(): Promise<void>;
@@ -177,4 +179,53 @@ export class UserMap implements UserMapInterface {
 	public size(): number {
 		return this.userMap.size;
 	}
+
+	public async sync(includeIdle = true) {
+		let filters = undefined;
+		if (!includeIdle) {
+			filters = [
+				{
+					memcmp: {
+						offset: 4350,
+						bytes: bs58.encode(Uint8Array.from([0])),
+					},
+				},
+			];
+		}
+
+		const programAccounts =
+			await this.driftClient.connection.getProgramAccounts(
+				this.driftClient.program.programId,
+				{
+					commitment: this.driftClient.connection.commitment,
+					filters: [
+						{
+							memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
+						},
+						...(Array.isArray(filters) ? filters : []),
+					],
+				}
+			);
+
+		const programAccountMap = new Map<string, AccountInfo<Buffer>>();
+		for (const programAccount of programAccounts) {
+			programAccountMap.set(
+				programAccount.pubkey.toString(),
+				programAccount.account
+			);
+		}
+
+		for (const key of programAccountMap.keys()) {
+			if (!this.has(key)) {
+				await this.addPubkey(new PublicKey(key));
+			}
+		}
+
+		for (const [key, user] of this.userMap.entries()) {
+			if (!programAccountMap.has(key)) {
+				await user.unsubscribe();
+				this.userMap.delete(key);
+			}
+		}
+	}
 }

package/src/userMap/userStatsMap.ts

@@ -17,9 +17,10 @@ import {
 	InsuranceFundStakeRecord,
 } from '..';
 import { ProgramAccount } from '@project-serum/anchor';
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
 
 import { UserMap } from './userMap';
+import { Buffer } from 'buffer';
 
 export class UserStatsMap {
 	/**
@@ -190,4 +191,34 @@ export class UserStatsMap {
 	public size(): number {
 		return this.userStatsMap.size;
 	}
+
+	public async sync() {
+		const programAccounts =
+			await this.driftClient.connection.getProgramAccounts(
+				this.driftClient.program.programId,
+				{
+					commitment: this.driftClient.connection.commitment,
+					filters: [
+						{
+							memcmp:
+								this.driftClient.program.coder.accounts.memcmp('UserStats'),
+						},
+					],
+				}
+			);
+
+		const programAccountMap = new Map<string, AccountInfo<Buffer>>();
+		for (const programAccount of programAccounts) {
+			programAccountMap.set(
+				new PublicKey(programAccount.account.data.slice(8, 40)).toString(),
+				programAccount.account
+			);
+		}
+
+		for (const key of programAccountMap.keys()) {
+			if (!this.has(key)) {
+				await this.addUserStat(new PublicKey(key));
+			}
+		}
+	}
 }