@metamask-previews/perps-controller 8.0.0-preview-51b287c55 → 8.1.0-preview-3af52b79c

package/dist/services/HyperLiquidSubscriptionService.cjs

@@ -426,7 +426,7 @@ class HyperLiquidSubscriptionService {
     }
     /**
      * Subscribe to open interest cap updates
-     * OI caps are extracted from webData2 subscription (zero additional overhead)
+     * OI caps are extracted from the shared webData3 subscription (zero additional overhead)
      *
      * @param params - The subscription parameters including callback and account ID.
      * @returns A cleanup function to unsubscribe from OI cap updates.
@@ -493,7 +493,7 @@ class HyperLiquidSubscriptionService {
     }
     /**
      * Subscribe to live order updates
-     * Uses the shared webData2 subscription to avoid duplicate connections
+     * Uses the shared per-DEX subscriptions to avoid duplicate connections
      *
      * @param params - The subscription parameters including callback and account ID.
      * @returns A cleanup function to unsubscribe from order updates.
@@ -519,7 +519,7 @@ class HyperLiquidSubscriptionService {
     }
     /**
      * Subscribe to live account updates
-     * Uses the shared webData2 subscription to avoid duplicate connections
+     * Uses the shared per-DEX subscriptions to avoid duplicate connections
      *
      * @param params - The subscription parameters including callback and account ID.
      * @returns A cleanup function to unsubscribe from account updates.
@@ -753,11 +753,11 @@ class HyperLiquidSubscriptionService {
             // Clear existing subscription references (they're dead after reconnection)
             __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_webData3Subscriptions, "f").clear();
             __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_webData3SubscriptionPromise, undefined, "f");
-            // Clear individual subscriptions (clearinghouseState + openOrders) for HIP-3 mode
+            // Clear individual subscriptions (clearinghouseState + openOrders)
             __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_clearinghouseStateSubscriptions, "f").clear();
             __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_openOrdersSubscriptions, "f").clear();
             // Re-establish the subscription (will use current account)
-            // This will set up webData2 for non-HIP-3, or individual subscriptions + webData3 (OI caps only) for HIP-3
+            // This sets up per-DEX clearinghouseState + openOrders subscriptions plus webData3 (OI caps only)
             await __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_ensureSharedWebData3Subscription).call(this);
         }
         // Re-establish activeAsset subscriptions if there are market data subscribers
@@ -1614,12 +1614,18 @@ async function _HyperLiquidSubscriptionService_ensureSharedWebData3Subscription(
     // Note: webData3 includes all DEX data, so no separate HIP-3 subscriptions needed
 }, _HyperLiquidSubscriptionService_createUserDataSubscription = 
 /**
- * Create WebSocket subscription for user data (positions, orders, account)
- * - Uses webData2 when HIP-3 disabled (main DEX only)
- * - Uses webData3 when HIP-3 enabled (main + HIP-3 DEXs)
+ * Create WebSocket subscription for user data (positions, orders, account).
  *
- * webData2 provides data for main DEX only
- * webData3 provides perpDexStates[] array containing data for all DEXs:
+ * Positions, orders, and account/spot balance are always delivered via
+ * per-DEX `clearinghouseState` + `openOrders` subscriptions (sub-second
+ * updates). webData3 is used only for OI caps extraction (not
+ * latency-sensitive). The deprecated webData2 snapshot channel is no longer
+ * used (TAT-3332).
+ *
+ * - HIP-3 disabled: subscribe to the main DEX only (`dexsToSubscribe = ['']`).
+ * - HIP-3 enabled: subscribe to the main DEX plus each enabled HIP-3 DEX.
+ *
+ * webData3 provides perpDexStates[] array containing OI caps for all DEXs:
  * - Index 0: Main DEX (dexName = '')
  * - Index 1+: HIP-3 DEXs in order of enabledDexs array
  *
@@ -1648,187 +1654,105 @@ async function _HyperLiquidSubscriptionService_createUserDataSubscription(accoun
         });
     }
     return new Promise((resolve, reject) => {
-        // Choose channel based on HIP-3 master switch
-        if (__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_hip3Enabled, "f")) {
-            // HIP-3 enabled: Use individual subscriptions for positions/orders/account
-            // webData3 is only used for OI caps extraction
-            // Determine which DEXs to subscribe to
-            const dexsToSubscribe = [
-                '', // Main DEX
+        // Use per-DEX clearinghouseState + openOrders subscriptions for
+        // positions/orders/account on every path. webData3 is used only for OI
+        // caps extraction. The deprecated webData2 channel is no longer used.
+        // Determine which DEXs to subscribe to:
+        // - HIP-3 enabled: main DEX + each enabled HIP-3 DEX.
+        // - HIP-3 disabled: main DEX only.
+        const dexsToSubscribe = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_hip3Enabled, "f")
+            ? [
+                '',
                 ...__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_enabledDexs, "f").filter((dexId) => __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_isDexEnabled).call(this, dexId)),
-            ];
-            // Track expected DEXs for synchronized notifications
-            // Clear previous tracking and set new expected DEXs
-            __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_expectedDexs, new Set(dexsToSubscribe), "f");
-            __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_initializedDexs, new Set(), "f");
-            // Set up individual subscriptions for each DEX
-            const subscriptionPromises = [];
-            for (const currentDexName of dexsToSubscribe) {
-                // Set up clearinghouseState subscription for positions + account
-                subscriptionPromises.push(__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_ensureClearinghouseStateSubscription).call(this, userAddress, currentDexName));
-                // Set up openOrders subscription for orders
-                subscriptionPromises.push(__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_ensureOpenOrdersSubscription).call(this, userAddress, currentDexName));
-            }
-            // Also set up webData3 for OI caps only
-            const webData3Promise = subscriptionClient
-                .webData3({ user: userAddress }, (data) => {
-                try {
-                    // webData3 is ONLY used for OI caps extraction
-                    // Positions, orders, and account data come from individual subscriptions
-                    const allOICaps = [];
-                    data.perpDexStates.forEach((dexState, index) => {
-                        // Map webData3 index to DEX name
-                        // Index 0 = main DEX (null), Index 1+ = HIP-3 DEXs from discoveredDexNames
-                        const dexIdentifier = index === 0 ? null : __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_discoveredDexNames, "f")[index - 1];
-                        // Skip unknown DEXs (not in discoveredDexNames) to prevent main DEX cache corruption
-                        if (index > 0 && dexIdentifier === undefined) {
-                            return; // Unknown DEX - skip to prevent misidentifying as main DEX
-                        }
-                        // Only process DEXs we care about (skip others silently)
-                        if (!__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_isDexEnabled).call(this, dexIdentifier ?? null)) {
-                            return; // Skip this DEX - not enabled in our configuration
-                        }
-                        const currentDexName = dexIdentifier ?? '';
-                        const oiCaps = dexState.perpsAtOpenInterestCap ?? [];
-                        // Add DEX prefix for HIP-3 symbols (e.g., "xyz:TSLA")
-                        if (currentDexName) {
-                            allOICaps.push(...oiCaps.map((symbol) => `${currentDexName}:${symbol}`));
-                        }
-                        else {
-                            // Main DEX - no prefix needed
-                            allOICaps.push(...oiCaps);
-                        }
-                    });
-                    // Update OI caps cache and notify if changed
-                    const oiCapsHash = [...allOICaps]
-                        .sort((a, b) => a.localeCompare(b))
-                        .join(',');
-                    if (oiCapsHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, "f")) {
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICaps, allOICaps, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, oiCapsHash, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_oiCapsCacheInitialized, true, "f");
-                        // Notify all subscribers
-                        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_oiCapSubscribers, "f").forEach((callback) => callback(allOICaps));
-                    }
-                }
-                catch (error) {
-                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'webData3 callback error', {
-                        user: userAddress,
-                        hasPerpDexStates: data?.perpDexStates !== undefined,
-                        perpDexStatesLength: data?.perpDexStates?.length ?? 0,
-                    }));
-                }
-            })
-                .then((sub) => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_webData3Subscriptions, "f").set(dexName, sub);
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log(`webData3 subscription established for OI caps (main + HIP-3)`);
-                return undefined;
-            })
-                .catch((error) => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'createUserDataSubscription (webData3)', {
-                    dex: dexName,
-                }));
-                throw error;
-            });
-            subscriptionPromises.push(webData3Promise);
-            // Wait for all subscriptions to be established
-            Promise.all(subscriptionPromises)
-                .then(() => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log(`HIP-3 user data subscriptions established for ${dexsToSubscribe.length} DEXs`);
-                resolve();
-                return undefined;
-            })
-                .catch((error) => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'createUserDataSubscription (HIP-3)', {
-                    dexs: dexsToSubscribe,
-                }));
-                reject((0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'));
-            });
-        }
-        else {
-            // HIP-3 disabled: Use webData2 (main DEX only)
-            subscriptionClient
-                .webData2({ user: userAddress }, (data) => {
-                try {
-                    // webData2 returns clearinghouseState for main DEX only
-                    const currentDexName = ''; // Main DEX
-                    // Check for removed fields before accessing
-                    if (!data.clearinghouseState) {
-                        return;
-                    }
-                    // Extract and process positions from clearinghouseState
-                    const positions = data.clearinghouseState.assetPositions
-                        .filter((assetPos) => assetPos.position.szi !== '0')
-                        .map((assetPos) => (0, hyperLiquidAdapter_1.adaptPositionFromSDK)(assetPos));
-                    // Extract TP/SL from orders
-                    const { tpslMap, tpslCountMap, processedOrders: orders, } = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_extractTPSLFromOrders).call(this, data.openOrders || [], positions);
-                    // Merge TP/SL data into positions
-                    const positionsWithTPSL = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_mergeTPSLIntoPositions).call(this, positions, tpslMap, tpslCountMap);
-                    // Extract account data (webData2 provides clearinghouseState)
-                    const accountState = (0, hyperLiquidAdapter_1.adaptAccountStateFromSDK)(data.clearinghouseState);
-                    // Store in caches (main DEX only)
-                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_dexPositionsCache, "f").set(currentDexName, positionsWithTPSL);
-                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_dexOrdersCache, "f").set(currentDexName, orders);
-                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_dexAccountCache, "f").set(currentDexName, accountState);
-                    // OI caps (main DEX only)
-                    const oiCaps = data.perpsAtOpenInterestCap ?? [];
-                    const oiCapsHash = [...oiCaps]
-                        .sort((a, b) => a.localeCompare(b))
-                        .join(',');
-                    if (oiCapsHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, "f")) {
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICaps, oiCaps, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, oiCapsHash, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_oiCapsCacheInitialized, true, "f");
-                        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_oiCapSubscribers, "f").forEach((callback) => callback(oiCaps));
+            ]
+            : [''];
+        // Track expected DEXs for synchronized notifications
+        // Clear previous tracking and set new expected DEXs
+        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_expectedDexs, new Set(dexsToSubscribe), "f");
+        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_initializedDexs, new Set(), "f");
+        // Set up individual subscriptions for each DEX
+        const subscriptionPromises = [];
+        for (const currentDexName of dexsToSubscribe) {
+            // Set up clearinghouseState subscription for positions + account
+            subscriptionPromises.push(__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_ensureClearinghouseStateSubscription).call(this, userAddress, currentDexName));
+            // Set up openOrders subscription for orders
+            subscriptionPromises.push(__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_ensureOpenOrdersSubscription).call(this, userAddress, currentDexName));
+        }
+        // Also set up webData3 for OI caps only
+        const webData3Promise = subscriptionClient
+            .webData3({ user: userAddress }, (data) => {
+            try {
+                // webData3 is ONLY used for OI caps extraction
+                // Positions, orders, and account data come from individual subscriptions
+                const allOICaps = [];
+                data.perpDexStates.forEach((dexState, index) => {
+                    // Map webData3 index to DEX name
+                    // Index 0 = main DEX (null), Index 1+ = HIP-3 DEXs from discoveredDexNames
+                    const dexIdentifier = index === 0 ? null : __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_discoveredDexNames, "f")[index - 1];
+                    // Skip unknown DEXs (not in discoveredDexNames) to prevent main DEX cache corruption
+                    if (index > 0 && dexIdentifier === undefined) {
+                        return; // Unknown DEX - skip to prevent misidentifying as main DEX
                     }
-                    // Notify subscribers (no aggregation needed - only main DEX).
-                    // Apply spot balance so single-DEX accounts see the same
-                    // spot-inclusive totalBalance as the HIP-3 aggregation path.
-                    const spotAdjustedAccount = (0, accountUtils_1.addSpotBalanceToAccountState)(accountState, __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedSpotState, "f"), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getSpotBalanceOptions).call(this));
-                    const positionsHash = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_hashPositions).call(this, positionsWithTPSL);
-                    const ordersHash = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_hashOrders).call(this, orders);
-                    const accountHash = __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_hashAccountState).call(this, spotAdjustedAccount);
-                    if (positionsHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedPositionsHash, "f")) {
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedPositions, positionsWithTPSL, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedPositionsHash, positionsHash, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_positionsCacheInitialized, true, "f");
-                        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_positionSubscribers, "f").forEach((callback) => callback(positionsWithTPSL));
+                    // Only process DEXs we care about (skip others silently)
+                    if (!__classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_isDexEnabled).call(this, dexIdentifier ?? null)) {
+                        return; // Skip this DEX - not enabled in our configuration
                     }
-                    if (ordersHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedOrdersHash, "f")) {
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOrders, orders, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOrdersHash, ordersHash, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_ordersCacheInitialized, true, "f");
-                        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_orderSubscribers, "f").forEach((callback) => callback(orders));
+                    const currentDexName = dexIdentifier ?? '';
+                    const oiCaps = dexState.perpsAtOpenInterestCap ?? [];
+                    // Add DEX prefix for HIP-3 symbols (e.g., "xyz:TSLA")
+                    if (currentDexName) {
+                        allOICaps.push(...oiCaps.map((symbol) => `${currentDexName}:${symbol}`));
                     }
-                    if (accountHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedAccountHash, "f")) {
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedAccount, spotAdjustedAccount, "f");
-                        __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedAccountHash, accountHash, "f");
-                        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_accountSubscribers, "f").forEach((callback) => callback(spotAdjustedAccount));
+                    else {
+                        // Main DEX - no prefix needed
+                        allOICaps.push(...oiCaps);
                     }
+                });
+                // Update OI caps cache and notify if changed
+                const oiCapsHash = [...allOICaps]
+                    .sort((a, b) => a.localeCompare(b))
+                    .join(',');
+                if (oiCapsHash !== __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, "f")) {
+                    __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICaps, allOICaps, "f");
+                    __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOICapsHash, oiCapsHash, "f");
+                    __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_oiCapsCacheInitialized, true, "f");
+                    // Notify all subscribers
+                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_oiCapSubscribers, "f").forEach((callback) => callback(allOICaps));
                 }
-                catch (error) {
-                    __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'webData2 callback error', {
-                        user: userAddress,
-                        dataKeys: data ? Object.keys(data) : 'data is null/undefined',
-                        hasClearinghouseState: data?.clearinghouseState !== undefined,
-                        hasOpenOrders: data?.openOrders !== undefined,
-                        hasPerpsAtOpenInterestCap: data?.perpsAtOpenInterestCap !== undefined,
-                    }));
-                }
-            })
-                .then((subscription) => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_webData3Subscriptions, "f").set(dexName, subscription);
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log('webData2 subscription established for main DEX only');
-                resolve();
-                return undefined;
-            })
-                .catch((error) => {
-                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'createUserDataSubscription (webData2)', {
-                    dex: dexName,
+            }
+            catch (error) {
+                __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'webData3 callback error', {
+                    user: userAddress,
+                    hasPerpDexStates: data?.perpDexStates !== undefined,
+                    perpDexStatesLength: data?.perpDexStates?.length ?? 0,
                 }));
-                reject((0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'));
-            });
-        }
+            }
+        })
+            .then((sub) => {
+            __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_webData3Subscriptions, "f").set(dexName, sub);
+            __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log(`webData3 subscription established for OI caps (main + HIP-3)`);
+            return undefined;
+        })
+            .catch((error) => {
+            __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'createUserDataSubscription (webData3)', {
+                dex: dexName,
+            }));
+            throw error;
+        });
+        subscriptionPromises.push(webData3Promise);
+        // Wait for all subscriptions to be established
+        Promise.all(subscriptionPromises)
+            .then(() => {
+            __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log(`User data subscriptions established for ${dexsToSubscribe.length} DEX(s)`);
+            resolve();
+            return undefined;
+        })
+            .catch((error) => {
+            __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_logErrorUnlessClearing).call(this, (0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'), __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_instances, "m", _HyperLiquidSubscriptionService_getErrorContext).call(this, 'createUserDataSubscription', {
+                dexs: dexsToSubscribe,
+            }));
+            reject((0, errorUtils_1.ensureError)(error, 'HyperLiquidSubscriptionService.createUserDataSubscription'));
+        });
     });
 }, _HyperLiquidSubscriptionService_ensureClearinghouseStateSubscription = 
 /**
@@ -2149,7 +2073,7 @@ async function _HyperLiquidSubscriptionService_createOpenOrdersSubscription(user
         __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedPositionsHash, '', "f");
         __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedOrdersHash, '', "f");
         __classPrivateFieldSet(this, _HyperLiquidSubscriptionService_cachedAccountHash, '', "f");
-        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log('All multi-DEX subscriptions cleaned up (webData2/3 + individual subscriptions)');
+        __classPrivateFieldGet(this, _HyperLiquidSubscriptionService_deps, "f").debugLogger.log('All multi-DEX subscriptions cleaned up (webData3 + individual subscriptions)');
     }
 }, _HyperLiquidSubscriptionService_ensureOrderFillISubscription = 
 /**