@drift-labs/sdk 2.7.0 → 2.8.0-beta.0

package/lib/accounts/bulkAccountLoader.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { BufferAndSlot } from './types';
-import { Mutex } from 'async-mutex';
 declare type AccountToLoad = {
     publicKey: PublicKey;
     callbacks: Map<string, (buffer: Buffer, slot: number) => void>;
@@ -15,12 +14,11 @@ export declare class BulkAccountLoader {
     errorCallbacks: Map<string, (e: any) => void>;
     intervalId?: NodeJS.Timer;
     loadPromise?: Promise<void>;
-    loadPromiseLock: Mutex;
     loadPromiseResolver: () => void;
     lastTimeLoadingPromiseCleared: number;
     mostRecentSlot: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
-    addAccount(publicKey: PublicKey, callback: (buffer: Buffer, slot: number) => void): string;
+    addAccount(publicKey: PublicKey, callback: (buffer: Buffer, slot: number) => void): Promise<string>;
     removeAccount(publicKey: PublicKey, callbackId: string): void;
     addErrorCallbacks(callback: (error: Error) => void): string;
     removeErrorCallbacks(callbackId: string): void;

package/lib/accounts/bulkAccountLoader.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkAccountLoader = void 0;
 const uuid_1 = require("uuid");
 const promiseTimeout_1 = require("../util/promiseTimeout");
-const async_mutex_1 = require("async-mutex");
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
 const oneMinute = 60 * 1000;
 class BulkAccountLoader {
@@ -11,14 +10,13 @@ class BulkAccountLoader {
         this.accountsToLoad = new Map();
         this.bufferAndSlotMap = new Map();
         this.errorCallbacks = new Map();
-        this.loadPromiseLock = new async_mutex_1.Mutex();
         this.lastTimeLoadingPromiseCleared = Date.now();
         this.mostRecentSlot = 0;
         this.connection = connection;
         this.commitment = commitment;
         this.pollingFrequency = pollingFrequency;
     }
-    addAccount(publicKey, callback) {
+    async addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
         const callbackId = (0, uuid_1.v4)();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
@@ -37,10 +35,8 @@ class BulkAccountLoader {
         if (existingSize === 0) {
             this.startPolling();
         }
-        // if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
-        this.loadPromiseLock.runExclusive(() => {
-            this.loadPromise = undefined;
-        });
+        // resolve the current loadPromise in case client wants to call load
+        await this.loadPromise;
         return callbackId;
     }
     removeAccount(publicKey, callbackId) {
@@ -70,38 +66,36 @@ class BulkAccountLoader {
             .map((begin) => array.slice(begin, begin + size));
     }
     async load() {
-        await this.loadPromiseLock.runExclusive(async () => {
-            if (this.loadPromise) {
-                const now = Date.now();
-                if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-                    this.loadPromise = undefined;
-                }
-                else {
-                    return this.loadPromise;
-                }
-            }
-            this.loadPromise = new Promise((resolver) => {
-                this.loadPromiseResolver = resolver;
-            });
-            this.lastTimeLoadingPromiseCleared = Date.now();
-            try {
-                const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
-                await Promise.all(chunks.map((chunk) => {
-                    return this.loadChunk(chunk);
-                }));
-            }
-            catch (e) {
-                console.error(`Error in bulkAccountLoader.load()`);
-                console.error(e);
-                for (const [_, callback] of this.errorCallbacks) {
-                    callback(e);
-                }
-            }
-            finally {
-                this.loadPromiseResolver();
+        if (this.loadPromise) {
+            const now = Date.now();
+            if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
                 this.loadPromise = undefined;
             }
+            else {
+                return this.loadPromise;
+            }
+        }
+        this.loadPromise = new Promise((resolver) => {
+            this.loadPromiseResolver = resolver;
         });
+        this.lastTimeLoadingPromiseCleared = Date.now();
+        try {
+            const chunks = this.chunks(Array.from(this.accountsToLoad.values()), GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE);
+            await Promise.all(chunks.map((chunk) => {
+                return this.loadChunk(chunk);
+            }));
+        }
+        catch (e) {
+            console.error(`Error in bulkAccountLoader.load()`);
+            console.error(e);
+            for (const [_, callback] of this.errorCallbacks) {
+                callback(e);
+            }
+        }
+        finally {
+            this.loadPromiseResolver();
+            this.loadPromise = undefined;
+        }
     }
     async loadChunk(accountsToLoad) {
         if (accountsToLoad.length === 0) {

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -38,8 +38,8 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     updateOraclesToPoll(): boolean;
     addOracleToPoll(oracleInfo: OracleInfo): boolean;
     addToAccountLoader(): Promise<void>;
-    addAccountToAccountLoader(accountToPoll: AccountToPoll): void;
-    addOracleToAccountLoader(oracleToPoll: OraclesToPoll): void;
+    addAccountToAccountLoader(accountToPoll: AccountToPoll): Promise<void>;
+    addOracleToAccountLoader(oracleToPoll: OraclesToPoll): Promise<void>;
     fetch(): Promise<void>;
     didSubscriptionSucceed(): boolean;
     unsubscribe(): Promise<void>;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -116,17 +116,17 @@ class PollingDriftClientAccountSubscriber {
     }
     async addToAccountLoader() {
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            this.addAccountToAccountLoader(accountToPoll);
+            await this.addAccountToAccountLoader(accountToPoll);
         }
         for (const [_, oracleToPoll] of this.oraclesToPoll) {
-            this.addOracleToAccountLoader(oracleToPoll);
+            await this.addOracleToAccountLoader(oracleToPoll);
         }
         this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
             this.eventEmitter.emit('error', error);
         });
     }
-    addAccountToAccountLoader(accountToPoll) {
-        accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
+    async addAccountToAccountLoader(accountToPoll) {
+        accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
             const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
@@ -148,9 +148,9 @@ class PollingDriftClientAccountSubscriber {
             }
         });
     }
-    addOracleToAccountLoader(oracleToPoll) {
+    async addOracleToAccountLoader(oracleToPoll) {
         const oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection);
-        oracleToPoll.callbackId = this.accountLoader.addAccount(oracleToPoll.publicKey, (buffer, slot) => {
+        oracleToPoll.callbackId = await this.accountLoader.addAccount(oracleToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
             const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
@@ -216,13 +216,13 @@ class PollingDriftClientAccountSubscriber {
     async addSpotMarket(marketIndex) {
         await this.addSpotMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
-        this.addAccountToAccountLoader(accountToPoll);
+        await this.addAccountToAccountLoader(accountToPoll);
         return true;
     }
     async addPerpMarket(marketIndex) {
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
-        this.addAccountToAccountLoader(accountToPoll);
+        await this.addAccountToAccountLoader(accountToPoll);
         return true;
     }
     async addOracle(oracleInfo) {
@@ -231,7 +231,7 @@ class PollingDriftClientAccountSubscriber {
         }
         this.addOracleToPoll(oracleInfo);
         const oracleToPoll = this.oraclesToPoll.get(oracleInfo.publicKey.toString());
-        this.addOracleToAccountLoader(oracleToPoll);
+        await this.addOracleToAccountLoader(oracleToPoll);
         return true;
     }
     assertIsSubscribed() {

package/lib/accounts/pollingOracleAccountSubscriber.d.ts

@@ -18,7 +18,7 @@ export declare class PollingOracleAccountSubscriber implements OracleAccountSubs
     oraclePriceData?: DataAndSlot<OraclePriceData>;
     constructor(publicKey: PublicKey, oracleClient: OracleClient, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
-    addToAccountLoader(): void;
+    addToAccountLoader(): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/pollingOracleAccountSubscriber.js

@@ -15,7 +15,7 @@ class PollingOracleAccountSubscriber {
         if (this.isSubscribed) {
             return true;
         }
-        this.addToAccountLoader();
+        await this.addToAccountLoader();
         let subscriptionSucceeded = false;
         let retries = 0;
         while (!subscriptionSucceeded && retries < 5) {
@@ -29,11 +29,11 @@ class PollingOracleAccountSubscriber {
         this.isSubscribed = subscriptionSucceeded;
         return subscriptionSucceeded;
     }
-    addToAccountLoader() {
+    async addToAccountLoader() {
         if (this.callbackId) {
             return;
         }
-        this.callbackId = this.accountLoader.addAccount(this.publicKey, async (buffer, slot) => {
+        this.callbackId = await this.accountLoader.addAccount(this.publicKey, async (buffer, slot) => {
             const oraclePriceData = await this.oracleClient.getOraclePriceDataFromBuffer(buffer);
             this.oraclePriceData = { data: oraclePriceData, slot };
             // @ts-ignore

package/lib/accounts/pollingTokenAccountSubscriber.d.ts

@@ -17,7 +17,7 @@ export declare class PollingTokenAccountSubscriber implements TokenAccountSubscr
     tokenAccountAndSlot?: DataAndSlot<AccountInfo>;
     constructor(publicKey: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
-    addToAccountLoader(): void;
+    addToAccountLoader(): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/pollingTokenAccountSubscriber.js

@@ -15,7 +15,7 @@ class PollingTokenAccountSubscriber {
         if (this.isSubscribed) {
             return true;
         }
-        this.addToAccountLoader();
+        await this.addToAccountLoader();
         let subscriptionSucceeded = false;
         let retries = 0;
         while (!subscriptionSucceeded && retries < 5) {
@@ -29,11 +29,11 @@ class PollingTokenAccountSubscriber {
         this.isSubscribed = subscriptionSucceeded;
         return subscriptionSucceeded;
     }
-    addToAccountLoader() {
+    async addToAccountLoader() {
         if (this.callbackId) {
             return;
         }
-        this.callbackId = this.accountLoader.addAccount(this.publicKey, (buffer, slot) => {
+        this.callbackId = await this.accountLoader.addAccount(this.publicKey, (buffer, slot) => {
             const tokenAccount = (0, token_1.parseTokenAccount)(buffer);
             this.tokenAccountAndSlot = { data: tokenAccount, slot };
             // @ts-ignore

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -35,7 +35,7 @@ class PollingUserAccountSubscriber {
             eventType: 'userAccountUpdate',
         });
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
+            accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
                 if (!buffer) {
                     return;
                 }

package/lib/accounts/pollingUserStatsAccountSubscriber.js

@@ -35,7 +35,7 @@ class PollingUserStatsAccountSubscriber {
             eventType: 'userStatsAccountUpdate',
         });
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
+            accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
                 if (!buffer) {
                     return;
                 }

package/lib/accounts/types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.7.0",
+    "version": "2.8.0-beta.0",
     "name": "drift",
     "instructions": [
         {

package/lib/serum/serumSubscriber.js

@@ -18,13 +18,13 @@ class SerumSubscriber {
         this.market = await serum_1.Market.load(this.connection, this.marketAddress, undefined, this.programId);
         this.asksAddress = this.market.asksAddress;
         this.asks = await this.market.loadAsks(this.connection);
-        this.asksCallbackId = this.accountLoader.addAccount(this.asksAddress, (buffer, slot) => {
+        this.asksCallbackId = await this.accountLoader.addAccount(this.asksAddress, (buffer, slot) => {
             this.lastAsksSlot = slot;
             this.asks = serum_1.Orderbook.decode(this.market, buffer);
         });
         this.bidsAddress = this.market.bidsAddress;
         this.bids = await this.market.loadBids(this.connection);
-        this.bidsCallbackId = this.accountLoader.addAccount(this.bidsAddress, (buffer, slot) => {
+        this.bidsCallbackId = await this.accountLoader.addAccount(this.bidsAddress, (buffer, slot) => {
             this.lastBidsSlot = slot;
             this.bids = serum_1.Orderbook.decode(this.market, buffer);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.7.0",
+	"version": "2.8.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -39,7 +39,6 @@
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "1.66.2",
 		"@switchboard-xyz/switchboard-v2": "^0.0.67",
-		"async-mutex": "^0.4.0",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"
 	},

package/src/accounts/bulkAccountLoader.ts

@@ -2,7 +2,6 @@ import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';
 import { BufferAndSlot } from './types';
 import { promiseTimeout } from '../util/promiseTimeout';
-import { Mutex } from 'async-mutex';
 
 type AccountToLoad = {
 	publicKey: PublicKey;
@@ -23,7 +22,6 @@ export class BulkAccountLoader {
 	intervalId?: NodeJS.Timer;
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
-	loadPromiseLock: Mutex = new Mutex();
 	loadPromiseResolver: () => void;
 	lastTimeLoadingPromiseCleared = Date.now();
 	mostRecentSlot = 0;
@@ -38,10 +36,10 @@ export class BulkAccountLoader {
 		this.pollingFrequency = pollingFrequency;
 	}
 
-	public addAccount(
+	public async addAccount(
 		publicKey: PublicKey,
 		callback: (buffer: Buffer, slot: number) => void
-	): string {
+	): Promise<string> {
 		const existingSize = this.accountsToLoad.size;
 
 		const callbackId = uuidv4();
@@ -65,10 +63,8 @@ export class BulkAccountLoader {
 			this.startPolling();
 		}
 
-		// if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
-		this.loadPromiseLock.runExclusive(() => {
-			this.loadPromise = undefined;
-		});
+		// resolve the current loadPromise in case client wants to call load
+		await this.loadPromise;
 
 		return callbackId;
 	}
@@ -105,43 +101,41 @@ export class BulkAccountLoader {
 	}
 
 	public async load(): Promise<void> {
-		await this.loadPromiseLock.runExclusive(async () => {
-			if (this.loadPromise) {
-				const now = Date.now();
-				if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-					this.loadPromise = undefined;
-				} else {
-					return this.loadPromise;
-				}
-			}
-
-			this.loadPromise = new Promise((resolver) => {
-				this.loadPromiseResolver = resolver;
-			});
-			this.lastTimeLoadingPromiseCleared = Date.now();
-
-			try {
-				const chunks = this.chunks(
-					Array.from(this.accountsToLoad.values()),
-					GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
-				);
-
-				await Promise.all(
-					chunks.map((chunk) => {
-						return this.loadChunk(chunk);
-					})
-				);
-			} catch (e) {
-				console.error(`Error in bulkAccountLoader.load()`);
-				console.error(e);
-				for (const [_, callback] of this.errorCallbacks) {
-					callback(e);
-				}
-			} finally {
-				this.loadPromiseResolver();
+		if (this.loadPromise) {
+			const now = Date.now();
+			if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
 				this.loadPromise = undefined;
+			} else {
+				return this.loadPromise;
 			}
+		}
+
+		this.loadPromise = new Promise((resolver) => {
+			this.loadPromiseResolver = resolver;
 		});
+		this.lastTimeLoadingPromiseCleared = Date.now();
+
+		try {
+			const chunks = this.chunks(
+				Array.from(this.accountsToLoad.values()),
+				GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
+			);
+
+			await Promise.all(
+				chunks.map((chunk) => {
+					return this.loadChunk(chunk);
+				})
+			);
+		} catch (e) {
+			console.error(`Error in bulkAccountLoader.load()`);
+			console.error(e);
+			for (const [_, callback] of this.errorCallbacks) {
+				callback(e);
+			}
+		} finally {
+			this.loadPromiseResolver();
+			this.loadPromise = undefined;
+		}
 	}
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -194,11 +194,11 @@ export class PollingDriftClientAccountSubscriber
 
 	async addToAccountLoader(): Promise<void> {
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			this.addAccountToAccountLoader(accountToPoll);
+			await this.addAccountToAccountLoader(accountToPoll);
 		}
 
 		for (const [_, oracleToPoll] of this.oraclesToPoll) {
-			this.addOracleToAccountLoader(oracleToPoll);
+			await this.addOracleToAccountLoader(oracleToPoll);
 		}
 
 		this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
@@ -206,8 +206,8 @@ export class PollingDriftClientAccountSubscriber
 		});
 	}
 
-	addAccountToAccountLoader(accountToPoll: AccountToPoll): void {
-		accountToPoll.callbackId = this.accountLoader.addAccount(
+	async addAccountToAccountLoader(accountToPoll: AccountToPoll): Promise<void> {
+		accountToPoll.callbackId = await this.accountLoader.addAccount(
 			accountToPoll.publicKey,
 			(buffer: Buffer, slot: number) => {
 				if (!buffer) return;
@@ -236,13 +236,13 @@ export class PollingDriftClientAccountSubscriber
 		);
 	}
 
-	addOracleToAccountLoader(oracleToPoll: OraclesToPoll): void {
+	async addOracleToAccountLoader(oracleToPoll: OraclesToPoll): Promise<void> {
 		const oracleClient = this.oracleClientCache.get(
 			oracleToPoll.source,
 			this.program.provider.connection
 		);
 
-		oracleToPoll.callbackId = this.accountLoader.addAccount(
+		oracleToPoll.callbackId = await this.accountLoader.addAccount(
 			oracleToPoll.publicKey,
 			(buffer: Buffer, slot: number) => {
 				if (!buffer) return;
@@ -342,14 +342,14 @@ export class PollingDriftClientAccountSubscriber
 	async addSpotMarket(marketIndex: number): Promise<boolean> {
 		await this.addSpotMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
-		this.addAccountToAccountLoader(accountToPoll);
+		await this.addAccountToAccountLoader(accountToPoll);
 		return true;
 	}
 
 	async addPerpMarket(marketIndex: number): Promise<boolean> {
 		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
-		this.addAccountToAccountLoader(accountToPoll);
+		await this.addAccountToAccountLoader(accountToPoll);
 		return true;
 	}
 
@@ -362,7 +362,7 @@ export class PollingDriftClientAccountSubscriber
 		const oracleToPoll = this.oraclesToPoll.get(
 			oracleInfo.publicKey.toString()
 		);
-		this.addOracleToAccountLoader(oracleToPoll);
+		await this.addOracleToAccountLoader(oracleToPoll);
 		return true;
 	}
 

package/src/accounts/pollingOracleAccountSubscriber.ts

@@ -41,7 +41,7 @@ export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 			return true;
 		}
 
-		this.addToAccountLoader();
+		await this.addToAccountLoader();
 
 		let subscriptionSucceeded = false;
 		let retries = 0;
@@ -59,12 +59,12 @@ export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 		return subscriptionSucceeded;
 	}
 
-	addToAccountLoader(): void {
+	async addToAccountLoader(): Promise<void> {
 		if (this.callbackId) {
 			return;
 		}
 
-		this.callbackId = this.accountLoader.addAccount(
+		this.callbackId = await this.accountLoader.addAccount(
 			this.publicKey,
 			async (buffer, slot) => {
 				const oraclePriceData =

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -36,7 +36,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 			return true;
 		}
 
-		this.addToAccountLoader();
+		await this.addToAccountLoader();
 		let subscriptionSucceeded = false;
 		let retries = 0;
 		while (!subscriptionSucceeded && retries < 5) {
@@ -53,12 +53,12 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		return subscriptionSucceeded;
 	}
 
-	addToAccountLoader(): void {
+	async addToAccountLoader(): Promise<void> {
 		if (this.callbackId) {
 			return;
 		}
 
-		this.callbackId = this.accountLoader.addAccount(
+		this.callbackId = await this.accountLoader.addAccount(
 			this.publicKey,
 			(buffer, slot: number) => {
 				const tokenAccount = parseTokenAccount(buffer);

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -65,7 +65,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		});
 
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			accountToPoll.callbackId = this.accountLoader.addAccount(
+			accountToPoll.callbackId = await this.accountLoader.addAccount(
 				accountToPoll.publicKey,
 				(buffer, slot) => {
 					if (!buffer) {

package/src/accounts/pollingUserStatsAccountSubscriber.ts

@@ -68,7 +68,7 @@ export class PollingUserStatsAccountSubscriber
 		});
 
 		for (const [_, accountToPoll] of this.accountsToPoll) {
-			accountToPoll.callbackId = this.accountLoader.addAccount(
+			accountToPoll.callbackId = await this.accountLoader.addAccount(
 				accountToPoll.publicKey,
 				(buffer, slot) => {
 					if (!buffer) {

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.7.0",
+  "version": "2.8.0-beta.0",
   "name": "drift",
   "instructions": [
     {

package/src/serum/serumSubscriber.ts

@@ -46,7 +46,7 @@ export class SerumSubscriber {
 		this.asksAddress = this.market.asksAddress;
 		this.asks = await this.market.loadAsks(this.connection);
 
-		this.asksCallbackId = this.accountLoader.addAccount(
+		this.asksCallbackId = await this.accountLoader.addAccount(
 			this.asksAddress,
 			(buffer, slot) => {
 				this.lastAsksSlot = slot;
@@ -57,7 +57,7 @@ export class SerumSubscriber {
 		this.bidsAddress = this.market.bidsAddress;
 		this.bids = await this.market.loadBids(this.connection);
 
-		this.bidsCallbackId = this.accountLoader.addAccount(
+		this.bidsCallbackId = await this.accountLoader.addAccount(
 			this.bidsAddress,
 			(buffer, slot) => {
 				this.lastBidsSlot = slot;

package/src/assert/assert.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;

package/src/examples/makeTradeExample.js

@@ -1,157 +0,0 @@
-'use strict';
-var __awaiter =
-	(this && this.__awaiter) ||
-	function (thisArg, _arguments, P, generator) {
-		function adopt(value) {
-			return value instanceof P
-				? value
-				: new P(function (resolve) {
-						resolve(value);
-				  });
-		}
-		return new (P || (P = Promise))(function (resolve, reject) {
-			function fulfilled(value) {
-				try {
-					step(generator.next(value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function rejected(value) {
-				try {
-					step(generator['throw'](value));
-				} catch (e) {
-					reject(e);
-				}
-			}
-			function step(result) {
-				result.done
-					? resolve(result.value)
-					: adopt(result.value).then(fulfilled, rejected);
-			}
-			step((generator = generator.apply(thisArg, _arguments || [])).next());
-		});
-	};
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.getTokenAddress = void 0;
-const anchor_1 = require('@project-serum/anchor');
-const __1 = require('..');
-const spl_token_1 = require('@solana/spl-token');
-const web3_js_1 = require('@solana/web3.js');
-const __2 = require('..');
-const banks_1 = require('../constants/spotMarkets');
-const getTokenAddress = (mintAddress, userPubKey) => {
-	return spl_token_1.Token.getAssociatedTokenAddress(
-		new web3_js_1.PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`),
-		spl_token_1.TOKEN_PROGRAM_ID,
-		new web3_js_1.PublicKey(mintAddress),
-		new web3_js_1.PublicKey(userPubKey)
-	);
-};
-exports.getTokenAddress = getTokenAddress;
-const main = () =>
-	__awaiter(void 0, void 0, void 0, function* () {
-		// Initialize Drift SDK
-		const sdkConfig = __2.initialize({ env: 'devnet' });
-		// Set up the Wallet and Provider
-		const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-		const keypair = web3_js_1.Keypair.fromSecretKey(
-			Uint8Array.from(JSON.parse(privateKey))
-		);
-		const wallet = new __1.Wallet(keypair);
-		// Set up the Connection
-		const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-		const connection = new web3_js_1.Connection(rpcAddress);
-		// Set up the Provider
-		const provider = new anchor_1.AnchorProvider(
-			connection,
-			wallet,
-			anchor_1.AnchorProvider.defaultOptions()
-		);
-		// Check SOL Balance
-		const lamportsBalance = yield connection.getBalance(wallet.publicKey);
-		console.log('SOL balance:', lamportsBalance / Math.pow(10, 9));
-		// Misc. other things to set up
-		const usdcTokenAddress = yield exports.getTokenAddress(
-			sdkConfig.USDC_MINT_ADDRESS,
-			wallet.publicKey.toString()
-		);
-		// Set up the Drift Clearing House
-		const clearingHousePublicKey = new web3_js_1.PublicKey(
-			sdkConfig.DRIFT_PROGRAM_ID
-		);
-		const clearingHouse = new __2.ClearingHouse({
-			connection,
-			wallet: provider.wallet,
-			programID: clearingHousePublicKey,
-		});
-		yield clearingHouse.subscribe();
-		// Set up Clearing House user client
-		const user = new __2.ClearingHouseUser({
-			clearingHouse,
-			userAccountPublicKey: yield clearingHouse.getUserAccountPublicKey(),
-		});
-		//// Check if clearing house account exists for the current wallet
-		const userAccountExists = yield user.exists();
-		if (!userAccountExists) {
-			//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
-			const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-			yield clearingHouse.initializeUserAccountAndDepositCollateral(
-				depositAmount,
-				yield exports.getTokenAddress(
-					usdcTokenAddress.toString(),
-					wallet.publicKey.toString()
-				),
-				banks_1.SpotMarkets['devnet'][0].marketIndex
-			);
-		}
-		yield user.subscribe();
-		// Get current price
-		const solMarketInfo = sdkConfig.PERP_MARKETS.find(
-			(market) => market.baseAssetSymbol === 'SOL'
-		);
-		const currentMarketPrice = __2.calculateMarkPrice(
-			clearingHouse.getMarketAccount(solMarketInfo.marketIndex),
-			undefined
-		);
-		const formattedPrice = __2.convertToNumber(
-			currentMarketPrice,
-			__2.PRICE_PRECISION
-		);
-		console.log(`Current Market Price is $${formattedPrice}`);
-		// Estimate the slippage for a $5000 LONG trade
-		const solMarketAccount = clearingHouse.getMarketAccount(
-			solMarketInfo.marketIndex
-		);
-		const longAmount = new anchor_1.BN(5000).mul(__2.QUOTE_PRECISION);
-		const slippage = __2.convertToNumber(
-			__2.calculateTradeSlippage(
-				__2.PositionDirection.LONG,
-				longAmount,
-				solMarketAccount,
-				'quote',
-				undefined
-			)[0],
-			__2.PRICE_PRECISION
-		);
-		console.log(
-			`Slippage for a $5000 LONG on the SOL market would be $${slippage}`
-		);
-		// Make a $5000 LONG trade
-		yield clearingHouse.openPosition(
-			__2.PositionDirection.LONG,
-			longAmount,
-			solMarketInfo.marketIndex
-		);
-		console.log(`LONGED $5000 SOL`);
-		// Reduce the position by $2000
-		const reduceAmount = new anchor_1.BN(2000).mul(__2.QUOTE_PRECISION);
-		yield clearingHouse.openPosition(
-			__2.PositionDirection.SHORT,
-			reduceAmount,
-			solMarketInfo.marketIndex
-		);
-		// Close the rest of the position
-		yield clearingHouse.closePosition(solMarketInfo.marketIndex);
-	});
-main();

package/src/token/index.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTokenAccount = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-function parseTokenAccount(data) {
-    const accountInfo = spl_token_1.AccountLayout.decode(data);
-    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
-    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
-    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
-    if (accountInfo.delegateOption === 0) {
-        accountInfo.delegate = null;
-        // eslint-disable-next-line new-cap
-        accountInfo.delegatedAmount = new spl_token_1.u64(0);
-    }
-    else {
-        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
-    }
-    accountInfo.isInitialized = accountInfo.state !== 0;
-    accountInfo.isFrozen = accountInfo.state === 2;
-    if (accountInfo.isNativeOption === 1) {
-        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
-        accountInfo.isNative = true;
-    }
-    else {
-        accountInfo.rentExemptReserve = null;
-        accountInfo.isNative = false;
-    }
-    if (accountInfo.closeAuthorityOption === 0) {
-        accountInfo.closeAuthority = null;
-    }
-    else {
-        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
-    }
-    return accountInfo;
-}
-exports.parseTokenAccount = parseTokenAccount;

package/src/tx/types.js

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

package/src/tx/utils.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapInTx = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const COMPUTE_UNITS_DEFAULT = 200000;
-function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
-) {
-    const tx = new web3_js_1.Transaction();
-    if (computeUnits != COMPUTE_UNITS_DEFAULT) {
-        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: computeUnits,
-            additionalFee: 0,
-        }));
-    }
-    return tx.add(instruction);
-}
-exports.wrapInTx = wrapInTx;

package/src/util/computeUnits.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
-            }
-        });
-        return computeUnits;
-    });
-}
-exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenAddress = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-const getTokenAddress = (mintAddress, userPubKey) => {
-    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
-};
-exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseTimeout = void 0;
-function promiseTimeout(promise, timeoutMs) {
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(() => resolve(null), timeoutMs);
-    });
-    return Promise.race([promise, timeoutPromise]).then((result) => {
-        clearTimeout(timeoutId);
-        return result;
-    });
-}
-exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimateTps = void 0;
-function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
-        if (failed) {
-            signatures = signatures.filter((signature) => signature.err);
-        }
-        const numberOfSignatures = signatures.length;
-        if (numberOfSignatures === 0) {
-            return 0;
-        }
-        return (numberOfSignatures /
-            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
-    });
-}
-exports.estimateTps = estimateTps;