@metamask-previews/perps-controller 6.0.1-preview-e5cef32c6 → 6.1.0-preview-6d2aeda

package/CHANGELOG.md

@@ -7,11 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.1.0]
+
 ### Changed
 
+- Pass the perps builder base fee into rewards discount resolution and treat unhydrated rewards subscription state as retryable instead of a definitive no-discount result ([#8803](https://github.com/MetaMask/core/pull/8803))
 - Bump `@metamask/controller-utils` from `^12.0.0` to `^12.1.0` ([#8774](https://github.com/MetaMask/core/pull/8774))
 - Bump `@metamask/transaction-controller` from `^65.3.0` to `^65.4.0` ([#8796](https://github.com/MetaMask/core/pull/8796))
 
+### Fixed
+
+- Defer signing-backed HyperLiquid unified-account setup for hardware wallets across migratable abstraction modes, including Ledger, Trezor, OneKey, Lattice, and QR keyrings, to avoid repeated signing prompts while browsing ([#8803](https://github.com/MetaMask/core/pull/8803))
+- Improve logging and retry classification for failed cancel/close/TP-SL operations and SDK-wrapped keyring-locked errors ([#8803](https://github.com/MetaMask/core/pull/8803))
+
 ## [6.0.1]
 
 ### Changed
@@ -290,7 +298,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/controller-utils` from `^11.18.0` to `^11.19.0` ([#7995](https://github.com/MetaMask/core/pull/7995))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@6.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@6.1.0...HEAD
+[6.1.0]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@6.0.1...@metamask/perps-controller@6.1.0
 [6.0.1]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@6.0.0...@metamask/perps-controller@6.0.1
 [6.0.0]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@5.0.0...@metamask/perps-controller@6.0.0
 [5.0.0]: https://github.com/MetaMask/core/compare/@metamask/perps-controller@4.0.0...@metamask/perps-controller@5.0.0

package/dist/providers/HyperLiquidProvider.cjs

@@ -29,6 +29,7 @@ const types_1 = require("../types/index.cjs");
 const hyperliquid_types_1 = require("../types/hyperliquid-types.cjs");
 const accountUtils_1 = require("../utils/accountUtils.cjs");
 const errorUtils_1 = require("../utils/errorUtils.cjs");
+const hyperLiquidAbstraction_1 = require("../utils/hyperLiquidAbstraction.cjs");
 const hyperLiquidAdapter_1 = require("../utils/hyperLiquidAdapter.cjs");
 const hyperLiquidValidation_1 = require("../utils/hyperLiquidValidation.cjs");
 const marketDataTransform_1 = require("../utils/marketDataTransform.cjs");
@@ -143,7 +144,7 @@ class HyperLiquidProvider {
          * - Builder fee approval (required for orders)
          * - Referral code setup (attribution)
          *
-         * These operations are DEFERRED from ensureReady() to avoid QR popup spam
+         * These operations are DEFERRED from ensureReady() to avoid hardware wallet prompt spam
          * when users are just viewing the Perps section (critical for hardware wallets).
          *
          * Call this method before any trading operation (placeOrder, cancelOrder, etc.)
@@ -3863,7 +3864,8 @@ async function _HyperLiquidProvider_ensureUnifiedAccountEnabled(options) {
     const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
     const network = __classPrivateFieldGet(this, _HyperLiquidProvider_clientService, "f").isTestnetMode() ? 'testnet' : 'mainnet';
     // Check global cache first to avoid repeated signing requests
-    // This is CRITICAL for hardware wallets to prevent QR popup spam
+    // This is CRITICAL for hardware wallets to prevent repeated signing prompts
+    // while browsing.
     const cachedStatus = TradingReadinessCache_1.TradingReadinessCache.get(network, userAddress);
     if (cachedStatus?.attempted) {
         __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Unified Account setup already attempted (from global cache)', {
@@ -3928,12 +3930,12 @@ async function _HyperLiquidProvider_ensureUnifiedAccountEnabled(options) {
             completeInFlight();
             return;
         }
-        // Defer the user-signed transition until the user attempts an action.
+        // Defer signing-backed transitions 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 });
+        if ((0, hyperLiquidAbstraction_1.shouldDeferUnifiedAccountSetup)(currentMode, allowUserSigning)) {
+            __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('HyperLiquidProvider: Deferring unified account migration to action time', { user: userAddress, network, mode: currentMode });
             completeInFlight();
             return;
         }
@@ -3996,8 +3998,9 @@ async function _HyperLiquidProvider_ensureUnifiedAccountEnabled(options) {
         completeInFlight();
     }
     catch (error) {
-        // If keyring is locked, don't cache so it retries when unlocked
-        if ((0, errorUtils_1.ensureError)(error).message === perpsErrorCodes_1.PERPS_ERROR_CODES.KEYRING_LOCKED) {
+        // HyperLiquid wraps wallet signing failures and preserves KEYRING_LOCKED
+        // in `cause`, so classify the full chain and leave retry caches empty.
+        if ((0, errorUtils_1.isKeyringLockedError)(error)) {
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureUnifiedAccountEnabled] Keyring locked, will retry later');
             __classPrivateFieldSet(this, _HyperLiquidProvider_unifiedAccountSetupNeedsRetry, true, "f");
             completeInFlight();
@@ -4082,10 +4085,10 @@ async function _HyperLiquidProvider_ensureReady() {
             await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_buildAssetMapping).call(this);
         }
         // 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.
+        // blocked when they try to trade. Software wallets can complete the
+        // signing-backed migration during initial setup so the first trade sees
+        // the unified balance. Hardware wallets remain deferred to action time to
+        // avoid repeated signing prompts while browsing.
         await __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_ensureUnifiedAccountEnabled).call(this, {
             allowUserSigning: !__classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").isSelectedHardwareWallet(),
         });
@@ -5158,10 +5161,11 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
     const userAddress = await __classPrivateFieldGet(this, _HyperLiquidProvider_walletService, "f").getUserAddressWithDefault();
     const cacheKey = __classPrivateFieldGet(this, _HyperLiquidProvider_instances, "m", _HyperLiquidProvider_getCacheKey).call(this, network, userAddress);
     // Check GLOBAL cache first to avoid repeated signing requests across reconnections
-    // This is CRITICAL for hardware wallets to prevent QR popup spam
+    // This is CRITICAL for hardware wallets to prevent repeated signing prompts
+    // while browsing.
     const globalCached = TradingReadinessCache_1.PerpsSigningCache.getBuilderFee(network, userAddress);
     if (globalCached?.attempted) {
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Using global cache (prevents QR popup spam)', { network, success: globalCached.success });
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Using global cache (prevents hardware wallet prompt spam)', { network, success: globalCached.success });
         if (globalCached.success) {
             __classPrivateFieldGet(this, _HyperLiquidProvider_builderFeeCheckCache, "f").set(cacheKey, true);
         }
@@ -5222,8 +5226,9 @@ async function _HyperLiquidProvider_ensureBuilderFeeApproval() {
         completeInFlight();
     }
     catch (error) {
-        // If keyring is locked, don't cache so it retries when unlocked
-        if ((0, errorUtils_1.ensureError)(error).message === perpsErrorCodes_1.PERPS_ERROR_CODES.KEYRING_LOCKED) {
+        // HyperLiquid wraps wallet signing failures and preserves KEYRING_LOCKED
+        // in `cause`, so classify the full chain and leave retry caches empty.
+        if ((0, errorUtils_1.isKeyringLockedError)(error)) {
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureBuilderFeeApproval] Keyring locked, will retry later');
             completeInFlight();
             return;
@@ -6054,7 +6059,7 @@ async function _HyperLiquidProvider_ensureReferralSet() {
     // Check GLOBAL cache first
     const globalCached = TradingReadinessCache_1.PerpsSigningCache.getReferral(network, userAddress);
     if (globalCached?.attempted) {
-        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureReferralSet] Using global cache (prevents QR popup spam)', { network, success: globalCached.success });
+        __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureReferralSet] Using global cache (prevents hardware wallet prompt spam)', { network, success: globalCached.success });
         return;
     }
     // Check if another provider is currently attempting this
@@ -6111,8 +6116,9 @@ async function _HyperLiquidProvider_ensureReferralSet() {
         completeInFlight();
     }
     catch (error) {
-        // If keyring is locked, don't cache so it retries when unlocked
-        if ((0, errorUtils_1.ensureError)(error).message === perpsErrorCodes_1.PERPS_ERROR_CODES.KEYRING_LOCKED) {
+        // HyperLiquid wraps wallet signing failures and preserves KEYRING_LOCKED
+        // in `cause`, so classify the full chain and leave retry caches empty.
+        if ((0, errorUtils_1.isKeyringLockedError)(error)) {
             __classPrivateFieldGet(this, _HyperLiquidProvider_deps, "f").debugLogger.log('[ensureReferralSet] Keyring locked, will retry later');
             completeInFlight();
             return;