@drift-labs/sdk 0.2.0-master.39 → 0.2.0-master.40

package/lib/accounts/bulkAccountLoader.d.ts

@@ -1,6 +1,7 @@
 /// <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>;
@@ -14,6 +15,7 @@ export declare class BulkAccountLoader {
     errorCallbacks: Map<string, (e: any) => void>;
     intervalId?: NodeJS.Timer;
     loadPromise?: Promise<void>;
+    loadPromiseLock: Mutex;
     loadPromiseResolver: () => void;
     lastTimeLoadingPromiseCleared: number;
     mostRecentSlot: number;

package/lib/accounts/bulkAccountLoader.js

@@ -3,6 +3,7 @@ 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 {
@@ -10,6 +11,7 @@ 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;
@@ -36,7 +38,9 @@ class BulkAccountLoader {
             this.startPolling();
         }
         // if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
-        this.loadPromise = undefined;
+        this.loadPromiseLock.runExclusive(() => {
+            this.loadPromise = undefined;
+        });
         return callbackId;
     }
     removeAccount(publicKey, callbackId) {
@@ -66,36 +70,38 @@ class BulkAccountLoader {
             .map((begin) => array.slice(begin, begin + size));
     }
     async load() {
-        if (this.loadPromise) {
-            const now = Date.now();
-            if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-                this.loadPromise = undefined;
+        await this.loadPromiseLock.runExclusive(async () => {
+            if (this.loadPromise) {
+                const now = Date.now();
+                if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
+                    this.loadPromise = undefined;
+                }
+                else {
+                    return this.loadPromise;
+                }
             }
-            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);
+                }));
             }
-        }
-        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);
+            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;
-        }
+            finally {
+                this.loadPromiseResolver();
+                this.loadPromise = undefined;
+            }
+        });
     }
     async loadChunk(accountsToLoad) {
         if (accountsToLoad.length === 0) {

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/driftClient.js

@@ -127,9 +127,9 @@ class DriftClient {
         });
     }
     async subscribe() {
-        const subscribePromises = this.subscribeUsers().concat(this.accountSubscriber.subscribe());
+        let subscribePromises = this.subscribeUsers().concat(this.accountSubscriber.subscribe());
         if (this.userStats !== undefined) {
-            subscribePromises.concat(this.userStats.subscribe());
+            subscribePromises = subscribePromises.concat(this.userStats.subscribe());
         }
         this.isSubscribed = (await Promise.all(subscribePromises)).reduce((success, prevSuccess) => success && prevSuccess);
         return this.isSubscribed;
@@ -141,18 +141,18 @@ class DriftClient {
      *	Forces the accountSubscriber to fetch account updates from rpc
      */
     async fetchAccounts() {
-        const promises = [...this.users.values()]
+        let promises = [...this.users.values()]
             .map((user) => user.fetchAccounts())
             .concat(this.accountSubscriber.fetch());
         if (this.userStats) {
-            promises.concat(this.userStats.fetchAccounts());
+            promises = promises.concat(this.userStats.fetchAccounts());
         }
         await Promise.all(promises);
     }
     async unsubscribe() {
-        const unsubscribePromises = this.unsubscribeUsers().concat(this.accountSubscriber.unsubscribe());
+        let unsubscribePromises = this.unsubscribeUsers().concat(this.accountSubscriber.unsubscribe());
         if (this.userStats !== undefined) {
-            unsubscribePromises.concat(this.userStats.unsubscribe());
+            unsubscribePromises = unsubscribePromises.concat(this.userStats.unsubscribe());
         }
         await Promise.all(unsubscribePromises);
         this.isSubscribed = false;
@@ -221,11 +221,22 @@ class DriftClient {
         this.authority = newWallet.publicKey;
         if (this.isSubscribed) {
             await Promise.all(this.unsubscribeUsers());
+            if (this.userStats) {
+                await this.userStats.unsubscribe();
+                this.userStats = new userStats_1.UserStats({
+                    driftClient: this,
+                    userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority),
+                    accountSubscription: this.userAccountSubscriptionConfig,
+                });
+            }
         }
         this.users.clear();
         this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
         if (this.isSubscribed) {
             await Promise.all(this.subscribeUsers());
+            if (this.userStats) {
+                await this.userStats.subscribe();
+            }
         }
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
@@ -245,8 +256,9 @@ class DriftClient {
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const tx = new web3_js_1.Transaction();
         if (subAccountId === 0) {
-            // not the safest assumption, can explicitly check if user stats account exists if it causes problems
-            tx.add(await this.getInitializeUserStatsIx());
+            if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
+                tx.add(await this.getInitializeUserStatsIx());
+            }
         }
         tx.add(initializeUserAccountIx);
         const { txSig } = await this.txSender.send(tx, [], this.opts);
@@ -706,7 +718,9 @@ class DriftClient {
             ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
             : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, false, false);
         if (subAccountId === 0) {
-            tx.add(await this.getInitializeUserStatsIx());
+            if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
+                tx.add(await this.getInitializeUserStatsIx());
+            }
         }
         tx.add(initializeUserAccountIx).add(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
@@ -723,7 +737,9 @@ class DriftClient {
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associateTokenPublicKey, subAccountId, false, false);
         const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToIx);
         if (subAccountId === 0) {
-            tx.add(await this.getInitializeUserStatsIx());
+            if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
+                tx.add(await this.getInitializeUserStatsIx());
+            }
         }
         tx.add(initializeUserAccountIx).add(depositCollateralIx);
         const txSig = await this.program.provider.sendAndConfirm(tx, []);

package/lib/types.d.ts

@@ -449,6 +449,7 @@ export declare type SpotBankruptcyRecord = {
     marketIndex: number;
     borrowAmount: BN;
     cumulativeDepositInterestDelta: BN;
+    ifPayment: BN;
 };
 export declare type SettlePnlRecord = {
     ts: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.39",
+	"version": "0.2.0-master.40",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -33,12 +33,13 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@project-serum/serum": "^0.13.38",
 		"@project-serum/anchor": "0.25.0-beta.1",
+		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "1.41.0",
 		"@switchboard-xyz/switchboard-v2": "^0.0.67",
+		"async-mutex": "^0.4.0",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"
 	},
@@ -53,8 +54,8 @@
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^3.4.0",
 		"mocha": "^10.0.0",
-		"ts-node": "^10.8.0",
-		"prettier": "^2.4.1"
+		"prettier": "^2.4.1",
+		"ts-node": "^10.8.0"
 	},
 	"description": "SDK for Drift Protocol v1",
 	"engines": {

package/src/accounts/bulkAccountLoader.ts

@@ -2,6 +2,7 @@ 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;
@@ -22,6 +23,7 @@ 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;
@@ -64,7 +66,9 @@ export class BulkAccountLoader {
 		}
 
 		// if a new account needs to be polled, remove the cached loadPromise in case client calls load immediately after
-		this.loadPromise = undefined;
+		this.loadPromiseLock.runExclusive(() => {
+			this.loadPromise = undefined;
+		});
 
 		return callbackId;
 	}
@@ -101,41 +105,43 @@ export class BulkAccountLoader {
 	}
 
 	public async load(): Promise<void> {
-		if (this.loadPromise) {
-			const now = Date.now();
-			if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
-				this.loadPromise = undefined;
-			} else {
-				return this.loadPromise;
+		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);
+			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;
 			}
-		} finally {
-			this.loadPromiseResolver();
-			this.loadPromise = undefined;
-		}
+		});
 	}
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {

package/src/driftClient.ts

@@ -230,11 +230,11 @@ export class DriftClient {
 	}
 
 	public async subscribe(): Promise<boolean> {
-		const subscribePromises = this.subscribeUsers().concat(
+		let subscribePromises = this.subscribeUsers().concat(
 			this.accountSubscriber.subscribe()
 		);
 		if (this.userStats !== undefined) {
-			subscribePromises.concat(this.userStats.subscribe());
+			subscribePromises = subscribePromises.concat(this.userStats.subscribe());
 		}
 		this.isSubscribed = (await Promise.all(subscribePromises)).reduce(
 			(success, prevSuccess) => success && prevSuccess
@@ -250,21 +250,23 @@ export class DriftClient {
 	 *	Forces the accountSubscriber to fetch account updates from rpc
 	 */
 	public async fetchAccounts(): Promise<void> {
-		const promises = [...this.users.values()]
+		let promises = [...this.users.values()]
 			.map((user) => user.fetchAccounts())
 			.concat(this.accountSubscriber.fetch());
 		if (this.userStats) {
-			promises.concat(this.userStats.fetchAccounts());
+			promises = promises.concat(this.userStats.fetchAccounts());
 		}
 		await Promise.all(promises);
 	}
 
 	public async unsubscribe(): Promise<void> {
-		const unsubscribePromises = this.unsubscribeUsers().concat(
+		let unsubscribePromises = this.unsubscribeUsers().concat(
 			this.accountSubscriber.unsubscribe()
 		);
 		if (this.userStats !== undefined) {
-			unsubscribePromises.concat(this.userStats.unsubscribe());
+			unsubscribePromises = unsubscribePromises.concat(
+				this.userStats.unsubscribe()
+			);
 		}
 		await Promise.all(unsubscribePromises);
 		this.isSubscribed = false;
@@ -378,11 +380,28 @@ export class DriftClient {
 
 		if (this.isSubscribed) {
 			await Promise.all(this.unsubscribeUsers());
+
+			if (this.userStats) {
+				await this.userStats.unsubscribe();
+
+				this.userStats = new UserStats({
+					driftClient: this,
+					userStatsAccountPublicKey: getUserStatsAccountPublicKey(
+						this.program.programId,
+						this.authority
+					),
+					accountSubscription: this.userAccountSubscriptionConfig,
+				});
+			}
 		}
 		this.users.clear();
 		this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
 		if (this.isSubscribed) {
 			await Promise.all(this.subscribeUsers());
+
+			if (this.userStats) {
+				await this.userStats.subscribe();
+			}
 		}
 
 		this.activeSubAccountId = activeSubAccountId;
@@ -420,8 +439,11 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		if (subAccountId === 0) {
-			// not the safest assumption, can explicitly check if user stats account exists if it causes problems
-			tx.add(await this.getInitializeUserStatsIx());
+			if (
+				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
+			) {
+				tx.add(await this.getInitializeUserStatsIx());
+			}
 		}
 		tx.add(initializeUserAccountIx);
 		const { txSig } = await this.txSender.send(tx, [], this.opts);
@@ -1143,7 +1165,11 @@ export class DriftClient {
 				  );
 
 		if (subAccountId === 0) {
-			tx.add(await this.getInitializeUserStatsIx());
+			if (
+				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
+			) {
+				tx.add(await this.getInitializeUserStatsIx());
+			}
 		}
 		tx.add(initializeUserAccountIx).add(depositCollateralIx);
 
@@ -1202,7 +1228,11 @@ export class DriftClient {
 		const tx = new Transaction().add(createAssociatedAccountIx).add(mintToIx);
 
 		if (subAccountId === 0) {
-			tx.add(await this.getInitializeUserStatsIx());
+			if (
+				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
+			) {
+				tx.add(await this.getInitializeUserStatsIx());
+			}
 		}
 		tx.add(initializeUserAccountIx).add(depositCollateralIx);
 

package/src/types.ts

@@ -371,6 +371,7 @@ export type SpotBankruptcyRecord = {
 	marketIndex: number;
 	borrowAmount: BN;
 	cumulativeDepositInterestDelta: BN;
+	ifPayment: BN;
 };
 
 export type SettlePnlRecord = {

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/events/eventList.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventList = void 0;
-class Node {
-    constructor(event, next, prev) {
-        this.event = event;
-        this.next = next;
-        this.prev = prev;
-    }
-}
-class EventList {
-    constructor(eventType, maxSize, sortFn, orderDirection) {
-        this.eventType = eventType;
-        this.maxSize = maxSize;
-        this.sortFn = sortFn;
-        this.orderDirection = orderDirection;
-        this.size = 0;
-    }
-    insert(event) {
-        this.size++;
-        const newNode = new Node(event);
-        if (this.head === undefined) {
-            this.head = this.tail = newNode;
-            return;
-        }
-        if (this.sortFn(this.head.event, newNode.event) ===
-            (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
-            this.head.prev = newNode;
-            newNode.next = this.head;
-            this.head = newNode;
-        }
-        else {
-            let currentNode = this.head;
-            while (currentNode.next !== undefined &&
-                this.sortFn(currentNode.next.event, newNode.event) !==
-                    (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
-                currentNode = currentNode.next;
-            }
-            newNode.next = currentNode.next;
-            if (currentNode.next !== undefined) {
-                newNode.next.prev = newNode;
-            }
-            currentNode.next = newNode;
-            newNode.prev = currentNode;
-        }
-        if (this.size > this.maxSize) {
-            this.detach();
-        }
-    }
-    detach() {
-        const node = this.tail;
-        if (node.prev !== undefined) {
-            node.prev.next = node.next;
-        }
-        else {
-            this.head = node.next;
-        }
-        if (node.next !== undefined) {
-            node.next.prev = node.prev;
-        }
-        else {
-            this.tail = node.prev;
-        }
-        this.size--;
-    }
-    toArray() {
-        return Array.from(this);
-    }
-    *[Symbol.iterator]() {
-        let node = this.head;
-        while (node) {
-            yield node.event;
-            node = node.next;
-        }
-    }
-}
-exports.EventList = EventList;

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.CLEARING_HOUSE_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;