@metamask-previews/bridge-status-controller 63.1.0-preview-159e76e4 → 64.0.0-preview-7cfbb337

package/CHANGELOG.md

@@ -7,10 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [64.0.0]
+
 ### Changed
 
+- **BREAKING:** Bump `@metamask/bridge-controller` from `^63.2.0` to `^64.0.0` ([#7295](https://github.com/MetaMask/core/pull/7295))
+- Improve type safety by replacing tx data type assertions with type predicates ([#7228](https://github.com/MetaMask/core/pull/7228))
+- Submit `resetApproval` tx before the tx approval if it is included in the quoteResponse ([#7228](https://github.com/MetaMask/core/pull/7228))
 - Bump `@metamask/network-controller` from `^26.0.0` to `^27.0.0` ([#7258](https://github.com/MetaMask/core/pull/7258))
-- Bump `@metamask/transaction-controller` from `^62.3.0` to `^62.3.1` ([#7257](https://github.com/MetaMask/core/pull/7257))
+- Bump `@metamask/transaction-controller` from `^62.3.0` to `^62.4.0` ([#7257](https://github.com/MetaMask/core/pull/7257), [#7289](https://github.com/MetaMask/core/pull/7289))
 
 ## [63.1.0]
 
@@ -804,7 +809,8 @@ 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@63.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@64.0.0...HEAD
+[64.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@63.1.0...@metamask/bridge-status-controller@64.0.0
 [63.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@63.0.0...@metamask/bridge-status-controller@63.1.0
 [63.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@62.0.0...@metamask/bridge-status-controller@63.0.0
 [62.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@61.0.0...@metamask/bridge-status-controller@62.0.0

package/dist/bridge-status-controller.cjs

@@ -14,6 +14,7 @@ var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTx
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
+const bridge_controller_2 = require("@metamask/bridge-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const polling_controller_1 = require("@metamask/polling-controller");
 const transaction_controller_1 = require("@metamask/transaction-controller");
@@ -65,7 +66,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return;
             }
             this.update((statusState) => {
-                statusState.txHistory[txHistoryKey].status.status = bridge_controller_1.StatusTypes.FAILED;
+                statusState.txHistory[txHistoryKey].status.status = bridge_controller_2.StatusTypes.FAILED;
             });
         });
         this.resetState = () => {
@@ -123,7 +124,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }
             });
             // Restart polling if it was stopped and this is a bridge transaction
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
+            const isBridgeTx = (0, bridge_controller_2.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
             if (isBridgeTx) {
                 // Check if polling was stopped (no active polling token)
                 const existingPollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[targetTxMetaId];
@@ -151,8 +152,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const { txHistory } = this.state;
             const historyItems = Object.values(txHistory);
             const incompleteHistoryItems = historyItems
-                .filter((historyItem) => historyItem.status.status === bridge_controller_1.StatusTypes.PENDING ||
-                historyItem.status.status === bridge_controller_1.StatusTypes.UNKNOWN)
+                .filter((historyItem) => historyItem.status.status === bridge_controller_2.StatusTypes.PENDING ||
+                historyItem.status.status === bridge_controller_2.StatusTypes.UNKNOWN)
                 .filter((historyItem) => {
                 // Check if we are already polling this tx, if so, skip restarting polling for that
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[historyItem.txMetaId];
@@ -160,7 +161,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             })
                 // Swap txs don't need to have their statuses polled
                 .filter((historyItem) => {
-                const isBridgeTx = (0, bridge_controller_1.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
+                const isBridgeTx = (0, bridge_controller_2.isCrossChain)(historyItem.quote.srcChainId, historyItem.quote.destChainId);
                 return isBridgeTx;
             });
             incompleteHistoryItems.forEach((historyItem) => {
@@ -198,7 +199,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 status: {
                     // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
                     // Also we know the bare minimum fields for status at this point in time
-                    status: bridge_controller_1.StatusTypes.PENDING,
+                    status: bridge_controller_2.StatusTypes.PENDING,
                     srcChain: {
                         chainId: statusRequest.srcChainId,
                         txHash: statusRequest.srcTxHash,
@@ -225,7 +226,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return;
             }
             const { quote } = txHistoryItem;
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quote.srcChainId, quote.destChainId);
+            const isBridgeTx = (0, bridge_controller_2.isCrossChain)(quote.srcChainId, quote.destChainId);
             if (isBridgeTx) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
@@ -301,7 +302,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const statusRequest = (0, bridge_status_1.getStatusRequestWithSrcTxHash)(historyItem.quote, srcTxHash);
                 const { status, validationFailures } = await (0, bridge_status_1.fetchBridgeTxStatus)(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                 if (validationFailures.length > 0) {
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.StatusValidationFailed, bridgeTxMetaId, {
                         failures: validationFailures,
                     });
                     throw new Error(`Bridge status validation failed: ${validationFailures.join(', ')}`);
@@ -309,8 +310,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 const newBridgeHistoryItem = {
                     ...historyItem,
                     status,
-                    completionTime: status.status === bridge_controller_1.StatusTypes.COMPLETE ||
-                        status.status === bridge_controller_1.StatusTypes.FAILED
+                    completionTime: status.status === bridge_controller_2.StatusTypes.COMPLETE ||
+                        status.status === bridge_controller_2.StatusTypes.FAILED
                         ? Date.now()
                         : undefined, // TODO make this more accurate by looking up dest txHash block time
                     attempts: undefined,
@@ -323,8 +324,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     state.txHistory[bridgeTxMetaId] = newBridgeHistoryItem;
                 });
                 const pollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
-                const isFinalStatus = status.status === bridge_controller_1.StatusTypes.COMPLETE ||
-                    status.status === bridge_controller_1.StatusTypes.FAILED;
+                const isFinalStatus = status.status === bridge_controller_2.StatusTypes.COMPLETE ||
+                    status.status === bridge_controller_2.StatusTypes.FAILED;
                 if (isFinalStatus && pollingToken) {
                     this.stopPollingByPollingToken(pollingToken);
                     delete __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[bridgeTxMetaId];
@@ -332,12 +333,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     if (historyItem.featureId) {
                         return;
                     }
-                    if (status.status === bridge_controller_1.StatusTypes.COMPLETE) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
+                    if (status.status === bridge_controller_2.StatusTypes.COMPLETE) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, bridgeTxMetaId);
                         this.messenger.publish('BridgeStatusController:destinationTransactionCompleted', historyItem.quote.destAsset.assetId);
                     }
-                    if (status.status === bridge_controller_1.StatusTypes.FAILED) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
+                    if (status.status === bridge_controller_2.StatusTypes.FAILED) {
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, bridgeTxMetaId);
                     }
                 }
             }
@@ -433,11 +434,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             return finalTransactionMeta;
         });
-        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, quoteResponse, requireApproval) => {
-            const { approval } = quoteResponse;
+        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
             if (approval) {
                 const approveTx = async () => {
-                    await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, quoteResponse);
+                    await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, resetApproval);
                     const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
                         transactionType: isBridgeTx
                             ? transaction_controller_1.TransactionType.bridgeApproval
@@ -445,7 +445,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         trade: approval,
                         requireApproval,
                     });
-                    await (0, transaction_1.handleApprovalDelay)(quoteResponse);
+                    await (0, transaction_1.handleApprovalDelay)(srcChainId);
                     return approvalTxMeta;
                 };
                 return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
@@ -453,7 +453,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         ? constants_1.TraceName.BridgeTransactionApprovalCompleted
                         : constants_1.TraceName.SwapTransactionApprovalCompleted,
                     data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+                        srcChainId: (0, bridge_controller_2.formatChainIdToCaip)(srcChainId),
                         stxEnabled: false,
                     },
                 }, approveTx);
@@ -475,7 +475,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: unknown account in trade data');
             }
-            const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(trade.chainId);
+            const hexChainId = (0, bridge_controller_2.formatChainIdToHex)(trade.chainId);
             const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
             const requestOptions = {
                 actionId,
@@ -497,8 +497,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             const { result } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionFn, "f").call(this, transactionParamsWithMaxGas, requestOptions);
             return await __classPrivateFieldGet(this, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, "f").call(this, result);
         });
-        _BridgeStatusController_handleUSDTAllowanceReset.set(this, async (quoteResponse) => {
-            const resetApproval = await (0, transaction_1.getUSDTAllowanceResetTx)(this.messenger, quoteResponse);
+        _BridgeStatusController_handleUSDTAllowanceReset.set(this, async (resetApproval) => {
             if (resetApproval) {
                 await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
                     transactionType: transaction_controller_1.TransactionType.bridgeApproval,
@@ -570,7 +569,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @returns The transaction meta
          */
         this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext) => {
-            this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_1.AbortReason.TransactionSubmitted, 
+            this.messenger.call('BridgeController:stopPollingForQuotes', bridge_controller_2.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
             quoteResponse.featureId ? undefined : quotesReceivedContext);
@@ -578,38 +577,37 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
-            const isHardwareAccount = (0, bridge_controller_1.isHardwareWallet)(selectedAccount);
+            const isHardwareAccount = (0, bridge_controller_2.isHardwareWallet)(selectedAccount);
             const preConfirmationProperties = (0, metrics_1.getPreConfirmationPropertiesFromQuote)(quoteResponse, isStxEnabledOnClient, isHardwareAccount);
             // Emit Submitted event after submit button is clicked
             !quoteResponse.featureId &&
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Submitted, undefined, preConfirmationProperties);
             let txMeta;
             let approvalTxId;
             const startTime = Date.now();
-            const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+            const isBridgeTx = (0, bridge_controller_2.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
             // Submit non-EVM tx (Solana, BTC, Tron)
-            const isNonEvmTrade = (0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId) &&
-                (typeof quoteResponse.trade === 'string' ||
-                    (0, bridge_controller_1.isBitcoinTrade)(quoteResponse.trade) ||
-                    (0, bridge_controller_1.isTronTrade)(quoteResponse.trade));
-            if (isNonEvmTrade) {
+            if ((0, bridge_controller_2.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
                 // Handle non-EVM approval if present (e.g., Tron token approvals)
-                if (quoteResponse.approval) {
+                if (quoteResponse.approval && (0, bridge_controller_2.isTronTrade)(quoteResponse.approval)) {
                     const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
                         name: isBridgeTx
                             ? constants_1.TraceName.BridgeTransactionApprovalCompleted
                             : constants_1.TraceName.SwapTransactionApprovalCompleted,
                         data: {
-                            srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+                            srcChainId: (0, bridge_controller_2.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
                             stxEnabled: false,
                         },
                     }, async () => {
                         try {
-                            return await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount);
+                            return quoteResponse.approval &&
+                                (0, bridge_controller_2.isTronTrade)(quoteResponse.approval)
+                                ? await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount)
+                                : undefined;
                         }
                         catch (error) {
                             !quoteResponse.featureId &&
-                                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, undefined, {
+                                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, undefined, {
                                     error_message: error?.message,
                                     ...preConfirmationProperties,
                                 });
@@ -618,23 +616,28 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     });
                     approvalTxId = approvalTxMeta?.id;
                     // Add delay after approval similar to EVM flow
-                    await (0, transaction_1.handleApprovalDelay)(quoteResponse);
+                    await (0, transaction_1.handleApprovalDelay)(quoteResponse.quote.srcChainId);
                 }
                 txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
                     name: isBridgeTx
                         ? constants_1.TraceName.BridgeTransactionCompleted
                         : constants_1.TraceName.SwapTransactionCompleted,
                     data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+                        srcChainId: (0, bridge_controller_2.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
                         stxEnabled: false,
                     },
                 }, async () => {
                     try {
+                        if (!((0, bridge_controller_2.isTronTrade)(quoteResponse.trade) ||
+                            (0, bridge_controller_2.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 __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.trade, quoteResponse, selectedAccount);
                     }
                     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_2.UnifiedSwapBridgeEventName.Failed, txMeta?.id, {
                                 error_message: error?.message,
                                 ...preConfirmationProperties,
                             });
@@ -653,15 +656,20 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         ? constants_1.TraceName.BridgeTransactionCompleted
                         : constants_1.TraceName.SwapTransactionCompleted,
                     data: {
-                        srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+                        srcChainId: (0, bridge_controller_2.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
                         stxEnabled: 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');
+                    }
                     if (isStxEnabledOnClient || quoteResponse.quote.gasIncluded7702) {
                         const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
                             isBridgeTx,
-                            resetApproval: (await (0, transaction_1.getUSDTAllowanceResetTx)(this.messenger, quoteResponse)),
-                            approval: quoteResponse.approval,
+                            resetApproval: quoteResponse.resetApproval,
+                            approval: quoteResponse.approval && (0, bridge_controller_1.isEvmTxData)(quoteResponse.approval)
+                                ? quoteResponse.approval
+                                : undefined,
                             trade: quoteResponse.trade,
                             quoteResponse,
                             requireApproval,
@@ -670,7 +678,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                         return tradeMeta;
                     }
                     // Set approval time and id if an approval tx is needed
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, isBridgeTx, quoteResponse, requireApproval);
+                    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);
                     approvalTxId = approvalTxMeta?.id;
                     await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
                     return await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
@@ -697,12 +707,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     startTime,
                     approvalTxId,
                 });
-                if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
+                if ((0, bridge_controller_2.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
                     // Start polling for bridge tx status
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMeta.id);
                     // Track non-EVM Swap completed event
                     if (!isBridgeTx) {
-                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
+                        __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, txMeta.id);
                     }
                 }
             }
@@ -720,7 +730,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          */
         _BridgeStatusController_trackUnifiedSwapBridgeEvent.set(this, (eventName, txMetaId, eventProperties) => {
             const baseProperties = {
-                action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
+                action_type: bridge_controller_2.MetricsActionType.SWAPBRIDGE_V1,
                 ...(eventProperties ?? {}),
             };
             // This will publish events for PERPS dropped tx failures as well
@@ -735,7 +745,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
-            if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
+            if (eventName === bridge_controller_2.UnifiedSwapBridgeEventName.StatusValidationFailed) {
                 const { chain_id_source, chain_id_destination, token_address_source, token_address_destination, } = requestParamProperties;
                 this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
                     ...baseProperties,
@@ -803,16 +813,16 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 __classPrivateFieldGet(this, _BridgeStatusController_markTxAsFailed, "f").call(this, transactionMeta);
                 // Track failed event
                 if (status !== transaction_controller_1.TransactionStatus.rejected) {
-                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, id, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
+                    __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Failed, id, (0, metrics_1.getEVMTxPropertiesFromTransactionMeta)(transactionMeta));
                 }
             }
         });
         this.messenger.subscribe('TransactionController:transactionConfirmed', (transactionMeta) => {
             const { type, id, chainId } = transactionMeta;
             if (type === transaction_controller_1.TransactionType.swap) {
-                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, id);
+                __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_2.UnifiedSwapBridgeEventName.Completed, id);
             }
-            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_1.isNonEvmChainId)(chainId)) {
+            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_2.isNonEvmChainId)(chainId)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, id);
             }
         });