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

package/VERSION

@@ -1 +1 @@
-2.52.0-beta.2
+2.52.0-beta.3

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

@@ -1645,7 +1645,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 +1660,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/package.json

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

package/src/user.ts

@@ -27,6 +27,7 @@ import {
 	OPEN_ORDER_MARGIN_REQUIREMENT,
 	PRICE_PRECISION,
 	QUOTE_PRECISION,
+	QUOTE_PRECISION_EXP,
 	QUOTE_SPOT_MARKET_INDEX,
 	SPOT_MARKET_WEIGHT_PRECISION,
 	TEN,
@@ -40,6 +41,7 @@ import {
 	UserAccountSubscriber,
 } from './accounts/types';
 import {
+	BigNum,
 	BN,
 	calculateBaseAssetValue,
 	calculateMarketMarginRatio,
@@ -3013,7 +3015,7 @@ export class User {
 		let makerFee =
 			feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
 
-		if (marketIndex && isVariant(marketType, 'perp')) {
+		if (marketIndex !== undefined && isVariant(marketType, 'perp')) {
 			const marketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
 			takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
 			makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
@@ -3030,11 +3032,22 @@ export class User {
 	 * @param quoteAmount
 	 * @returns feeForQuote : Precision QUOTE_PRECISION
 	 */
-	public calculateFeeForQuoteAmount(quoteAmount: BN): BN {
-		const feeTier = this.getUserFeeTier(MarketType.PERP);
-		return quoteAmount
-			.mul(new BN(feeTier.feeNumerator))
-			.div(new BN(feeTier.feeDenominator));
+	public calculateFeeForQuoteAmount(quoteAmount: BN, marketIndex?: number): BN {
+		if (marketIndex !== undefined) {
+			const takerFeeMultiplier = this.getMarketFees(
+				MarketType.PERP,
+				marketIndex
+			).takerFee;
+			const feeAmountNum =
+				BigNum.from(quoteAmount, QUOTE_PRECISION_EXP).toNum() *
+				takerFeeMultiplier;
+			return BigNum.fromPrint(feeAmountNum.toString(), QUOTE_PRECISION_EXP).val;
+		} else {
+			const feeTier = this.getUserFeeTier(MarketType.PERP);
+			return quoteAmount
+				.mul(new BN(feeTier.feeNumerator))
+				.div(new BN(feeTier.feeDenominator));
+		}
 	}
 
 	/**