@metamask/bridge-status-controller 68.0.2 → 69.0.0

package/CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [69.0.0]
+
+### Added
+
+- Added more unit test coverage for intents and EVM transactions. Also refactored some mocks and code blocks to improve testability ([#8186](https://github.com/MetaMask/core/pull/8186))
+
+### Changed
+
+- Bump `@metamask/bridge-controller` from `^69.1.0` to `^69.1.1` ([#8225](https://github.com/MetaMask/core/pull/8225))
+- Bump `@metamask/gas-fee-controller` from `^26.0.3` to `^26.1.0` ([#8225](https://github.com/MetaMask/core/pull/8225))
+- **BREAKING:** `BridgeStatusControllerMessenger` must now allow `TransactionController:isAtomicBatchSupported` action ([#8125](https://github.com/MetaMask/core/pull/8125))
+- Bump `@metamask/transaction-controller` from `^62.21.0` to `^63.0.0` ([#8217](https://github.com/MetaMask/core/pull/8217), [#8225](https://github.com/MetaMask/core/pull/8225))
+
+### Fixed
+
+- Delegated accounts (EIP-7702) now use batched transactions to avoid in-flight transaction limit ([#8125](https://github.com/MetaMask/core/pull/8125))
+- Bridge transaction types now properly matched in 7702 batch path ([#8125](https://github.com/MetaMask/core/pull/8125))
+- Delegated account batch transactions now recorded in bridge status history ([#8125](https://github.com/MetaMask/core/pull/8125))
+- Gas fields now included for delegated account transactions that are not gas-sponsored ([#8125](https://github.com/MetaMask/core/pull/8125))
+
+## [68.1.0]
+
+### Added
+
+- Added optional `activeAbTests` context support so Unified SwapBridge events can include `active_ab_tests` independently of `ab_tests`. ([#8152](https://github.com/MetaMask/core/pull/8152))
+
+### Changed
+
+- Bump `@metamask/bridge-controller` from `^69.0.1` to `^69.1.0` ([#8168](https://github.com/MetaMask/core/pull/8168))
+
 ## [68.0.2]
 
 ### Changed
@@ -1010,7 +1040,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.0.2...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@69.0.0...HEAD
+[69.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.1.0...@metamask/bridge-status-controller@69.0.0
+[68.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.0.2...@metamask/bridge-status-controller@68.1.0
 [68.0.2]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.0.1...@metamask/bridge-status-controller@68.0.2
 [68.0.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.0.0...@metamask/bridge-status-controller@68.0.1
 [68.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@67.0.1...@metamask/bridge-status-controller@68.0.0

package/dist/bridge-status-controller.cjs

@@ -208,7 +208,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             });
         });
         _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs, actionId) => {
-            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
+            const { bridgeTxMeta, statusRequest, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, } = startPollingForBridgeTxStatusArgs;
             // Determine the key for this history item:
             // - For pre-submission (non-batch EVM): use actionId
             // - For post-submission or other cases: use bridgeTxMeta.id
@@ -246,10 +246,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 },
                 hasApprovalTx: Boolean(quoteResponse.approval),
                 approvalTxId,
-                isStxEnabled: isStxEnabled ?? false,
+                isStxEnabled: Boolean(isStxEnabled),
                 featureId: quoteResponse.featureId,
                 location,
                 ...(abTests && { abTests }),
+                ...(activeAbTests && { activeAbTests }),
             };
             this.update((state) => {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
@@ -381,9 +382,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             try {
                 let status;
                 let validationFailures = [];
-                const isIntent = Boolean(historyItem.quote.intent);
-                if (isIntent) {
-                    const intentTxStatus = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").getIntentTransactionStatus(bridgeTxMetaId, historyItem, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
+                if (historyItem.quote.intent) {
+                    const intentTxStatus = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").getIntentTransactionStatus(bridgeTxMetaId, historyItem.quote.srcChainId, historyItem.quote.intent.protocol, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), historyItem.status.srcChain.txHash);
                     if (intentTxStatus?.bridgeStatus === null ||
                         intentTxStatus?.bridgeStatus === undefined) {
                         return;
@@ -428,7 +428,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 this.update((state) => {
                     state.txHistory[bridgeTxMetaId] = newBridgeHistoryItem;
                 });
-                if (isIntent) {
+                if (historyItem.quote.intent) {
                     __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").syncTransactionFromIntentStatus(bridgeTxMetaId, historyItem);
                 }
                 // 5. After effects
@@ -562,7 +562,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             });
         });
         _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
-            if (approval) {
+            if (approval && (0, bridge_controller_1.isEvmTxData)(approval)) {
                 const approveTx = async () => {
                     await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, resetApproval);
                     const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
@@ -649,8 +649,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             // Convert to hex since txFee values from the quote are decimal strings
             if (txFee) {
                 return {
-                    maxFeePerGas: (0, controller_utils_1.toHex)(txFee.maxFeePerGas ?? 0),
-                    maxPriorityFeePerGas: (0, controller_utils_1.toHex)(txFee.maxPriorityFeePerGas ?? 0),
+                    maxFeePerGas: (0, controller_utils_1.toHex)(txFee.maxFeePerGas),
+                    maxPriorityFeePerGas: (0, controller_utils_1.toHex)(txFee.maxPriorityFeePerGas),
                     gas: gas ? (0, controller_utils_1.toHex)(gas) : undefined,
                 };
             }
@@ -714,10 +714,11 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
          * @param quotesReceivedContext - The context for the QuotesReceived event
          * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
-         * @param abTests - A/B test context to attribute events to specific experiments
+         * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+         * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @returns The transaction meta
          */
-        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests) => {
+        this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
             this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted, 
             // If trade is submitted before all quotes are loaded, the QuotesReceived event is published
             // If the trade has a featureId, it means it was submitted outside of the Unified Swap and Bridge experience, so no QuotesReceived event is published
@@ -727,12 +728,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
             const isHardwareAccount = (0, bridge_controller_1.isHardwareWallet)(selectedAccount);
-            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount, location, abTests, activeAbTests);
             // Emit Submitted event after submit button is clicked
             !quoteResponse.featureId &&
                 __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
             let approvalTxId;
+            let isDelegatedAccount = false;
             const startTime = Date.now();
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
             const isTronTx = (0, bridge_controller_1.isTronChainId)(quoteResponse.quote.srcChainId);
@@ -753,7 +755,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             return quoteResponse.approval &&
                                 (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)
                                 ? await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount)
-                                : undefined;
+                                : /* c8 ignore start */
+                                    undefined;
+                            /* c8 ignore end */
                         }
                         catch (error) {
                             !quoteResponse.featureId &&
@@ -787,7 +791,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     }
                     catch (error) {
                         !quoteResponse.featureId &&
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, txMeta?.id, {
+                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
                                 error_message: error?.message,
                                 ...preConfirmationProperties,
                             });
@@ -813,7 +817,25 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     if (!(0, bridge_controller_1.isEvmTxData)(quoteResponse.trade)) {
                         throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
                     }
-                    if (isStxEnabledOnClient || quoteResponse.quote.gasIncluded7702) {
+                    // Check if the account is an EIP-7702 delegated account
+                    // Delegated accounts only allow 1 in-flight tx, so approve + swap
+                    // must be batched into a single transaction
+                    const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
+                    isDelegatedAccount = await (async () => {
+                        try {
+                            const atomicBatchSupport = await this.messenger.call('TransactionController:isAtomicBatchSupported', {
+                                address: quoteResponse.trade.from,
+                                chainIds: [hexChainId],
+                            });
+                            return atomicBatchSupport.some((entry) => entry.isSupported && entry.delegationAddress);
+                        }
+                        catch {
+                            return false;
+                        }
+                    })();
+                    if (isStxEnabledOnClient ||
+                        quoteResponse.quote.gasIncluded7702 ||
+                        isDelegatedAccount) {
                         const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
                             isBridgeTx,
                             resetApproval: quoteResponse.resetApproval,
@@ -823,6 +845,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                             trade: quoteResponse.trade,
                             quoteResponse,
                             requireApproval,
+                            isDelegatedAccount,
                         });
                         approvalTxId = approvalMeta?.id;
                         return tradeMeta;
@@ -850,6 +873,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         approvalTxId,
                         location,
                         abTests,
+                        activeAbTests,
                     }, actionId);
                     // Pass txFee when gasIncluded is true to use the quote's gas fees
                     // instead of re-estimating (which would fail for max native token swaps)
@@ -874,7 +898,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 // Only add history here for non-EVM and batch EVM transactions
                 const isNonBatchEvm = !(0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId) &&
                     !isStxEnabledOnClient &&
-                    !quoteResponse.quote.gasIncluded7702;
+                    !quoteResponse.quote.gasIncluded7702 &&
+                    !isDelegatedAccount;
                 if (!isNonBatchEvm) {
                     // Add swap or bridge tx to history
                     __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
@@ -891,6 +916,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         approvalTxId,
                         location,
                         abTests,
+                        activeAbTests,
                     });
                 }
                 if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
@@ -915,40 +941,36 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param params.quoteResponse - Quote carrying intent data
          * @param params.accountAddress - The EOA submitting the order
          * @param params.location - The entry point from which the user initiated the swap or bridge
-         * @param params.abTests - A/B test context to attribute events to specific experiments
+         * @param params.abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+         * @param params.activeAbTests - New A/B test context for `active_ab_tests` (migration target). Attributes events to specific experiments.
          * @returns A lightweight TransactionMeta-like object for history linking
          */
         this.submitIntent = async (params) => {
-            const { quoteResponse, accountAddress, location, abTests } = params;
+            const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
             this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted);
             // Build pre-confirmation properties for error tracking parity with submitTx
             const account = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
             const isHardwareAccount = Boolean(account) && (0, bridge_controller_1.isHardwareWallet)(account);
-            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, isHardwareAccount, location, abTests);
+            const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
             try {
                 const intent = (0, transaction_1.getIntentFromQuote)(quoteResponse);
                 // If backend provided an approval tx for this intent quote, submit it first (on-chain),
                 // then proceed with off-chain intent submission.
-                let approvalTxId;
-                if (quoteResponse.approval) {
-                    const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-                    // Handle approval silently for better UX in intent flows
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
-                        ? quoteResponse.approval
-                        : undefined, quoteResponse.resetApproval, 
-                    /* requireApproval */ false);
-                    approvalTxId = approvalTxMeta?.id;
-                    if (approvalTxId) {
-                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
-                    }
+                const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+                const requireApproval = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE;
+                // Handle approval silently for better UX in intent flows
+                const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval, quoteResponse.resetApproval, requireApproval);
+                const approvalTxId = approvalTxMeta?.id;
+                if (approvalTxId) {
+                    await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxId);
                 }
-                const { srcChainId: chainId, requestId } = quoteResponse.quote;
+                const { srcChainId, requestId } = quoteResponse.quote;
                 const signature = await this.messenger.call('KeyringController:signTypedMessage', {
                     from: accountAddress,
                     data: intent.typedData,
                 }, keyring_controller_1.SignTypedDataVersion.V4);
                 const submissionParams = {
-                    srcChainId: chainId.toString(),
+                    srcChainId,
                     quoteId: requestId,
                     signature,
                     order: intent.order,
@@ -958,16 +980,17 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const intentOrder = await __classPrivateFieldGet(this, _BridgeStatusController_intentManager, "f").submitIntent(submissionParams, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"));
                 const orderUid = intentOrder.id;
                 // Determine transaction type: swap for same-chain, bridge for cross-chain
-                const isCrossChainTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-                const transactionType = isCrossChainTx
-                    ? transaction_controller_1.TransactionType.bridge
-                    : transaction_controller_1.TransactionType.swap;
+                const transactionType = isBridgeTx
+                    ? /* c8 ignore start */
+                        transaction_controller_1.TransactionType.bridge
+                    : /* c8 ignore end */
+                        transaction_controller_1.TransactionType.swap;
                 // Create actual transaction in Transaction Controller first
-                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', (0, bridge_controller_1.formatChainIdToHex)(chainId));
+                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', (0, bridge_controller_1.formatChainIdToHex)(srcChainId));
                 // This is a synthetic transaction whose purpose is to be able
                 // to track the order status via the history
                 const intentTransactionParams = {
-                    chainId: (0, bridge_controller_1.formatChainIdToHex)(chainId),
+                    chainId: (0, bridge_controller_1.formatChainIdToHex)(srcChainId),
                     from: accountAddress,
                     to: intent.settlementContract ??
                         '0x9008D19f58AAbd9eD0D60971565AA8510560ab41', // Default settlement contract
@@ -997,7 +1020,6 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     ...statusUpdatedTxMeta,
                     isIntentTx: true,
                     orderUid,
-                    intentType: isCrossChainTx ? 'bridge' : 'swap',
                 };
                 // Record in bridge history with actual transaction metadata
                 try {
@@ -1024,6 +1046,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         startTime,
                         location,
                         abTests,
+                        activeAbTests,
                     });
                     // Start polling using the orderId key to route to intent manager
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeHistoryKey);
@@ -1050,11 +1073,15 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param eventProperties - The properties for the event
          */
         _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties) => {
-            const { ab_tests: eventAbTests } = eventProperties ?? {};
+            // Legacy/new metrics fields are intentionally kept independent during migration.
             const historyAbTests = txMetaId
                 ? this.state.txHistory?.[txMetaId]?.abTests
                 : undefined;
-            const resolvedAbTests = eventAbTests ?? historyAbTests ?? undefined;
+            const historyActiveAbTests = txMetaId
+                ? this.state.txHistory?.[txMetaId]?.activeAbTests
+                : undefined;
+            const resolvedAbTests = eventProperties?.ab_tests ?? historyAbTests;
+            const resolvedActiveAbTests = eventProperties?.active_ab_tests ?? historyActiveAbTests;
             const baseProperties = {
                 action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
                 location: eventProperties?.location ??
@@ -1065,6 +1092,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     Object.keys(resolvedAbTests).length > 0 && {
                     ab_tests: resolvedAbTests,
                 }),
+                ...(resolvedActiveAbTests &&
+                    resolvedActiveAbTests.length > 0 && {
+                    active_ab_tests: resolvedActiveAbTests,
+                }),
             };
             // This will publish events for PERPS dropped tx failures as well
             if (!txMetaId) {