@metamask-previews/perps-controller 13.1.0-preview-8c2a2eeb2 → 13.1.0-preview-b13d916

package/CHANGELOG.md

@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Stop reporting `TPSL_UPDATE_FAILED` from `updatePositionTPSL` when HyperLiquid accepts a trigger with `waitingForTrigger`; accepted triggers without response order IDs are reconciled before mixed-failure cleanup
+- Prevent transient HyperLiquid WebSocket disconnects from failing the first TP/SL update by checking builder-fee approval over HTTP ([#9997](https://github.com/MetaMask/core/pull/9997))
+- Stop reporting `TPSL_UPDATE_FAILED` from `updatePositionTPSL` when HyperLiquid accepts a trigger with `waitingForTrigger`; accepted triggers without response order IDs are reconciled before mixed-failure cleanup ([#9995](https://github.com/MetaMask/core/pull/9995))
 
 ## [13.1.0]
 
@@ -19,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Preserve trigger prices and normalized trigger order types in HyperLiquid historical orders while retaining their lifecycle and execution semantics ([#9982](https://github.com/MetaMask/core/pull/9982)).
 - Classify `xyz:CBRS` and `xyz:SPCX` as stocks in the Hyperliquid fallback market map ([#9988](https://github.com/MetaMask/core/pull/9988))
 
 ## [13.0.0]

package/dist/providers/HyperLiquidProvider.cjs

@@ -18,6 +18,7 @@ const bignumber_js_1 = require("bignumber.js");
 const uuid_1 = require("uuid");
 const eventNames_js_1 = require("../constants/eventNames.cjs");
 const hyperLiquidConfig_js_1 = require("../constants/hyperLiquidConfig.cjs");
+const orderTypes_js_1 = require("../constants/orderTypes.cjs");
 const perpsConfig_js_1 = require("../constants/perpsConfig.cjs");
 const transactionsHistoryConfig_js_1 = require("../constants/transactionsHistoryConfig.cjs");
 const perpsErrorCodes_js_1 = require("../perpsErrorCodes.cjs");
@@ -38,10 +39,18 @@ const idUtils_js_1 = require("../utils/idUtils.cjs");
 const marketDataTransform_js_1 = require("../utils/marketDataTransform.cjs");
 const marketUtils_js_1 = require("../utils/marketUtils.cjs");
 const orderCalculations_js_1 = require("../utils/orderCalculations.cjs");
-const orderTypes_js_1 = require("../utils/orderTypes.cjs");
+const orderTypes_js_2 = require("../utils/orderTypes.cjs");
 const standaloneInfoClient_js_1 = require("../utils/standaloneInfoClient.cjs");
 const stringParseUtils_js_1 = require("../utils/stringParseUtils.cjs");
 // getStreamManagerInstance removed: use this.#deps.streamManager instead
+const HISTORICAL_ORDER_TYPE_BY_DETAILED_TYPE = {
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.LIMIT]: 'limit',
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.MARKET]: 'market',
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.STOP_LIMIT]: 'limit',
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.STOP_MARKET]: 'market',
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.TAKE_PROFIT_LIMIT]: 'limit',
+    [orderTypes_js_1.DETAILED_ORDER_TYPES.TAKE_PROFIT_MARKET]: 'market',
+};
 /**
  * Type guard to check if a status is an object (not a string literal like "waitingForFill")
  * The SDK returns status as a union of object types and string literals.
@@ -349,11 +358,11 @@ function collectPositionTriggerOrders(params) {
     const triggerOrders = Array.from(byOrderId.values());
     const takeProfitOrders = triggerOrders.filter((order) => order.direction === 'take_profit');
     const stopLossOrders = triggerOrders.filter((order) => order.direction !== 'take_profit');
-    const takeProfitSummaryPrice = (0, orderTypes_js_1.resolvePositionTriggerSummaryPrice)({
+    const takeProfitSummaryPrice = (0, orderTypes_js_2.resolvePositionTriggerSummaryPrice)({
         triggerOrders: takeProfitOrders,
         scannedPrice: takeProfitPrice,
     });
-    const stopLossSummaryPrice = (0, orderTypes_js_1.resolvePositionTriggerSummaryPrice)({
+    const stopLossSummaryPrice = (0, orderTypes_js_2.resolvePositionTriggerSummaryPrice)({
         triggerOrders: stopLossOrders,
         scannedPrice: stopLossPrice,
     });
@@ -914,7 +923,7 @@ class HyperLiquidProvider {
             // single order, so they leave the shared path here — before the order
             // array, the HIP-3 transfer, and the atomic single-order submit, none of
             // which describe what a TWAP, a ladder, or a chase does.
-            if ((0, orderTypes_js_1.isStrategyOrderType)(params.orderType)) {
+            if ((0, orderTypes_js_2.isStrategyOrderType)(params.orderType)) {
                 return await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_placeStrategyOrder).call(this, params, params.orderType);
             }
             // Extract DEX name for API calls (main DEX = null)
@@ -1095,7 +1104,7 @@ class HyperLiquidProvider {
             if (isMinimumOrderError &&
                 retryCount === 0 &&
                 !params.reduceOnly &&
-                !(0, orderTypes_js_1.isStrategyOrderType)(params.orderType)) {
+                !(0, orderTypes_js_2.isStrategyOrderType)(params.orderType)) {
                 let adjustedUsdAmount;
                 let originalValue;
                 if (params.usdAmount) {
@@ -1325,7 +1334,7 @@ class HyperLiquidProvider {
             // `modify` rebuilds an order as a plain limit/market order, so a trigger
             // on either side of the edit would be silently dropped. Reject a resting
             // trigger order as well as an edit *into* one; cancel and re-place instead.
-            if ((0, orderTypes_js_1.isTriggerOrderType)(params.newOrder.orderType)) {
+            if ((0, orderTypes_js_2.isTriggerOrderType)(params.newOrder.orderType)) {
                 return {
                     success: false,
                     error: perpsErrorCodes_js_1.PERPS_ERROR_CODES.ORDER_EDIT_TRIGGER_UNSUPPORTED,
@@ -1336,7 +1345,7 @@ class HyperLiquidProvider {
             // FrontendMarket modification and quietly drop the TWAP schedule, the
             // ladder, or the chase loop the caller asked for. Cancel by the strategy
             // handle and place again.
-            if ((0, orderTypes_js_1.isStrategyOrderType)(params.newOrder.orderType)) {
+            if ((0, orderTypes_js_2.isStrategyOrderType)(params.newOrder.orderType)) {
                 return {
                     success: false,
                     error: perpsErrorCodes_js_1.PERPS_ERROR_CODES.ORDER_EDIT_STRATEGY_UNSUPPORTED,
@@ -1454,7 +1463,7 @@ class HyperLiquidProvider {
                 // A limit order honours the caller's time in force; validation above has
                 // already rejected one on any other order shape.
                 t: params.newOrder.orderType === 'limit'
-                    ? { limit: { tif: (0, orderTypes_js_1.toSDKTimeInForce)(params.newOrder.timeInForce) } }
+                    ? { limit: { tif: (0, orderTypes_js_2.toSDKTimeInForce)(params.newOrder.timeInForce) } }
                     : { limit: { tif: 'FrontendMarket' } }, // True market order
                 c: params.newOrder.clientOrderId
                     ? params.newOrder.clientOrderId
@@ -1515,7 +1524,7 @@ class HyperLiquidProvider {
         // A strategy handle is not an exchange order ID, so it cannot go through
         // the single-order cancel below. Callers that omit `orderType` — every
         // existing one — keep the behaviour they have today.
-        if (params.orderType && (0, orderTypes_js_1.isStrategyOrderType)(params.orderType)) {
+        if (params.orderType && (0, orderTypes_js_2.isStrategyOrderType)(params.orderType)) {
             return await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_cancelStrategyOrder).call(this, params);
         }
         // Resolve ownership before the first await. A reprice can change the child
@@ -2145,7 +2154,7 @@ class HyperLiquidProvider {
                         orderType,
                         triggerPrice,
                         reduceOnly: true,
-                        ...((0, orderTypes_js_1.isLimitExecutionOrderType)(orderType) && {
+                        ...((0, orderTypes_js_2.isLimitExecutionOrderType)(orderType) && {
                             price: order.price,
                         }),
                     };
@@ -2159,9 +2168,9 @@ class HyperLiquidProvider {
                             r: true,
                             t: {
                                 trigger: {
-                                    isMarket: !(0, orderTypes_js_1.isLimitExecutionOrderType)(orderType),
+                                    isMarket: !(0, orderTypes_js_2.isLimitExecutionOrderType)(orderType),
                                     triggerPx: triggerPrice,
-                                    tpsl: (0, orderTypes_js_1.getTriggerDirection)(orderType) === 'stop' ? 'sl' : 'tp',
+                                    tpsl: (0, orderTypes_js_2.getTriggerDirection)(orderType) === 'stop' ? 'sl' : 'tp',
                                 },
                             },
                         },
@@ -3099,11 +3108,11 @@ class HyperLiquidProvider {
                 });
                 return {
                     ...position,
-                    takeProfitPrice: (0, orderTypes_js_1.resolvePositionTriggerSummaryPrice)({
+                    takeProfitPrice: (0, orderTypes_js_2.resolvePositionTriggerSummaryPrice)({
                         triggerOrders: takeProfitOrders,
                         scannedPrice: takeProfitPrice,
                     }),
-                    stopLossPrice: (0, orderTypes_js_1.resolvePositionTriggerSummaryPrice)({
+                    stopLossPrice: (0, orderTypes_js_2.resolvePositionTriggerSummaryPrice)({
                         triggerOrders: stopLossOrders,
                         scannedPrice: stopLossPrice,
                     }),
@@ -3244,8 +3253,6 @@ class HyperLiquidProvider {
             // Transform HyperLiquid orders to abstract Order type
             const orders = (rawOrders || []).map((rawOrder) => {
                 const { order, status, statusTimestamp } = rawOrder;
-                // Normalize side: HyperLiquid uses 'A' (Ask/Sell) and 'B' (Bid/Buy)
-                const normalizedSide = order.side === 'B' ? 'buy' : 'sell';
                 // Normalize status
                 let normalizedStatus;
                 switch (status) {
@@ -3278,28 +3285,19 @@ class HyperLiquidProvider {
                     default:
                         normalizedStatus = 'queued';
                 }
-                // Calculate filled and remaining size
-                const originalSize = parseFloat(order.origSz || order.sz);
-                const currentSize = parseFloat(order.sz);
-                const filledSize = originalSize - currentSize;
+                const adaptedOrder = (0, hyperLiquidAdapter_js_1.adaptOrderFromSDK)(order, undefined);
+                // limitPx is also populated as a slippage cap for market orders, so the
+                // exchange's detailed type is the reliable execution-mode source.
+                const historicalOrderType = (0, utils_1.hasProperty)(HISTORICAL_ORDER_TYPE_BY_DETAILED_TYPE, order.orderType)
+                    ? HISTORICAL_ORDER_TYPE_BY_DETAILED_TYPE[order.orderType]
+                    : 'market';
                 return {
-                    orderId: order.oid?.toString() || '',
-                    symbol: order.coin,
-                    side: normalizedSide,
-                    orderType: order.orderType?.toLowerCase().includes('limit')
-                        ? 'limit'
-                        : 'market',
-                    size: order.sz,
-                    originalSize: order.origSz || order.sz,
-                    price: order.limitPx || '0',
-                    filledSize: filledSize.toString(),
-                    remainingSize: currentSize.toString(),
+                    ...adaptedOrder,
+                    orderType: historicalOrderType,
+                    remainingSize: parseFloat(order.sz).toString(),
                     status: normalizedStatus,
                     timestamp: statusTimestamp,
                     lastUpdated: statusTimestamp,
-                    detailedOrderType: order.orderType, // Full order type from exchange (e.g., 'Take Profit Limit', 'Stop Market')
-                    isTrigger: order.isTrigger,
-                    reduceOnly: order.reduceOnly,
                 };
             });
             return orders;
@@ -4166,7 +4164,7 @@ class HyperLiquidProvider {
                     // fallback (plain limit, stop_limit, take_profit_limit)
                     if (!priceForValidation &&
                         params.price &&
-                        (0, orderTypes_js_1.isLimitExecutionOrderType)(params.orderType)) {
+                        (0, orderTypes_js_2.isLimitExecutionOrderType)(params.orderType)) {
                         priceForValidation = parseFloat(params.price);
                         __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Using limit price for order validation (limit order):', {
                             size,
@@ -4177,7 +4175,7 @@ class HyperLiquidProvider {
                     // have no limit price; the trigger price is the best notional estimate.
                     if (!priceForValidation &&
                         params.triggerPrice &&
-                        (0, orderTypes_js_1.isTriggerOrderType)(params.orderType)) {
+                        (0, orderTypes_js_2.isTriggerOrderType)(params.orderType)) {
                         priceForValidation = parseFloat(params.triggerPrice);
                         __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Using trigger price for order validation (trigger order):', {
                             size,
@@ -5006,7 +5004,7 @@ class HyperLiquidProvider {
         // market order (taker), a stop_limit as a limit order, a scale ladder as the
         // resting limit orders it fans out into, and a TWAP as the marketable
         // suborders it crosses the book with.
-        const isMarketExecution = (0, orderTypes_js_1.getTriggerExecution)(orderType) === 'market';
+        const isMarketExecution = (0, orderTypes_js_2.getTriggerExecution)(orderType) === 'market';
         // A chase is post-only by construction, so it can only ever fill as a maker.
         // Quoting it at the taker rate would overstate the fee whatever the caller
         // passes for `isMaker`.
@@ -6998,7 +6996,7 @@ async function _HyperLiquidProvider_queryUserDataAcrossDexs(baseParams, queryFn)
  * @returns Current max fee rate or null if not approved
  */
 async function _HyperLiquidProvider_checkBuilderFeeApproval(builder, userAddress) {
-    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient();
+    const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient({ useHttp: true });
     return infoClient.maxBuilderFee({
         user: userAddress,
         builder,