@metamask-previews/perps-controller 2.0.0-preview-27fa5d81d → 2.0.0-preview-086e47368

package/CHANGELOG.md

@@ -7,11 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Refactor pending withdraw/deposit tracking to FIFO queue design ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Add `completeWithdrawalFromHistory` method for FIFO-based withdrawal completion matching ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Add `lastCompletedWithdrawalTimestamp` and `lastCompletedWithdrawalTxHashes` state fields ([#8333](https://github.com/MetaMask/core/pull/8333))
+
 ### Changed
 
+- Centralize Arbitrum network check in deposit hooks to prevent missing network errors ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Provider credentials, builder fee injection, and env var centralization ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Reduce max order amount by 0.5% buffer to avoid insufficient margin rejections ([#8333](https://github.com/MetaMask/core/pull/8333))
 - Bump `@metamask/account-tree-controller` from `^6.0.0` to `^7.0.0` ([#8325](https://github.com/MetaMask/core/pull/8325))
 - Bump `@metamask/profile-sync-controller` from `^28.0.1` to `^28.0.2` ([#8325](https://github.com/MetaMask/core/pull/8325))
 
+### Fixed
+
+- Fix incorrect fee estimate when flipping a position ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Fix incorrect PnL and order size displayed after SL execution ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Fix stop loss not showing up in recent activity ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Fix incorrect market categories ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Fix TP/SL decimal precision for PUMP ([#8333](https://github.com/MetaMask/core/pull/8333))
+- Fix missing decimal on price input when using preset on limit price ([#8333](https://github.com/MetaMask/core/pull/8333))
+
 ## [2.0.0]
 
 ### Changed

package/dist/PerpsController.cjs

@@ -106,6 +106,8 @@ const getDefaultPerpsControllerState = () => ({
     withdrawInProgress: false,
     lastDepositTransactionId: null,
     lastWithdrawResult: null,
+    lastCompletedWithdrawalTimestamp: null,
+    lastCompletedWithdrawalTxHashes: [],
     withdrawalRequests: [],
     withdrawalProgress: {
         progress: 0,
@@ -218,6 +220,18 @@ const metadata = {
         includeInDebugSnapshot: false,
         usedInUi: true,
     },
+    lastCompletedWithdrawalTimestamp: {
+        includeInStateLogs: true,
+        persist: true,
+        includeInDebugSnapshot: false,
+        usedInUi: true,
+    },
+    lastCompletedWithdrawalTxHashes: {
+        includeInStateLogs: false,
+        persist: false,
+        includeInDebugSnapshot: false,
+        usedInUi: true,
+    },
     withdrawalRequests: {
         includeInStateLogs: true,
         persist: true,
@@ -1186,8 +1200,9 @@ class PerpsController extends base_controller_1.BaseController {
         });
     }
     /**
-     * Update withdrawal request status when it completes
-     * This is called when a withdrawal is matched with a completed withdrawal from the API
+     * Update withdrawal request status when it completes, or remove it on failure.
+     * This is called when a withdrawal is matched with a completed withdrawal from the API.
+     * When status is `failed`, the request is removed from the queue (not retained).
      *
      * @param withdrawalId - The withdrawal transaction ID.
      * @param status - The current status.
@@ -1205,13 +1220,22 @@ class PerpsController extends base_controller_1.BaseController {
                 withdrawalAmount = request.amount;
                 shouldTrack =
                     withdrawalAmount !== undefined && request.status !== status;
-                request.status = status;
-                request.success = status === 'completed';
-                if (txHash) {
-                    request.txHash = txHash;
+                if (status === 'failed') {
+                    state.withdrawalRequests.splice(withdrawalIndex, 1);
+                    state.withdrawInProgress = state.withdrawalRequests.some((req) => req.status === 'pending' || req.status === 'bridging');
+                    state.withdrawalProgress = {
+                        progress: 0,
+                        lastUpdated: Date.now(),
+                        activeWithdrawalId: null,
+                    };
                 }
-                // Clear withdrawal progress when withdrawal completes
-                if (status === 'completed' || status === 'failed') {
+                else {
+                    request.status = status;
+                    request.success = status === 'completed';
+                    if (txHash) {
+                        request.txHash = txHash;
+                    }
+                    // Clear withdrawal progress when withdrawal completes
                     state.withdrawalProgress = {
                         progress: 0,
                         lastUpdated: Date.now(),
@@ -1236,6 +1260,59 @@ class PerpsController extends base_controller_1.BaseController {
             });
         }
     }
+    /**
+     * Complete a specific withdrawal detected via transaction history polling (FIFO queue).
+     * Called when a completed withdrawal appears in the transaction history matching a pending request.
+     *
+     * Uses FIFO matching: oldest pending withdrawal is matched with first completed withdrawal
+     * in history that happened after its submission time.
+     *
+     * @param withdrawalRequestId - The ID of the pending withdrawal request to mark as complete.
+     * @param completedWithdrawal - The completed withdrawal data from the history API.
+     * @param completedWithdrawal.txHash - The on-chain transaction hash.
+     * @param completedWithdrawal.amount - The withdrawal amount.
+     * @param completedWithdrawal.timestamp - The completion timestamp from the history API.
+     * @param completedWithdrawal.asset - The asset symbol (e.g. USDC).
+     */
+    completeWithdrawalFromHistory(withdrawalRequestId, completedWithdrawal) {
+        let didRemove = false;
+        this.update((state) => {
+            const requestIndex = state.withdrawalRequests.findIndex((req) => req.id === withdrawalRequestId);
+            if (requestIndex === -1) {
+                return;
+            }
+            didRemove = true;
+            state.withdrawalRequests.splice(requestIndex, 1);
+            // Update the FIFO guard. The timestamp is persisted for cross-restart
+            // protection. The txHashes array (not persisted) accumulates within a
+            // session to prevent re-matching direct completions and same-millisecond
+            // API completions. It resets naturally on app restart.
+            state.lastCompletedWithdrawalTimestamp = completedWithdrawal.timestamp;
+            state.lastCompletedWithdrawalTxHashes.push(completedWithdrawal.txHash);
+            const hasPendingWithdrawals = state.withdrawalRequests.some((req) => req.status === 'pending' || req.status === 'bridging');
+            state.withdrawInProgress = hasPendingWithdrawals;
+            if (!hasPendingWithdrawals) {
+                state.withdrawalProgress = {
+                    progress: 0,
+                    lastUpdated: Date.now(),
+                    activeWithdrawalId: null,
+                };
+            }
+            state.lastUpdateTimestamp = Date.now();
+        });
+        if (!didRemove) {
+            return;
+        }
+        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_debugLog).call(this, 'PerpsController: Completed withdrawal from transaction history (FIFO)', {
+            withdrawalRequestId,
+            txHash: completedWithdrawal.txHash,
+            amount: completedWithdrawal.amount,
+        });
+        __classPrivateFieldGet(this, _PerpsController_instances, "m", _PerpsController_getMetrics).call(this).trackPerpsEvent(types_1.PerpsAnalyticsEvent.WithdrawalTransaction, {
+            [eventNames_1.PERPS_EVENT_PROPERTY.STATUS]: eventNames_1.PERPS_EVENT_VALUE.STATUS.COMPLETED,
+            [eventNames_1.PERPS_EVENT_PROPERTY.WITHDRAWAL_AMOUNT]: Number.parseFloat(completedWithdrawal.amount),
+        });
+    }
     /**
      * Update withdrawal progress (persistent across navigation)
      *
@@ -2408,7 +2485,7 @@ class PerpsController extends base_controller_1.BaseController {
             timestamp: new Date().toISOString(),
         });
         this.update((state) => {
-            // Filter out pending/bridging withdrawals, keep completed/failed for history
+            // Filter out pending/bridging withdrawals, keep completed for history
             state.withdrawalRequests = state.withdrawalRequests.filter((req) => req.status !== 'pending' && req.status !== 'bridging');
             // Filter out pending deposits, keep completed/failed for history
             state.depositRequests = state.depositRequests.filter((req) => req.status !== 'pending' && req.status !== 'bridging');
@@ -2911,7 +2988,7 @@ async function _PerpsController_submitTransaction(txParams, options) {
 }, _PerpsController_migrateRequestsIfNeeded = function _PerpsController_migrateRequestsIfNeeded() {
     this.update((state) => {
         // Remove withdrawal requests without accountAddress - they can't be attributed to any account
-        state.withdrawalRequests = state.withdrawalRequests.filter((req) => Boolean(req.accountAddress));
+        state.withdrawalRequests = state.withdrawalRequests.filter((req) => Boolean(req.accountAddress) && req.status !== 'failed');
         // Remove deposit requests without accountAddress - they can't be attributed to any account
         state.depositRequests = state.depositRequests.filter((req) => Boolean(req.accountAddress));
     });