@metamask-previews/perps-controller 11.0.0-preview-ea8763e0c → 11.0.0-preview-6b4bcdab3

package/dist/PerpsController.mjs

@@ -9,15 +9,15 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _PerpsController_instances, _a, _PerpsController_initializationPromise, _PerpsController_isReinitializing, _PerpsController_myxRegistrationPromise, _PerpsController_blockedRegionListVersion, _PerpsController_hip3Enabled, _PerpsController_hip3AllowlistMarkets, _PerpsController_hip3BlocklistMarkets, _PerpsController_hip3ConfigSource, _PerpsController_priceDeviationLimit, _PerpsController_attributionContext, _PerpsController_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_handlersRegistered, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_standaloneProviderOperations, _PerpsController_eligibilityCheckDeferred, _PerpsController_ausQueue, _PerpsController_userDiskWrite, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_getAggregatedCacheProviderIds, _PerpsController_isMarketCacheEntryCurrent, _PerpsController_isUserCacheIdentityCurrent, _PerpsController_fetchAndCacheUserDataSnapshot, _PerpsController_getOrCreateStandaloneProvider, _PerpsController_trackStandaloneProviderOperation, _PerpsController_retireStandaloneProvider, _PerpsController_cleanupStandaloneProvider, _PerpsController_getMetrics, _PerpsController_findNetworkClientIdForChain, _PerpsController_submitTransaction, _PerpsController_migrateRequestsIfNeeded, _PerpsController_withStreamPause, _PerpsController_performInitialization, _PerpsController_createProviders, _PerpsController_assignActiveProvider, _PerpsController_getErrorContext, _PerpsController_getControllerState, _PerpsController_buildMarketAllowedFilter, _PerpsController_compilePatternsSafely, _PerpsController_createServiceContext, _PerpsController_ensureTradingServiceDeps, _PerpsController_buildGlobalSnapshotContext, _PerpsController_getStaticSnapshotDexes, _PerpsController_preloadWatchedPaths, _PerpsController_preloadTimer, _PerpsController_isPreloading, _PerpsController_marketPreloadQueued, _PerpsController_isPreloadingUserData, _PerpsController_userPreloadQueued, _PerpsController_userSnapshotRequests, _PerpsController_preloadStateUnsubscribe, _PerpsController_accountChangeUnsubscribe, _PerpsController_previousIsTestnet, _PerpsController_previousHip3ConfigVersion, _PerpsController_preloadRefreshMs, _PerpsController_preloadGuardMs, _PerpsController_hydrateCacheFromDiskSync, _PerpsController_persistUserCacheToDisk, _PerpsController_performMarketDataPreload, _PerpsController_performUserDataPreload, _PerpsController_persistWatchlistToRemote, _PerpsController_syncWatchlistFromRemote;
+var _PerpsController_instances, _a, _PerpsController_initializationPromise, _PerpsController_isReinitializing, _PerpsController_myxRegistrationPromise, _PerpsController_blockedRegionListVersion, _PerpsController_hip3Enabled, _PerpsController_hip3AllowlistMarkets, _PerpsController_hip3BlocklistMarkets, _PerpsController_hip3ConfigSource, _PerpsController_priceDeviationLimit, _PerpsController_attributionContext, _PerpsController_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_handlersRegistered, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_eligibilityCheckDeferred, _PerpsController_ausQueue, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_getAggregatedCacheProviderIds, _PerpsController_getOrCreateStandaloneProvider, _PerpsController_cleanupStandaloneProvider, _PerpsController_getMetrics, _PerpsController_findNetworkClientIdForChain, _PerpsController_submitTransaction, _PerpsController_migrateRequestsIfNeeded, _PerpsController_withStreamPause, _PerpsController_performInitialization, _PerpsController_createProviders, _PerpsController_assignActiveProvider, _PerpsController_getErrorContext, _PerpsController_getControllerState, _PerpsController_buildMarketAllowedFilter, _PerpsController_compilePatternsSafely, _PerpsController_createServiceContext, _PerpsController_ensureTradingServiceDeps, _PerpsController_preloadWatchedPaths, _PerpsController_preloadTimer, _PerpsController_isPreloading, _PerpsController_isPreloadingUserData, _PerpsController_preloadStateUnsubscribe, _PerpsController_accountChangeUnsubscribe, _PerpsController_previousIsTestnet, _PerpsController_previousHip3ConfigVersion, _PerpsController_preloadRefreshMs, _PerpsController_preloadGuardMs, _PerpsController_hydrateCacheFromDiskSync, _PerpsController_performMarketDataPreload, _PerpsController_performUserDataPreload, _PerpsController_persistWatchlistToRemote, _PerpsController_syncWatchlistFromRemote;
 import { BaseController } from "@metamask/base-controller";
 import { ORIGIN_METAMASK } from "@metamask/controller-utils";
 import { v4 as uuidv4 } from "uuid";
 import { CandlePeriod } from "./constants/chartConfig.mjs";
 import { PERPS_EVENT_PROPERTY, PERPS_EVENT_VALUE } from "./constants/eventNames.mjs";
-import { canonicalizeHyperLiquidDexes, MAINNET_HIP3_CONFIG, TESTNET_HIP3_CONFIG, USDC_SYMBOL } from "./constants/hyperLiquidConfig.mjs";
+import { USDC_SYMBOL } from "./constants/hyperLiquidConfig.mjs";
 import { PerpsMeasurementName } from "./constants/performanceMetrics.mjs";
-import { PERPS_CONSTANTS, MARKET_SORTING_CONFIG, PROVIDER_CONFIG, buildProviderCacheKey, MAX_SLIPPAGE_BOUNDS, DEFAULT_PERPS_MODE, DEFAULT_PRO_LAYOUT_PREFERENCES } from "./constants/perpsConfig.mjs";
+import { PERPS_CONSTANTS, MARKET_SORTING_CONFIG, PROVIDER_CONFIG, PERPS_DISK_CACHE_USER_DATA, buildProviderCacheKey, MAX_SLIPPAGE_BOUNDS, DEFAULT_PERPS_MODE, DEFAULT_PRO_LAYOUT_PREFERENCES } from "./constants/perpsConfig.mjs";
 import { PERPS_ERROR_CODES } from "./perpsErrorCodes.mjs";
 import { AggregatedPerpsProvider } from "./providers/AggregatedPerpsProvider.mjs";
 import { HyperLiquidProvider } from "./providers/HyperLiquidProvider.mjs";
@@ -35,39 +35,9 @@ import { WebSocketConnectionState, PerpsAnalyticsEvent, PerpsTraceNames, PerpsTr
 import { getSelectedEvmAccountFromMessenger } from "./utils/accountUtils.mjs";
 import { ensureError } from "./utils/errorUtils.mjs";
 import { parseAssetName } from "./utils/hyperLiquidAdapter.mjs";
-import { clonePerpsMarketData, compileMarketPattern, shouldIncludeMarket } from "./utils/marketUtils.mjs";
+import { compileMarketPattern, shouldIncludeMarket } from "./utils/marketUtils.mjs";
 import { hydrateFromDiskSync, persistMarketEntriesToDisk, persistUserEntriesToDisk } from "./utils/perpsDiskPersistence.mjs";
 import { wait } from "./utils/wait.mjs";
-function cloneUserDataSnapshot(snapshot) {
-    return {
-        positions: snapshot.positions.map((position) => ({
-            ...position,
-            leverage: { ...position.leverage },
-            cumulativeFunding: { ...position.cumulativeFunding },
-            ...(position.takeProfitOrders && {
-                takeProfitOrders: position.takeProfitOrders.map((order) => ({
-                    ...order,
-                })),
-            }),
-            ...(position.stopLossOrders && {
-                stopLossOrders: position.stopLossOrders.map((order) => ({
-                    ...order,
-                })),
-            }),
-        })),
-        orders: snapshot.orders.map((order) => ({ ...order })),
-        accountState: {
-            ...snapshot.accountState,
-            ...(snapshot.accountState.subAccountBreakdown && {
-                subAccountBreakdown: Object.fromEntries(Object.entries(snapshot.accountState.subAccountBreakdown).map(([dex, balances]) => [dex, { ...balances }])),
-            }),
-        },
-        identity: {
-            ...snapshot.identity,
-            dexes: [...snapshot.identity.dexes],
-        },
-    };
-}
 /**
  * Returns the first non-empty string from the given values.
  * Env vars default to '' (not null/undefined), so ?? wouldn't fall through.
@@ -430,7 +400,6 @@ const MESSENGER_EXPOSED_METHODS = [
     'getBlockExplorerUrl',
     'getCachedMarketDataForActiveProvider',
     'getCachedUserDataForActiveProvider',
-    'getUserDataSnapshot',
     'getCurrentNetwork',
     'getFunding',
     'getHistoricalPortfolio',
@@ -563,7 +532,6 @@ export class PerpsController extends BaseController {
         _PerpsController_handlersRegistered.set(this, false);
         _PerpsController_standaloneProviderIsTestnet.set(this, null);
         _PerpsController_standaloneProviderHip3Version.set(this, null);
-        _PerpsController_standaloneProviderOperations.set(this, new Map());
         _PerpsController_eligibilityCheckDeferred.set(this, void 0);
         /**
          * Serial promise queue for all AUS watchlist operations (hydration and
@@ -579,7 +547,6 @@ export class PerpsController extends BaseController {
          * a failed operation does not stall subsequent ones.
          */
         _PerpsController_ausQueue.set(this, Promise.resolve());
-        _PerpsController_userDiskWrite.set(this, Promise.resolve());
         // Store options for dependency injection (allows core package to inject platform-specific services)
         _PerpsController_options.set(this, void 0);
         // Service instances (instantiated with platform dependencies)
@@ -593,10 +560,7 @@ export class PerpsController extends BaseController {
         _PerpsController_rewardsIntegrationService.set(this, void 0);
         _PerpsController_preloadTimer.set(this, null);
         _PerpsController_isPreloading.set(this, false);
-        _PerpsController_marketPreloadQueued.set(this, false);
         _PerpsController_isPreloadingUserData.set(this, false);
-        _PerpsController_userPreloadQueued.set(this, false);
-        _PerpsController_userSnapshotRequests.set(this, new Map());
         _PerpsController_preloadStateUnsubscribe.set(this, null);
         _PerpsController_accountChangeUnsubscribe.set(this, null);
         _PerpsController_previousIsTestnet.set(this, null);
@@ -615,9 +579,7 @@ export class PerpsController extends BaseController {
         __classPrivateFieldSet(this, _PerpsController_marketDataService, new MarketDataService({
             ...infrastructure,
             terminalMarketService: infrastructure.terminalMarketService ??
-                (infrastructure.terminalApi?.marketDataUrl ||
-                    infrastructure.terminalApiUrl ||
-                    infrastructure.terminalApi?.globalSnapshotUrl
+                (infrastructure.terminalApiUrl
                     ? new TerminalMarketService(infrastructure)
                     : undefined),
         }), "f");
@@ -684,20 +646,24 @@ export class PerpsController extends BaseController {
         if (activeProvider === 'aggregated') {
             // Assemble from all registered provider entries
             const assembled = [];
+            let oldestTimestamp = Infinity;
             for (const providerId of __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getAggregatedCacheProviderIds).call(this, Object.keys(cache))) {
                 const key = buildProviderCacheKey(providerId, this.state.isTestnet);
                 const entry = cache[key];
                 if (!entry || entry.data.length === 0) {
                     continue;
                 }
-                if (!__classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isMarketCacheEntryCurrent).call(this, providerId, entry, options)) {
-                    continue;
-                }
-                assembled.push(...clonePerpsMarketData(entry.data));
+                oldestTimestamp = Math.min(oldestTimestamp, entry.timestamp);
+                assembled.push(...entry.data);
             }
             if (assembled.length === 0) {
                 return null;
             }
+            // Check TTL against the oldest entry
+            if (!options?.skipTTL &&
+                Date.now() - oldestTimestamp > __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 10) {
+                return null;
+            }
             return assembled;
         }
         // Single provider mode
@@ -706,10 +672,11 @@ export class PerpsController extends BaseController {
         if (!entry || entry.data.length === 0) {
             return null;
         }
-        if (!__classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isMarketCacheEntryCurrent).call(this, activeProvider, entry, options)) {
+        if (!options?.skipTTL &&
+            Date.now() - entry.timestamp > __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 10) {
             return null;
         }
-        return clonePerpsMarketData(entry.data);
+        return entry.data;
     }
     /**
      * Read cached user data for the currently active provider (or aggregated).
@@ -733,21 +700,18 @@ export class PerpsController extends BaseController {
             currentAddress = evmAccount?.address ?? null;
         }
         catch {
-            // Account identity is required before account-scoped data can be trusted.
+            // Can't determine current account — trust the cache
         }
-        if (!currentAddress) {
-            return null;
-        }
-        const selectedAddress = currentAddress;
         const skipTTL = options?.skipTTL ?? false;
-        const isValidEntry = (providerId, entry) => {
+        const isValidEntry = (entry) => {
             if (!entry) {
                 return false;
             }
             if (!skipTTL && Date.now() - entry.timestamp >= staleCutoff) {
                 return false;
             }
-            if (!__classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isUserCacheIdentityCurrent).call(this, providerId, entry, selectedAddress)) {
+            if (currentAddress &&
+                entry.address.toLowerCase() !== currentAddress.toLowerCase()) {
                 return false;
             }
             return true;
@@ -759,9 +723,9 @@ export class PerpsController extends BaseController {
             let defaultAccountState = null;
             let hasValidEntry = false;
             for (const providerId of __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getAggregatedCacheProviderIds).call(this, Object.keys(cache))) {
-                const providerNetworkKey = buildProviderCacheKey(providerId, this.state.isTestnet);
-                const entry = cache[providerNetworkKey];
-                if (!isValidEntry(providerId, entry)) {
+                const key = buildProviderCacheKey(providerId, this.state.isTestnet);
+                const entry = cache[key];
+                if (!isValidEntry(entry)) {
                     continue;
                 }
                 hasValidEntry = true;
@@ -782,9 +746,9 @@ export class PerpsController extends BaseController {
             };
         }
         // Single provider mode
-        const providerNetworkKey = buildProviderCacheKey(activeProvider, this.state.isTestnet);
-        const entry = cache[providerNetworkKey];
-        if (!entry || !isValidEntry(activeProvider, entry)) {
+        const key = buildProviderCacheKey(activeProvider, this.state.isTestnet);
+        const entry = cache[key];
+        if (!entry || !isValidEntry(entry)) {
             return null;
         }
         return {
@@ -793,82 +757,6 @@ export class PerpsController extends BaseController {
             accountState: entry.accountState,
         };
     }
-    /**
-     * Fetch, validate, and atomically cache a complete user-data snapshot.
-     * This remains callable after mount so consumers can seed their live channel
-     * from one coherent positions/orders/account result.
-     *
-     * @returns The accepted user-data snapshot.
-     */
-    async getUserDataSnapshot() {
-        const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
-        if (!evmAccount?.address) {
-            throw new Error('Cannot fetch user data snapshot without an EVM account');
-        }
-        if (this.state.activeProvider !== 'hyperliquid') {
-            throw new Error('User data snapshots require Hyperliquid provider mode');
-        }
-        const capturedActiveProvider = this.activeProviderInstance;
-        const standaloneProvider = capturedActiveProvider
-            ? null
-            : __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-        const provider = capturedActiveProvider ?? standaloneProvider;
-        if (!provider) {
-            throw new Error('Cannot create standalone Hyperliquid provider');
-        }
-        const { address } = evmAccount;
-        const { isTestnet, hip3ConfigVersion } = this.state;
-        const network = isTestnet ? 'testnet' : 'mainnet';
-        const expectedDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
-        if (!expectedDexes) {
-            throw new Error('User data snapshot DEX identity is not static');
-        }
-        const isCurrent = () => {
-            let currentAddress;
-            try {
-                currentAddress = getSelectedEvmAccountFromMessenger(this.messenger)?.address;
-            }
-            catch {
-                return false;
-            }
-            return (this.state.activeProvider === 'hyperliquid' &&
-                (!capturedActiveProvider ||
-                    this.activeProviderInstance === capturedActiveProvider) &&
-                this.state.isTestnet === isTestnet &&
-                this.state.hip3ConfigVersion === hip3ConfigVersion &&
-                currentAddress?.toLowerCase() === address.toLowerCase());
-        };
-        const context = {
-            provider,
-            standaloneProvider,
-            address,
-            isTestnet,
-            hip3ConfigVersion,
-            expectedDexes,
-            isCurrent,
-        };
-        const requestKey = [
-            'hyperliquid',
-            network,
-            address.toLowerCase(),
-            hip3ConfigVersion,
-            ...expectedDexes,
-        ].join('|');
-        const existingRequest = __classPrivateFieldGet(this, _PerpsController_userSnapshotRequests, "f").get(requestKey);
-        if (existingRequest?.provider === provider) {
-            return existingRequest.promise;
-        }
-        const request = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_fetchAndCacheUserDataSnapshot).call(this, context);
-        __classPrivateFieldGet(this, _PerpsController_userSnapshotRequests, "f").set(requestKey, { provider, promise: request });
-        try {
-            return await request;
-        }
-        finally {
-            if (__classPrivateFieldGet(this, _PerpsController_userSnapshotRequests, "f").get(requestKey)?.promise === request) {
-                __classPrivateFieldGet(this, _PerpsController_userSnapshotRequests, "f").delete(requestKey);
-            }
-        }
-    }
     /**
      * Test-observable accessor for whether a standalone provider is cached.
      *
@@ -1644,10 +1532,7 @@ export class PerpsController extends BaseController {
             // Fallback to cached standalone provider for pre-initialization discovery
             // TODO: When adding new providers (MYX), consider a provider factory pattern
             const provider = this.activeProviderInstance ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-            const operation = provider.getPositions(params);
-            return provider === __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")
-                ? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, provider, operation)
-                : operation;
+            return provider.getPositions(params);
         }
         const provider = this.getActiveProvider();
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getPositions({
@@ -1708,10 +1593,7 @@ export class PerpsController extends BaseController {
         // For standalone mode, access provider directly without initialization check
         if (params?.standalone && params.userAddress) {
             const provider = this.activeProviderInstance ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-            const operation = provider.getOpenOrders(params);
-            return provider === __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")
-                ? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, provider, operation)
-                : operation;
+            return provider.getOpenOrders(params);
         }
         const provider = this.getActiveProvider();
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getOpenOrders({
@@ -1756,10 +1638,7 @@ export class PerpsController extends BaseController {
             // Use activeProviderInstance if available (respects provider abstraction)
             // Fallback to cached standalone provider for pre-initialization discovery
             const provider = this.activeProviderInstance ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-            const operation = provider.getAccountState(params);
-            return provider === __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")
-                ? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, provider, operation)
-                : operation;
+            return provider.getAccountState(params);
         }
         const provider = this.getActiveProvider();
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getAccountState({
@@ -1797,15 +1676,12 @@ export class PerpsController extends BaseController {
         const isMarketAllowed = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_buildMarketAllowedFilter).call(this);
         if (params?.standalone) {
             const provider = this.activeProviderInstance ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-            const operation = __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarkets({
+            return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarkets({
                 provider,
                 params,
                 context: __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'getMarkets'),
                 isMarketAllowed,
             });
-            return provider === __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")
-                ? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, provider, operation)
-                : operation;
         }
         const provider = this.getActiveProvider();
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarkets({
@@ -1831,26 +1707,19 @@ export class PerpsController extends BaseController {
      * @returns A promise that resolves to the market data.
      */
     async getMarketDataWithPrices(params) {
-        const globalSnapshot = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_buildGlobalSnapshotContext).call(this);
-        const context = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'getMarketDataWithPrices', {
-            ...(globalSnapshot && { globalSnapshot }),
-        });
         if (params?.standalone) {
             const provider = this.activeProviderInstance ?? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getOrCreateStandaloneProvider).call(this);
-            const operation = __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarketDataWithPrices({
+            return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarketDataWithPrices({
                 provider,
                 params,
-                context,
+                context: __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'getMarketDataWithPrices'),
             });
-            return provider === __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")
-                ? __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, provider, operation)
-                : operation;
         }
         const provider = this.getActiveProvider();
         return __classPrivateFieldGet(this, _PerpsController_marketDataService, "f").getMarketDataWithPrices({
             provider,
             params,
-            context,
+            context: __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createServiceContext).call(this, 'getMarketDataWithPrices'),
         });
     }
     /**
@@ -1871,17 +1740,11 @@ export class PerpsController extends BaseController {
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
             /* fire-and-forget */
         });
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-            /* fire-and-forget */
-        });
         // Periodic refresh
         __classPrivateFieldSet(this, _PerpsController_preloadTimer, setInterval(() => {
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
                 /* fire-and-forget */
             });
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-                /* fire-and-forget */
-            });
         }, __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadRefreshMs)), "f");
         // Watch for isTestnet / hip3ConfigVersion changes
         const handler = (_state, patches) => {
@@ -1910,29 +1773,36 @@ export class PerpsController extends BaseController {
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
                     /* fire-and-forget */
                 });
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-                    /* fire-and-forget */
-                });
             }
         };
-        this.messenger.subscribe('PerpsController:stateChanged', handler);
+        this.messenger.subscribe('PerpsController:stateChange', handler);
         __classPrivateFieldSet(this, _PerpsController_preloadStateUnsubscribe, () => {
-            this.messenger.unsubscribe('PerpsController:stateChanged', handler);
+            this.messenger.unsubscribe('PerpsController:stateChange', handler);
         }, "f");
         // Watch for selected account changes and selected account group changes.
         const accountChangeHandler = () => {
             const evmAccount = getSelectedEvmAccountFromMessenger(this.messenger);
             const currentAddress = evmAccount?.address ?? null;
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: account cache selection', {
-                address: currentAddress?.toLowerCase() ?? null,
-                availableKeys: Object.keys(this.state.cachedUserDataByProvider).sort(),
-            });
-            // The address guard makes the previous entry unreadable immediately;
-            // refresh replaces it under the existing provider/network key.
-            if (currentAddress) {
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
+            // If any cached entry belongs to a different account, clear all entries.
+            // Max 4 entries (2 providers × 2 networks) — clearing all is simple and safe.
+            const hasStaleEntries = Object.values(this.state.cachedUserDataByProvider).some((entry) => entry.address.toLowerCase() !== currentAddress?.toLowerCase());
+            if (hasStaleEntries) {
+                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Account changed, clearing user data cache');
+                this.update((state) => {
+                    state.cachedUserDataByProvider = {};
+                });
+                // Invalidate disk-cached user data for the old account
+                __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.diskCache
+                    .removeItem(PERPS_DISK_CACHE_USER_DATA)
+                    .catch(() => {
                     /* fire-and-forget */
                 });
+                // Only preload if the new account is an EVM account
+                if (currentAddress) {
+                    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
+                        /* fire-and-forget */
+                    });
+                }
             }
         };
         this.messenger.subscribe('AccountsController:selectedAccountChange', accountChangeHandler);
@@ -1961,8 +1831,6 @@ export class PerpsController extends BaseController {
         }
         __classPrivateFieldSet(this, _PerpsController_previousIsTestnet, null, "f");
         __classPrivateFieldSet(this, _PerpsController_previousHip3ConfigVersion, null, "f");
-        __classPrivateFieldSet(this, _PerpsController_marketPreloadQueued, false, "f");
-        __classPrivateFieldSet(this, _PerpsController_userPreloadQueued, false, "f");
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this).catch(() => {
             /* fire-and-forget to preserve sync signature */
         });
@@ -2223,9 +2091,6 @@ export class PerpsController extends BaseController {
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
                     /* fire-and-forget */
                 });
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-                    /* fire-and-forget */
-                });
             }
         }
     }
@@ -2335,9 +2200,6 @@ export class PerpsController extends BaseController {
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
                     /* fire-and-forget */
                 });
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-                    /* fire-and-forget */
-                });
             }
         }
     }
@@ -3400,7 +3262,7 @@ export class PerpsController extends BaseController {
         return __classPrivateFieldGet(this, _PerpsController_isReinitializing, "f");
     }
 }
-_a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _PerpsController_isReinitializing = new WeakMap(), _PerpsController_myxRegistrationPromise = new WeakMap(), _PerpsController_blockedRegionListVersion = new WeakMap(), _PerpsController_hip3Enabled = new WeakMap(), _PerpsController_hip3AllowlistMarkets = new WeakMap(), _PerpsController_hip3BlocklistMarkets = new WeakMap(), _PerpsController_hip3ConfigSource = new WeakMap(), _PerpsController_priceDeviationLimit = new WeakMap(), _PerpsController_attributionContext = new WeakMap(), _PerpsController_standaloneProvider = new WeakMap(), _PerpsController_handlersRegistered = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_standaloneProviderOperations = new WeakMap(), _PerpsController_eligibilityCheckDeferred = new WeakMap(), _PerpsController_ausQueue = new WeakMap(), _PerpsController_userDiskWrite = new WeakMap(), _PerpsController_options = new WeakMap(), _PerpsController_tradingService = new WeakMap(), _PerpsController_marketDataService = new WeakMap(), _PerpsController_accountService = new WeakMap(), _PerpsController_eligibilityService = new WeakMap(), _PerpsController_dataLakeService = new WeakMap(), _PerpsController_depositService = new WeakMap(), _PerpsController_featureFlagConfigurationService = new WeakMap(), _PerpsController_rewardsIntegrationService = new WeakMap(), _PerpsController_preloadTimer = new WeakMap(), _PerpsController_isPreloading = new WeakMap(), _PerpsController_marketPreloadQueued = new WeakMap(), _PerpsController_isPreloadingUserData = new WeakMap(), _PerpsController_userPreloadQueued = new WeakMap(), _PerpsController_userSnapshotRequests = new WeakMap(), _PerpsController_preloadStateUnsubscribe = new WeakMap(), _PerpsController_accountChangeUnsubscribe = new WeakMap(), _PerpsController_previousIsTestnet = new WeakMap(), _PerpsController_previousHip3ConfigVersion = new WeakMap(), _PerpsController_instances = new WeakSet(), _PerpsController_isMYXProviderEnabled = function _PerpsController_isMYXProviderEnabled() {
+_a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _PerpsController_isReinitializing = new WeakMap(), _PerpsController_myxRegistrationPromise = new WeakMap(), _PerpsController_blockedRegionListVersion = new WeakMap(), _PerpsController_hip3Enabled = new WeakMap(), _PerpsController_hip3AllowlistMarkets = new WeakMap(), _PerpsController_hip3BlocklistMarkets = new WeakMap(), _PerpsController_hip3ConfigSource = new WeakMap(), _PerpsController_priceDeviationLimit = new WeakMap(), _PerpsController_attributionContext = new WeakMap(), _PerpsController_standaloneProvider = new WeakMap(), _PerpsController_handlersRegistered = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_eligibilityCheckDeferred = new WeakMap(), _PerpsController_ausQueue = new WeakMap(), _PerpsController_options = new WeakMap(), _PerpsController_tradingService = new WeakMap(), _PerpsController_marketDataService = new WeakMap(), _PerpsController_accountService = new WeakMap(), _PerpsController_eligibilityService = new WeakMap(), _PerpsController_dataLakeService = new WeakMap(), _PerpsController_depositService = new WeakMap(), _PerpsController_featureFlagConfigurationService = new WeakMap(), _PerpsController_rewardsIntegrationService = new WeakMap(), _PerpsController_preloadTimer = new WeakMap(), _PerpsController_isPreloading = new WeakMap(), _PerpsController_isPreloadingUserData = new WeakMap(), _PerpsController_preloadStateUnsubscribe = new WeakMap(), _PerpsController_accountChangeUnsubscribe = new WeakMap(), _PerpsController_previousIsTestnet = new WeakMap(), _PerpsController_previousHip3ConfigVersion = new WeakMap(), _PerpsController_instances = new WeakSet(), _PerpsController_isMYXProviderEnabled = function _PerpsController_isMYXProviderEnabled() {
     const myx = __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.myx;
     // Local env-var override (MM_PERPS_MYX_PROVIDER_ENABLED) always wins —
     // matches the UI selector (resolvePerpsMyxProviderEnabled) so controller
@@ -3453,96 +3315,6 @@ _a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _P
         }
     }
     return Array.from(providerIds);
-}, _PerpsController_isMarketCacheEntryCurrent = function _PerpsController_isMarketCacheEntryCurrent(providerId, entry, options) {
-    if (entry.sourceExpiresAt !== undefined) {
-        const expectedDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
-        return (providerId === 'hyperliquid' &&
-            Date.now() < entry.sourceExpiresAt &&
-            entry.hip3ConfigVersion === this.state.hip3ConfigVersion &&
-            expectedDexes !== undefined &&
-            Array.isArray(entry.dexes) &&
-            entry.dexes.length === expectedDexes.length &&
-            entry.dexes.every((dex, index) => dex === expectedDexes[index]));
-    }
-    return (options?.skipTTL === true ||
-        Date.now() - entry.timestamp <= __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 10);
-}, _PerpsController_isUserCacheIdentityCurrent = function _PerpsController_isUserCacheIdentityCurrent(providerId, entry, address) {
-    if (entry.address.toLowerCase() !== address.toLowerCase()) {
-        return false;
-    }
-    if (providerId !== 'hyperliquid') {
-        return true;
-    }
-    const expectedDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
-    return (entry.hip3ConfigVersion === this.state.hip3ConfigVersion &&
-        expectedDexes !== undefined &&
-        Array.isArray(entry.dexes) &&
-        entry.dexes.length === expectedDexes.length &&
-        entry.dexes.every((dex, index) => dex === expectedDexes[index]));
-}, _PerpsController_fetchAndCacheUserDataSnapshot = async function _PerpsController_fetchAndCacheUserDataSnapshot(context) {
-    const { provider, standaloneProvider, address, isTestnet, hip3ConfigVersion, expectedDexes, isCurrent, } = context;
-    if (!isCurrent()) {
-        throw new Error('User data snapshot context changed');
-    }
-    if (!provider.getUserDataSnapshot) {
-        throw new Error('Provider has no atomic snapshot API');
-    }
-    const identity = {
-        provider: 'hyperliquid',
-        network: isTestnet ? 'testnet' : 'mainnet',
-        hip3ConfigVersion,
-        dexes: expectedDexes,
-    };
-    const snapshotRequest = provider.getUserDataSnapshot({
-        userAddress: address,
-        identity,
-    });
-    const snapshot = standaloneProvider
-        ? await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_trackStandaloneProviderOperation).call(this, standaloneProvider, snapshotRequest)
-        : await snapshotRequest;
-    if (!isCurrent()) {
-        throw new Error('User data snapshot context changed');
-    }
-    const snapshotIdentity = snapshot.identity;
-    const hasCompleteBundle = Array.isArray(snapshot.positions) &&
-        Array.isArray(snapshot.orders) &&
-        snapshot.accountState !== null &&
-        typeof snapshot.accountState === 'object';
-    const hasExactIdentity = snapshotIdentity.provider === identity.provider &&
-        snapshotIdentity.network === identity.network &&
-        snapshotIdentity.hip3ConfigVersion === identity.hip3ConfigVersion &&
-        snapshotIdentity.address.toLowerCase() === address.toLowerCase() &&
-        snapshotIdentity.dexes.length === expectedDexes.length &&
-        snapshotIdentity.dexes.every((dex, index) => dex === expectedDexes[index]);
-    if (!hasCompleteBundle || !hasExactIdentity) {
-        throw new Error('User data snapshot is incomplete or mismatched');
-    }
-    if (!isCurrent()) {
-        throw new Error('User data snapshot context changed');
-    }
-    const cachedSnapshot = cloneUserDataSnapshot(snapshot);
-    const result = cloneUserDataSnapshot(snapshot);
-    const timestamp = Date.now();
-    const providerNetworkKey = buildProviderCacheKey('hyperliquid', isTestnet);
-    this.update((state) => {
-        state.cachedUserDataByProvider[providerNetworkKey] = {
-            positions: cachedSnapshot.positions,
-            orders: cachedSnapshot.orders,
-            accountState: cachedSnapshot.accountState,
-            timestamp,
-            address,
-            hip3ConfigVersion,
-            dexes: expectedDexes,
-        };
-    });
-    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_persistUserCacheToDisk).call(this);
-    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: user cache snapshot written', {
-        writtenKey: providerNetworkKey,
-        availableKeys: Object.keys(this.state.cachedUserDataByProvider).sort(),
-        positionCount: cachedSnapshot.positions.length,
-        orderCount: cachedSnapshot.orders.length,
-    });
-    return result;
 }, _PerpsController_getOrCreateStandaloneProvider = function _PerpsController_getOrCreateStandaloneProvider() {
     const currentIsTestnet = this.state.isTestnet;
     const currentHip3Version = this.state.hip3ConfigVersion ?? 0;
@@ -3551,13 +3323,10 @@ _a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _P
         __classPrivateFieldGet(this, _PerpsController_standaloneProviderHip3Version, "f") === currentHip3Version) {
         return __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f");
     }
-    // Stale or missing — retire the old provider after active operations finish.
+    // Stale or missing — tear down old one (fire-and-forget)
     if (__classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")) {
         const old = __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f");
-        __classPrivateFieldSet(this, _PerpsController_standaloneProvider, null, "f");
-        __classPrivateFieldSet(this, _PerpsController_standaloneProviderIsTestnet, null, "f");
-        __classPrivateFieldSet(this, _PerpsController_standaloneProviderHip3Version, null, "f");
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_retireStandaloneProvider).call(this, old).catch(() => {
+        Promise.resolve(old.disconnect()).catch(() => {
             /* best-effort */
         });
     }
@@ -3577,45 +3346,24 @@ _a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _P
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderIsTestnet, currentIsTestnet, "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderHip3Version, currentHip3Version, "f");
     return __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f");
-}, _PerpsController_trackStandaloneProviderOperation = function _PerpsController_trackStandaloneProviderOperation(provider, operation) {
-    const operations = __classPrivateFieldGet(this, _PerpsController_standaloneProviderOperations, "f").get(provider) ?? new Set();
-    __classPrivateFieldGet(this, _PerpsController_standaloneProviderOperations, "f").set(provider, operations);
-    const trackedOperation = operation.finally(() => {
-        operations.delete(trackedOperation);
-        if (operations.size === 0) {
-            __classPrivateFieldGet(this, _PerpsController_standaloneProviderOperations, "f").delete(provider);
-        }
-    });
-    operations.add(trackedOperation);
-    return trackedOperation;
-}, _PerpsController_retireStandaloneProvider = async function _PerpsController_retireStandaloneProvider(provider) {
-    const operations = __classPrivateFieldGet(this, _PerpsController_standaloneProviderOperations, "f").get(provider);
-    if (operations?.size) {
-        await Promise.allSettled([...operations]);
-    }
-    try {
-        await provider.disconnect();
-    }
-    catch {
-        /* best-effort */
-    }
-    finally {
-        __classPrivateFieldGet(this, _PerpsController_standaloneProviderOperations, "f").delete(provider);
-    }
 }, _PerpsController_cleanupStandaloneProvider = 
 /**
  * Disconnect and discard the cached standalone provider (if any).
  * Best-effort — errors are silently caught.
  */
 async function _PerpsController_cleanupStandaloneProvider() {
-    const provider = __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f");
-    if (!provider) {
+    if (!__classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f")) {
         return;
     }
+    try {
+        await __classPrivateFieldGet(this, _PerpsController_standaloneProvider, "f").disconnect();
+    }
+    catch {
+        /* best-effort */
+    }
     __classPrivateFieldSet(this, _PerpsController_standaloneProvider, null, "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderIsTestnet, null, "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderHip3Version, null, "f");
-    await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_retireStandaloneProvider).call(this, provider);
 }, _PerpsController_getMetrics = function _PerpsController_getMetrics() {
     return __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.metrics;
 }, _PerpsController_findNetworkClientIdForChain = function _PerpsController_findNetworkClientIdForChain(chainId) {
@@ -3949,60 +3697,6 @@ async function _PerpsController_performInitialization() {
     __classPrivateFieldGet(this, _PerpsController_tradingService, "f").setControllerDependencies({
         rewardsIntegrationService: __classPrivateFieldGet(this, _PerpsController_rewardsIntegrationService, "f"),
     });
-}, _PerpsController_buildGlobalSnapshotContext = function _PerpsController_buildGlobalSnapshotContext() {
-    const snapshotConfigured = Boolean(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.terminalApi?.globalSnapshotUrl) ||
-        typeof __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.terminalMarketService
-            ?.fetchGlobalSnapshot === 'function';
-    if (!snapshotConfigured || this.state.activeProvider !== 'hyperliquid') {
-        return undefined;
-    }
-    const enabledDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
-    if (!enabledDexes) {
-        return undefined;
-    }
-    const { isTestnet, hip3ConfigVersion } = this.state;
-    return {
-        request: {
-            provider: 'hyperliquid',
-            network: isTestnet ? 'testnet' : 'mainnet',
-            enabledDexes,
-        },
-        isCurrent: () => this.state.activeProvider === 'hyperliquid' &&
-            this.state.isTestnet === isTestnet &&
-            this.state.hip3ConfigVersion === hip3ConfigVersion,
-        isMarketAllowed: __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_buildMarketAllowedFilter).call(this),
-    };
-}, _PerpsController_getStaticSnapshotDexes = function _PerpsController_getStaticSnapshotDexes() {
-    if (!__classPrivateFieldGet(this, _PerpsController_hip3Enabled, "f")) {
-        return ['main'];
-    }
-    if (this.state.isTestnet) {
-        return TESTNET_HIP3_CONFIG.AutoDiscoverAll
-            ? undefined
-            : canonicalizeHyperLiquidDexes(TESTNET_HIP3_CONFIG.EnabledDexs);
-    }
-    if (MAINNET_HIP3_CONFIG.AutoDiscoverAll) {
-        return undefined;
-    }
-    const dexes = new Set();
-    for (const pattern of __classPrivateFieldGet(this, _PerpsController_hip3AllowlistMarkets, "f")) {
-        const colonIndex = pattern.indexOf(':');
-        if (colonIndex <= 0) {
-            if (/^[a-z][a-z0-9]*$/iu.test(pattern)) {
-                dexes.add(pattern.toLowerCase());
-                continue;
-            }
-            return undefined;
-        }
-        const dex = pattern.slice(0, colonIndex);
-        if (dex && /^[a-z0-9][a-z0-9-]*$/u.test(dex)) {
-            dexes.add(dex);
-        }
-        else {
-            return undefined;
-        }
-    }
-    return canonicalizeHyperLiquidDexes(dexes);
 }, _PerpsController_hydrateCacheFromDiskSync = function _PerpsController_hydrateCacheFromDiskSync() {
     const { marketUpdates, userUpdates, stats } = hydrateFromDiskSync(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.diskCache, this.state.cachedMarketDataByProvider, this.state.cachedUserDataByProvider, __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs));
     const hasMarketUpdates = Object.keys(marketUpdates).length > 0;
@@ -4023,40 +3717,12 @@ async function _PerpsController_performInitialization() {
         orders: stats.userOrders,
         duration_ms: stats.durationMs,
     });
-}, _PerpsController_persistUserCacheToDisk = function _PerpsController_persistUserCacheToDisk() {
-    const entries = [];
-    for (const [cacheKey, entry] of Object.entries(this.state.cachedUserDataByProvider)) {
-        const [providerId, network] = cacheKey.split(':');
-        if (!providerId ||
-            (network !== 'mainnet' && network !== 'testnet') ||
-            providerId === 'aggregated') {
-            continue;
-        }
-        entries.push({
-            providerNetworkKey: `${providerId}:${network}`,
-            address: entry.address,
-            positions: entry.positions,
-            orders: entry.orders,
-            accountState: entry.accountState,
-            timestamp: entry.timestamp,
-            ...(entry.hip3ConfigVersion !== undefined && {
-                hip3ConfigVersion: entry.hip3ConfigVersion,
-            }),
-            ...(entry.dexes !== undefined && { dexes: entry.dexes }),
-        });
-    }
-    __classPrivateFieldSet(this, _PerpsController_userDiskWrite, __classPrivateFieldGet(this, _PerpsController_userDiskWrite, "f")
-        .then(() => persistUserEntriesToDisk(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.diskCache, entries))
-        .catch(() => {
-        // Disk persistence is best-effort and must not block live data.
-    }), "f");
 }, _PerpsController_performMarketDataPreload = 
 /**
  * Perform a single market data preload (best-effort, no throw).
  */
 async function _PerpsController_performMarketDataPreload() {
     if (__classPrivateFieldGet(this, _PerpsController_isPreloading, "f")) {
-        __classPrivateFieldSet(this, _PerpsController_marketPreloadQueued, true, "f");
         return;
     }
     // Skip preloading during provider/network reinitialisation.
@@ -4071,16 +3737,9 @@ async function _PerpsController_performMarketDataPreload() {
         ? this.state.activeProvider // includes 'aggregated'
         : 'hyperliquid';
     const cacheKey = buildProviderCacheKey(actualProviderId, this.state.isTestnet);
-    const preloadContext = {
-        activeProvider: this.state.activeProvider,
-        isTestnet: this.state.isTestnet,
-        hip3ConfigVersion: this.state.hip3ConfigVersion,
-    };
-    const staticSnapshotDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
     const now = Date.now();
     const existingEntry = this.state.cachedMarketDataByProvider[cacheKey];
     if (existingEntry &&
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isMarketCacheEntryCurrent).call(this, actualProviderId, existingEntry) &&
         now - existingEntry.timestamp < __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
         return;
     }
@@ -4105,32 +3764,8 @@ async function _PerpsController_performMarketDataPreload() {
             duration_ms: Math.round(performance.now() - preloadStart),
             markets: data.length,
         });
-        if (this.state.activeProvider !== preloadContext.activeProvider ||
-            this.state.isTestnet !== preloadContext.isTestnet ||
-            this.state.hip3ConfigVersion !== preloadContext.hip3ConfigVersion) {
-            traceData = {
-                success: false,
-                error: 'Global snapshot preload context changed',
-            };
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Discarding stale global snapshot preload');
-            return;
-        }
         // Store under per-provider key(s)
         const ts = Date.now();
-        const sourceExpiries = data.flatMap((market) => market.dataSource === 'terminal-global-snapshot-mark' &&
-            typeof market.sourceExpiresAt === 'number'
-            ? [market.sourceExpiresAt]
-            : []);
-        const sourceExpiresAt = data.length > 0 && sourceExpiries.length === data.length
-            ? Math.min(...sourceExpiries)
-            : undefined;
-        const snapshotCacheIdentity = sourceExpiresAt !== undefined && staticSnapshotDexes
-            ? {
-                sourceExpiresAt,
-                hip3ConfigVersion: preloadContext.hip3ConfigVersion,
-                dexes: staticSnapshotDexes,
-            }
-            : {};
         const marketDiskEntries = [];
         if (this.state.activeProvider === 'aggregated' &&
             this.activeProviderInstance) {
@@ -4177,7 +3812,6 @@ async function _PerpsController_performMarketDataPreload() {
                 state.cachedMarketDataByProvider[cacheKey] = {
                     data,
                     timestamp: ts,
-                    ...snapshotCacheIdentity,
                 };
             });
         }
@@ -4187,6 +3821,10 @@ async function _PerpsController_performMarketDataPreload() {
         });
         traceData = { success: true, marketCount: data.length };
         __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.tracer.setMeasurement(PerpsMeasurementName.PerpsMarketDataPreload, performance.now() - preloadStart, 'millisecond');
+        // Also preload user data (fire-and-forget, non-blocking)
+        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
+            /* fire-and-forget */
+        });
     }
     catch (error) {
         traceData = {
@@ -4205,12 +3843,6 @@ async function _PerpsController_performMarketDataPreload() {
             data: traceData,
         });
         __classPrivateFieldSet(this, _PerpsController_isPreloading, false, "f");
-        if (__classPrivateFieldGet(this, _PerpsController_marketPreloadQueued, "f") && __classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
-            __classPrivateFieldSet(this, _PerpsController_marketPreloadQueued, false, "f");
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
-                // Background preload is best-effort.
-            });
-        }
     }
 }, _PerpsController_performUserDataPreload = 
 /**
@@ -4219,10 +3851,6 @@ async function _PerpsController_performMarketDataPreload() {
  */
 async function _PerpsController_performUserDataPreload() {
     if (__classPrivateFieldGet(this, _PerpsController_isPreloadingUserData, "f")) {
-        __classPrivateFieldSet(this, _PerpsController_userPreloadQueued, true, "f");
-        return;
-    }
-    if (__classPrivateFieldGet(this, _PerpsController_isReinitializing, "f")) {
         return;
     }
     // Get current user address
@@ -4231,54 +3859,21 @@ async function _PerpsController_performUserDataPreload() {
         return;
     }
     const userAddress = evmAccount.address;
-    const { activeProvider, isTestnet, hip3ConfigVersion } = this.state;
-    const { activeProviderInstance } = this;
-    const hyperliquidDexes = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getStaticSnapshotDexes).call(this);
-    const isCurrent = () => {
-        let currentAddress;
-        try {
-            currentAddress = getSelectedEvmAccountFromMessenger(this.messenger)?.address;
-        }
-        catch {
-            return false;
-        }
-        return (this.state.activeProvider === activeProvider &&
-            this.activeProviderInstance === activeProviderInstance &&
-            this.state.isTestnet === isTestnet &&
-            this.state.hip3ConfigVersion === hip3ConfigVersion &&
-            currentAddress?.toLowerCase() === userAddress.toLowerCase());
-    };
     // Determine actual provider (same logic as market preload)
-    const actualProviderId = activeProviderInstance
-        ? activeProvider // includes 'aggregated'
+    const actualProviderId = this.activeProviderInstance
+        ? this.state.activeProvider // includes 'aggregated'
         : 'hyperliquid';
-    const providerNetworkKey = buildProviderCacheKey(actualProviderId, isTestnet);
+    const userCacheKey = buildProviderCacheKey(actualProviderId, this.state.isTestnet);
     // Skip if cache is fresh and for same account
     const now = Date.now();
-    const existingEntry = this.state.cachedUserDataByProvider[providerNetworkKey];
-    const hasMatchingCache = existingEntry !== undefined &&
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isUserCacheIdentityCurrent).call(this, actualProviderId, existingEntry, userAddress);
-    const cacheAgeMs = existingEntry ? now - existingEntry.timestamp : null;
-    const websocketState = this.getWebSocketConnectionState();
-    let selectedEntryKey = null;
-    if (this.state.cachedUserDataByProvider[providerNetworkKey]) {
-        selectedEntryKey = providerNetworkKey;
-    }
-    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: user cache preload decision', {
-        requestedKey: providerNetworkKey,
-        selectedEntryKey,
-        availableKeys: Object.keys(this.state.cachedUserDataByProvider).sort(),
-        hasMatchingCache,
-        cacheAgeMs,
-        websocketState,
-    });
-    if (existingEntry &&
-        hasMatchingCache &&
+    const existingEntry = this.state.cachedUserDataByProvider[userCacheKey];
+    if (existingEntry?.address === userAddress &&
         now - existingEntry.timestamp < __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
         return;
     }
-    if (hasMatchingCache &&
-        this.getWebSocketConnectionState() === WebSocketConnectionState.Connected) {
+    // Skip standalone REST polling when WebSocket is connected — live data is streaming
+    if (this.getWebSocketConnectionState() === WebSocketConnectionState.Connected) {
+        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Skipping user data preload — WebSocket connected');
         return;
     }
     __classPrivateFieldSet(this, _PerpsController_isPreloadingUserData, true, "f");
@@ -4291,38 +3886,21 @@ async function _PerpsController_performUserDataPreload() {
             id: traceId,
             op: PerpsTraceOperations.Operation,
             tags: {
-                provider: activeProvider,
-                isTestnet,
+                provider: this.state.activeProvider,
+                isTestnet: this.state.isTestnet,
             },
             data: { userAddress },
         });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Fetching user data in background', {
             userAddress,
         });
-        if (activeProvider === 'hyperliquid') {
-            const snapshot = await this.getUserDataSnapshot();
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: User data preloaded', {
-                positionCount: snapshot.positions.length,
-                orderCount: snapshot.orders.length,
-                totalBalance: snapshot.accountState.totalBalance,
-            });
-            traceData = {
-                success: true,
-                positionCount: snapshot.positions.length,
-                orderCount: snapshot.orders.length,
-            };
-            __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.tracer.setMeasurement(PerpsMeasurementName.PerpsUserDataPreload, performance.now() - preloadStart, 'millisecond');
-            return;
-        }
         const [positions, orders, accountState] = await Promise.all([
             this.getPositions({ standalone: true, userAddress }),
             this.getOpenOrders({ standalone: true, userAddress }),
             this.getAccountState({ standalone: true, userAddress }),
         ]);
-        if (!isCurrent()) {
-            throw new Error('User data preload context changed');
-        }
-        if (activeProvider === 'aggregated' && activeProviderInstance) {
+        if (this.state.activeProvider === 'aggregated' &&
+            this.activeProviderInstance) {
             // Split by providerId and write one cache entry per provider key
             // (mirrors the market-data preload pattern at ~line 2976)
             const ts = Date.now();
@@ -4344,22 +3922,26 @@ async function _PerpsController_performUserDataPreload() {
             }
             // AccountState — assign to its provider bucket
             ensureBucket(accountState.providerId ?? fallbackProviderId).accountState = accountState;
+            const diskEntries = [];
             this.update((state) => {
                 for (const [pid, data] of byProvider) {
-                    const key = buildProviderCacheKey(pid, isTestnet);
+                    const key = buildProviderCacheKey(pid, this.state.isTestnet);
+                    diskEntries.push({
+                        providerNetworkKey: key,
+                        address: userAddress,
+                        positions: data.positions,
+                        orders: data.orders,
+                        accountState: data.accountState,
+                        timestamp: ts,
+                    });
                     state.cachedUserDataByProvider[key] = {
                         ...data,
                         timestamp: ts,
                         address: userAddress,
-                        ...(pid === 'hyperliquid' &&
-                            hyperliquidDexes && {
-                            hip3ConfigVersion,
-                            dexes: hyperliquidDexes,
-                        }),
                     };
                 }
                 // Write aggregated sentinel so the staleness guard sees it
-                state.cachedUserDataByProvider[providerNetworkKey] = {
+                state.cachedUserDataByProvider[userCacheKey] = {
                     positions: [],
                     orders: [],
                     accountState: null,
@@ -4367,26 +3949,30 @@ async function _PerpsController_performUserDataPreload() {
                     address: userAddress,
                 };
             });
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_persistUserCacheToDisk).call(this);
+            persistUserEntriesToDisk(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.diskCache, diskEntries);
         }
         else {
             // Single provider — store directly under its key
             const ts = Date.now();
             this.update((state) => {
-                state.cachedUserDataByProvider[providerNetworkKey] = {
+                state.cachedUserDataByProvider[userCacheKey] = {
                     positions,
                     orders,
                     accountState,
                     timestamp: ts,
                     address: userAddress,
-                    ...(actualProviderId === 'hyperliquid' &&
-                        hyperliquidDexes && {
-                        hip3ConfigVersion,
-                        dexes: hyperliquidDexes,
-                    }),
                 };
             });
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_persistUserCacheToDisk).call(this);
+            persistUserEntriesToDisk(__classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.diskCache, [
+                {
+                    providerNetworkKey: userCacheKey,
+                    address: userAddress,
+                    positions,
+                    orders,
+                    accountState,
+                    timestamp: ts,
+                },
+            ]);
         }
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: User data preloaded', {
             positionCount: positions.length,
@@ -4417,12 +4003,6 @@ async function _PerpsController_performUserDataPreload() {
             data: traceData,
         });
         __classPrivateFieldSet(this, _PerpsController_isPreloadingUserData, false, "f");
-        if (__classPrivateFieldGet(this, _PerpsController_userPreloadQueued, "f") && __classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
-            __classPrivateFieldSet(this, _PerpsController_userPreloadQueued, false, "f");
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performUserDataPreload).call(this).catch(() => {
-                // Background preload is best-effort.
-            });
-        }
     }
 }, _PerpsController_persistWatchlistToRemote = 
 /**