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

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.4
+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/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.4",
+	"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/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() *