@metamask/bridge-status-controller 70.0.1 → 70.0.3

package/CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [70.0.3]
+
+### Changed
+
+- Bump `@metamask/snaps-controllers` from `^17.2.0` to `^19.0.0` ([#8319](https://github.com/MetaMask/core/pull/8319))
+- Bump `@metamask/accounts-controller` from `^37.1.0` to `^37.1.1` ([#8325](https://github.com/MetaMask/core/pull/8325))
+- Bump `@metamask/bridge-controller` from `^69.2.2` to `^69.2.3` ([#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))
+
+## [70.0.2]
+
+### Changed
+
+- Bump `@metamask/accounts-controller` from `^37.0.0` to `^37.1.0` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/base-controller` from `^9.0.0` to `^9.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/bridge-controller` from `^69.2.1` to `^69.2.2` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/gas-fee-controller` from `^26.1.0` to `^26.1.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/keyring-controller` from `^25.1.0` to `^25.1.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/network-controller` from `^30.0.0` to `^30.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/polling-controller` from `^16.0.3` to `^16.0.4` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/profile-sync-controller` from `^28.0.0` to `^28.0.1` ([#8317](https://github.com/MetaMask/core/pull/8317))
+- Bump `@metamask/transaction-controller` from `^63.1.0` to `^63.3.1` ([#8301](https://github.com/MetaMask/core/pull/8301), [#8313](https://github.com/MetaMask/core/pull/8313), [#8317](https://github.com/MetaMask/core/pull/8317))
+
 ## [70.0.1]
 
 ### Changed
@@ -16,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Publish UnifiedSwapBridge Failed event for any exception thrown during `submitTx`. Previously the Failed event was only getting published for EVM txs after tx submission ([#8277](https://github.com/MetaMask/core/pull/8277))
 - Keep EIP-7702 batching disabled for gasless transactions that use smart transactions / `eth_sendBundle` when the quote is gas-included but not gas-included-7702 even when the account is a smart account ([#8275](https://github.com/MetaMask/core/pull/8275))
 - For hardware wallets on MetaMask Mobile, non-batch EVM flows with ERC-20 approval now run the hardware-wallet delay before waiting for approval confirmation, preserving Ledger second-prompt spacing while gas estimation still runs after allowance is set on-chain ([#8268](https://github.com/MetaMask/core/pull/8268))
 
@@ -1059,7 +1083,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@70.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.3...HEAD
+[70.0.3]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.2...@metamask/bridge-status-controller@70.0.3
+[70.0.2]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.1...@metamask/bridge-status-controller@70.0.2
 [70.0.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@70.0.0...@metamask/bridge-status-controller@70.0.1
 [70.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@69.0.0...@metamask/bridge-status-controller@70.0.0
 [69.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@68.1.0...@metamask/bridge-status-controller@69.0.0

package/dist/bridge-status-controller.cjs

@@ -519,140 +519,131 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const isHardwareAccount = (0, bridge_controller_1.isHardwareWallet)(selectedAccount);
             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);
-            // Submit non-EVM tx (Solana, BTC, Tron)
-            if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
-                // Handle non-EVM approval if present (e.g., Tron token approvals)
-                if (quoteResponse.approval && (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)) {
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), async () => {
-                        try {
+            try {
+                // Emit Submitted event after submit button is clicked
+                !quoteResponse.featureId &&
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
+                // Submit non-EVM tx (Solana, BTC, Tron)
+                if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
+                    // Handle non-EVM approval if present (e.g., Tron token approvals)
+                    if (quoteResponse.approval && (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)) {
+                        const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getApprovalTraceParams)(quoteResponse, false), async () => {
                             return quoteResponse.approval &&
                                 (0, bridge_controller_1.isTronTrade)(quoteResponse.approval)
                                 ? await (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.approval, quoteResponse, selectedAccount)
                                 : /* c8 ignore start */
                                     undefined;
                             /* c8 ignore end */
-                        }
-                        catch (error) {
-                            !quoteResponse.featureId &&
-                                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
-                                    error_message: error?.message,
-                                    ...preConfirmationProperties,
-                                });
-                            throw error;
-                        }
-                    });
-                    approvalTxId = approvalTxMeta?.id;
-                    // Add delay after approval similar to EVM flow
-                    await (0, transaction_1.handleApprovalDelay)(quoteResponse.quote.srcChainId);
-                }
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, false), async () => {
-                    try {
+                        });
+                        approvalTxId = approvalTxMeta?.id;
+                        // Add delay after approval similar to EVM flow
+                        await (0, transaction_1.handleApprovalDelay)(quoteResponse.quote.srcChainId);
+                    }
+                    txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, false), async () => {
                         if (!((0, bridge_controller_1.isTronTrade)(quoteResponse.trade) ||
                             (0, bridge_controller_1.isBitcoinTrade)(quoteResponse.trade) ||
                             typeof quoteResponse.trade === 'string')) {
                             throw new Error('Failed to submit cross-chain swap transaction: trade is not a non-EVM transaction');
                         }
                         return await (0, snaps_1.handleNonEvmTx)(this.messenger, quoteResponse.trade, quoteResponse, selectedAccount);
-                    }
-                    catch (error) {
-                        !quoteResponse.featureId &&
-                            __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
-                                error_message: error?.message,
-                                ...preConfirmationProperties,
+                    });
+                }
+                else {
+                    // Submit EVM tx
+                    // For hardware wallets on Mobile, this is fixes an issue where the Ledger does not get prompted for the 2nd approval
+                    // Extension does not have this issue
+                    const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE && isHardwareAccount;
+                    // Handle smart transactions if enabled
+                    txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, isStxEnabledOnClient), async () => {
+                        if (!(0, bridge_controller_1.isEvmTxData)(quoteResponse.trade)) {
+                            throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
+                        }
+                        // 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 (0, transaction_1.checkIsDelegatedAccount)(this.messenger, quoteResponse.trade.from, [hexChainId]);
+                        if (isStxEnabledOnClient ||
+                            quoteResponse.quote.gasIncluded7702 ||
+                            isDelegatedAccount) {
+                            const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
+                                isBridgeTx,
+                                resetApproval: quoteResponse.resetApproval,
+                                approval: quoteResponse.approval &&
+                                    (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                                    ? quoteResponse.approval
+                                    : undefined,
+                                trade: quoteResponse.trade,
+                                quoteResponse,
+                                requireApproval,
+                                isDelegatedAccount,
                             });
-                        throw error;
-                    }
-                });
-            }
-            else {
-                // Submit EVM tx
-                // For hardware wallets on Mobile, this is fixes an issue where the Ledger does not get prompted for the 2nd approval
-                // Extension does not have this issue
-                const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === types_1.BridgeClientId.MOBILE && isHardwareAccount;
-                // Handle smart transactions if enabled
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, (0, trace_1.getTraceParams)(quoteResponse, isStxEnabledOnClient), async () => {
-                    if (!(0, bridge_controller_1.isEvmTxData)(quoteResponse.trade)) {
-                        throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
-                    }
-                    // 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 (0, transaction_1.checkIsDelegatedAccount)(this.messenger, quoteResponse.trade.from, [hexChainId]);
-                    if (isStxEnabledOnClient ||
-                        quoteResponse.quote.gasIncluded7702 ||
-                        isDelegatedAccount) {
-                        const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
-                            isBridgeTx,
-                            resetApproval: quoteResponse.resetApproval,
-                            approval: quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
-                                ? quoteResponse.approval
-                                : undefined,
-                            trade: quoteResponse.trade,
+                            approvalTxId = approvalMeta?.id;
+                            return tradeMeta;
+                        }
+                        // Set approval time and id if an approval tx is needed
+                        const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                            ? quoteResponse.approval
+                            : undefined, quoteResponse.resetApproval, requireApproval);
+                        approvalTxId = approvalTxMeta?.id;
+                        // Hardware-wallet delay first (Ledger second-prompt spacing), then wait for
+                        // on-chain approval confirmation so swap gas estimation runs after allowance is set.
+                        if (requireApproval && approvalTxMeta) {
+                            await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                            await (0, transaction_1.waitForTxConfirmation)(this.messenger, approvalTxMeta.id);
+                        }
+                        else {
+                            await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
+                        }
+                        // Generate actionId for pre-submission history (non-batch EVM only)
+                        const actionId = (0, transaction_1.generateActionId)().toString();
+                        // Add pre-submission history keyed by actionId
+                        // This ensures we have quote data available if transaction fails during submission
+                        __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
+                            accountAddress: selectedAccount.address,
                             quoteResponse,
+                            slippagePercentage: 0,
+                            isStxEnabled: isStxEnabledOnClient,
+                            startTime,
+                            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)
+                        const tradeTxMeta = await (0, transaction_1.submitEvmTransaction)({
+                            messenger: this.messenger,
+                            transactionType: isBridgeTx
+                                ? transaction_controller_1.TransactionType.bridge
+                                : transaction_controller_1.TransactionType.swap,
+                            trade: quoteResponse.trade,
                             requireApproval,
-                            isDelegatedAccount,
+                            txFee: quoteResponse.quote.gasIncluded
+                                ? quoteResponse.quote.feeData.txFee
+                                : undefined,
+                            actionId,
                         });
-                        approvalTxId = approvalMeta?.id;
-                        return tradeMeta;
-                    }
-                    // Set approval time and id if an approval tx is needed
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
-                        ? quoteResponse.approval
-                        : undefined, quoteResponse.resetApproval, requireApproval);
-                    approvalTxId = approvalTxMeta?.id;
-                    // Hardware-wallet delay first (Ledger second-prompt spacing), then wait for
-                    // on-chain approval confirmation so swap gas estimation runs after allowance is set.
-                    if (requireApproval && approvalTxMeta) {
-                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
-                        await (0, transaction_1.waitForTxConfirmation)(this.messenger, approvalTxMeta.id);
-                    }
-                    else {
-                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
-                    }
-                    // Generate actionId for pre-submission history (non-batch EVM only)
-                    const actionId = (0, transaction_1.generateActionId)().toString();
-                    // Add pre-submission history keyed by actionId
-                    // This ensures we have quote data available if transaction fails during submission
-                    __classPrivateFieldGet(this, _BridgeStatusController_addTxToHistory, "f").call(this, {
-                        accountAddress: selectedAccount.address,
-                        quoteResponse,
-                        slippagePercentage: 0,
-                        isStxEnabled: isStxEnabledOnClient,
-                        startTime,
-                        approvalTxId,
-                        location,
-                        abTests,
-                        activeAbTests,
-                        actionId,
+                        // On success, rekey from actionId to txMeta.id and update srcTxHash
+                        __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
+                        return tradeTxMeta;
                     });
-                    // 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)
-                    const tradeTxMeta = await (0, transaction_1.submitEvmTransaction)({
-                        messenger: this.messenger,
-                        transactionType: isBridgeTx
-                            ? transaction_controller_1.TransactionType.bridge
-                            : transaction_controller_1.TransactionType.swap,
-                        trade: quoteResponse.trade,
-                        requireApproval,
-                        txFee: quoteResponse.quote.gasIncluded
-                            ? quoteResponse.quote.feeData.txFee
-                            : undefined,
-                        actionId,
+                }
+            }
+            catch (error) {
+                !quoteResponse.featureId &&
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
+                        error_message: error?.message,
+                        ...preConfirmationProperties,
                     });
-                    // On success, rekey from actionId to txMeta.id and update srcTxHash
-                    __classPrivateFieldGet(this, _BridgeStatusController_rekeyHistoryItem, "f").call(this, actionId, tradeTxMeta);
-                    return tradeTxMeta;
-                });
+                throw error;
             }
             try {
                 // For non-batch EVM transactions, history was already added/rekeyed above