@drift-labs/sdk 2.52.0-beta.0 → 2.52.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.52.0-beta.0
+2.52.0-beta.10

package/examples/phoenix.ts

@@ -1,5 +1,5 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { PRICE_PRECISION, PhoenixSubscriber } from '../src';
+import { BASE_PRECISION, PRICE_PRECISION, PhoenixSubscriber } from '../src';
 import { PROGRAM_ID } from '@ellipsis-labs/phoenix-sdk';
 
 export async function listenToBook(): Promise<void> {
@@ -19,9 +19,16 @@ export async function listenToBook(): Promise<void> {
 	await phoenixSubscriber.subscribe();
 
 	for (let i = 0; i < 10; i++) {
-		const bid = phoenixSubscriber.getBestBid().toNumber() / PRICE_PRECISION;
-		const ask = phoenixSubscriber.getBestAsk().toNumber() / PRICE_PRECISION;
-		console.log(`iter ${i}:`, bid.toFixed(3), '@', ask.toFixed(3));
+		const bids = phoenixSubscriber.getL2Levels("bids");
+		const asks = phoenixSubscriber.getL2Levels("asks");
+		console.log("bids");
+		for (const bid of bids) {
+			console.log(bid.price.toNumber() / PRICE_PRECISION.toNumber(), bid.size.toNumber() / BASE_PRECISION.toNumber());
+		}
+		console.log("asks");
+		for (const ask of asks) {
+			console.log(ask.price.toNumber() / PRICE_PRECISION.toNumber(), ask.size.toNumber() / BASE_PRECISION.toNumber());
+		}
 		await new Promise((r) => setTimeout(r, 2000));
 	}
 

package/lib/accounts/basicUserAccountSubscriber.d.ts

@@ -4,6 +4,10 @@ import { PublicKey } from '@solana/web3.js';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
+/**
+ * Basic implementation of UserAccountSubscriber. It will only take in UserAccount
+ * data during initialization and will not fetch or subscribe to updates.
+ */
 export declare class BasicUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;

package/lib/accounts/basicUserAccountSubscriber.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicUserAccountSubscriber = void 0;
 const events_1 = require("events");
+/**
+ * Basic implementation of UserAccountSubscriber. It will only take in UserAccount
+ * data during initialization and will not fetch or subscribe to updates.
+ */
 class BasicUserAccountSubscriber {
     constructor(userAccountPublicKey, data, slot) {
         this.isSubscribed = true;

package/lib/accounts/bulkAccountLoader.js

@@ -47,6 +47,7 @@ class BulkAccountLoader {
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.delete(callbackId);
             if (existingAccountToLoad.callbacks.size === 0) {
+                this.bufferAndSlotMap.delete(publicKey.toString());
                 this.accountsToLoad.delete(existingAccountToLoad.publicKey.toString());
             }
         }
@@ -107,7 +108,9 @@ class BulkAccountLoader {
         const requests = new Array();
         for (const accountsToLoadChunk of accountsToLoadChunks) {
             const args = [
-                accountsToLoadChunk.map((accountToLoad) => {
+                accountsToLoadChunk
+                    .filter((accountToLoad) => accountToLoad.callbacks.size > 0)
+                    .map((accountToLoad) => {
                     return accountToLoad.publicKey.toBase58();
                 }),
                 { commitment: this.commitment },
@@ -137,6 +140,9 @@ class BulkAccountLoader {
             }
             const accountsToLoad = accountsToLoadChunks[i];
             accountsToLoad.forEach((accountToLoad, j) => {
+                if (accountToLoad.callbacks.size === 0) {
+                    return;
+                }
                 const key = accountToLoad.publicKey.toBase58();
                 const oldRPCResponse = this.bufferAndSlotMap.get(key);
                 if (oldRPCResponse && newSlot < oldRPCResponse.slot) {

package/lib/accounts/oneShotUserAccountSubscriber.d.ts

@@ -0,0 +1,17 @@
+import { Commitment, PublicKey } from '@solana/web3.js';
+import { UserAccount } from '../types';
+import { BasicUserAccountSubscriber } from './basicUserAccountSubscriber';
+import { Program } from '@coral-xyz/anchor';
+/**
+ * Simple implementation of UserAccountSubscriber. It will fetch the UserAccount
+ * date on subscribe (or call to fetch) if no account data is provided on init.
+ * Expect to use only 1 RPC call unless you call fetch repeatedly.
+ */
+export declare class OneShotUserAccountSubscriber extends BasicUserAccountSubscriber {
+    program: Program;
+    commitment: Commitment;
+    constructor(program: Program, userAccountPublicKey: PublicKey, data?: UserAccount, slot?: number, commitment?: Commitment);
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
+    fetchIfUnloaded(): Promise<void>;
+    fetch(): Promise<void>;
+}

package/lib/accounts/oneShotUserAccountSubscriber.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneShotUserAccountSubscriber = void 0;
+const basicUserAccountSubscriber_1 = require("./basicUserAccountSubscriber");
+/**
+ * Simple implementation of UserAccountSubscriber. It will fetch the UserAccount
+ * date on subscribe (or call to fetch) if no account data is provided on init.
+ * Expect to use only 1 RPC call unless you call fetch repeatedly.
+ */
+class OneShotUserAccountSubscriber extends basicUserAccountSubscriber_1.BasicUserAccountSubscriber {
+    constructor(program, userAccountPublicKey, data, slot, commitment) {
+        super(userAccountPublicKey, data, slot);
+        this.program = program;
+        this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
+    }
+    async subscribe(userAccount) {
+        if (userAccount) {
+            this.user = { data: userAccount, slot: this.user.slot };
+            return true;
+        }
+        await this.fetchIfUnloaded();
+        if (this.doesAccountExist()) {
+            this.eventEmitter.emit('update');
+        }
+        return true;
+    }
+    async fetchIfUnloaded() {
+        if (this.user.data === undefined) {
+            await this.fetch();
+        }
+    }
+    async fetch() {
+        var _a, _b;
+        try {
+            const dataAndContext = await this.program.account.user.fetchAndContext(this.userAccountPublicKey, this.commitment);
+            if (dataAndContext.context.slot > ((_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
+                this.user = {
+                    data: dataAndContext.data,
+                    slot: dataAndContext.context.slot,
+                };
+            }
+        }
+        catch (e) {
+            console.error(`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`);
+        }
+    }
+}
+exports.OneShotUserAccountSubscriber = OneShotUserAccountSubscriber;

package/lib/accounts/pollingInsuranceFundStakeAccountSubscriber.js

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

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -24,5 +24,5 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;
-    unsubscribe(): Promise<void>;
+    unsubscribe(onResub?: boolean): Promise<void>;
 }

package/lib/accounts/webSocketAccountSubscriber.js

@@ -15,7 +15,7 @@ class WebSocketAccountSubscriber {
             commitment !== null && commitment !== void 0 ? commitment : this.program.provider.opts.commitment;
     }
     async subscribe(onChange) {
-        if (this.listenerId || this.isUnsubscribing) {
+        if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
@@ -58,7 +58,7 @@ class WebSocketAccountSubscriber {
             }
             if (this.receivingData) {
                 console.log(`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`);
-                await this.unsubscribe();
+                await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
@@ -114,11 +114,14 @@ class WebSocketAccountSubscriber {
             return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
         }
     }
-    unsubscribe() {
+    unsubscribe(onResub = false) {
+        if (!onResub) {
+            this.resubTimeoutMs = undefined;
+        }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);
         this.timeoutId = undefined;
-        if (this.listenerId) {
+        if (this.listenerId != null) {
             const promise = this.program.provider.connection
                 .removeAccountChangeListener(this.listenerId)
                 .then(() => {

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -29,5 +29,5 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context) => void): Promise<void>;
     private setTimeout;
     handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;
-    unsubscribe(): Promise<void>;
+    unsubscribe(onResub?: boolean): Promise<void>;
 }

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -17,7 +17,7 @@ class WebSocketProgramAccountSubscriber {
     }
     async subscribe(onChange) {
         var _a;
-        if (this.listenerId || this.isUnsubscribing) {
+        if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
@@ -47,7 +47,7 @@ class WebSocketProgramAccountSubscriber {
             }
             if (this.receivingData) {
                 console.log(`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`);
-                await this.unsubscribe();
+                await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
@@ -93,11 +93,14 @@ class WebSocketProgramAccountSubscriber {
             this.onChange(keyedAccountInfo.accountId, account, context);
         }
     }
-    unsubscribe() {
+    unsubscribe(onResub = false) {
+        if (!onResub) {
+            this.resubTimeoutMs = undefined;
+        }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);
         this.timeoutId = undefined;
-        if (this.listenerId) {
+        if (this.listenerId != null) {
             const promise = this.program.provider.connection
                 .removeAccountChangeListener(this.listenerId)
                 .then(() => {

package/lib/adminClient.d.ts

@@ -54,6 +54,7 @@ export declare class AdminClient extends DriftClient {
     updateSpotMarketOracle(spotMarketIndex: number, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
     updateSpotMarketOrdersEnabled(spotMarketIndex: number, ordersEnabled: boolean): Promise<TransactionSignature>;
     updateSerumFulfillmentConfigStatus(serumFulfillmentConfig: PublicKey, status: SpotFulfillmentConfigStatus): Promise<TransactionSignature>;
+    updatePhoenixFulfillmentConfigStatus(phoenixFulfillmentConfig: PublicKey, status: SpotFulfillmentConfigStatus): Promise<TransactionSignature>;
     updateSpotMarketExpiry(spotMarketIndex: number, expiryTs: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -626,6 +626,15 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updatePhoenixFulfillmentConfigStatus(phoenixFulfillmentConfig, status) {
+        return await this.program.rpc.phoenixFulfillmentConfigStatus(status, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                phoenixFulfillmentConfig,
+            },
+        });
+    }
     async updateSpotMarketExpiry(spotMarketIndex, expiryTs) {
         return await this.program.rpc.updateSpotMarketExpiry(expiryTs, {
             accounts: {

package/lib/constants/numericConstants.d.ts

@@ -61,3 +61,6 @@ export declare const LAMPORTS_PRECISION: BN;
 export declare const LAMPORTS_EXP: BN;
 export declare const OPEN_ORDER_MARGIN_REQUIREMENT: BN;
 export declare const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT: BN;
+export declare const ACCOUNT_AGE_DELETION_CUTOFF_SECONDS: number;
+export declare const IDLE_TIME_SLOTS = 9000;
+export declare const SLOT_TIME_ESTIMATE_MS = 400;

package/lib/constants/numericConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.MAX_LEVERAGE_ORDER_SIZE = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
-exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
+exports.SLOT_TIME_ESTIMATE_MS = exports.IDLE_TIME_SLOTS = exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -65,3 +65,6 @@ exports.LAMPORTS_PRECISION = new __1.BN(web3_js_1.LAMPORTS_PER_SOL);
 exports.LAMPORTS_EXP = new __1.BN(Math.log10(web3_js_1.LAMPORTS_PER_SOL));
 exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.QUOTE_PRECISION.div(new __1.BN(100));
 exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = new __1.BN(-25).mul(exports.QUOTE_PRECISION);
+exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = 60 * 60 * 24 * 13; // 13 days
+exports.IDLE_TIME_SLOTS = 9000;
+exports.SLOT_TIME_ESTIMATE_MS = 400;

package/lib/dlob/orderBookLevels.d.ts

@@ -47,4 +47,26 @@ export declare function getVammL2Generator({ marketAccount, oraclePriceData, num
     topOfBookQuoteAmounts?: BN[];
 }): L2OrderBookGenerator;
 export declare function groupL2(l2: L2OrderBook, grouping: BN, depth: number): L2OrderBook;
+/**
+ * The purpose of this function is uncross the L2 orderbook by modifying the bid/ask price at the top of the book
+ * This will make the liquidity look worse but more intuitive (users familiar with clob get confused w temporarily
+ * crossing book)
+ *
+ * Things to note about how it works:
+ * - it will not uncross the user's liquidity
+ * - it does the uncrossing by "shifting" the crossing liquidity to the nearest uncrossed levels. Thus the output liquidity maintains the same total size.
+ *
+ * @param bids
+ * @param asks
+ * @param oraclePrice
+ * @param oracleTwap5Min
+ * @param markTwap5Min
+ * @param grouping
+ * @param userBids
+ * @param userAsks
+ */
+export declare function uncrossL2(bids: L2Level[], asks: L2Level[], oraclePrice: BN, oracleTwap5Min: BN, markTwap5Min: BN, grouping: BN, userBids: Set<string>, userAsks: Set<string>): {
+    bids: L2Level[];
+    asks: L2Level[];
+};
 export {};

package/lib/dlob/orderBookLevels.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupL2 = exports.getVammL2Generator = exports.createL2Levels = exports.mergeL2LevelGenerators = exports.getL2GeneratorFromDLOBNodes = exports.DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS = void 0;
+exports.uncrossL2 = exports.groupL2 = exports.getVammL2Generator = exports.createL2Levels = exports.mergeL2LevelGenerators = exports.getL2GeneratorFromDLOBNodes = exports.DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS = void 0;
 const __1 = require("..");
 const assert_1 = require("../assert/assert");
 exports.DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS = [
@@ -245,3 +245,117 @@ function groupL2Levels(levels, grouping, direction, depth) {
     }
     return groupedLevels;
 }
+/**
+ * The purpose of this function is uncross the L2 orderbook by modifying the bid/ask price at the top of the book
+ * This will make the liquidity look worse but more intuitive (users familiar with clob get confused w temporarily
+ * crossing book)
+ *
+ * Things to note about how it works:
+ * - it will not uncross the user's liquidity
+ * - it does the uncrossing by "shifting" the crossing liquidity to the nearest uncrossed levels. Thus the output liquidity maintains the same total size.
+ *
+ * @param bids
+ * @param asks
+ * @param oraclePrice
+ * @param oracleTwap5Min
+ * @param markTwap5Min
+ * @param grouping
+ * @param userBids
+ * @param userAsks
+ */
+function uncrossL2(bids, asks, oraclePrice, oracleTwap5Min, markTwap5Min, grouping, userBids, userAsks) {
+    // If there are no bids or asks, there is nothing to center
+    if (bids.length === 0 || asks.length === 0) {
+        return { bids, asks };
+    }
+    // If the top of the book is already centered, there is nothing to do
+    if (bids[0].price.lt(asks[0].price)) {
+        return { bids, asks };
+    }
+    const newBids = [];
+    const newAsks = [];
+    const updateLevels = (newPrice, oldLevel, levels) => {
+        if (levels.length > 0 && levels[levels.length - 1].price.eq(newPrice)) {
+            levels[levels.length - 1].size = levels[levels.length - 1].size.add(oldLevel.size);
+            for (const [source, size] of Object.entries(oldLevel.sources)) {
+                if (levels[levels.length - 1].sources[source]) {
+                    levels[levels.length - 1].sources = {
+                        ...levels[levels.length - 1].sources,
+                        [source]: levels[levels.length - 1].sources[source].add(size),
+                    };
+                }
+                else {
+                    levels[levels.length - 1].sources[source] = size;
+                }
+            }
+        }
+        else {
+            levels.push({
+                price: newPrice,
+                size: oldLevel.size,
+                sources: oldLevel.sources,
+            });
+        }
+    };
+    // This is the best estimate of the premium in the market vs oracle to filter crossing around
+    const referencePrice = oraclePrice.add(markTwap5Min.sub(oracleTwap5Min));
+    let bidIndex = 0;
+    let askIndex = 0;
+    while (bidIndex < bids.length || askIndex < asks.length) {
+        const nextBid = bids[bidIndex];
+        const nextAsk = asks[askIndex];
+        if (!nextBid) {
+            newAsks.push(nextAsk);
+            askIndex++;
+            continue;
+        }
+        if (!nextAsk) {
+            newBids.push(nextBid);
+            bidIndex++;
+            continue;
+        }
+        if (nextBid.price.gt(nextAsk.price)) {
+            if (userBids.has(nextBid.price.toString())) {
+                newBids.push(nextBid);
+                bidIndex++;
+                continue;
+            }
+            if (userAsks.has(nextAsk.price.toString())) {
+                newAsks.push(nextAsk);
+                askIndex++;
+                continue;
+            }
+            if (nextBid.price.gt(referencePrice) &&
+                nextAsk.price.gt(referencePrice)) {
+                const newBidPrice = nextAsk.price.sub(grouping);
+                updateLevels(newBidPrice, nextBid, newBids);
+                bidIndex++;
+            }
+            else if (nextAsk.price.lt(referencePrice) &&
+                nextBid.price.lt(referencePrice)) {
+                const newAskPrice = nextBid.price.add(grouping);
+                updateLevels(newAskPrice, nextAsk, newAsks);
+                askIndex++;
+            }
+            else {
+                const newBidPrice = referencePrice.sub(grouping);
+                const newAskPrice = referencePrice.add(grouping);
+                updateLevels(newBidPrice, nextBid, newBids);
+                updateLevels(newAskPrice, nextAsk, newAsks);
+                bidIndex++;
+                askIndex++;
+            }
+        }
+        else {
+            newAsks.push(nextAsk);
+            askIndex++;
+            newBids.push(nextBid);
+            bidIndex++;
+        }
+    }
+    return {
+        bids: newBids,
+        asks: newAsks,
+    };
+}
+exports.uncrossL2 = uncrossL2;

package/lib/driftClient.d.ts

@@ -134,6 +134,9 @@ export declare class DriftClient {
     getReferredUserStatsAccountsByReferrer(referrer: PublicKey): Promise<UserStatsAccount[]>;
     getReferrerNameAccountsForAuthority(authority: PublicKey): Promise<ReferrerNameAccount[]>;
     deleteUser(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getUserDeletionIx(userAccountPublicKey: PublicKey): Promise<anchor.web3.TransactionInstruction>;
+    reclaimRent(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getReclaimRentIx(userAccountPublicKey: PublicKey): Promise<anchor.web3.TransactionInstruction>;
     getUser(subAccountId?: number, authority?: PublicKey): User;
     hasUser(subAccountId?: number, authority?: PublicKey): boolean;
     getUsers(): User[];

package/lib/driftClient.js

@@ -668,6 +668,14 @@ class DriftClient {
     async deleteUser(subAccountId = 0, txParams) {
         var _a;
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const ix = await this.getUserDeletionIx(userAccountPublicKey);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(ix, txParams), [], this.opts);
+        const userMapKey = this.getUserMapKey(subAccountId, this.wallet.publicKey);
+        await ((_a = this.users.get(userMapKey)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
+        this.users.delete(userMapKey);
+        return txSig;
+    }
+    async getUserDeletionIx(userAccountPublicKey) {
         const ix = await this.program.instruction.deleteUser({
             accounts: {
                 user: userAccountPublicKey,
@@ -676,12 +684,25 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+        return ix;
+    }
+    async reclaimRent(subAccountId = 0, txParams) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const ix = await this.getReclaimRentIx(userAccountPublicKey);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ix, txParams), [], this.opts);
-        const userMapKey = this.getUserMapKey(subAccountId, this.wallet.publicKey);
-        await ((_a = this.users.get(userMapKey)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
-        this.users.delete(userMapKey);
         return txSig;
     }
+    async getReclaimRentIx(userAccountPublicKey) {
+        return await this.program.instruction.reclaimRent({
+            accounts: {
+                user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+            },
+        });
+    }
     getUser(subAccountId, authority) {
         subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
@@ -2212,8 +2233,13 @@ class DriftClient {
     async getSwapIx({ outMarketIndex, inMarketIndex, amountIn, inTokenAccount, outTokenAccount, limitPrice, reduceOnly, userAccountPublicKey, }) {
         const userAccountPublicKeyToUse = userAccountPublicKey || (await this.getUserAccountPublicKey());
         const userAccounts = [];
-        if (this.hasUser() && this.getUser().getUserAccountAndSlot()) {
-            userAccounts.push(this.getUser().getUserAccountAndSlot().data);
+        try {
+            if (this.hasUser() && this.getUser().getUserAccountAndSlot()) {
+                userAccounts.push(this.getUser().getUserAccountAndSlot().data);
+            }
+        }
+        catch (err) {
+            // ignore
         }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts,

package/lib/events/webSocketLogProvider.js

@@ -17,7 +17,7 @@ class WebSocketLogProvider {
         }
     }
     async subscribe(callback) {
-        if (this.subscriptionId) {
+        if (this.subscriptionId != null) {
             return true;
         }
         this.callback = callback;
@@ -48,14 +48,14 @@ class WebSocketLogProvider {
         }, this.commitment);
     }
     isSubscribed() {
-        return this.subscriptionId !== undefined;
+        return this.subscriptionId != null;
     }
     async unsubscribe(external = false) {
         this.isUnsubscribing = true;
         this.externalUnsubscribe = external;
         clearTimeout(this.timeoutId);
         this.timeoutId = undefined;
-        if (this.subscriptionId !== undefined) {
+        if (this.subscriptionId != null) {
             try {
                 await this.connection.removeOnLogsListener(this.subscriptionId);
                 this.subscriptionId = undefined;

package/lib/factory/bigNum.d.ts

@@ -86,7 +86,7 @@ export declare class BigNum {
      * @returns
      */
     toNotional(useTradePrecision?: boolean, precisionOverride?: number): string;
-    toMillified(precision?: number, rounded?: boolean): string;
+    toMillified(precision?: number, rounded?: boolean, type?: 'financial' | 'scientific'): string;
     toJSON(): {
         val: string;
         precision: string;

package/lib/factory/bigNum.js

@@ -330,7 +330,7 @@ class BigNum {
         }
         return `${prefix}${val.replace('-', '')}`;
     }
-    toMillified(precision = 3, rounded = false) {
+    toMillified(precision = 3, rounded = false, type = 'financial') {
         if (rounded) {
             return this.toRounded(precision).toMillified(precision);
         }
@@ -346,7 +346,10 @@ class BigNum {
         if (leftSide.length <= 3) {
             return this.shift(new anchor_1.BN(precision)).toPrecision(precision, true);
         }
-        const unitTicks = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
+        const unitTicks = type === 'financial'
+            ? ['', 'K', 'M', 'B', 'T', 'Q']
+            : ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y'];
+        // TODO -- handle nubers which are larger than the max unit tick
         const unitNumber = Math.floor((leftSide.length - 1) / 3);
         const unit = unitTicks[unitNumber];
         let leadDigits = leftSide.slice(0, precision);