@metamask-previews/perps-controller 4.0.0-preview-e0eba6dbb → 4.0.0-preview-56dd1249f

package/dist/providers/HyperLiquidProvider.mjs

@@ -9,9 +9,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HyperLiquidProvider_instances, _HyperLiquidProvider_deps, _HyperLiquidProvider_clientService, _HyperLiquidProvider_walletService, _HyperLiquidProvider_subscriptionService, _HyperLiquidProvider_symbolToAssetId, _HyperLiquidProvider_userFeeCache, _HyperLiquidProvider_maxLeverageCache, _HyperLiquidProvider_cachedMetaByDex, _HyperLiquidProvider_cachedMarketDataWithPrices, _HyperLiquidProvider_cachedSpotMeta, _HyperLiquidProvider_dexDiscoveryCache, _HyperLiquidProvider_referralCheckCache, _HyperLiquidProvider_builderFeeCheckCache, _HyperLiquidProvider_ensureReadyPromise, _HyperLiquidProvider_pendingBuilderFeeApprovals, _HyperLiquidProvider_compiledAllowlistPatterns, _HyperLiquidProvider_compiledBlocklistPatterns, _HyperLiquidProvider_userFeeDiscountBips, _HyperLiquidProvider_hip3Enabled, _HyperLiquidProvider_allowlistMarkets, _HyperLiquidProvider_blocklistMarkets, _HyperLiquidProvider_useDexAbstraction, _HyperLiquidProvider_dexDiscoveryComplete, _HyperLiquidProvider_pendingValidatedDexsPromise, _HyperLiquidProvider_cachedUsdcTokenId, _HyperLiquidProvider_errorMappings, _HyperLiquidProvider_clientsInitialized, _HyperLiquidProvider_initializationPromise, _HyperLiquidProvider_messenger, _HyperLiquidProvider_builderAddressTestnet, _HyperLiquidProvider_builderAddressMainnet, _HyperLiquidProvider_compilePatternsSafely, _HyperLiquidProvider_ensureClientsInitialized, _HyperLiquidProvider_ensureDexAbstractionEnabled, _HyperLiquidProvider_ensureReady, _HyperLiquidProvider_tradingSetupPromise, _HyperLiquidProvider_tradingSetupComplete, _HyperLiquidProvider_ensureReadyForTrading, _HyperLiquidProvider_getOrFetchPrice, _HyperLiquidProvider_filterFills, _HyperLiquidProvider_getAllAvailableDexs, _HyperLiquidProvider_getValidatedDexs, _HyperLiquidProvider_fetchValidatedDexsInternal, _HyperLiquidProvider_getCachedMeta, _HyperLiquidProvider_backfillAssetMapForDex, _HyperLiquidProvider_getAssetIdWithRepair, _HyperLiquidProvider_getCachedSpotMeta, _HyperLiquidProvider_getCachedPerpDexs, _HyperLiquidProvider_calculateHip3FeeMultiplier, _HyperLiquidProvider_getCacheKey, _HyperLiquidProvider_fetchMarketsForDex, _HyperLiquidProvider_getUsdcTokenId, _HyperLiquidProvider_isUsdhCollateralDex, _HyperLiquidProvider_getSpotUsdhBalance, _HyperLiquidProvider_getSpotUsdcBalance, _HyperLiquidProvider_transferUsdcToSpot, _HyperLiquidProvider_swapUsdcToUsdh, _HyperLiquidProvider_ensureUsdhCollateralForOrder, _HyperLiquidProvider_buildAssetMapping, _HyperLiquidProvider_queryUserDataAcrossDexs, _HyperLiquidProvider_mapError, _HyperLiquidProvider_getErrorContext, _HyperLiquidProvider_checkBuilderFeeApproval, _HyperLiquidProvider_ensureBuilderFeeApproval, _HyperLiquidProvider_checkBuilderFeeStatus, _HyperLiquidProvider_getBalanceForDex, _HyperLiquidProvider_findSourceDexWithBalance, _HyperLiquidProvider_autoTransferForHip3Order, _HyperLiquidProvider_autoTransferBackAfterClose, _HyperLiquidProvider_calculateHip3RequiredMargin, _HyperLiquidProvider_handleHip3PostOrderRebalance, _HyperLiquidProvider_handleHip3OrderRollback, _HyperLiquidProvider_validateOrderBeforePlacement, _HyperLiquidProvider_getAssetInfo, _HyperLiquidProvider_prepareAssetForTrading, _HyperLiquidProvider_handleHip3PreOrder, _HyperLiquidProvider_submitOrderWithRollback, _HyperLiquidProvider_handleOrderError, _HyperLiquidProvider_getStandaloneValidatedDexs, _HyperLiquidProvider_getAllMids, _HyperLiquidProvider_fetchSingleDexFresh, _HyperLiquidProvider_mergeDexResultsInto, _HyperLiquidProvider_cacheFreshMarketDataSnapshot, _HyperLiquidProvider_getStaleMarketDataSnapshot, _HyperLiquidProvider_isFeeCacheValid, _HyperLiquidProvider_getBuilderAddress, _HyperLiquidProvider_getReferralCode, _HyperLiquidProvider_ensureReferralSet, _HyperLiquidProvider_isReferralCodeReady, _HyperLiquidProvider_checkReferralSet, _HyperLiquidProvider_setReferralCode;
+var _HyperLiquidProvider_instances, _HyperLiquidProvider_deps, _HyperLiquidProvider_clientService, _HyperLiquidProvider_walletService, _HyperLiquidProvider_subscriptionService, _HyperLiquidProvider_symbolToAssetId, _HyperLiquidProvider_userFeeCache, _HyperLiquidProvider_maxLeverageCache, _HyperLiquidProvider_cachedMetaByDex, _HyperLiquidProvider_cachedMarketDataWithPrices, _HyperLiquidProvider_cachedSpotMeta, _HyperLiquidProvider_dexDiscoveryCache, _HyperLiquidProvider_referralCheckCache, _HyperLiquidProvider_builderFeeCheckCache, _HyperLiquidProvider_ensureReadyPromise, _HyperLiquidProvider_pendingBuilderFeeApprovals, _HyperLiquidProvider_compiledAllowlistPatterns, _HyperLiquidProvider_compiledBlocklistPatterns, _HyperLiquidProvider_userFeeDiscountBips, _HyperLiquidProvider_hip3Enabled, _HyperLiquidProvider_allowlistMarkets, _HyperLiquidProvider_blocklistMarkets, _HyperLiquidProvider_useUnifiedAccount, _HyperLiquidProvider_dexDiscoveryComplete, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, _HyperLiquidProvider_pendingValidatedDexsPromise, _HyperLiquidProvider_cachedUsdcTokenId, _HyperLiquidProvider_errorMappings, _HyperLiquidProvider_clientsInitialized, _HyperLiquidProvider_initializationPromise, _HyperLiquidProvider_messenger, _HyperLiquidProvider_builderAddressTestnet, _HyperLiquidProvider_builderAddressMainnet, _HyperLiquidProvider_compilePatternsSafely, _HyperLiquidProvider_ensureClientsInitialized, _HyperLiquidProvider_ensureUnifiedAccountEnabled, _HyperLiquidProvider_ensureReady, _HyperLiquidProvider_tradingSetupPromise, _HyperLiquidProvider_tradingSetupComplete, _HyperLiquidProvider_ensureReadyForTrading, _HyperLiquidProvider_getOrFetchPrice, _HyperLiquidProvider_filterFills, _HyperLiquidProvider_getAllAvailableDexs, _HyperLiquidProvider_getValidatedDexs, _HyperLiquidProvider_fetchValidatedDexsInternal, _HyperLiquidProvider_getCachedMeta, _HyperLiquidProvider_backfillAssetMapForDex, _HyperLiquidProvider_getAssetIdWithRepair, _HyperLiquidProvider_getCachedSpotMeta, _HyperLiquidProvider_getCachedPerpDexs, _HyperLiquidProvider_calculateHip3FeeMultiplier, _HyperLiquidProvider_getCacheKey, _HyperLiquidProvider_fetchMarketsForDex, _HyperLiquidProvider_getUsdcTokenId, _HyperLiquidProvider_isUsdhCollateralDex, _HyperLiquidProvider_getSpotUsdhBalance, _HyperLiquidProvider_getSpotUsdcBalance, _HyperLiquidProvider_transferUsdcToSpot, _HyperLiquidProvider_swapUsdcToUsdh, _HyperLiquidProvider_ensureUsdhCollateralForOrder, _HyperLiquidProvider_buildAssetMapping, _HyperLiquidProvider_queryUserDataAcrossDexs, _HyperLiquidProvider_mapError, _HyperLiquidProvider_getErrorContext, _HyperLiquidProvider_checkBuilderFeeApproval, _HyperLiquidProvider_ensureBuilderFeeApproval, _HyperLiquidProvider_checkBuilderFeeStatus, _HyperLiquidProvider_getBalanceForDex, _HyperLiquidProvider_findSourceDexWithBalance, _HyperLiquidProvider_autoTransferForHip3Order, _HyperLiquidProvider_autoTransferBackAfterClose, _HyperLiquidProvider_calculateHip3RequiredMargin, _HyperLiquidProvider_handleHip3PostOrderRebalance, _HyperLiquidProvider_handleHip3OrderRollback, _HyperLiquidProvider_validateOrderBeforePlacement, _HyperLiquidProvider_getAssetInfo, _HyperLiquidProvider_prepareAssetForTrading, _HyperLiquidProvider_handleHip3PreOrder, _HyperLiquidProvider_submitOrderWithRollback, _HyperLiquidProvider_handleOrderError, _HyperLiquidProvider_getStandaloneValidatedDexs, _HyperLiquidProvider_getAllMids, _HyperLiquidProvider_fetchSingleDexFresh, _HyperLiquidProvider_mergeDexResultsInto, _HyperLiquidProvider_cacheFreshMarketDataSnapshot, _HyperLiquidProvider_getStaleMarketDataSnapshot, _HyperLiquidProvider_isFeeCacheValid, _HyperLiquidProvider_getBuilderAddress, _HyperLiquidProvider_getReferralCode, _HyperLiquidProvider_ensureReferralSet, _HyperLiquidProvider_isReferralCodeReady, _HyperLiquidProvider_checkReferralSet, _HyperLiquidProvider_setReferralCode;
 import { hasProperty } from "@metamask/utils";
 import { v4 as uuidv4 } from "uuid";
+import { PERPS_EVENT_PROPERTY, PERPS_EVENT_VALUE } from "../constants/eventNames.mjs";
 import { BASIS_POINTS_DIVISOR, BUILDER_FEE_CONFIG, FEE_RATES, getBridgeInfo, getChainId, HIP3_ASSET_MARKET_TYPES, HIP3_FEE_CONFIG, HIP3_MARGIN_CONFIG, HYPERLIQUID_WITHDRAWAL_MINUTES, REFERRAL_CONFIG, SPOT_ASSET_ID_OFFSET, TRADING_DEFAULTS, USDC_DECIMALS, USDH_CONFIG } from "../constants/hyperLiquidConfig.mjs";
 import { ORDER_SLIPPAGE_CONFIG, PERFORMANCE_CONFIG, PERPS_CONSTANTS, TP_SL_CONFIG, WITHDRAWAL_CONSTANTS } from "../constants/perpsConfig.mjs";
 import { PERPS_TRANSACTIONS_HISTORY_CONSTANTS } from "../constants/transactionsHistoryConfig.mjs";
@@ -21,6 +22,8 @@ import { HyperLiquidClientService, WebSocketConnectionState } from "../services/
 import { HyperLiquidSubscriptionService } from "../services/HyperLiquidSubscriptionService.mjs";
 import { HyperLiquidWalletService } from "../services/HyperLiquidWalletService.mjs";
 import { TradingReadinessCache, PerpsSigningCache } from "../services/TradingReadinessCache.mjs";
+import { PerpsAnalyticsEvent } from "../types/index.mjs";
+import { HL_ABSTRACTION_WIRE, HL_UNIFIED_ACCOUNT_MODE, hyperLiquidModeFoldsSpot } from "../types/hyperliquid-types.mjs";
 import { addSpotBalanceToAccountState, aggregateAccountStates } from "../utils/accountUtils.mjs";
 import { ensureError } from "../utils/errorUtils.mjs";
 import { adaptAccountStateFromSDK, adaptHyperLiquidLedgerUpdateToUserHistoryItem, adaptMarketFromSDK, adaptOrderFromSDK, adaptPositionFromSDK, buildAssetMapping, formatHyperLiquidPrice, formatHyperLiquidSize, parseAssetName } from "../utils/hyperLiquidAdapter.mjs";
@@ -96,11 +99,23 @@ export class HyperLiquidProvider {
         _HyperLiquidProvider_hip3Enabled.set(this, void 0);
         _HyperLiquidProvider_allowlistMarkets.set(this, void 0);
         _HyperLiquidProvider_blocklistMarkets.set(this, void 0);
-        _HyperLiquidProvider_useDexAbstraction.set(this, void 0);
+        // Emergency kill-switch for the Unified Account migration flow. Defaults
+        // to true and is the expected production state after HL's DEX Abstraction
+        // deprecation. Kept as a constructor option (not removed) so we can
+        // disable the migration via a hot-fix release if a regression surfaces
+        // in the wild — flipping this to false reverts to the legacy programmatic
+        // HIP-3 transfer path that already lives in the codebase.
+        _HyperLiquidProvider_useUnifiedAccount.set(this, void 0);
         // True once DEX discovery has succeeded with real data (not a fallback).
         // When false, #ensureReadyPromise is reset after each init so the next
         // caller retries DEX discovery instead of reusing a degraded mapping.
         _HyperLiquidProvider_dexDiscoveryComplete.set(this, false);
+        // True when the most recent #ensureUnifiedAccountEnabled run ended in a
+        // transient state that warrants retry (silent agent-key failure, REST
+        // userAbstraction lookup failure, or keyring locked). #ensureReady resets
+        // its memoized promise when this is set so the next entry retries the
+        // migration instead of returning the cached resolved promise.
+        _HyperLiquidProvider_unifiedAccountSetupNeedsRetry.set(this, false);
         // Pending promise to deduplicate concurrent getValidatedDexs() calls
         _HyperLiquidProvider_pendingValidatedDexsPromise.set(this, null);
         // Cache for USDC token ID from spot metadata
@@ -141,8 +156,8 @@ export class HyperLiquidProvider {
         __classPrivateFieldSet(this, _HyperLiquidProvider_hip3Enabled, options.hip3Enabled ?? false, "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_allowlistMarkets, options.allowlistMarkets ?? [], "f");
         __classPrivateFieldSet(this, _HyperLiquidProvider_blocklistMarkets, options.blocklistMarkets ?? [], "f");
-        // Attempt native balance abstraction, fallback to programmatic transfer if unsupported
-        __classPrivateFieldSet(this, _HyperLiquidProvider_useDexAbstraction, options.useDexAbstraction ?? true, "f");
+        // Attempt unified account mode, fallback to programmatic transfer if unsupported
+        __classPrivateFieldSet(this, _HyperLiquidProvider_useUnifiedAccount, options.useUnifiedAccount ?? true, "f");
         // Initialize services with injected platform dependencies
         __classPrivateFieldSet(this, _HyperLiquidProvider_clientService, new HyperLiquidClientService(__classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f"), {
             isTestnet,
@@ -741,7 +756,7 @@ export class HyperLiquidProvider {
                 const closeSize = Math.abs(positionSize);
                 const totalMarginUsed = parseFloat(position.marginUsed);
                 // Track HIP-3 transfers (full position close means all margin is freed)
-                if (isHip3Position && dexName && !__classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
+                if (isHip3Position && dexName && !__classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
                     hip3Transfers.push({
                         sourceDex: dexName,
                         freedMargin: totalMarginUsed,
@@ -795,7 +810,7 @@ export class HyperLiquidProvider {
                 (hasProperty(stat, 'filled') || hasProperty(stat, 'resting'))).length;
             const failureCount = statuses.length - successCount;
             // Handle HIP-3 margin transfers for successful closes
-            if (!__classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
+            if (!__classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
                 for (let i = 0; i < statuses.length; i++) {
                     const status = statuses[i];
                     const isSuccess = isStatusObject(status) &&
@@ -1163,7 +1178,7 @@ export class HyperLiquidProvider {
             if (result.success &&
                 isHip3Position &&
                 hip3Dex &&
-                !__classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
+                !__classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
                 __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Position closed successfully, initiating manual auto-transfer back');
                 // Non-blocking: Transfer freed margin back to main DEX
                 await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_autoTransferBackAfterClose).call(this, {
@@ -1174,8 +1189,8 @@ export class HyperLiquidProvider {
             else if (result.success &&
                 isHip3Position &&
                 hip3Dex &&
-                __classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
-                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Position closed - DEX abstraction will auto-return freed margin', {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Position closed - Unified Account will auto-return freed margin', {
                     coin: params.symbol,
                     dex: hip3Dex,
                     note: 'HyperLiquid handles return automatically',
@@ -1932,7 +1947,7 @@ export class HyperLiquidProvider {
                     isTestnet: __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode(),
                 });
                 const dexs = await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getStandaloneValidatedDexs).call(this);
-                const [standaloneSpotStateResult, standalonePerpsResults] = await Promise.all([
+                const [standaloneSpotStateResult, standalonePerpsResults, standaloneAbstractionResult,] = await Promise.all([
                     standaloneInfoClient
                         .spotClearinghouseState({ user: userAddress })
                         .catch((error) => {
@@ -1942,11 +1957,21 @@ export class HyperLiquidProvider {
                         return null;
                     }),
                     queryStandaloneClearinghouseStates(standaloneInfoClient, userAddress, dexs),
+                    standaloneInfoClient
+                        .userAbstraction({ user: userAddress })
+                        .catch((error) => {
+                        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Standalone userAbstraction fetch failed; spot fold disabled until the mode resolves', {
+                            error: ensureError(error, 'HyperLiquidProvider.getAccountState.standalone.abstraction').message,
+                        });
+                        return null;
+                    }),
                 ]);
                 // Aggregate account states across all DEXs, then apply spot-backed
                 // adjustments so streamed/standalone/full paths report the same totals.
                 const dexAccountStates = standalonePerpsResults.map((perpsState) => adaptAccountStateFromSDK(perpsState));
-                const aggregatedAccountState = addSpotBalanceToAccountState(aggregateAccountStates(dexAccountStates), standaloneSpotStateResult);
+                const aggregatedAccountState = addSpotBalanceToAccountState(aggregateAccountStates(dexAccountStates), standaloneSpotStateResult, {
+                    foldIntoCollateral: hyperLiquidModeFoldsSpot(standaloneAbstractionResult),
+                });
                 __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: standalone account state fetched', { totalBalance: aggregatedAccountState.totalBalance });
                 return aggregatedAccountState;
             }
@@ -1960,11 +1985,20 @@ export class HyperLiquidProvider {
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Network mode:', __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode() ? 'TESTNET' : 'MAINNET');
             // Get Spot balance (global, not DEX-specific) and Perps states across all DEXs.
             // One transient DEX failure should not blank the entire account state.
-            const [spotStateResult, perpsStateResult] = await Promise.allSettled([
+            const [spotStateResult, perpsStateResult, abstractionResult] = await Promise.allSettled([
                 infoClient.spotClearinghouseState({ user: userAddress }),
                 __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_queryUserDataAcrossDexs).call(this, { user: userAddress }, (userParam) => infoClient.clearinghouseState(userParam)),
+                infoClient.userAbstraction({ user: userAddress }),
             ]);
             const spotState = spotStateResult.status === 'fulfilled' ? spotStateResult.value : null;
+            const abstractionMode = abstractionResult.status === 'fulfilled'
+                ? abstractionResult.value
+                : null;
+            if (abstractionResult.status === 'rejected') {
+                __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('User abstraction fetch failed; spot fold disabled until the mode resolves', {
+                    error: ensureError(abstractionResult.reason, 'HyperLiquidProvider.getAccountState.abstraction').message,
+                });
+            }
             const perpsResponse = perpsStateResult.status === 'fulfilled'
                 ? perpsStateResult.value
                 : {
@@ -2011,7 +2045,9 @@ export class HyperLiquidProvider {
                 });
                 return dexAccountState;
             });
-            const aggregatedAccountState = addSpotBalanceToAccountState(aggregateAccountStates(dexAccountStates), spotState);
+            const aggregatedAccountState = addSpotBalanceToAccountState(aggregateAccountStates(dexAccountStates), spotState, {
+                foldIntoCollateral: hyperLiquidModeFoldsSpot(abstractionMode),
+            });
             // Build per-sub-account breakdown (HIP-3 DEXs map to sub-accounts)
             const subAccountBreakdown = {};
             perpsStateResults.forEach((result) => {
@@ -2685,14 +2721,20 @@ export class HyperLiquidProvider {
             // Step 4: Ensure client is ready
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: ENSURING CLIENT READY');
             await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureReady).call(this);
+            await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureUnifiedAccountEnabled).call(this, { allowUserSigning: true });
             const exchangeClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getExchangeClient();
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: CLIENT READY');
             // Step 5: Validate amount against account balance
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: CHECKING ACCOUNT BALANCE');
             const accountState = await this.getAccountState();
-            const availableBalance = parseFloat(accountState.availableBalance);
+            // Release-branch bridge for Unified Account: availableToTradeBalance
+            // includes collateral HL can draw in target mode. The larger balance
+            // contract will replace this with an explicit withdrawableBalance field.
+            const availableBalance = parseFloat(accountState.availableToTradeBalance ?? accountState.availableBalance);
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: ACCOUNT BALANCE', {
                 availableBalance,
+                clearinghouseAvailableBalance: accountState.availableBalance,
+                availableToTradeBalance: accountState.availableToTradeBalance,
                 totalBalance: accountState.totalBalance,
                 marginUsed: accountState.marginUsed,
                 unrealizedPnl: accountState.unrealizedPnl,
@@ -3505,7 +3547,7 @@ export class HyperLiquidProvider {
             // Clear session caches (ensures fresh state on reconnect/account switch)
             __classPrivateFieldGet(this, _HyperLiquidProvider_referralCheckCache, "f").clear();
             __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").clear();
-            // NOTE: DexAbstractionCache is global and NOT cleared on disconnect
+            // NOTE: UnifiedAccountCache is global and NOT cleared on disconnect
             // to prevent repeated signing requests across reconnections
             __classPrivateFieldGet(this, _HyperLiquidProvider_cachedMetaByDex, "f").clear();
             __classPrivateFieldSet(this, _HyperLiquidProvider_cachedSpotMeta, null, "f");
@@ -3685,7 +3727,7 @@ export class HyperLiquidProvider {
         return `${baseUrl}/explorer`;
     }
 }
-_HyperLiquidProvider_deps = new WeakMap(), _HyperLiquidProvider_clientService = new WeakMap(), _HyperLiquidProvider_walletService = new WeakMap(), _HyperLiquidProvider_subscriptionService = new WeakMap(), _HyperLiquidProvider_symbolToAssetId = new WeakMap(), _HyperLiquidProvider_userFeeCache = new WeakMap(), _HyperLiquidProvider_maxLeverageCache = new WeakMap(), _HyperLiquidProvider_cachedMetaByDex = new WeakMap(), _HyperLiquidProvider_cachedMarketDataWithPrices = new WeakMap(), _HyperLiquidProvider_cachedSpotMeta = new WeakMap(), _HyperLiquidProvider_dexDiscoveryCache = new WeakMap(), _HyperLiquidProvider_referralCheckCache = new WeakMap(), _HyperLiquidProvider_builderFeeCheckCache = new WeakMap(), _HyperLiquidProvider_ensureReadyPromise = new WeakMap(), _HyperLiquidProvider_pendingBuilderFeeApprovals = new WeakMap(), _HyperLiquidProvider_compiledAllowlistPatterns = new WeakMap(), _HyperLiquidProvider_compiledBlocklistPatterns = new WeakMap(), _HyperLiquidProvider_userFeeDiscountBips = new WeakMap(), _HyperLiquidProvider_hip3Enabled = new WeakMap(), _HyperLiquidProvider_allowlistMarkets = new WeakMap(), _HyperLiquidProvider_blocklistMarkets = new WeakMap(), _HyperLiquidProvider_useDexAbstraction = new WeakMap(), _HyperLiquidProvider_dexDiscoveryComplete = new WeakMap(), _HyperLiquidProvider_pendingValidatedDexsPromise = new WeakMap(), _HyperLiquidProvider_cachedUsdcTokenId = new WeakMap(), _HyperLiquidProvider_errorMappings = new WeakMap(), _HyperLiquidProvider_clientsInitialized = new WeakMap(), _HyperLiquidProvider_initializationPromise = new WeakMap(), _HyperLiquidProvider_messenger = new WeakMap(), _HyperLiquidProvider_builderAddressTestnet = new WeakMap(), _HyperLiquidProvider_builderAddressMainnet = new WeakMap(), _HyperLiquidProvider_tradingSetupPromise = new WeakMap(), _HyperLiquidProvider_tradingSetupComplete = new WeakMap(), _HyperLiquidProvider_instances = new WeakSet(), _HyperLiquidProvider_compilePatternsSafely = function _HyperLiquidProvider_compilePatternsSafely(patterns, listName) {
+_HyperLiquidProvider_deps = new WeakMap(), _HyperLiquidProvider_clientService = new WeakMap(), _HyperLiquidProvider_walletService = new WeakMap(), _HyperLiquidProvider_subscriptionService = new WeakMap(), _HyperLiquidProvider_symbolToAssetId = new WeakMap(), _HyperLiquidProvider_userFeeCache = new WeakMap(), _HyperLiquidProvider_maxLeverageCache = new WeakMap(), _HyperLiquidProvider_cachedMetaByDex = new WeakMap(), _HyperLiquidProvider_cachedMarketDataWithPrices = new WeakMap(), _HyperLiquidProvider_cachedSpotMeta = new WeakMap(), _HyperLiquidProvider_dexDiscoveryCache = new WeakMap(), _HyperLiquidProvider_referralCheckCache = new WeakMap(), _HyperLiquidProvider_builderFeeCheckCache = new WeakMap(), _HyperLiquidProvider_ensureReadyPromise = new WeakMap(), _HyperLiquidProvider_pendingBuilderFeeApprovals = new WeakMap(), _HyperLiquidProvider_compiledAllowlistPatterns = new WeakMap(), _HyperLiquidProvider_compiledBlocklistPatterns = new WeakMap(), _HyperLiquidProvider_userFeeDiscountBips = new WeakMap(), _HyperLiquidProvider_hip3Enabled = new WeakMap(), _HyperLiquidProvider_allowlistMarkets = new WeakMap(), _HyperLiquidProvider_blocklistMarkets = new WeakMap(), _HyperLiquidProvider_useUnifiedAccount = new WeakMap(), _HyperLiquidProvider_dexDiscoveryComplete = new WeakMap(), _HyperLiquidProvider_unifiedAccountSetupNeedsRetry = new WeakMap(), _HyperLiquidProvider_pendingValidatedDexsPromise = new WeakMap(), _HyperLiquidProvider_cachedUsdcTokenId = new WeakMap(), _HyperLiquidProvider_errorMappings = new WeakMap(), _HyperLiquidProvider_clientsInitialized = new WeakMap(), _HyperLiquidProvider_initializationPromise = new WeakMap(), _HyperLiquidProvider_messenger = new WeakMap(), _HyperLiquidProvider_builderAddressTestnet = new WeakMap(), _HyperLiquidProvider_builderAddressMainnet = new WeakMap(), _HyperLiquidProvider_tradingSetupPromise = new WeakMap(), _HyperLiquidProvider_tradingSetupComplete = new WeakMap(), _HyperLiquidProvider_instances = new WeakSet(), _HyperLiquidProvider_compilePatternsSafely = function _HyperLiquidProvider_compilePatternsSafely(patterns, listName) {
     const compiled = [];
     for (const pattern of patterns) {
         try {
@@ -3756,9 +3798,9 @@ async function _HyperLiquidProvider_ensureClientsInitialized() {
         // so future calls can retry if needed
         __classPrivateFieldSet(this, _HyperLiquidProvider_initializationPromise, null, "f");
     }
-}, _HyperLiquidProvider_ensureDexAbstractionEnabled = 
+}, _HyperLiquidProvider_ensureUnifiedAccountEnabled = 
 /**
- * Attempt to enable HIP-3 native balance abstraction
+ * Attempt to enable HyperLiquid Unified Account mode for HIP-3 orders
  *
  * If successful, HyperLiquid automatically manages collateral transfers for HIP-3 orders.
  * If not supported, disables the flag to trigger programmatic transfer fallback.
@@ -3766,10 +3808,24 @@ async function _HyperLiquidProvider_ensureClientsInitialized() {
  * IMPORTANT: Uses global singleton cache to prevent repeated signing requests
  * across provider reconnections (critical for hardware wallets).
  *
+ * @param options - Optional configuration.
+ * @param options.allowUserSigning - When true, runs the EIP-712 user-signed migration for `dexAbstraction` accounts. Defaults to false so init does not surface a signing prompt; action-time entry points (trading, withdraw) pass true.
  * @private
  */
-async function _HyperLiquidProvider_ensureDexAbstractionEnabled() {
-    if (!__classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
+async function _HyperLiquidProvider_ensureUnifiedAccountEnabled(options) {
+    // dexAbstraction → unifiedAccount requires an EIP-712 prompt (HL blocks
+    // the agent path for that transition). Init calls with allowUserSigning=false so
+    // viewing the Perps section never surfaces a signing dialog. Trading and
+    // withdraw entry points pass allowUserSigning=true to drive the migration when
+    // the user actually intends to act.
+    const allowUserSigning = options?.allowUserSigning ?? false;
+    // Optimistic reset — set true below only at the failure points that
+    // warrant retry (silent agent failure, REST lookup failure, keyring
+    // locked). Final-state outcomes (success, prompted-failure cached,
+    // already-on-compatible, defer, unknown mode, feature off) leave it
+    // false so #ensureReady can keep the memoized promise.
+    __classPrivateFieldSet(this, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, false, "f");
+    if (!__classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
         return; // Feature disabled
     }
     const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
@@ -3778,7 +3834,7 @@ async function _HyperLiquidProvider_ensureDexAbstractionEnabled() {
     // This is CRITICAL for hardware wallets to prevent QR popup spam
     const cachedStatus = TradingReadinessCache.get(network, userAddress);
     if (cachedStatus?.attempted) {
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: DEX abstraction already attempted (from global cache)', {
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unified Account setup already attempted (from global cache)', {
             user: userAddress,
             network,
             enabled: cachedStatus.enabled,
@@ -3788,75 +3844,178 @@ async function _HyperLiquidProvider_ensureDexAbstractionEnabled() {
     }
     // Check if another provider instance is currently attempting this operation
     // This prevents concurrent signing attempts across providers during reconnection
-    const inFlightPromise = PerpsSigningCache.isInFlight('dexAbstraction', network, userAddress);
+    const inFlightPromise = PerpsSigningCache.isInFlight('unifiedAccount', network, userAddress);
     if (inFlightPromise) {
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: DEX abstraction in-flight, waiting...', { network, userAddress });
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unified Account setup in-flight, waiting...', { network, userAddress });
         await inFlightPromise;
-        return; // After waiting, the cache should be set by the other provider
+        // The other instance may have finished without writing the cache (e.g.
+        // an init-time call deferred a dexAbstraction migration). If the cache
+        // is still empty and we are an action-time caller (allowUserSigning=true),
+        // we must run our own attempt — otherwise the trade/withdraw would
+        // proceed in the deprecated mode.
+        const postWaitCache = TradingReadinessCache.get(network, userAddress);
+        if (postWaitCache?.attempted) {
+            return;
+        }
+        // Fall through to acquire our own lock and retry.
     }
     // Set in-flight lock to prevent concurrent attempts
-    const completeInFlight = PerpsSigningCache.setInFlight('dexAbstraction', network, userAddress);
+    const completeInFlight = PerpsSigningCache.setInFlight('unifiedAccount', network, userAddress);
+    let currentMode;
     try {
         // Re-check cache after acquiring lock (another provider might have finished)
         const recheckCache = TradingReadinessCache.get(network, userAddress);
         if (recheckCache?.attempted) {
-            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: DEX abstraction completed by another provider', { network, userAddress });
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unified Account setup completed by another provider', { network, userAddress });
             completeInFlight();
             return;
         }
         const infoClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getInfoClient();
-        // Check if already enabled on-chain (returns boolean | null)
-        const isEnabled = await infoClient.userDexAbstraction({
+        // Check current abstraction mode on-chain
+        currentMode = await infoClient.userAbstraction({
             user: userAddress,
         });
-        if (isEnabled === true) {
-            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: DEX abstraction already enabled on-chain', { user: userAddress, network });
-            // Cache the enabled status to skip future checks
+        if (currentMode === 'unifiedAccount' ||
+            currentMode === 'portfolioMargin') {
+            // portfolioMargin is a superset of unifiedAccount — it already supports
+            // auto-collateral management for HIP-3 orders and is more capital-efficient.
+            // Downgrading portfolio margin users to unifiedAccount would be harmful,
+            // so we treat both modes as already-enabled and skip migration.
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Account already in a compatible mode, skipping migration', { user: userAddress, network, mode: currentMode });
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").metrics.trackPerpsEvent(PerpsAnalyticsEvent.AccountSetup, {
+                [PERPS_EVENT_PROPERTY.ABSTRACTION_MODE]: currentMode,
+                [PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.ALREADY_ENABLED,
+            });
             TradingReadinessCache.set(network, userAddress, {
                 attempted: true,
                 enabled: true,
             });
+            // Record the resolved mode in the subscription service so the next
+            // aggregation folds spot correctly without waiting for #refreshSpotState.
+            __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionService, "f").setUserAbstractionMode(userAddress, currentMode);
+            completeInFlight();
+            return;
+        }
+        // Defer the user-signed transition until the user attempts an action.
+        // Cache is intentionally left untouched so the next entry re-evaluates;
+        // the read-only userAbstraction call is cheap and gated by the in-flight
+        // lock, preventing concurrent prompts.
+        if (currentMode === 'dexAbstraction' && !allowUserSigning) {
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Deferring dexAbstraction → unifiedAccount migration to action time', { user: userAddress, network });
             completeInFlight();
             return;
         }
-        // Enable DEX abstraction (one-time, irreversible, requires signature)
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Enabling DEX abstraction (requires signature)', {
+        // Bail on unknown modes BEFORE firing analytics or attempting dispatch.
+        // Keeps `migration_required` actionable (only fires for modes we can
+        // actually migrate) and avoids re-emitting on every reconnection.
+        if (currentMode !== 'dexAbstraction' &&
+            currentMode !== 'default' &&
+            currentMode !== 'disabled') {
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unknown abstraction mode, skipping Unified Account migration', { user: userAddress, network, mode: currentMode });
+            completeInFlight();
+            return;
+        }
+        // Track which mode users are currently on before we attempt migration.
+        // This tells us the distribution of legacy modes across our user base.
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").metrics.trackPerpsEvent(PerpsAnalyticsEvent.AccountSetup, {
+            [PERPS_EVENT_PROPERTY.ABSTRACTION_MODE]: currentMode,
+            [PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.MIGRATION_REQUIRED,
+        });
+        // Enable Unified Account mode.
+        // - default / disabled: agent wallet can do this silently (no prompt)
+        // - dexAbstraction: HL blocks the agent transition — requires the user's main
+        //   wallet to sign an EIP-712 action via userSetAbstraction (one-time prompt)
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Enabling Unified Account mode', {
             user: userAddress,
             network,
+            previousMode: currentMode,
             note: 'HyperLiquid will auto-manage collateral for HIP-3 orders',
         });
         const exchangeClient = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").getExchangeClient();
-        await exchangeClient.agentEnableDexAbstraction();
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('✅ HyperLiquidProvider: DEX abstraction enabled successfully');
-        // Cache success to prevent re-attempts on reconnection
+        if (currentMode === 'dexAbstraction') {
+            // Requires EIP-712 signature from the user's main wallet (one-time migration).
+            // HL blocks the dexAbstraction → unifiedAccount transition via the agent wallet,
+            // so userSetAbstraction (user-signed) is the only path for legacy users.
+            await exchangeClient.userSetAbstraction({
+                user: userAddress,
+                abstraction: HL_UNIFIED_ACCOUNT_MODE,
+            });
+        }
+        else {
+            // default / disabled — silent agent transition, no user prompt
+            await exchangeClient.agentSetAbstraction({
+                abstraction: HL_ABSTRACTION_WIRE.unifiedAccount,
+            });
+        }
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('✅ HyperLiquidProvider: Unified Account enabled successfully');
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").metrics.trackPerpsEvent(PerpsAnalyticsEvent.AccountSetup, {
+            [PERPS_EVENT_PROPERTY.PREVIOUS_ABSTRACTION_MODE]: currentMode,
+            [PERPS_EVENT_PROPERTY.ABSTRACTION_MODE]: HL_UNIFIED_ACCOUNT_MODE,
+            [PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.SUCCESS,
+        });
         TradingReadinessCache.set(network, userAddress, {
             attempted: true,
             enabled: true,
         });
+        // Record the post-migration mode in the subscription service so it
+        // immediately re-aggregates with fold=true and surfaces the unified
+        // balance rather than waiting for the next #refreshSpotState.
+        __classPrivateFieldGet(this, _HyperLiquidProvider_subscriptionService, "f").setUserAbstractionMode(userAddress, HL_UNIFIED_ACCOUNT_MODE);
         completeInFlight();
     }
     catch (error) {
         // If keyring is locked, don't cache so it retries when unlocked
         if (ensureError(error).message === PERPS_ERROR_CODES.KEYRING_LOCKED) {
-            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureDexAbstractionEnabled] Keyring locked, will retry later');
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureUnifiedAccountEnabled] Keyring locked, will retry later');
+            __classPrivateFieldSet(this, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, true, "f");
             completeInFlight();
             return;
         }
-        // Cache the attempt (even on failure) to prevent repeated signing requests
-        // This is CRITICAL for hardware wallets - if user rejects, don't ask again
-        TradingReadinessCache.set(network, userAddress, {
-            attempted: true,
-            enabled: false,
-        });
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: DEX abstraction failed, cached to prevent retries', {
+        // Cache failure ONLY for the user-prompted path
+        // (`dexAbstraction → unifiedAccount` via `userSetAbstraction`). The
+        // rationale for caching is "don't re-prompt a user who already saw the
+        // signature dialog and rejected it" — that doesn't apply to:
+        //   - Read-only userAbstraction lookup failures (no prompt; transient).
+        //   - Silent agent-key paths (`default`/`disabled` → `agentSetAbstraction`
+        //     does not show a UI prompt; failures are typically transient HL
+        //     outages and pinning them would leave users stuck in the
+        //     deprecated mode for the rest of the session).
+        // Action-time retries pick up the unmigrated state and try again.
+        if (currentMode === 'dexAbstraction') {
+            TradingReadinessCache.set(network, userAddress, {
+                attempted: true,
+                enabled: false,
+            });
+        }
+        else {
+            // Silent agent-key failure (default/disabled) or read-only
+            // userAbstraction lookup failure — neither is a final state, so
+            // signal #ensureReady to drop its memoized promise and retry on
+            // the next entry instead of pinning the user in the deprecated
+            // mode for the provider's lifetime.
+            __classPrivateFieldSet(this, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, true, "f");
+        }
+        const errorMessage = ensureError(error, 'HyperLiquidProvider.ensureUnifiedAccountEnabled').message;
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unified Account setup failed', {
             user: userAddress,
             network,
-            error: ensureError(error, 'HyperLiquidProvider.ensureDexAbstractionEnabled').message,
+            error: errorMessage,
+            // Cache writes only happen on the user-prompted dexAbstraction
+            // path (see P2-B logic above). Reflect that here so retry
+            // behaviour is debuggable from the log alone.
+            cached: currentMode === 'dexAbstraction',
+        });
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").metrics.trackPerpsEvent(PerpsAnalyticsEvent.AccountSetup, {
+            ...(currentMode && {
+                [PERPS_EVENT_PROPERTY.PREVIOUS_ABSTRACTION_MODE]: currentMode,
+                [PERPS_EVENT_PROPERTY.ABSTRACTION_MODE]: HL_UNIFIED_ACCOUNT_MODE,
+            }),
+            [PERPS_EVENT_PROPERTY.STATUS]: PERPS_EVENT_VALUE.STATUS.FAILED,
+            [PERPS_EVENT_PROPERTY.ERROR_MESSAGE]: errorMessage,
         });
         completeInFlight();
-        // Don't blindly disable the flag on any error
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").logger.error(ensureError(error, 'HyperLiquidProvider.ensureDexAbstractionEnabled'), __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getErrorContext).call(this, 'ensureDexAbstractionEnabled', {
-            note: 'Could not enable DEX abstraction (may already be enabled, user rejected, or network error)',
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").logger.error(ensureError(error, 'HyperLiquidProvider.ensureUnifiedAccountEnabled'), __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getErrorContext).call(this, 'ensureUnifiedAccountEnabled', {
+            note: 'Could not enable Unified Account (user rejected, or network error)',
         }));
     }
 }, _HyperLiquidProvider_ensureReady = 
@@ -3890,9 +4049,14 @@ async function _HyperLiquidProvider_ensureReady() {
             });
             await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_buildAssetMapping).call(this);
         }
-        // NOTE: Signing operations (DEX abstraction, builder fee, referral) are now DEFERRED
-        // They are called on-demand in ensureReadyForTrading() when user attempts to trade
-        // This prevents QR popups when just viewing the Perps section (critical for hardware wallets)
+        // Attempt Unified Account migration as early as possible so users aren't
+        // blocked when they try to trade. Software-wallet dexAbstraction users can
+        // complete the one-time EIP-712 migration during initial setup so the first
+        // trade sees the unified balance. Hardware wallets remain deferred to
+        // action time to avoid QR / Ledger prompt spam while browsing.
+        await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureUnifiedAccountEnabled).call(this, {
+            allowUserSigning: !__classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").isSelectedHardwareWallet(),
+        });
     })(), "f");
     // Await initialization - keep the promise so subsequent calls resolve immediately
     // The promise is only reset in disconnect() for clean reconnection,
@@ -3904,10 +4068,21 @@ async function _HyperLiquidProvider_ensureReady() {
         // will be re-discovered on the next #ensureReady() call.
         __classPrivateFieldSet(this, _HyperLiquidProvider_ensureReadyPromise, null, "f");
     }
+    else if (__classPrivateFieldGet(this, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, "f")) {
+        // Silent migration / lookup / keyring-locked failure left the cache
+        // empty. Without resetting the memoized promise, subsequent
+        // #ensureReady calls would skip retry and the user would be stuck
+        // in the deprecated mode for the provider's lifetime.
+        __classPrivateFieldSet(this, _HyperLiquidProvider_ensureReadyPromise, null, "f");
+    }
     __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureReady] Initialization complete');
 }, _HyperLiquidProvider_ensureReadyForTrading = async function _HyperLiquidProvider_ensureReadyForTrading() {
     // First ensure basic initialization is complete
     await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureReady).call(this);
+    // dexAbstraction users were deferred during init to avoid an EIP-712 prompt
+    // on Perps section open. Drive the migration here, gated by its own cache so
+    // already-migrated or already-rejected users are not re-prompted.
+    await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureUnifiedAccountEnabled).call(this, { allowUserSigning: true });
     // If trading setup already complete, return immediately
     if (__classPrivateFieldGet(this, _HyperLiquidProvider_tradingSetupComplete, "f")) {
         return;
@@ -3931,8 +4106,6 @@ async function _HyperLiquidProvider_ensureReady() {
                 // Don't throw - spotMeta will be fetched on-demand if needed
             }
         }
-        // Attempt to enable native balance abstraction
-        await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureDexAbstractionEnabled).call(this);
         // Set up builder fee approval
         try {
             await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureBuilderFeeApproval).call(this);
@@ -5555,11 +5728,11 @@ async function _HyperLiquidProvider_handleHip3PreOrder(params) {
             isBuy,
         });
         await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureUsdhCollateralForOrder).call(this, dexName, requiredMargin);
-        // DEX abstraction will pull USDH from spot automatically
+        // Unified Account will pull USDH from spot automatically
         return { transferInfo: null };
     }
-    if (__classPrivateFieldGet(this, _HyperLiquidProvider_useDexAbstraction, "f")) {
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Using DEX abstraction (no manual transfer)', {
+    if (__classPrivateFieldGet(this, _HyperLiquidProvider_useUnifiedAccount, "f")) {
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Using Unified Account (no manual transfer)', {
             symbol,
             dex: dexName,
         });
@@ -5588,7 +5761,7 @@ async function _HyperLiquidProvider_handleHip3PreOrder(params) {
         const errorMsg = transferError?.message || '';
         if (errorMsg.includes('Cannot transfer with DEX abstraction enabled')) {
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('Detected DEX abstraction is enabled, switching mode');
-            __classPrivateFieldSet(this, _HyperLiquidProvider_useDexAbstraction, true, "f");
+            __classPrivateFieldSet(this, _HyperLiquidProvider_useUnifiedAccount, true, "f");
             return { transferInfo: null };
         }
         throw transferError;