@metamask-previews/perps-controller 11.0.0-preview-9efd0b754 → 12.0.0-preview-4e64b66e8

package/dist/services/TradingService.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TradingService_instances, _TradingService_deps, _TradingService_controllerDeps, _TradingService_getErrorContext, _TradingService_buildAttributionProperties, _TradingService_trackSubmitted, _TradingService_trackOrderResult, _TradingService_handleOrderSuccess, _TradingService_withFeeDiscount, _TradingService_loadPositionData, _TradingService_calculateCloseMetrics, _TradingService_buildCloseEventProperties, _TradingService_trackPositionCloseResult, _TradingService_handleDataLakeReporting, _TradingService_calculateFeeDiscountWithMeasurement;
+var _TradingService_instances, _TradingService_deps, _TradingService_controllerDeps, _TradingService_feeContextTail, _TradingService_getErrorContext, _TradingService_buildAttributionProperties, _TradingService_trackSubmitted, _TradingService_trackOrderResult, _TradingService_handleOrderSuccess, _TradingService_withFeeDiscount, _TradingService_loadPositionData, _TradingService_calculateCloseMetrics, _TradingService_buildCloseEventProperties, _TradingService_trackPositionCloseResult, _TradingService_handleDataLakeReporting, _TradingService_calculateFeeDiscountWithMeasurement;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TradingService = void 0;
 const bignumber_js_1 = require("bignumber.js");
@@ -49,6 +49,8 @@ class TradingService {
          * Set via setControllerDependencies() after construction.
          */
         _TradingService_controllerDeps.set(this, null);
+        /** Serializes provider fee context so concurrent orders cannot share it. */
+        _TradingService_feeContextTail.set(this, Promise.resolve());
         __classPrivateFieldSet(this, _TradingService_deps, deps, "f");
     }
     /**
@@ -112,10 +114,11 @@ class TradingService {
                 },
             });
             // Calculate fee discount at execution time (fresh, secure)
-            const feeDiscountBips = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
-            __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee discount calculated', {
-                feeDiscountBips,
-                hasDiscount: feeDiscountBips !== undefined,
+            const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
+            __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee resolution calculated', {
+                feeDiscountBips: feeResolution?.discountBips,
+                feeSource: feeResolution?.source,
+                hasDiscount: feeResolution?.discountBips !== undefined,
             });
             __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Submitting order to provider', {
                 symbol: params.symbol,
@@ -165,7 +168,7 @@ class TradingService {
             }, perpsConfig_js_1.PERPS_CONSTANTS.PlaceOrderTimeoutMs);
             const result = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
                 provider,
-                feeDiscountBips,
+                feeResolution,
                 operation: () => provider.placeOrder(params),
             });
             if (orderSubmissionThresholdTimeoutId !== undefined) {
@@ -292,11 +295,11 @@ class TradingService {
                 },
             });
             // Calculate fee discount only if required dependencies are available
-            const feeDiscountBips = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
+            const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
             // Execute order edit with fee discount management
             const result = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
                 provider,
-                feeDiscountBips,
+                feeResolution,
                 operation: () => provider.editOrder(params),
             });
             const completionDuration = __classPrivateFieldGet(this, _TradingService_deps, "f").performance.now() - startTime;
@@ -686,11 +689,11 @@ class TradingService {
                 }),
             });
             // Calculate fee discount with measurement
-            const feeDiscountBips = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
+            const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
             // Execute position close with fee discount management
             result = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
                 provider,
-                feeDiscountBips,
+                feeResolution,
                 operation: () => provider.closePosition(params),
             });
             const completionDuration = __classPrivateFieldGet(this, _TradingService_deps, "f").performance.now() - startTime;
@@ -807,10 +810,10 @@ class TradingService {
             });
             // Use batch close if provider supports it (provider handles filtering)
             if (provider.closePositions) {
-                const feeDiscountBips = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
+                const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
                 operationResult = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
                     provider,
-                    feeDiscountBips,
+                    feeResolution,
                     operation: async () => {
                         if (!provider.closePositions) {
                             throw new Error('closePositions method not available');
@@ -970,11 +973,11 @@ class TradingService {
                 ...__classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_buildAttributionProperties).call(this, params.trackingData),
             });
             // Get fee discount from rewards
-            const feeDiscountBips = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
+            const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
             // Execute with fee discount management
             result = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
                 provider,
-                feeDiscountBips,
+                feeResolution,
                 operation: () => provider.updatePositionTPSL(params),
             });
             if (result.success) {
@@ -1221,8 +1224,13 @@ class TradingService {
                 [eventNames_js_1.PERPS_EVENT_PROPERTY.ACTION]: flipAction,
                 ...__classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_buildAttributionProperties).call(this, trackingData),
             });
+            const feeResolution = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_calculateFeeDiscountWithMeasurement).call(this);
             // Place flip order (HyperLiquid handles margin transfer automatically)
-            const result = await provider.placeOrder(orderParams);
+            const result = await __classPrivateFieldGet(this, _TradingService_instances, "m", _TradingService_withFeeDiscount).call(this, {
+                provider,
+                feeResolution,
+                operation: () => provider.placeOrder(orderParams),
+            });
             const completionDuration = __classPrivateFieldGet(this, _TradingService_deps, "f").performance.now() - startTime;
             const executedPrice = parseFloat(result.averagePrice ?? position.entryPrice);
             if (result.success) {
@@ -1319,7 +1327,7 @@ class TradingService {
     }
 }
 exports.TradingService = TradingService;
-_TradingService_deps = new WeakMap(), _TradingService_controllerDeps = new WeakMap(), _TradingService_instances = new WeakSet(), _TradingService_getErrorContext = function _TradingService_getErrorContext(method, additionalContext) {
+_TradingService_deps = new WeakMap(), _TradingService_controllerDeps = new WeakMap(), _TradingService_feeContextTail = new WeakMap(), _TradingService_instances = new WeakSet(), _TradingService_getErrorContext = function _TradingService_getErrorContext(method, additionalContext) {
     return {
         controller: 'TradingService',
         method,
@@ -1554,18 +1562,29 @@ async function _TradingService_handleOrderSuccess(options) {
  *
  * @param options - The configuration options.
  * @param options.provider - The perps provider instance.
- * @param options.feeDiscountBips - The fee discount bips value.
+ * @param options.feeResolution - The resolved fee and attribution source.
  * @param options.operation - The operation value.
  * @returns The result of the operation.
  */
 async function _TradingService_withFeeDiscount(options) {
-    const { provider, feeDiscountBips, operation } = options;
+    const { provider, feeResolution, operation } = options;
+    const previous = __classPrivateFieldGet(this, _TradingService_feeContextTail, "f");
+    let release = () => undefined;
+    __classPrivateFieldSet(this, _TradingService_feeContextTail, new Promise((resolve) => {
+        release = resolve;
+    }), "f");
+    await previous;
     try {
-        // Set discount context in provider for this operation
-        if (feeDiscountBips !== undefined && provider.setUserFeeDiscount) {
-            provider.setUserFeeDiscount(feeDiscountBips);
-            __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee discount set in provider', {
-                feeDiscountBips,
+        if (provider.setUserFeeResolution) {
+            provider.setUserFeeResolution(feeResolution);
+        }
+        else if (provider.setUserFeeDiscount) {
+            provider.setUserFeeDiscount(feeResolution?.discountBips);
+        }
+        if (feeResolution) {
+            __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee resolution set in provider', {
+                feeDiscountBips: feeResolution.discountBips,
+                feeSource: feeResolution.source,
             });
         }
         // Execute the operation
@@ -1573,10 +1592,14 @@ async function _TradingService_withFeeDiscount(options) {
     }
     finally {
         // Always clear discount context, even on exception
-        if (provider.setUserFeeDiscount) {
+        if (provider.setUserFeeResolution) {
+            provider.setUserFeeResolution(undefined);
+        }
+        else if (provider.setUserFeeDiscount) {
             provider.setUserFeeDiscount(undefined);
-            __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee discount cleared from provider');
         }
+        __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee resolution cleared from provider');
+        release();
     }
 }, _TradingService_loadPositionData = 
 /**
@@ -1828,14 +1851,15 @@ async function _TradingService_calculateFeeDiscountWithMeasurement() {
     const { rewardsIntegrationService } = __classPrivateFieldGet(this, _TradingService_controllerDeps, "f");
     const orderExecutionFeeDiscountStartTime = __classPrivateFieldGet(this, _TradingService_deps, "f").performance.now();
     // Calculate fee discount using messenger pattern (service handles controller access internally)
-    const discountBips = await rewardsIntegrationService.calculateUserFeeDiscount();
+    const resolution = await rewardsIntegrationService.resolveFee();
     const orderExecutionFeeDiscountDuration = __classPrivateFieldGet(this, _TradingService_deps, "f").performance.now() - orderExecutionFeeDiscountStartTime;
     // Record measurement
     __classPrivateFieldGet(this, _TradingService_deps, "f").tracer.setMeasurement(performanceMetrics_js_1.PerpsMeasurementName.PerpsRewardsOrderExecutionFeeDiscountApiCall, orderExecutionFeeDiscountDuration, 'millisecond');
     __classPrivateFieldGet(this, _TradingService_deps, "f").debugLogger.log('TradingService: Fee discount API call completed', {
-        discountBips,
+        discountBips: resolution.discountBips,
+        source: resolution.source,
         duration: `${orderExecutionFeeDiscountDuration.toFixed(0)}ms`,
     });
-    return discountBips;
+    return resolution;
 };
 //# sourceMappingURL=TradingService.cjs.map