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

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -1,18 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PriorityFeeSubscriber = void 0;
+const averageOverSlotsStrategy_1 = require("./averageOverSlotsStrategy");
+const maxOverSlotsStrategy_1 = require("./maxOverSlotsStrategy");
 class PriorityFeeSubscriber {
-    constructor({ connection, frequencyMs, addresses, slotsToCheck = 10, }) {
+    constructor({ connection, frequencyMs, addresses, customStrategy, slotsToCheck = 10, }) {
+        this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
+        this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy();
         this.latestPriorityFee = 0;
-        // avg of last {slotsToCheck} slots
-        this.avgPriorityFee = 0;
-        // max of last {slotsToCheck} slots
-        this.maxPriorityFee = 0;
+        this.lastStrategyResult = 0;
+        this.lastCustomStrategyResult = 0;
+        this.lastAvgStrategyResult = 0;
+        this.lastMaxStrategyResult = 0;
         this.lastSlotSeen = 0;
         this.connection = connection;
         this.frequencyMs = frequencyMs;
         this.addresses = addresses;
-        this.slotsToCheck = slotsToCheck;
+        if (slotsToCheck) {
+            this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy(slotsToCheck);
+            this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy(slotsToCheck);
+        }
+        if (customStrategy) {
+            this.customStrategy = customStrategy;
+        }
+    }
+    get avgPriorityFee() {
+        return this.lastAvgStrategyResult;
+    }
+    get maxPriorityFee() {
+        return this.lastMaxStrategyResult;
+    }
+    get customPriorityFee() {
+        if (!this.customStrategy) {
+            console.error('Custom strategy not set');
+        }
+        return this.lastCustomStrategyResult;
     }
     async subscribe() {
         if (this.intervalId) {
@@ -21,20 +43,22 @@ class PriorityFeeSubscriber {
         this.intervalId = setInterval(this.load.bind(this), this.frequencyMs);
     }
     async load() {
-        var _a, _b, _c;
         // @ts-ignore
         const rpcJSONResponse = await this.connection._rpcRequest('getRecentPrioritizationFees', [this.addresses]);
-        const descResults = (_c = (_b = (_a = rpcJSONResponse === null || rpcJSONResponse === void 0 ? void 0 : rpcJSONResponse.result) === null || _a === void 0 ? void 0 : _a.sort((a, b) => b.slot - a.slot)) === null || _b === void 0 ? void 0 : _b.slice(0, this.slotsToCheck)) !== null && _c !== void 0 ? _c : [];
-        if (!(descResults === null || descResults === void 0 ? void 0 : descResults.length))
+        // getRecentPrioritizationFees returns results unsorted
+        const results = rpcJSONResponse === null || rpcJSONResponse === void 0 ? void 0 : rpcJSONResponse.result;
+        if (!results.length)
             return;
+        const descResults = results.sort((a, b) => b.slot - a.slot);
         const mostRecentResult = descResults[0];
         this.latestPriorityFee = mostRecentResult.prioritizationFee;
         this.lastSlotSeen = mostRecentResult.slot;
-        this.avgPriorityFee =
-            descResults.reduce((a, b) => {
-                return a + b.prioritizationFee;
-            }, 0) / descResults.length;
-        this.maxPriorityFee = Math.max(...descResults.map((result) => result.prioritizationFee));
+        this.lastAvgStrategyResult = this.averageStrategy.calculate(descResults);
+        this.lastMaxStrategyResult = this.maxStrategy.calculate(descResults);
+        if (this.customStrategy) {
+            this.lastCustomStrategyResult =
+                this.customStrategy.calculate(descResults);
+        }
     }
     async unsubscribe() {
         if (this.intervalId) {

package/lib/priorityFee/types.d.ts

@@ -0,0 +1,6 @@
+export interface PriorityFeeStrategy {
+    calculate(samples: {
+        slot: number;
+        prioritizationFee: number;
+    }[]): number;
+}

package/lib/priorityFee/types.js

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

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

@@ -278,6 +278,9 @@ export declare class DepositExplanation {
     static readonly TRANSFER: {
         transfer: {};
     };
+    static readonly BORROW: {
+        borrow: {};
+    };
 }
 export declare class SettlePnlExplanation {
     static readonly NONE: {
@@ -767,7 +770,7 @@ export type AMM = {
     pegMultiplier: BN;
     cumulativeFundingRateLong: BN;
     cumulativeFundingRateShort: BN;
-    last24hAvgFundingRate: BN;
+    last24HAvgFundingRate: BN;
     lastFundingRateShort: BN;
     lastFundingRateLong: BN;
     totalLiquidationFee: BN;

package/lib/types.js

@@ -183,6 +183,7 @@ class DepositExplanation {
 exports.DepositExplanation = DepositExplanation;
 DepositExplanation.NONE = { none: {} };
 DepositExplanation.TRANSFER = { transfer: {} };
+DepositExplanation.BORROW = { borrow: {} };
 class SettlePnlExplanation {
 }
 exports.SettlePnlExplanation = SettlePnlExplanation;

package/lib/user.d.ts

@@ -353,7 +353,7 @@ export declare class User {
      * @param quoteAmount
      * @returns feeForQuote : Precision QUOTE_PRECISION
      */
-    calculateFeeForQuoteAmount(quoteAmount: BN): BN;
+    calculateFeeForQuoteAmount(quoteAmount: BN, marketIndex?: number): BN;
     /**
      * Calculates a user's max withdrawal amounts for a spot market. If reduceOnly is true,
      * it will return the max withdrawal amount without opening a liability for the user

package/lib/user.js

@@ -768,8 +768,7 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
-        const userPosition = this.getPerpPositionWithLPSettle(marketIndex)[0] ||
-            this.getEmptyPosition(marketIndex);
+        const userPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, false, true)[0] || this.getEmptyPosition(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
         return (0, margin_1.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData, includeOpenOrders);
     }
@@ -1645,7 +1644,7 @@ class User {
         const feeTier = this.getUserFeeTier(marketType);
         let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
         let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
-        if (marketIndex && (0, types_1.isVariant)(marketType, 'perp')) {
+        if (marketIndex !== undefined && (0, types_1.isVariant)(marketType, 'perp')) {
             const marketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
             takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
             makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
@@ -1660,11 +1659,19 @@ class User {
      * @param quoteAmount
      * @returns feeForQuote : Precision QUOTE_PRECISION
      */
-    calculateFeeForQuoteAmount(quoteAmount) {
-        const feeTier = this.getUserFeeTier(_1.MarketType.PERP);
-        return quoteAmount
-            .mul(new _1.BN(feeTier.feeNumerator))
-            .div(new _1.BN(feeTier.feeDenominator));
+    calculateFeeForQuoteAmount(quoteAmount, marketIndex) {
+        if (marketIndex !== undefined) {
+            const takerFeeMultiplier = this.getMarketFees(_1.MarketType.PERP, marketIndex).takerFee;
+            const feeAmountNum = _1.BigNum.from(quoteAmount, numericConstants_1.QUOTE_PRECISION_EXP).toNum() *
+                takerFeeMultiplier;
+            return _1.BigNum.fromPrint(feeAmountNum.toString(), numericConstants_1.QUOTE_PRECISION_EXP).val;
+        }
+        else {
+            const feeTier = this.getUserFeeTier(_1.MarketType.PERP);
+            return quoteAmount
+                .mul(new _1.BN(feeTier.feeNumerator))
+                .div(new _1.BN(feeTier.feeDenominator));
+        }
     }
     /**
      * Calculates a user's max withdrawal amounts for a spot market. If reduceOnly is true,

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.10",
 	"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;