@drift-labs/sdk 2.82.0-beta.3 → 2.82.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.3
+2.82.0-beta.5

package/lib/driftClient.d.ts

@@ -657,6 +657,16 @@ export declare class DriftClient {
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType: MarketType, marketIndex?: number, user?: User): {
+        takerFee: number;
+        makerFee: number;
+    };
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/driftClient.js

@@ -3548,6 +3548,41 @@ class DriftClient {
         };
         return extendedInfo;
     }
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType, marketIndex, user) {
+        let feeTier;
+        if (user) {
+            feeTier = user.getUserFeeTier(marketType);
+        }
+        else {
+            const state = this.getStateAccount();
+            feeTier = (0, types_1.isVariant)(marketType, 'perp')
+                ? state.perpFeeStructure.feeTiers[0]
+                : state.spotFeeStructure.feeTiers[0];
+        }
+        let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
+        let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
+        if (marketIndex !== undefined) {
+            let marketAccount = null;
+            if ((0, types_1.isVariant)(marketType, 'perp')) {
+                marketAccount = this.getPerpMarketAccount(marketIndex);
+            }
+            else {
+                marketAccount = this.getSpotMarketAccount(marketIndex);
+            }
+            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
+        }
+        return {
+            takerFee,
+            makerFee,
+        };
+    }
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/priorityFee/driftPriorityFeeMethod.d.ts

@@ -1,3 +1,13 @@
-import { DriftPriorityFeeLevels } from './heliusPriorityFeeMethod';
+import { HeliusPriorityLevel } from './heliusPriorityFeeMethod';
+export type DriftMarketInfo = {
+    marketType: string;
+    marketIndex: number;
+};
+export type DriftPriorityFeeLevels = {
+    [key in HeliusPriorityLevel]: number;
+} & {
+    marketType: 'perp' | 'spot';
+    marketIndex: number;
+};
 export type DriftPriorityFeeResponse = DriftPriorityFeeLevels[];
 export declare function fetchDriftPriorityFee(url: string, marketTypes: string[], marketIndexes: number[]): Promise<DriftPriorityFeeResponse>;

package/lib/priorityFee/heliusPriorityFeeMethod.d.ts

@@ -9,12 +9,6 @@ export declare enum HeliusPriorityLevel {
 export type HeliusPriorityFeeLevels = {
     [key in HeliusPriorityLevel]: number;
 };
-export type DriftPriorityFeeLevels = {
-    [key in HeliusPriorityLevel]: number;
-} & {
-    marketType: 'perp' | 'spot';
-    marketIndex: number;
-};
 export type HeliusPriorityFeeResponse = {
     jsonrpc: string;
     result: {

package/lib/priorityFee/index.d.ts

@@ -4,6 +4,8 @@ export * from './ewmaStrategy';
 export * from './maxOverSlotsStrategy';
 export * from './maxStrategy';
 export * from './priorityFeeSubscriber';
+export * from './priorityFeeSubscriberMap';
 export * from './solanaPriorityFeeMethod';
 export * from './heliusPriorityFeeMethod';
+export * from './driftPriorityFeeMethod';
 export * from './types';

package/lib/priorityFee/index.js

@@ -20,6 +20,8 @@ __exportStar(require("./ewmaStrategy"), exports);
 __exportStar(require("./maxOverSlotsStrategy"), exports);
 __exportStar(require("./maxStrategy"), exports);
 __exportStar(require("./priorityFeeSubscriber"), exports);
+__exportStar(require("./priorityFeeSubscriberMap"), exports);
 __exportStar(require("./solanaPriorityFeeMethod"), exports);
 __exportStar(require("./heliusPriorityFeeMethod"), exports);
+__exportStar(require("./driftPriorityFeeMethod"), exports);
 __exportStar(require("./types"), exports);

package/lib/priorityFee/priorityFeeSubscriber.d.ts

@@ -1,8 +1,9 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { DriftMarketInfo, PriorityFeeMethod, PriorityFeeStrategy, PriorityFeeSubscriberConfig } from './types';
+import { PriorityFeeMethod, PriorityFeeStrategy, PriorityFeeSubscriberConfig } from './types';
 import { AverageOverSlotsStrategy } from './averageOverSlotsStrategy';
 import { MaxOverSlotsStrategy } from './maxOverSlotsStrategy';
 import { HeliusPriorityFeeLevels, HeliusPriorityLevel } from './heliusPriorityFeeMethod';
+import { DriftMarketInfo } from './driftPriorityFeeMethod';
 export declare class PriorityFeeSubscriber {
     connection: Connection;
     frequencyMs: number;

package/lib/priorityFee/priorityFeeSubscriberMap.d.ts

@@ -1,5 +1,5 @@
-import { DriftPriorityFeeLevels } from './heliusPriorityFeeMethod';
-import { DriftMarketInfo, PriorityFeeSubscriberMapConfig } from './types';
+import { DriftMarketInfo, DriftPriorityFeeLevels } from './driftPriorityFeeMethod';
+import { PriorityFeeSubscriberMapConfig } from './types';
 /**
  * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
  */

package/lib/priorityFee/types.d.ts

@@ -1,7 +1,7 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { SolanaPriorityFeeResponse } from './solanaPriorityFeeMethod';
 import { HeliusPriorityFeeResponse } from './heliusPriorityFeeMethod';
-import { DriftPriorityFeeResponse } from './driftPriorityFeeMethod';
+import { DriftMarketInfo, DriftPriorityFeeResponse } from './driftPriorityFeeMethod';
 export declare const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10000;
 export interface PriorityFeeStrategy {
     calculate(samples: SolanaPriorityFeeResponse[] | HeliusPriorityFeeResponse | DriftPriorityFeeResponse): number;
@@ -11,10 +11,6 @@ export declare enum PriorityFeeMethod {
     HELIUS = "helius",
     DRIFT = "drift"
 }
-export type DriftMarketInfo = {
-    marketType: string;
-    marketIndex: number;
-};
 export type PriorityFeeSubscriberConfig = {
     connection?: Connection;
     frequencyMs?: number;

package/lib/user.d.ts

@@ -346,16 +346,6 @@ export declare class User {
      */
     accountLeverageRatioAfterTrade(targetMarketIndex: number, targetMarketType: MarketType, tradeQuoteAmount: BN, tradeSide: PositionDirection, includeOpenOrders?: boolean): BN;
     getUserFeeTier(marketType: MarketType, now?: BN): import("./types").FeeTier;
-    /**
-     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
-     * @param marketType
-     * @param positionMarketIndex
-     * @returns : {takerFee: number, makerFee: number} Precision None
-     */
-    getMarketFees(marketType: MarketType, marketIndex?: number): {
-        takerFee: number;
-        makerFee: number;
-    };
     /**
      * Calculates how much perp fee will be taken for a given sized trade
      * @param quoteAmount

package/lib/user.js

@@ -1709,32 +1709,6 @@ class User {
         }
         return state.spotFeeStructure.feeTiers[feeTierIndex];
     }
-    /**
-     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
-     * @param marketType
-     * @param positionMarketIndex
-     * @returns : {takerFee: number, makerFee: number} Precision None
-     */
-    getMarketFees(marketType, marketIndex) {
-        const feeTier = this.getUserFeeTier(marketType);
-        let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
-        let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
-        if (marketIndex !== undefined) {
-            let marketAccount = null;
-            if ((0, types_1.isVariant)(marketType, 'perp')) {
-                marketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
-            }
-            else {
-                marketAccount = this.driftClient.getSpotMarketAccount(marketIndex);
-            }
-            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
-            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
-        }
-        return {
-            takerFee,
-            makerFee,
-        };
-    }
     /**
      * Calculates how much perp fee will be taken for a given sized trade
      * @param quoteAmount
@@ -1742,7 +1716,7 @@ class User {
      */
     calculateFeeForQuoteAmount(quoteAmount, marketIndex) {
         if (marketIndex !== undefined) {
-            const takerFeeMultiplier = this.getMarketFees(_1.MarketType.PERP, marketIndex).takerFee;
+            const takerFeeMultiplier = this.driftClient.getMarketFees(_1.MarketType.PERP, marketIndex, this).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;

package/package.json

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

package/src/driftClient.ts

@@ -6640,6 +6640,48 @@ export class DriftClient {
 		return extendedInfo;
 	}
 
+	/**
+	 * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+	 * @param marketType
+	 * @param positionMarketIndex
+	 * @returns : {takerFee: number, makerFee: number} Precision None
+	 */
+	public getMarketFees(
+		marketType: MarketType,
+		marketIndex?: number,
+		user?: User
+	) {
+		let feeTier;
+		if (user) {
+			feeTier = user.getUserFeeTier(marketType);
+		} else {
+			const state = this.getStateAccount();
+			feeTier = isVariant(marketType, 'perp')
+				? state.perpFeeStructure.feeTiers[0]
+				: state.spotFeeStructure.feeTiers[0];
+		}
+
+		let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
+		let makerFee =
+			feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
+
+		if (marketIndex !== undefined) {
+			let marketAccount = null;
+			if (isVariant(marketType, 'perp')) {
+				marketAccount = this.getPerpMarketAccount(marketIndex);
+			} else {
+				marketAccount = this.getSpotMarketAccount(marketIndex);
+			}
+			takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+			makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
+		}
+
+		return {
+			takerFee,
+			makerFee,
+		};
+	}
+
 	/**
 	 * Returns the market index and type for a given market name
 	 * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/src/priorityFee/driftPriorityFeeMethod.ts

@@ -1,5 +1,17 @@
 import fetch from 'node-fetch';
-import { DriftPriorityFeeLevels } from './heliusPriorityFeeMethod';
+import { HeliusPriorityLevel } from './heliusPriorityFeeMethod';
+
+export type DriftMarketInfo = {
+	marketType: string;
+	marketIndex: number;
+};
+
+export type DriftPriorityFeeLevels = {
+	[key in HeliusPriorityLevel]: number;
+} & {
+	marketType: 'perp' | 'spot';
+	marketIndex: number;
+};
 
 export type DriftPriorityFeeResponse = DriftPriorityFeeLevels[];
 

package/src/priorityFee/heliusPriorityFeeMethod.ts

@@ -13,13 +13,6 @@ export type HeliusPriorityFeeLevels = {
 	[key in HeliusPriorityLevel]: number;
 };
 
-export type DriftPriorityFeeLevels = {
-	[key in HeliusPriorityLevel]: number;
-} & {
-	marketType: 'perp' | 'spot';
-	marketIndex: number;
-};
-
 export type HeliusPriorityFeeResponse = {
 	jsonrpc: string;
 	result: {

package/src/priorityFee/index.ts

@@ -4,6 +4,8 @@ export * from './ewmaStrategy';
 export * from './maxOverSlotsStrategy';
 export * from './maxStrategy';
 export * from './priorityFeeSubscriber';
+export * from './priorityFeeSubscriberMap';
 export * from './solanaPriorityFeeMethod';
 export * from './heliusPriorityFeeMethod';
+export * from './driftPriorityFeeMethod';
 export * from './types';

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -1,7 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import {
 	DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS,
-	DriftMarketInfo,
 	PriorityFeeMethod,
 	PriorityFeeStrategy,
 	PriorityFeeSubscriberConfig,
@@ -14,7 +13,10 @@ import {
 	HeliusPriorityLevel,
 	fetchHeliusPriorityFee,
 } from './heliusPriorityFeeMethod';
-import { fetchDriftPriorityFee } from './driftPriorityFeeMethod';
+import {
+	fetchDriftPriorityFee,
+	DriftMarketInfo,
+} from './driftPriorityFeeMethod';
 
 export class PriorityFeeSubscriber {
 	connection: Connection;

package/src/priorityFee/priorityFeeSubscriberMap.ts

@@ -1,11 +1,11 @@
 import {
+	DriftMarketInfo,
+	DriftPriorityFeeLevels,
 	DriftPriorityFeeResponse,
 	fetchDriftPriorityFee,
 } from './driftPriorityFeeMethod';
-import { DriftPriorityFeeLevels } from './heliusPriorityFeeMethod';
 import {
 	DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS,
-	DriftMarketInfo,
 	PriorityFeeSubscriberMapConfig,
 } from './types';
 

package/src/priorityFee/types.ts

@@ -1,7 +1,10 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { SolanaPriorityFeeResponse } from './solanaPriorityFeeMethod';
 import { HeliusPriorityFeeResponse } from './heliusPriorityFeeMethod';
-import { DriftPriorityFeeResponse } from './driftPriorityFeeMethod';
+import {
+	DriftMarketInfo,
+	DriftPriorityFeeResponse,
+} from './driftPriorityFeeMethod';
 
 export const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10_000;
 
@@ -22,11 +25,6 @@ export enum PriorityFeeMethod {
 	DRIFT = 'drift',
 }
 
-export type DriftMarketInfo = {
-	marketType: string;
-	marketIndex: number;
-};
-
 export type PriorityFeeSubscriberConfig = {
 	/// rpc connection, optional if using priorityFeeMethod.HELIUS
 	connection?: Connection;

package/src/user.ts

@@ -3162,35 +3162,6 @@ export class User {
 		return state.spotFeeStructure.feeTiers[feeTierIndex];
 	}
 
-	/**
-	 * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
-	 * @param marketType
-	 * @param positionMarketIndex
-	 * @returns : {takerFee: number, makerFee: number} Precision None
-	 */
-	public getMarketFees(marketType: MarketType, marketIndex?: number) {
-		const feeTier = this.getUserFeeTier(marketType);
-		let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
-		let makerFee =
-			feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
-
-		if (marketIndex !== undefined) {
-			let marketAccount = null;
-			if (isVariant(marketType, 'perp')) {
-				marketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
-			} else {
-				marketAccount = this.driftClient.getSpotMarketAccount(marketIndex);
-			}
-			takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
-			makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
-		}
-
-		return {
-			takerFee,
-			makerFee,
-		};
-	}
-
 	/**
 	 * Calculates how much perp fee will be taken for a given sized trade
 	 * @param quoteAmount
@@ -3198,9 +3169,10 @@ export class User {
 	 */
 	public calculateFeeForQuoteAmount(quoteAmount: BN, marketIndex?: number): BN {
 		if (marketIndex !== undefined) {
-			const takerFeeMultiplier = this.getMarketFees(
+			const takerFeeMultiplier = this.driftClient.getMarketFees(
 				MarketType.PERP,
-				marketIndex
+				marketIndex,
+				this
 			).takerFee;
 			const feeAmountNum =
 				BigNum.from(quoteAmount, QUOTE_PRECISION_EXP).toNum() *