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

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateInventoryScale = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -201,11 +201,7 @@ function calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBas
     return [openBids, openAsks];
 }
 exports.calculateMarketOpenBidAsk = calculateMarketOpenBidAsk;
-function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve, directionalSpread, maxSpread) {
-    if (baseAssetAmountWithAmm.eq(numericConstants_1.ZERO)) {
-        return 1;
-    }
-    const MAX_BID_ASK_INVENTORY_SKEW_FACTOR = numericConstants_1.BID_ASK_SPREAD_PRECISION.mul(new anchor_1.BN(10));
+function calculateInventoryLiquidityRatio(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
     // inventory skew
     const [openBids, openAsks] = calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
     const minSideLiquidity = anchor_1.BN.min(openBids.abs(), openAsks.abs());
@@ -213,6 +209,15 @@ function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBa
         .mul(numericConstants_1.PERCENTAGE_PRECISION)
         .div(anchor_1.BN.max(minSideLiquidity, numericConstants_1.ONE))
         .abs(), numericConstants_1.PERCENTAGE_PRECISION);
+    return inventoryScaleBN;
+}
+exports.calculateInventoryLiquidityRatio = calculateInventoryLiquidityRatio;
+function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve, directionalSpread, maxSpread) {
+    if (baseAssetAmountWithAmm.eq(numericConstants_1.ZERO)) {
+        return 1;
+    }
+    const MAX_BID_ASK_INVENTORY_SKEW_FACTOR = numericConstants_1.BID_ASK_SPREAD_PRECISION.mul(new anchor_1.BN(10));
+    const inventoryScaleBN = calculateInventoryLiquidityRatio(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
     const inventoryScaleMaxBN = anchor_1.BN.max(MAX_BID_ASK_INVENTORY_SKEW_FACTOR, new anchor_1.BN(maxSpread)
         .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION)
         .div(new anchor_1.BN(Math.max(directionalSpread, 1))));
@@ -220,6 +225,36 @@ function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBa
     return inventoryScaleCapped;
 }
 exports.calculateInventoryScale = calculateInventoryScale;
+function calculateReferencePriceOffset(reservePrice, last24hAvgFundingRate, liquidityFraction, oracleTwapFast, markTwapFast, oracleTwapSlow, markTwapSlow, maxOffsetPct) {
+    if (last24hAvgFundingRate.eq(numericConstants_1.ZERO)) {
+        return numericConstants_1.ZERO;
+    }
+    const maxOffsetInPrice = new anchor_1.BN(maxOffsetPct)
+        .mul(reservePrice)
+        .div(numericConstants_1.PERCENTAGE_PRECISION);
+    // Calculate quote denominated market premium
+    const markPremiumMinute = (0, __1.clampBN)(markTwapFast.sub(oracleTwapFast), maxOffsetInPrice.mul(new anchor_1.BN(-1)), maxOffsetInPrice);
+    const markPremiumHour = (0, __1.clampBN)(markTwapSlow.sub(oracleTwapSlow), maxOffsetInPrice.mul(new anchor_1.BN(-1)), maxOffsetInPrice);
+    // Convert last24hAvgFundingRate to quote denominated premium
+    const markPremiumDay = (0, __1.clampBN)(last24hAvgFundingRate.div(numericConstants_1.FUNDING_RATE_BUFFER_PRECISION).mul(new anchor_1.BN(24)), maxOffsetInPrice.mul(new anchor_1.BN(-1)), maxOffsetInPrice);
+    // Take average clamped premium as the price-based offset
+    const markPremiumAvg = markPremiumMinute
+        .add(markPremiumHour)
+        .add(markPremiumDay)
+        .div(new anchor_1.BN(3));
+    const markPremiumAvgPct = markPremiumAvg
+        .mul(numericConstants_1.PRICE_PRECISION)
+        .div(reservePrice);
+    const inventoryPct = (0, __1.clampBN)(liquidityFraction.mul(new anchor_1.BN(maxOffsetPct)).div(numericConstants_1.PERCENTAGE_PRECISION), maxOffsetInPrice.mul(new anchor_1.BN(-1)), maxOffsetInPrice);
+    // Only apply when inventory is consistent with recent and 24h market premium
+    let offsetPct = markPremiumAvgPct.add(inventoryPct);
+    if (!(0, __1.sigNum)(inventoryPct).eq((0, __1.sigNum)(markPremiumAvgPct))) {
+        offsetPct = numericConstants_1.ZERO;
+    }
+    const clampedOffsetPct = (0, __1.clampBN)(offsetPct, new anchor_1.BN(-maxOffsetPct), new anchor_1.BN(maxOffsetPct));
+    return clampedOffsetPct;
+}
+exports.calculateReferencePriceOffset = calculateReferencePriceOffset;
 function calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, reservePrice, totalFeeMinusDistributions) {
     // vAMM skew
     const netBaseAssetValue = quoteAssetReserve
@@ -283,6 +318,8 @@ function calculateSpreadBN(baseSpread, lastOracleReservePriceSpreadPct, lastOrac
         halfRevenueRetreatAmount: 0,
         longSpreadwRevRetreat: 0,
         shortSpreadwRevRetreat: 0,
+        longSpreadwOffsetShrink: 0,
+        shortSpreadwOffsetShrink: 0,
         totalSpread: 0,
         longSpread: 0,
         shortSpread: 0,
@@ -380,11 +417,13 @@ function calculateSpreadBN(baseSpread, lastOracleReservePriceSpreadPct, lastOrac
     return [longSpread, shortSpread];
 }
 exports.calculateSpreadBN = calculateSpreadBN;
-function calculateSpread(amm, oraclePriceData, now) {
+function calculateSpread(amm, oraclePriceData, now, reservePrice) {
     if (amm.baseSpread == 0 || amm.curveUpdateIntensity == 0) {
         return [amm.baseSpread / 2, amm.baseSpread / 2];
     }
-    const reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
+    if (!reservePrice) {
+        reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
+    }
     const targetPrice = (oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.price) || reservePrice;
     const confInterval = oraclePriceData.confidence || numericConstants_1.ZERO;
     const targetMarkSpreadPct = reservePrice
@@ -410,10 +449,15 @@ function calculateSpreadReserves(amm, oraclePriceData, now) {
                 quoteAssetReserve: amm.quoteAssetReserve,
             };
         }
-        const spreadFraction = anchor_1.BN.max(new anchor_1.BN(spread / 2), numericConstants_1.ONE);
+        let spreadFraction = new anchor_1.BN(spread / 2);
+        // make non-zero
+        if (spreadFraction.eq(numericConstants_1.ZERO)) {
+            spreadFraction = spread >= 0 ? new anchor_1.BN(1) : new anchor_1.BN(-1);
+        }
         const quoteAssetReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(spreadFraction));
         let quoteAssetReserve;
-        if ((0, types_1.isVariant)(direction, 'long')) {
+        if ((spread >= 0 && (0, types_1.isVariant)(direction, 'long')) ||
+            (spread <= 0 && (0, types_1.isVariant)(direction, 'short'))) {
             quoteAssetReserve = amm.quoteAssetReserve.add(quoteAssetReserveDelta);
         }
         else {
@@ -425,9 +469,14 @@ function calculateSpreadReserves(amm, oraclePriceData, now) {
             quoteAssetReserve,
         };
     }
-    const [longSpread, shortSpread] = calculateSpread(amm, oraclePriceData, now);
-    const askReserves = calculateSpreadReserve(longSpread, types_1.PositionDirection.LONG, amm);
-    const bidReserves = calculateSpreadReserve(shortSpread, types_1.PositionDirection.SHORT, amm);
+    const reservePrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
+    // always allow 10 bps of price offset, up to a fifth of the market's max_spread
+    const maxOffset = Math.max(amm.maxSpread / 5, numericConstants_1.PERCENTAGE_PRECISION.toNumber() / 1000);
+    const liquidityFraction = calculateInventoryLiquidityRatio(amm.baseAssetAmountWithAmm, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
+    const referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFraction, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset);
+    const [longSpread, shortSpread] = calculateSpread(amm, oraclePriceData, now, reservePrice);
+    const askReserves = calculateSpreadReserve(longSpread + referencePriceOffset.toNumber(), types_1.PositionDirection.LONG, amm);
+    const bidReserves = calculateSpreadReserve(shortSpread + referencePriceOffset.toNumber(), types_1.PositionDirection.SHORT, amm);
     return [bidReserves, askReserves];
 }
 exports.calculateSpreadReserves = calculateSpreadReserves;

package/lib/phoenix/phoenixSubscriber.js

@@ -104,9 +104,9 @@ class PhoenixSubscriber {
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 20);
         for (let i = 0; i < ladder[side].length; i++) {
             const { price, quantity } = ladder[side][i];
-            const size = new anchor_1.BN(Math.floor(quantity * basePrecision));
+            const size = new anchor_1.BN(quantity).mul(new anchor_1.BN(basePrecision));
             yield {
-                price: new anchor_1.BN(Math.floor(price * pricePrecision)),
+                price: new anchor_1.BN(price).mul(new anchor_1.BN(pricePrecision)),
                 size,
                 sources: {
                     phoenix: size,

package/lib/slot/SlotSubscriber.d.ts

@@ -1,8 +1,11 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types/types/src';
-type SlotSubscriberConfig = {};
+type SlotSubscriberConfig = {
+    resubTimeoutMs?: number;
+};
 export interface SlotSubscriberEvents {
     newSlot: (newSlot: number) => void;
 }
@@ -11,9 +14,14 @@ export declare class SlotSubscriber {
     currentSlot: number;
     subscriptionId: number;
     eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
-    constructor(connection: Connection, _config?: SlotSubscriberConfig);
+    timeoutId?: NodeJS.Timeout;
+    resubTimeoutMs?: number;
+    isUnsubscribing: boolean;
+    receivingData: boolean;
+    constructor(connection: Connection, config?: SlotSubscriberConfig);
     subscribe(): Promise<void>;
+    private setTimeout;
     getSlot(): number;
-    unsubscribe(): Promise<void>;
+    unsubscribe(onResub?: boolean): Promise<void>;
 }
 export {};

package/lib/slot/SlotSubscriber.js

@@ -3,28 +3,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SlotSubscriber = void 0;
 const events_1 = require("events");
 class SlotSubscriber {
-    constructor(connection, _config) {
+    constructor(connection, config) {
         this.connection = connection;
+        this.isUnsubscribing = false;
+        this.receivingData = false;
         this.eventEmitter = new events_1.EventEmitter();
+        this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
     }
     async subscribe() {
-        if (this.subscriptionId) {
+        if (this.subscriptionId != null) {
             return;
         }
         this.currentSlot = await this.connection.getSlot('confirmed');
         this.subscriptionId = this.connection.onSlotChange((slotInfo) => {
             if (!this.currentSlot || this.currentSlot < slotInfo.slot) {
+                if (this.resubTimeoutMs && !this.isUnsubscribing) {
+                    this.receivingData = true;
+                    clearTimeout(this.timeoutId);
+                    this.setTimeout();
+                }
                 this.currentSlot = slotInfo.slot;
                 this.eventEmitter.emit('newSlot', slotInfo.slot);
             }
         });
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
+    }
+    setTimeout() {
+        this.timeoutId = setTimeout(async () => {
+            if (this.isUnsubscribing) {
+                // If we are in the process of unsubscribing, do not attempt to resubscribe
+                return;
+            }
+            if (this.receivingData) {
+                console.log(`No new slot in ${this.resubTimeoutMs}ms, slot subscriber resubscribing`);
+                await this.unsubscribe(true);
+                this.receivingData = false;
+                await this.subscribe();
+            }
+        }, this.resubTimeoutMs);
     }
     getSlot() {
         return this.currentSlot;
     }
-    async unsubscribe() {
-        if (this.subscriptionId) {
+    async unsubscribe(onResub = false) {
+        if (!onResub) {
+            this.resubTimeoutMs = undefined;
+        }
+        this.isUnsubscribing = true;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
+        if (this.subscriptionId != null) {
             await this.connection.removeSlotChangeListener(this.subscriptionId);
+            this.subscriptionId = undefined;
+            this.isUnsubscribing = false;
+        }
+        else {
+            this.isUnsubscribing = false;
         }
     }
 }

package/lib/types.d.ts

@@ -767,7 +767,7 @@ export type AMM = {
     pegMultiplier: BN;
     cumulativeFundingRateLong: BN;
     cumulativeFundingRateShort: BN;
-    last24hAvgFundingRate: BN;
+    last24HAvgFundingRate: BN;
     lastFundingRateShort: BN;
     lastFundingRateLong: BN;
     totalLiquidationFee: BN;

package/lib/userMap/userMap.d.ts

@@ -22,6 +22,7 @@ export declare class UserMap implements UserMapInterface {
     private subscription;
     private stateAccountUpdateCallback;
     private decode;
+    private mostRecentSlot;
     private syncPromise?;
     private syncPromiseResolver;
     /**
@@ -68,4 +69,6 @@ export declare class UserMap implements UserMapInterface {
     sync(): Promise<void>;
     unsubscribe(): Promise<void>;
     updateUserAccount(key: string, userAccount: UserAccount, slot: number): Promise<void>;
+    updateLatestSlot(slot: number): void;
+    getSlot(): number;
 }

package/lib/userMap/userMap.js

@@ -21,6 +21,7 @@ class UserMap {
                 this.lastNumberOfSubAccounts = state.numberOfSubAccounts;
             }
         };
+        this.mostRecentSlot = 0;
         this.driftClient = config.driftClient;
         if (config.connection) {
             this.connection = config.connection;
@@ -73,7 +74,7 @@ class UserMap {
             userAccountPublicKey,
             accountSubscription: {
                 type: 'custom',
-                userAccountSubscriber: new __1.BasicUserAccountSubscriber(userAccountPublicKey, userAccount, slot),
+                userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
             },
         });
         await user.subscribe(userAccount);
@@ -218,6 +219,7 @@ class UserMap {
             await this.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
             const rpcResponseAndContext = rpcJSONResponse.result;
             const slot = rpcResponseAndContext.context.slot;
+            this.updateLatestSlot(slot);
             const programAccountBufferMap = new Map();
             for (const programAccount of rpcResponseAndContext.value) {
                 programAccountBufferMap.set(programAccount.pubkey.toString(), 
@@ -263,6 +265,7 @@ class UserMap {
         }
     }
     async updateUserAccount(key, userAccount, slot) {
+        this.updateLatestSlot(slot);
         if (!this.userMap.has(key)) {
             this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
         }
@@ -271,5 +274,11 @@ class UserMap {
             user.accountSubscriber.updateData(userAccount, slot);
         }
     }
+    updateLatestSlot(slot) {
+        this.mostRecentSlot = Math.max(slot, this.mostRecentSlot);
+    }
+    getSlot() {
+        return this.mostRecentSlot;
+    }
 }
 exports.UserMap = UserMap;

package/lib/userStats.d.ts

@@ -15,4 +15,5 @@ export declare class UserStats {
     getAccountAndSlot(): DataAndSlot<UserStatsAccount>;
     getAccount(): UserStatsAccount;
     getReferrerInfo(): ReferrerInfo | undefined;
+    static getOldestActionTs(account: UserStatsAccount): number;
 }

package/lib/userStats.js

@@ -48,5 +48,8 @@ class UserStats {
             };
         }
     }
+    static getOldestActionTs(account) {
+        return Math.min(account.lastFillerVolume30DTs.toNumber(), account.lastMakerVolume30DTs.toNumber(), account.lastTakerVolume30DTs.toNumber());
+    }
 }
 exports.UserStats = UserStats;

package/package.json

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

package/src/accounts/basicUserAccountSubscriber.ts

@@ -4,6 +4,10 @@ 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 class BasicUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;

package/src/accounts/bulkAccountLoader.ts

@@ -78,6 +78,7 @@ export class BulkAccountLoader {
 		if (existingAccountToLoad) {
 			existingAccountToLoad.callbacks.delete(callbackId);
 			if (existingAccountToLoad.callbacks.size === 0) {
+				this.bufferAndSlotMap.delete(publicKey.toString());
 				this.accountsToLoad.delete(existingAccountToLoad.publicKey.toString());
 			}
 		}
@@ -153,9 +154,11 @@ export class BulkAccountLoader {
 		const requests = new Array<{ methodName: string; args: any }>();
 		for (const accountsToLoadChunk of accountsToLoadChunks) {
 			const args = [
-				accountsToLoadChunk.map((accountToLoad) => {
-					return accountToLoad.publicKey.toBase58();
-				}),
+				accountsToLoadChunk
+					.filter((accountToLoad) => accountToLoad.callbacks.size > 0)
+					.map((accountToLoad) => {
+						return accountToLoad.publicKey.toBase58();
+					}),
 				{ commitment: this.commitment },
 			];
 
@@ -190,6 +193,10 @@ export 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);
 

package/src/accounts/oneShotUserAccountSubscriber.ts

@@ -0,0 +1,64 @@
+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 class OneShotUserAccountSubscriber extends BasicUserAccountSubscriber {
+	program: Program;
+	commitment: Commitment;
+
+	public constructor(
+		program: Program,
+		userAccountPublicKey: PublicKey,
+		data?: UserAccount,
+		slot?: number,
+		commitment?: Commitment
+	) {
+		super(userAccountPublicKey, data, slot);
+		this.program = program;
+		this.commitment = commitment ?? 'confirmed';
+	}
+
+	async subscribe(userAccount?: UserAccount): Promise<boolean> {
+		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(): Promise<void> {
+		if (this.user.data === undefined) {
+			await this.fetch();
+		}
+	}
+
+	async fetch(): Promise<void> {
+		try {
+			const dataAndContext = await this.program.account.user.fetchAndContext(
+				this.userAccountPublicKey,
+				this.commitment
+			);
+			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
+				this.user = {
+					data: dataAndContext.data as UserAccount,
+					slot: dataAndContext.context.slot,
+				};
+			}
+		} catch (e) {
+			console.error(
+				`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`
+			);
+		}
+	}
+}

package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts

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

package/src/accounts/webSocketAccountSubscriber.ts

@@ -40,7 +40,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
-		if (this.listenerId || this.isUnsubscribing) {
+		if (this.listenerId != null || this.isUnsubscribing) {
 			return;
 		}
 
@@ -95,7 +95,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 				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);
 			}
@@ -164,12 +164,15 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		}
 	}
 
-	unsubscribe(): Promise<void> {
+	unsubscribe(onResub = false): Promise<void> {
+		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/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -49,7 +49,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	async subscribe(
 		onChange: (accountId: PublicKey, data: T, context: Context) => void
 	): Promise<void> {
-		if (this.listenerId || this.isUnsubscribing) {
+		if (this.listenerId != null || this.isUnsubscribing) {
 			return;
 		}
 
@@ -91,7 +91,7 @@ export class WebSocketProgramAccountSubscriber<T>
 				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);
 			}
@@ -145,12 +145,15 @@ export class WebSocketProgramAccountSubscriber<T>
 		}
 	}
 
-	unsubscribe(): Promise<void> {
+	unsubscribe(onResub = false): Promise<void> {
+		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/src/adminClient.ts

@@ -1181,6 +1181,19 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async updatePhoenixFulfillmentConfigStatus(
+		phoenixFulfillmentConfig: PublicKey,
+		status: SpotFulfillmentConfigStatus
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.phoenixFulfillmentConfigStatus(status, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				phoenixFulfillmentConfig,
+			},
+		});
+	}
+
 	public async updateSpotMarketExpiry(
 		spotMarketIndex: number,
 		expiryTs: BN

package/src/constants/numericConstants.ts

@@ -99,3 +99,7 @@ export const OPEN_ORDER_MARGIN_REQUIREMENT = QUOTE_PRECISION.div(new BN(100));
 export const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = new BN(
 	-25
 ).mul(QUOTE_PRECISION);
+
+export const ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = 60 * 60 * 24 * 13; // 13 days
+export const IDLE_TIME_SLOTS = 9000;
+export const SLOT_TIME_ESTIMATE_MS = 400;