@metamask-previews/perps-controller 1.3.0-preview-17c76be24 → 1.3.0-preview-3ce0062c4

package/dist/PerpsController.cjs

@@ -10,9 +10,9 @@ 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_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_handlersRegistered, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_eligibilityCheckDeferred, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_marketCacheKey, _PerpsController_providerIsTestnet, _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_createServiceContext, _PerpsController_ensureTradingServiceDeps, _PerpsController_preloadWatchedPaths, _PerpsController_preloadTimer, _PerpsController_isPreloading, _PerpsController_isPreloadingUserData, _PerpsController_preloadStateUnsubscribe, _PerpsController_accountChangeUnsubscribe, _PerpsController_previousIsTestnet, _PerpsController_previousHip3ConfigVersion, _PerpsController_preloadRefreshMs, _PerpsController_preloadGuardMs, _PerpsController_performMarketDataPreload, _PerpsController_performUserDataPreload;
+var _PerpsController_instances, _a, _PerpsController_initializationPromise, _PerpsController_isReinitializing, _PerpsController_blockedRegionListVersion, _PerpsController_hip3Enabled, _PerpsController_hip3AllowlistMarkets, _PerpsController_hip3BlocklistMarkets, _PerpsController_hip3ConfigSource, _PerpsController_isMYXProviderEnabled, _PerpsController_standaloneProvider, _PerpsController_standaloneProviderIsTestnet, _PerpsController_standaloneProviderHip3Version, _PerpsController_eligibilityCheckDeferred, _PerpsController_options, _PerpsController_tradingService, _PerpsController_marketDataService, _PerpsController_accountService, _PerpsController_eligibilityService, _PerpsController_dataLakeService, _PerpsController_depositService, _PerpsController_featureFlagConfigurationService, _PerpsController_rewardsIntegrationService, _PerpsController_logError, _PerpsController_debugLog, _PerpsController_getOrCreateStandaloneProvider, _PerpsController_cleanupStandaloneProvider, _PerpsController_getMetrics, _PerpsController_findNetworkClientIdForChain, _PerpsController_submitTransaction, _PerpsController_migrateRequestsIfNeeded, _PerpsController_withStreamPause, _PerpsController_performInitialization, _PerpsController_getErrorContext, _PerpsController_getControllerState, _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_performMarketDataPreload, _PerpsController_performUserDataPreload;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PerpsController = exports.getDefaultPerpsControllerState = exports.InitializationState = exports.PERPS_ERROR_CODES = exports.resolveMyxAuthConfig = exports.firstNonEmpty = void 0;
+exports.PerpsController = exports.getDefaultPerpsControllerState = exports.InitializationState = exports.PERPS_ERROR_CODES = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const uuid_1 = require("uuid");
@@ -37,39 +37,6 @@ const types_1 = require("./types/index.cjs");
 const accountUtils_1 = require("./utils/accountUtils.cjs");
 const errorUtils_1 = require("./utils/errorUtils.cjs");
 const wait_1 = require("./utils/wait.cjs");
-/**
- * Returns the first non-empty string from the given values.
- * Env vars default to '' (not null/undefined), so ?? wouldn't fall through.
- *
- * @param vals - String values to check in order.
- * @returns The first non-empty string, or '' if all are empty/undefined.
- */
-function firstNonEmpty(...vals) {
-    return (vals.find((val) => val !== null && val !== undefined && val !== '') ?? '');
-}
-exports.firstNonEmpty = firstNonEmpty;
-/**
- * Resolves MYX auth config from provider credentials, handling
- * testnet/mainnet fallback logic.
- *
- * @param myx - MYX provider credentials.
- * @param isTestnet - Whether the controller is in testnet mode.
- * @returns Resolved appId, apiSecret, and brokerAddress.
- */
-function resolveMyxAuthConfig(myx, isTestnet) {
-    return {
-        appId: isTestnet
-            ? (myx.appIdTestnet ?? '')
-            : firstNonEmpty(myx.appIdMainnet, myx.appIdTestnet),
-        apiSecret: isTestnet
-            ? (myx.apiSecretTestnet ?? '')
-            : firstNonEmpty(myx.apiSecretMainnet, myx.apiSecretTestnet),
-        brokerAddress: isTestnet
-            ? (myx.brokerAddressTestnet ?? '')
-            : firstNonEmpty(myx.brokerAddressMainnet, myx.brokerAddressTestnet),
-    };
-}
-exports.resolveMyxAuthConfig = resolveMyxAuthConfig;
 // Re-export error codes from separate file to avoid circular dependencies
 var perpsErrorCodes_2 = require("./perpsErrorCodes.cjs");
 Object.defineProperty(exports, "PERPS_ERROR_CODES", { enumerable: true, get: function () { return perpsErrorCodes_2.PERPS_ERROR_CODES; } });
@@ -138,8 +105,13 @@ const getDefaultPerpsControllerState = () => ({
     },
     hip3ConfigVersion: 0,
     selectedPaymentToken: null,
-    cachedMarketDataByProvider: {},
-    cachedUserDataByProvider: {},
+    cachedMarketData: null,
+    cachedMarketDataTimestamp: 0,
+    cachedPositions: null,
+    cachedOrders: null,
+    cachedAccountState: null,
+    cachedUserDataTimestamp: 0,
+    cachedUserDataAddress: null,
 });
 exports.getDefaultPerpsControllerState = getDefaultPerpsControllerState;
 /**
@@ -296,18 +268,48 @@ const metadata = {
         includeInDebugSnapshot: false,
         usedInUi: true,
     },
-    cachedMarketDataByProvider: {
+    cachedMarketData: {
         includeInStateLogs: false,
         persist: false,
         includeInDebugSnapshot: false,
         usedInUi: true,
     },
-    cachedUserDataByProvider: {
+    cachedMarketDataTimestamp: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: false,
+    },
+    cachedPositions: {
         includeInStateLogs: false,
         persist: false,
         includeInDebugSnapshot: false,
         usedInUi: true,
     },
+    cachedOrders: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: true,
+    },
+    cachedAccountState: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: true,
+    },
+    cachedUserDataTimestamp: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: false,
+    },
+    cachedUserDataAddress: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: false,
+    },
 };
 const MESSENGER_EXPOSED_METHODS = [
     'placeOrder',
@@ -367,8 +369,6 @@ class PerpsController extends base_controller_1.BaseController {
         this.isInitialized = false;
         _PerpsController_initializationPromise.set(this, null);
         _PerpsController_isReinitializing.set(this, false);
-        /** Tracks the async MYX dynamic import so performInitialization can await it. */
-        _PerpsController_myxRegistrationPromise.set(this, null);
         this.blockedRegionList = {
             list: [],
             source: 'fallback',
@@ -397,7 +397,6 @@ class PerpsController extends base_controller_1.BaseController {
          * connections) on every standalone call from the preload cycle.
          */
         _PerpsController_standaloneProvider.set(this, null);
-        _PerpsController_handlersRegistered.set(this, false);
         _PerpsController_standaloneProviderIsTestnet.set(this, null);
         _PerpsController_standaloneProviderHip3Version.set(this, null);
         _PerpsController_eligibilityCheckDeferred.set(this, void 0);
@@ -473,122 +472,7 @@ class PerpsController extends base_controller_1.BaseController {
         this.providers = new Map();
         // Migrate old persisted data without accountAddress
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_migrateRequestsIfNeeded).call(this);
-    }
-    /**
-     * Read cached market data for the currently active provider (or aggregated).
-     * Returns null when no valid cache exists or when cache has expired.
-     *
-     * @returns The cached market data array, or null if no valid cache.
-     */
-    getCachedMarketDataForActiveProvider() {
-        const { activeProvider } = this.state;
-        const cache = this.state.cachedMarketDataByProvider;
-        if (activeProvider === 'aggregated') {
-            // Assemble from all registered provider entries
-            const assembled = [];
-            let oldestTimestamp = Infinity;
-            for (const [providerId] of this.providers) {
-                const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, providerId, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, providerId));
-                const entry = cache[key];
-                if (!entry || entry.data.length === 0) {
-                    continue;
-                }
-                oldestTimestamp = Math.min(oldestTimestamp, entry.timestamp);
-                assembled.push(...entry.data);
-            }
-            if (assembled.length === 0) {
-                return null;
-            }
-            // Check TTL against the oldest entry
-            if (Date.now() - oldestTimestamp > __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 10) {
-                return null;
-            }
-            return assembled;
-        }
-        // Single provider mode
-        const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, activeProvider, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, activeProvider));
-        const entry = cache[key];
-        if (!entry || entry.data.length === 0) {
-            return null;
-        }
-        if (Date.now() - entry.timestamp > __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 10) {
-            return null;
-        }
-        return entry.data;
-    }
-    /**
-     * Read cached user data for the currently active provider (or aggregated).
-     * Returns null when no valid cache exists, cache has expired, or address
-     * does not match the currently selected EVM account.
-     *
-     * @returns The cached user data, or null if no valid cache.
-     */
-    getCachedUserDataForActiveProvider() {
-        const { activeProvider } = this.state;
-        const cache = this.state.cachedUserDataByProvider;
-        const staleCutoff = __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs) * 2; // 60s
-        // Get current user address for validation
-        let currentAddress = null;
-        try {
-            const evmAccount = (0, accountUtils_1.getSelectedEvmAccount)(this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup'));
-            currentAddress = evmAccount?.address ?? null;
-        }
-        catch {
-            // Can't determine current account — trust the cache
-        }
-        const isValidEntry = (entry) => {
-            if (!entry) {
-                return false;
-            }
-            if (Date.now() - entry.timestamp >= staleCutoff) {
-                return false;
-            }
-            if (currentAddress &&
-                entry.address.toLowerCase() !== currentAddress.toLowerCase()) {
-                return false;
-            }
-            return true;
-        };
-        if (activeProvider === 'aggregated') {
-            // Assemble from all registered provider entries
-            const allPositions = [];
-            const allOrders = [];
-            let defaultAccountState = null;
-            let hasValidEntry = false;
-            for (const [providerId] of this.providers) {
-                const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, providerId, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, providerId));
-                const entry = cache[key];
-                if (!isValidEntry(entry)) {
-                    continue;
-                }
-                hasValidEntry = true;
-                allPositions.push(...entry.positions);
-                allOrders.push(...entry.orders);
-                // AccountState from default provider (hyperliquid)
-                if (providerId === 'hyperliquid') {
-                    defaultAccountState = entry.accountState;
-                }
-            }
-            if (!hasValidEntry) {
-                return null;
-            }
-            return {
-                positions: allPositions,
-                orders: allOrders,
-                accountState: defaultAccountState,
-            };
-        }
-        // Single provider mode
-        const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, activeProvider, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, activeProvider));
-        const entry = cache[key];
-        if (!entry || !isValidEntry(entry)) {
-            return null;
-        }
-        return {
-            positions: entry.positions,
-            orders: entry.orders,
-            accountState: entry.accountState,
-        };
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
      * Test-observable accessor for whether a standalone provider is cached.
@@ -668,10 +552,6 @@ class PerpsController extends base_controller_1.BaseController {
      * @returns A promise that resolves when the operation completes.
      */
     async init() {
-        if (!__classPrivateFieldGet(this, _PerpsController_handlersRegistered, "f")) {
-            this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
-            __classPrivateFieldSet(this, _PerpsController_handlersRegistered, true, "f");
-        }
         if (this.isInitialized) {
             return undefined;
         }
@@ -681,46 +561,6 @@ class PerpsController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _PerpsController_initializationPromise, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performInitialization).call(this), "f");
         return __classPrivateFieldGet(this, _PerpsController_initializationPromise, "f");
     }
-    /**
-     * Registers the MYX provider after dynamic import resolves.
-     *
-     * Extracted from the import().then() callback so it can be tested directly
-     * (Jest cannot resolve dynamic imports without --experimental-vm-modules).
-     *
-     * @param MYXProvider - Constructor class for the MYX provider.
-     */
-    registerMYXProvider(MYXProvider) {
-        const myxIsTestnet = perpsConfig_1.PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet;
-        const myx = __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.myx ?? {};
-        const myxAuthConfig = resolveMyxAuthConfig(myx, myxIsTestnet);
-        const myxProvider = new MYXProvider({
-            isTestnet: myxIsTestnet,
-            platformDependencies: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
-            messenger: this.messenger,
-            myxAuthConfig,
-        });
-        this.providers.set('myx', myxProvider);
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider registered', {
-            isTestnet: myxIsTestnet,
-        });
-    }
-    /**
-     * Handles errors from the MYX dynamic import.
-     *
-     * Module-not-found errors are expected (extension doesn't ship MYX) → debug log.
-     * Other errors indicate constructor/config problems → Sentry via logError.
-     *
-     * @param error - The caught error from the dynamic import or constructor.
-     */
-    handleMYXImportError(error) {
-        const isModuleError = error?.code === 'MODULE_NOT_FOUND';
-        if (isModuleError) {
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider module not available, skipping registration');
-        }
-        else {
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_logError).call(this, error instanceof Error ? error : new Error(String(error)), __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getErrorContext).call(this, 'createProviders.myx'));
-        }
-    }
     /**
      * Get the currently active provider.
      * In aggregated mode, returns AggregatedPerpsProvider which routes to underlying providers.
@@ -981,14 +821,6 @@ class PerpsController extends base_controller_1.BaseController {
                 origin: controller_utils_1.ORIGIN_METAMASK,
                 skipInitialGasEstimate: true,
             };
-            __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.tracer.addBreadcrumb({
-                category: 'perps',
-                message: 'Deposit action started',
-                level: 'info',
-                data: {
-                    place_order_after_deposit: placeOrder === true,
-                },
-            });
             if (placeOrder) {
                 // Use addTransaction to create transaction without navigating to confirmation screen
                 const addResult = await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_submitTransaction).call(this, transaction, {
@@ -1124,8 +956,8 @@ class PerpsController extends base_controller_1.BaseController {
                     const errorMessage = (0, errorUtils_1.ensureError)(error, 'PerpsController.depositWithOrder').message;
                     const isCancellation = errorMessage.includes('User denied') ||
                         errorMessage.includes('User rejected') ||
-                        errorMessage.includes('User cancelled') ||
-                        errorMessage.includes('User canceled');
+                        errorMessage.includes('cancelled') ||
+                        errorMessage.includes('canceled');
                     this.update((state) => {
                         const requestToUpdate = state.depositRequests.find((req) => req.id === currentDepositId);
                         if (requestToUpdate) {
@@ -1489,7 +1321,7 @@ class PerpsController extends base_controller_1.BaseController {
                 /* fire-and-forget */
             });
         }, __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadRefreshMs)), "f");
-        // Watch for isTestnet / hip3ConfigVersion changes
+        // Watch for isTestnet / hip3ConfigVersion / cachedUserDataAddress changes
         const handler = (_state, patches) => {
             // Early-return when no watched field changed (skips ~46 unrelated updates)
             const hasRelevantChange = patches.some((patch) => typeof patch.path[0] === 'string' &&
@@ -1510,9 +1342,16 @@ class PerpsController extends base_controller_1.BaseController {
                 });
                 __classPrivateFieldSet(this, _PerpsController_previousIsTestnet, currentIsTestnet, "f");
                 __classPrivateFieldSet(this, _PerpsController_previousHip3ConfigVersion, currentHip3Version, "f");
-                // No need to clear user data cache — per-provider keys include the
-                // network, so different networks don't collide. Re-preload will
-                // populate the new key.
+                // Clear stale cache (market + user data)
+                this.update((state) => {
+                    state.cachedMarketData = null;
+                    state.cachedMarketDataTimestamp = 0;
+                    state.cachedPositions = null;
+                    state.cachedOrders = null;
+                    state.cachedAccountState = null;
+                    state.cachedUserDataTimestamp = 0;
+                    state.cachedUserDataAddress = null;
+                });
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
                     /* fire-and-forget */
                 });
@@ -1526,13 +1365,16 @@ class PerpsController extends base_controller_1.BaseController {
         const accountChangeHandler = () => {
             const evmAccount = (0, accountUtils_1.getSelectedEvmAccount)(this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup'));
             const currentAddress = evmAccount?.address ?? null;
-            // 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) {
+            // If there's cached data from a different account (or no EVM account now), clear it
+            if (this.state.cachedUserDataAddress !== null &&
+                currentAddress !== this.state.cachedUserDataAddress) {
                 __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Account changed, clearing user data cache');
                 this.update((state) => {
-                    state.cachedUserDataByProvider = {};
+                    state.cachedPositions = null;
+                    state.cachedOrders = null;
+                    state.cachedAccountState = null;
+                    state.cachedUserDataTimestamp = 0;
+                    state.cachedUserDataAddress = null;
                 });
                 // Only preload if the new account is an EVM account
                 if (currentAddress) {
@@ -1765,15 +1607,6 @@ class PerpsController extends base_controller_1.BaseController {
         }
         finally {
             __classPrivateFieldSet(this, _PerpsController_isReinitializing, false, "f");
-            // Re-trigger preload now that reinit is complete and the
-            // activeProviderInstance points to the correct network.
-            // The state-change listener may have already fired during reinit
-            // but was skipped due to the #isReinitializing guard.
-            if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
-                    /* fire-and-forget */
-                });
-            }
         }
     }
     /**
@@ -1820,7 +1653,7 @@ class PerpsController extends base_controller_1.BaseController {
             // Provider disconnect is handled by performInitialization() during
             // reinitialization. The disconnect() method skips provider teardown
             // when isReinitializing is true to prevent double-disconnect.
-            // Update state with new provider (market data cache preserved per-provider)
+            // Update state with new provider
             this.update((state) => {
                 state.activeProvider = providerId;
                 state.accountState = null;
@@ -1877,12 +1710,6 @@ class PerpsController extends base_controller_1.BaseController {
         }
         finally {
             __classPrivateFieldSet(this, _PerpsController_isReinitializing, false, "f");
-            // Re-trigger preload now that reinit is complete.
-            if (__classPrivateFieldGet(this, _PerpsController_preloadTimer, "f")) {
-                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_performMarketDataPreload).call(this).catch(() => {
-                    /* fire-and-forget */
-                });
-            }
         }
     }
     /**
@@ -2260,18 +2087,14 @@ class PerpsController extends base_controller_1.BaseController {
      * Eligibility (Geo-Blocking)
      */
     /**
-     * Fetch geo location
+     * Activates geo-blocking eligibility monitoring.
+     * Call this after onboarding is complete when the controller was constructed
+     * with `deferEligibilityCheck: true`.
      *
-     * Returned in Country or Country-Region format
-     * Example: FR, DE, US-MI, CA-ON
-     */
-    /**
-     * Refresh eligibility status
-     */
-    /**
-     * Resume eligibility monitoring after onboarding completes.
-     * Clears the deferred flag and triggers an immediate eligibility check
-     * using the current remote feature flag state.
+     * Reads the current RemoteFeatureFlagController state, performs the initial
+     * eligibility check, and unblocks the existing stateChange subscription so
+     * future feature-flag updates flow through normally.
+     * Safe to call multiple times; subsequent calls simply re-check eligibility.
      */
     startEligibilityMonitoring() {
         __classPrivateFieldSet(this, _PerpsController_eligibilityCheckDeferred, false, "f");
@@ -2294,6 +2117,9 @@ class PerpsController extends base_controller_1.BaseController {
     stopEligibilityMonitoring() {
         __classPrivateFieldSet(this, _PerpsController_eligibilityCheckDeferred, true, "f");
     }
+    /**
+     * Refresh eligibility status
+     */
     async refreshEligibility() {
         if (__classPrivateFieldGet(this, _PerpsController_eligibilityCheckDeferred, "f")) {
             return;
@@ -2304,10 +2130,9 @@ class PerpsController extends base_controller_1.BaseController {
         // (started with remote config after it was fetched).
         const versionAtStart = __classPrivateFieldGet(this, _PerpsController_blockedRegionListVersion, "f");
         try {
-            const geoLocation = await this.messenger.call('GeolocationController:getGeolocation');
+            // TODO: It would be good to have this location before we call this async function to avoid the race condition
             const isEligible = await __classPrivateFieldGet(this, _PerpsController_eligibilityService, "f").checkEligibility({
                 blockedRegions: this.blockedRegionList.list,
-                geoLocation,
             });
             // Only update state if the blocked region list hasn't changed while we were awaiting.
             // This prevents stale fallback-based eligibility checks from overwriting
@@ -2791,46 +2616,27 @@ class PerpsController extends base_controller_1.BaseController {
     }
 }
 exports.PerpsController = PerpsController;
-_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_standaloneProvider = new WeakMap(), _PerpsController_handlersRegistered = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_eligibilityCheckDeferred = 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
-    // and UI agree on whether MYX is available.
-    if (myx?.enabled) {
-        return true;
-    }
-    // Credentials present → MYX is enabled regardless of remote flag.
-    // Use || so empty-string env vars (default '') fall through.
-    const hasCredentials = Boolean(
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    myx?.appIdTestnet || myx?.appIdMainnet);
-    if (hasCredentials) {
-        return true;
-    }
-    // No local override or credentials — check remote flag as fallback
+_a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _PerpsController_isReinitializing = new WeakMap(), _PerpsController_blockedRegionListVersion = new WeakMap(), _PerpsController_hip3Enabled = new WeakMap(), _PerpsController_hip3AllowlistMarkets = new WeakMap(), _PerpsController_hip3BlocklistMarkets = new WeakMap(), _PerpsController_hip3ConfigSource = new WeakMap(), _PerpsController_standaloneProvider = new WeakMap(), _PerpsController_standaloneProviderIsTestnet = new WeakMap(), _PerpsController_standaloneProviderHip3Version = new WeakMap(), _PerpsController_eligibilityCheckDeferred = 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 getLocalFlag = () => typeof globalThis.process !== 'undefined' &&
+        globalThis.process.env?.MM_PERPS_MYX_PROVIDER_ENABLED === 'true';
     try {
+        const localFlag = getLocalFlag();
         const remoteState = this.messenger.call('RemoteFeatureFlagController:getState');
         const remoteFlag = remoteState.remoteFeatureFlags?.perpsMyxProviderEnabled;
         if ((0, types_1.isVersionGatedFeatureFlag)(remoteFlag)) {
             const validated = __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.featureFlags.validateVersionGated(remoteFlag);
-            return validated ?? false;
+            return validated ?? localFlag;
         }
-        return false;
+        return localFlag;
     }
     catch {
-        return false;
+        // If RemoteFeatureFlagController not ready, use fallback
+        return getLocalFlag();
     }
 }, _PerpsController_logError = function _PerpsController_logError(error, options) {
     __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.logger.error(error, options);
 }, _PerpsController_debugLog = function _PerpsController_debugLog(...args) {
     __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure.debugLogger.log(...args);
-}, _PerpsController_marketCacheKey = function _PerpsController_marketCacheKey(providerId, isTestnet) {
-    return `${providerId}:${isTestnet ? 'testnet' : 'mainnet'}`;
-}, _PerpsController_providerIsTestnet = function _PerpsController_providerIsTestnet(providerId) {
-    if (providerId === 'myx') {
-        return perpsConfig_1.PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet;
-    }
-    return this.state.isTestnet;
 }, _PerpsController_getOrCreateStandaloneProvider = function _PerpsController_getOrCreateStandaloneProvider() {
     const currentIsTestnet = this.state.isTestnet;
     const currentHip3Version = this.state.hip3ConfigVersion ?? 0;
@@ -2853,10 +2659,6 @@ _a = PerpsController, _PerpsController_initializationPromise = new WeakMap(), _P
         blocklistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3BlocklistMarkets, "f"),
         platformDependencies: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
         messenger: this.messenger,
-        builderAddressTestnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
-            ?.builderAddressTestnet,
-        builderAddressMainnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
-            ?.builderAddressMainnet,
     }), "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderIsTestnet, currentIsTestnet, "f");
     __classPrivateFieldSet(this, _PerpsController_standaloneProviderHip3Version, currentHip3Version, "f");
@@ -3014,16 +2816,89 @@ async function _PerpsController_performInitialization() {
             }
             this.providers.clear();
             await __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_cleanupStandaloneProvider).call(this);
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_createProviders).call(this);
-            // Await MYX dynamic import (if started) so MYX is in the providers
-            // map before we assign the active provider. Runs concurrently with
-            // the WebSocket readiness delay for zero additional latency.
-            await Promise.all([
-                (0, wait_1.wait)(perpsConfig_1.PERPS_CONSTANTS.ReconnectionCleanupDelayMs),
-                __classPrivateFieldGet(this, _PerpsController_myxRegistrationPromise, "f"),
-            ]);
-            __classPrivateFieldSet(this, _PerpsController_myxRegistrationPromise, null, "f");
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_assignActiveProvider).call(this);
+            const { activeProvider } = this.state;
+            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Creating provider with HIP-3 configuration', {
+                hip3Enabled: __classPrivateFieldGet(this, _PerpsController_hip3Enabled, "f"),
+                hip3AllowlistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3AllowlistMarkets, "f"),
+                hip3BlocklistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3BlocklistMarkets, "f"),
+                hip3ConfigSource: __classPrivateFieldGet(this, _PerpsController_hip3ConfigSource, "f"),
+                isTestnet: this.state.isTestnet,
+                activeProvider,
+            });
+            // Always create HyperLiquid provider as the base provider
+            const hyperLiquidProvider = new HyperLiquidProvider_1.HyperLiquidProvider({
+                isTestnet: this.state.isTestnet,
+                hip3Enabled: __classPrivateFieldGet(this, _PerpsController_hip3Enabled, "f"),
+                allowlistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3AllowlistMarkets, "f"),
+                blocklistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3BlocklistMarkets, "f"),
+                platformDependencies: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
+                messenger: this.messenger,
+            });
+            this.providers.set('hyperliquid', hyperLiquidProvider);
+            // Register MYX provider if enabled via feature flag.
+            // Uses dynamic import so @myx-trade/sdk is excluded from the bundle
+            // unless MM_PERPS_MYX_PROVIDER_ENABLED=true is set at build time.
+            // Wrapped in try/catch so a missing module (stripped at build time)
+            // only skips MYX registration instead of aborting initialization.
+            const isMYXEnabled = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isMYXProviderEnabled).call(this);
+            if (isMYXEnabled) {
+                try {
+                    const { MYXProvider } = await import("./providers/MYXProvider.cjs");
+                    const myxProvider = new MYXProvider({
+                        isTestnet: perpsConfig_1.PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet,
+                        platformDependencies: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
+                    });
+                    this.providers.set('myx', myxProvider);
+                    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider registered', {
+                        isTestnet: perpsConfig_1.PROVIDER_CONFIG.MYX_TESTNET_ONLY || this.state.isTestnet,
+                    });
+                }
+                catch {
+                    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider module not available (stripped from build), skipping registration');
+                }
+            }
+            // Set up active provider based on activeProvider value in state
+            // 'aggregated' is treated as just another provider that wraps others
+            if (activeProvider === 'aggregated') {
+                // Aggregated mode: wrap in AggregatedPerpsProvider for multi-provider support
+                this.activeProviderInstance = new AggregatedPerpsProvider_1.AggregatedPerpsProvider({
+                    providers: this.providers,
+                    defaultProvider: 'hyperliquid',
+                    infrastructure: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
+                });
+                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Using aggregated provider (multi-provider)', { registeredProviders: Array.from(this.providers.keys()) });
+            }
+            else if (activeProvider === 'hyperliquid') {
+                // Direct provider mode: use HyperLiquid provider directly
+                this.activeProviderInstance = hyperLiquidProvider;
+                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, `PerpsController: Using direct provider (${activeProvider})`);
+            }
+            else if (activeProvider === 'myx') {
+                // MYX provider mode
+                const myxProvider = this.providers.get('myx');
+                if (myxProvider) {
+                    this.activeProviderInstance = myxProvider;
+                }
+                else {
+                    // MYX feature flag is disabled — fall back to HyperLiquid
+                    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider not available (feature flag disabled), falling back to hyperliquid');
+                    this.activeProviderInstance = hyperLiquidProvider;
+                    this.update((state) => {
+                        state.activeProvider = 'hyperliquid';
+                    });
+                }
+                __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, `PerpsController: Using direct provider (${this.activeProviderInstance === hyperLiquidProvider ? 'hyperliquid' : activeProvider})`);
+            }
+            else {
+                // Unsupported provider - throw error to prevent silent misconfiguration
+                throw new Error(`Unsupported provider: ${String(activeProvider)}. Currently only 'hyperliquid', 'myx', and 'aggregated' are supported.`);
+            }
+            // Future providers can be added here with their own authentication patterns:
+            // - Some might use API keys: new BinanceProvider({ apiKey, apiSecret })
+            // - Some might use different wallet patterns: new GMXProvider({ signer })
+            // - Some might not need auth at all: new DydxProvider()
+            // Wait for WebSocket transport to be ready before marking as initialized
+            await (0, wait_1.wait)(perpsConfig_1.PERPS_CONSTANTS.ReconnectionCleanupDelayMs);
             this.isInitialized = true;
             this.update((state) => {
                 state.initializationState = InitializationState.Initialized;
@@ -3031,7 +2906,7 @@ async function _PerpsController_performInitialization() {
             });
             __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Providers initialized successfully', {
                 providerCount: this.providers.size,
-                activeProvider: this.state.activeProvider,
+                activeProvider,
                 timestamp: new Date().toISOString(),
                 attempts: attempt,
             });
@@ -3066,84 +2941,6 @@ async function _PerpsController_performInitialization() {
         attempts: maxAttempts,
         timestamp: new Date().toISOString(),
     });
-}, _PerpsController_createProviders = function _PerpsController_createProviders() {
-    const { activeProvider } = this.state;
-    __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Creating provider with HIP-3 configuration', {
-        hip3Enabled: __classPrivateFieldGet(this, _PerpsController_hip3Enabled, "f"),
-        hip3AllowlistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3AllowlistMarkets, "f"),
-        hip3BlocklistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3BlocklistMarkets, "f"),
-        hip3ConfigSource: __classPrivateFieldGet(this, _PerpsController_hip3ConfigSource, "f"),
-        isTestnet: this.state.isTestnet,
-        activeProvider,
-    });
-    // Always create HyperLiquid provider as the base provider
-    const hyperLiquidProvider = new HyperLiquidProvider_1.HyperLiquidProvider({
-        isTestnet: this.state.isTestnet,
-        hip3Enabled: __classPrivateFieldGet(this, _PerpsController_hip3Enabled, "f"),
-        allowlistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3AllowlistMarkets, "f"),
-        blocklistMarkets: __classPrivateFieldGet(this, _PerpsController_hip3BlocklistMarkets, "f"),
-        platformDependencies: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
-        messenger: this.messenger,
-        builderAddressTestnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
-            ?.builderAddressTestnet,
-        builderAddressMainnet: __classPrivateFieldGet(this, _PerpsController_options, "f").clientConfig?.providerCredentials?.hyperliquid
-            ?.builderAddressMainnet,
-    });
-    this.providers.set('hyperliquid', hyperLiquidProvider);
-    // Register MYX provider if enabled via feature flag.
-    // Dynamic import because the MYX package pulls in heavy dependencies we
-    // don't want bundled in extension. Until MYX fixes their package, extension
-    // doesn't ship it — the catch branch silently skips registration.
-    // Uses .then()/.catch() instead of await because #createProviders is not async;
-    // MYX registration completing asynchronously is fine since it's only used when
-    // explicitly enabled and selected.
-    const isMYXEnabled = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_isMYXProviderEnabled).call(this);
-    if (isMYXEnabled) {
-        // IMPORTANT: Must use import() — NOT require() — for core/extension tree-shaking.
-        // require() is synchronous and bundlers include it in the main bundle.
-        // import() enables true code splitting so MYX is excluded when not enabled.
-        __classPrivateFieldSet(this, _PerpsController_myxRegistrationPromise, import("./providers/MYXProvider.cjs")
-            .then(({ MYXProvider }) => {
-            this.registerMYXProvider(MYXProvider);
-            return undefined;
-        })
-            .catch((error) => this.handleMYXImportError(error)), "f");
-    }
-}, _PerpsController_assignActiveProvider = function _PerpsController_assignActiveProvider() {
-    const { activeProvider } = this.state;
-    const hyperLiquidProvider = this.providers.get('hyperliquid');
-    if (!hyperLiquidProvider) {
-        throw new Error('HyperLiquid provider not registered — cannot assign active provider');
-    }
-    if (activeProvider === 'aggregated') {
-        this.activeProviderInstance = new AggregatedPerpsProvider_1.AggregatedPerpsProvider({
-            providers: this.providers,
-            defaultProvider: 'hyperliquid',
-            infrastructure: __classPrivateFieldGet(this, _PerpsController_options, "f").infrastructure,
-        });
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Using aggregated provider (multi-provider)', { registeredProviders: Array.from(this.providers.keys()) });
-    }
-    else if (activeProvider === 'hyperliquid') {
-        this.activeProviderInstance = hyperLiquidProvider;
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, `PerpsController: Using direct provider (${activeProvider})`);
-    }
-    else if (activeProvider === 'myx') {
-        const myxProvider = this.providers.get('myx');
-        if (myxProvider) {
-            this.activeProviderInstance = myxProvider;
-        }
-        else {
-            __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: MYX provider not available, falling back to hyperliquid');
-            this.activeProviderInstance = hyperLiquidProvider;
-            this.update((state) => {
-                state.activeProvider = 'hyperliquid';
-            });
-        }
-        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, `PerpsController: Using direct provider (${this.activeProviderInstance === hyperLiquidProvider ? 'hyperliquid' : activeProvider})`);
-    }
-    else {
-        throw new Error(`Unsupported provider: ${String(activeProvider)}. Currently only 'hyperliquid', 'myx', and 'aggregated' are supported.`);
-    }
 }, _PerpsController_getErrorContext = function _PerpsController_getErrorContext(method, extra) {
     return {
         tags: {
@@ -3173,7 +2970,7 @@ async function _PerpsController_performInitialization() {
         },
         stateManager: {
             update: (updater) => 
-            // @ts-expect-error TS2589 - excessively deep instantiation from BaseController generic
+            // @ts-expect-error TS2589 - excessively deep instantiation when inferring stateManager from BaseController
             this.update(updater),
             getState: () => __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getControllerState).call(this),
         },
@@ -3191,22 +2988,9 @@ async function _PerpsController_performMarketDataPreload() {
     if (__classPrivateFieldGet(this, _PerpsController_isPreloading, "f")) {
         return;
     }
-    // Skip preloading during provider/network reinitialisation.
-    // The activeProviderInstance still points to the OLD network's provider
-    // until init() completes, so fetching now would store stale data under
-    // the NEW network's cache key.
-    if (__classPrivateFieldGet(this, _PerpsController_isReinitializing, "f")) {
-        return;
-    }
-    // Determine actual provider and cache key for debounce
-    const actualProviderId = this.activeProviderInstance
-        ? this.state.activeProvider // includes 'aggregated'
-        : 'hyperliquid';
-    const cacheKey = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, actualProviderId, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, actualProviderId));
     const now = Date.now();
-    const existingEntry = this.state.cachedMarketDataByProvider[cacheKey];
-    if (existingEntry &&
-        now - existingEntry.timestamp < __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
+    if (now - this.state.cachedMarketDataTimestamp <
+        __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
         return;
     }
     __classPrivateFieldSet(this, _PerpsController_isPreloading, true, "f");
@@ -3225,46 +3009,10 @@ async function _PerpsController_performMarketDataPreload() {
         });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Fetching market data in background');
         const data = await this.getMarketDataWithPrices({ standalone: true });
-        // Store under per-provider key(s)
-        const ts = Date.now();
-        if (this.state.activeProvider === 'aggregated' &&
-            this.activeProviderInstance) {
-            // Split returned data by providerId and store each slice
-            const fallbackProviderId = 'hyperliquid'; // default for items missing providerId
-            const byProvider = new Map();
-            for (const item of data) {
-                const pid = item.providerId ?? fallbackProviderId;
-                const existing = byProvider.get(pid);
-                if (existing) {
-                    existing.push(item);
-                }
-                else {
-                    byProvider.set(pid, [item]);
-                }
-            }
-            this.update((state) => {
-                for (const [pid, slice] of byProvider) {
-                    const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, pid, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, pid));
-                    state.cachedMarketDataByProvider[key] = {
-                        data: slice,
-                        timestamp: ts,
-                    };
-                }
-                // Write aggregated sentinel so the staleness guard sees it
-                state.cachedMarketDataByProvider[cacheKey] = {
-                    data: [], // sentinel — real data is in per-provider keys
-                    timestamp: ts,
-                };
-            });
-        }
-        else {
-            this.update((state) => {
-                state.cachedMarketDataByProvider[cacheKey] = {
-                    data,
-                    timestamp: ts,
-                };
-            });
-        }
+        this.update((state) => {
+            state.cachedMarketData = data;
+            state.cachedMarketDataTimestamp = Date.now();
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Market data preloaded', {
             marketCount: data.length,
         });
@@ -3308,16 +3056,10 @@ async function _PerpsController_performUserDataPreload() {
         return;
     }
     const userAddress = evmAccount.address;
-    // Determine actual provider (same logic as market preload)
-    const actualProviderId = this.activeProviderInstance
-        ? this.state.activeProvider // includes 'aggregated'
-        : 'hyperliquid';
-    const userCacheKey = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, actualProviderId, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, actualProviderId));
     // Skip if cache is fresh and for same account
     const now = Date.now();
-    const existingEntry = this.state.cachedUserDataByProvider[userCacheKey];
-    if (existingEntry?.address === userAddress &&
-        now - existingEntry.timestamp < __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
+    if (this.state.cachedUserDataAddress === userAddress &&
+        now - this.state.cachedUserDataTimestamp < __classPrivateFieldGet(_a, _a, "f", _PerpsController_preloadGuardMs)) {
         return;
     }
     // Skip standalone REST polling when WebSocket is connected — live data is streaming
@@ -3348,60 +3090,13 @@ async function _PerpsController_performUserDataPreload() {
             this.getOpenOrders({ standalone: true, userAddress }),
             this.getAccountState({ standalone: true, userAddress }),
         ]);
-        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();
-            const fallbackProviderId = 'hyperliquid'; // default for items missing providerId
-            const byProvider = new Map();
-            const ensureBucket = (pid) => {
-                let bucket = byProvider.get(pid);
-                if (!bucket) {
-                    bucket = { positions: [], orders: [], accountState: null };
-                    byProvider.set(pid, bucket);
-                }
-                return bucket;
-            };
-            for (const pos of positions) {
-                ensureBucket(pos.providerId ?? fallbackProviderId).positions.push(pos);
-            }
-            for (const order of orders) {
-                ensureBucket(order.providerId ?? fallbackProviderId).orders.push(order);
-            }
-            // AccountState — assign to its provider bucket
-            ensureBucket(accountState.providerId ?? fallbackProviderId).accountState = accountState;
-            this.update((state) => {
-                for (const [pid, data] of byProvider) {
-                    const key = __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_marketCacheKey).call(this, pid, __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_providerIsTestnet).call(this, pid));
-                    state.cachedUserDataByProvider[key] = {
-                        ...data,
-                        timestamp: ts,
-                        address: userAddress,
-                    };
-                }
-                // Write aggregated sentinel so the staleness guard sees it
-                state.cachedUserDataByProvider[userCacheKey] = {
-                    positions: [],
-                    orders: [],
-                    accountState: null,
-                    timestamp: ts,
-                    address: userAddress,
-                };
-            });
-        }
-        else {
-            // Single provider — store directly under its key
-            this.update((state) => {
-                state.cachedUserDataByProvider[userCacheKey] = {
-                    positions,
-                    orders,
-                    accountState,
-                    timestamp: Date.now(),
-                    address: userAddress,
-                };
-            });
-        }
+        this.update((state) => {
+            state.cachedPositions = positions;
+            state.cachedOrders = orders;
+            state.cachedAccountState = accountState;
+            state.cachedUserDataTimestamp = Date.now();
+            state.cachedUserDataAddress = userAddress;
+        });
         __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: User data preloaded', {
             positionCount: positions.length,
             orderCount: orders.length,