@metamask-previews/bridge-status-controller 69.0.0-preview-45f35b773 → 69.0.0-preview-e0f8f1907

package/dist/bridge-status-controller.mjs

@@ -9,21 +9,28 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_shouldPollHistoryItem, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getJwt, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
-import { formatChainIdToHex, isNonEvmChainId, StatusTypes, UnifiedSwapBridgeEventName, formatChainIdToCaip, isCrossChain, isTronChainId, isEvmTxData, isHardwareWallet, MetricsActionType, MetaMetricsSwapsEventSource, isBitcoinTrade, isTronTrade, AbortReason, PollingStatus } from "@metamask/bridge-controller";
+var _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_intentManager, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_rekeyHistoryItem, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_waitForTxConfirmation, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+import { formatChainIdToHex, isNonEvmChainId, StatusTypes, UnifiedSwapBridgeEventName, isCrossChain, isTronChainId, isEvmTxData, isHardwareWallet, MetricsActionType, MetaMetricsSwapsEventSource, isBitcoinTrade, isTronTrade, PollingStatus } from "@metamask/bridge-controller";
 import { toHex } from "@metamask/controller-utils";
-import { SignTypedDataVersion } from "@metamask/keyring-controller";
 import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { TransactionStatus, TransactionType } from "@metamask/transaction-controller";
 import { numberToHex } from "@metamask/utils";
 import { IntentManager } from "./bridge-status-controller.intent.mjs";
-import { BRIDGE_PROD_API_BASE_URL, BRIDGE_STATUS_CONTROLLER_NAME, DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE, MAX_ATTEMPTS, REFRESH_INTERVAL_MS, TraceName } from "./constants.mjs";
+import { BRIDGE_PROD_API_BASE_URL, BRIDGE_STATUS_CONTROLLER_NAME, DEFAULT_BRIDGE_STATUS_CONTROLLER_STATE, MAX_ATTEMPTS, REFRESH_INTERVAL_MS } from "./constants.mjs";
 import { BridgeClientId } from "./types.mjs";
+import { getAccountByAddress } from "./utils/accounts.mjs";
+import { getJwt } from "./utils/authentication.mjs";
+import { stopPollingForQuotes, trackMetricsEvent } from "./utils/bridge.mjs";
 import { fetchBridgeTxStatus, getStatusRequestWithSrcTxHash, shouldSkipFetchDueToFetchFailures } from "./utils/bridge-status.mjs";
 import { getTxGasEstimates } from "./utils/gas.mjs";
-import { mapIntentOrderStatusToTransactionStatus } from "./utils/intent-api.mjs";
+import { getInitialHistoryItem, rekeyHistoryItemInState, shouldPollHistoryItem } from "./utils/history.mjs";
+import { getIntentFromQuote, mapIntentOrderStatusToTransactionStatus } from "./utils/intent-api.mjs";
+import { signTypedMessage } from "./utils/keyring.mjs";
 import { getFinalizedTxProperties, getPriceImpactFromQuote, getRequestMetadataFromHistory, getRequestParamFromHistory, getTradeDataFromHistory, getEVMTxPropertiesFromTransactionMeta, getTxStatusesFromHistory, getPreConfirmationPropertiesFromQuote } from "./utils/metrics.mjs";
-import { findAndUpdateTransactionsInBatch, getAddTransactionBatchParams, getClientRequest, getHistoryKey, getIntentFromQuote, getStatusRequestParams, handleApprovalDelay, handleMobileHardwareWalletDelay, handleNonEvmTxResponse, generateActionId, waitForTxConfirmation, rekeyHistoryItemInState } from "./utils/transaction.mjs";
+import { getNetworkClientIdByChainId, getSelectedChainId } from "./utils/network.mjs";
+import { handleNonEvmTx } from "./utils/snaps.mjs";
+import { getApprovalTraceParams, getTraceParams } from "./utils/trace.mjs";
+import { findAndUpdateTransactionsInBatch, getAddTransactionBatchParams, getStatusRequestParams, handleApprovalDelay, handleMobileHardwareWalletDelay, generateActionId, waitForTxConfirmation } from "./utils/transaction.mjs";
 const metadata = {
     // We want to persist the bridge status state so that we can show the proper data for the Activity list
     // basically match the behavior of TransactionController
@@ -46,7 +53,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 ...state,
             },
         });
-        _BridgeStatusController_instances.add(this);
         _BridgeStatusController_pollingTokensByTxMetaId.set(this, {});
         _BridgeStatusController_intentManager.set(this, void 0);
         _BridgeStatusController_clientId.set(this, void 0);
@@ -90,9 +96,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 });
             }
             else {
-                const { selectedNetworkClientId } = this.messenger.call('NetworkController:getState');
-                const selectedNetworkClient = this.messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
-                const selectedChainId = selectedNetworkClient.configuration.chainId;
+                const selectedChainId = getSelectedChainId(this.messenger);
                 __classPrivateFieldGet(this, _BridgeStatusController_wipeBridgeStatusByChainId, "f").call(this, address, selectedChainId);
             }
         };
@@ -134,7 +138,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 }
             });
             // Restart polling if it was stopped and this tx still needs status updates
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem)) {
+            if (shouldPollHistoryItem(historyItem)) {
                 // Check if polling was stopped (no active polling token)
                 const existingPollingToken = __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[targetTxMetaId];
                 if (!existingPollingToken) {
@@ -142,7 +146,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, targetTxMetaId);
                     // Track polling manually restarted event
                     if (!historyItem.featureId) {
-                        const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+                        const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
                         const requestParams = getRequestParamFromHistory(historyItem);
                         const requestMetadata = getRequestMetadataFromHistory(historyItem, selectedAccount);
                         const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
@@ -191,7 +195,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             })
                 // Only restart polling for items that still require status updates
                 .filter((historyItem) => {
-                return __classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, historyItem);
+                return shouldPollHistoryItem(historyItem);
             });
             incompleteHistoryItems.forEach((historyItem) => {
                 const bridgeTxMetaId = historyItem.txMetaId;
@@ -204,51 +208,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, bridgeTxMetaId);
             });
         });
-        _BridgeStatusController_addTxToHistory.set(this, (startPollingForBridgeTxStatusArgs, actionId) => {
-            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
-            const historyKey = getHistoryKey(actionId, bridgeTxMeta?.id);
-            // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
-            // We know it's in progress but not the exact status yet
-            const txHistoryItem = {
-                txMetaId: bridgeTxMeta?.id,
-                actionId,
-                originalTransactionId: bridgeTxMeta
-                    ?.originalTransactionId || bridgeTxMeta?.id, // Keep original for intent transactions
-                batchId: bridgeTxMeta?.batchId,
-                quote: quoteResponse.quote,
-                startTime,
-                estimatedProcessingTimeInSeconds: quoteResponse.estimatedProcessingTimeInSeconds,
-                slippagePercentage,
-                pricingData: {
-                    amountSent: quoteResponse.sentAmount?.amount ?? '0',
-                    amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,
-                    quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,
-                    quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,
-                    quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,
-                },
-                initialDestAssetBalance,
-                targetContractAddress,
-                account: selectedAddress,
-                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: StatusTypes.PENDING,
-                    srcChain: {
-                        chainId: statusRequest.srcChainId,
-                        txHash: statusRequest.srcTxHash,
-                    },
-                },
-                hasApprovalTx: Boolean(quoteResponse.approval),
-                approvalTxId,
-                isStxEnabled: Boolean(isStxEnabled),
-                featureId: quoteResponse.featureId,
-                location,
-                ...(abTests && { abTests }),
-                ...(activeAbTests && { activeAbTests }),
-            };
+        _BridgeStatusController_addTxToHistory.set(this, (...args) => {
+            const { historyKey, txHistoryItem } = getInitialHistoryItem(...args);
             this.update((state) => {
                 // Use actionId as key for pre-submission, or txMeta.id for post-submission
                 state.txHistory[historyKey] = txHistoryItem;
@@ -278,18 +239,12 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (!txHistoryItem) {
                 return;
             }
-            if (__classPrivateFieldGet(this, _BridgeStatusController_shouldPollHistoryItem, "f").call(this, txHistoryItem)) {
+            if (shouldPollHistoryItem(txHistoryItem)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_pollingTokensByTxMetaId, "f")[txId] = this.startPolling({
                     bridgeTxMetaId: txId,
                 });
             }
         });
-        _BridgeStatusController_shouldPollHistoryItem.set(this, (historyItem) => {
-            const isIntent = Boolean(historyItem?.quote?.intent);
-            const isBridgeTx = isCrossChain(historyItem.quote.srcChainId, historyItem.quote.destChainId);
-            const isTronTx = isTronChainId(historyItem.quote.srcChainId);
-            return [isBridgeTx, isIntent, isTronTx].some(Boolean);
-        });
         /**
          * @deprecated For EVM/Solana swap/bridge txs we add tx to history in submitTx()
          * For Solana swap/bridge we start polling in submitTx()
@@ -341,7 +296,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 // Track max polling reached event
                 const historyItem = this.state.txHistory[bridgeTxMetaId];
                 if (historyItem && !historyItem.featureId) {
-                    const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+                    const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
                     const requestParams = getRequestParamFromHistory(historyItem);
                     const requestMetadata = getRequestMetadataFromHistory(historyItem, selectedAccount);
                     const { security_warnings: _, ...metadataWithoutWarnings } = requestMetadata;
@@ -397,7 +352,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     }
                     __classPrivateFieldGet(this, _BridgeStatusController_updateSrcTxHash, "f").call(this, bridgeTxMetaId, srcTxHash);
                     const statusRequest = getStatusRequestWithSrcTxHash(historyItem.quote, srcTxHash);
-                    const response = await fetchBridgeTxStatus(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await __classPrivateFieldGet(this, _BridgeStatusController_getJwt, "f").call(this), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
+                    const response = await fetchBridgeTxStatus(statusRequest, __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f"), await getJwt(this.messenger), __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"), __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl);
                     status = response.status;
                     validationFailures = response.validationFailures;
                 }
@@ -453,16 +408,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 __classPrivateFieldGet(this, _BridgeStatusController_handleFetchFailure, "f").call(this, bridgeTxMetaId);
             }
         });
-        _BridgeStatusController_getJwt.set(this, async () => {
-            try {
-                const token = await this.messenger.call('AuthenticationController:getBearerToken');
-                return token;
-            }
-            catch (error) {
-                console.error('Error getting JWT token for bridge-api request', error);
-                return undefined;
-            }
-        });
         _BridgeStatusController_getSrcTxHash.set(this, (bridgeTxMetaId) => {
             const { txHistory } = this.state;
             // Prefer the srcTxHash from bridgeStatusState so we don't have to l ook up in TransactionController
@@ -512,34 +457,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * TX SUBMISSION HANDLING
          *******************************************************
          */
-        /**
-         * Submits the transaction to the snap using the new unified ClientRequest interface
-         * Works for all non-EVM chains (Solana, BTC, Tron)
-         * This adds an approval tx to the ApprovalsController in the background
-         * The client needs to handle the approval tx by redirecting to the confirmation page with the approvalTxId in the URL
-         *
-         * @param trade - The trade data (can be approval or main trade)
-         * @param quoteResponse - The quote response containing metadata
-         * @param selectedAccount - The account to submit the transaction for
-         * @returns The transaction meta
-         */
-        _BridgeStatusController_handleNonEvmTx.set(this, async (trade, quoteResponse, selectedAccount) => {
-            if (!selectedAccount.metadata?.snap?.id) {
-                throw new Error('Failed to submit cross-chain swap transaction: undefined snap id');
-            }
-            const request = getClientRequest(trade, quoteResponse.quote.srcChainId, selectedAccount);
-            const requestResponse = (await this.messenger.call('SnapController:handleRequest', request));
-            // Create quote response with the specified trade
-            // This allows the same method to handle both approvals and main trades
-            const txQuoteResponse = {
-                ...quoteResponse,
-                trade,
-            };
-            const txMeta = handleNonEvmTxResponse(requestResponse, txQuoteResponse, selectedAccount);
-            // TODO remove this eventually, just returning it now to match extension behavior
-            // OR if the snap can propagate the snapRequestId or keyringReqId to the ApprovalsController, this can return the approvalTxId instead and clients won't need to subscribe to the ApprovalsController state to redirect
-            return txMeta;
-        });
         _BridgeStatusController_waitForHashAndReturnFinalTxMeta.set(this, async (hashPromise) => {
             const transactionHash = await hashPromise;
             const finalTransactionMeta = this.messenger
@@ -558,7 +475,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 pollMs,
             });
         });
-        _BridgeStatusController_handleApprovalTx.set(this, async (isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
+        _BridgeStatusController_handleApprovalTx.set(this, async (quoteResponse, isBridgeTx, srcChainId, approval, resetApproval, requireApproval) => {
             if (approval && isEvmTxData(approval)) {
                 const approveTx = async () => {
                     await __classPrivateFieldGet(this, _BridgeStatusController_handleUSDTAllowanceReset, "f").call(this, resetApproval);
@@ -572,15 +489,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     await handleApprovalDelay(srcChainId);
                     return approvalTxMeta;
                 };
-                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? TraceName.BridgeTransactionApprovalCompleted
-                        : TraceName.SwapTransactionApprovalCompleted,
-                    data: {
-                        srcChainId: formatChainIdToCaip(srcChainId),
-                        stxEnabled: false,
-                    },
-                }, approveTx);
+                return await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getApprovalTraceParams(quoteResponse, false), approveTx);
             }
             return undefined;
         });
@@ -599,13 +508,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          */
         _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, requireApproval = false, txFee, actionId: providedActionId, }) => {
             // Use provided actionId (for pre-submission history) or generate one
-            const actionId = providedActionId ?? generateActionId().toString();
-            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', trade.from);
+            const actionId = providedActionId ?? generateActionId();
+            const selectedAccount = getAccountByAddress(this.messenger, trade.from);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: unknown account in trade data');
             }
             const hexChainId = formatChainIdToHex(trade.chainId);
-            const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
+            const networkClientId = getNetworkClientIdByChainId(this.messenger, hexChainId);
             const requestOptions = {
                 actionId,
                 networkClientId,
@@ -716,11 +625,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          * @returns The transaction meta
          */
         this.submitTx = async (accountAddress, quoteResponse, isStxEnabledOnClient, quotesReceivedContext, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
-            this.messenger.call('BridgeController:stopPollingForQuotes', 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);
-            const selectedAccount = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
+            stopPollingForQuotes(this.messenger, quoteResponse.featureId, quotesReceivedContext);
+            const selectedAccount = getAccountByAddress(this.messenger, accountAddress);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
             }
@@ -739,19 +645,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (isNonEvmChainId(quoteResponse.quote.srcChainId)) {
                 // Handle non-EVM approval if present (e.g., Tron token approvals)
                 if (quoteResponse.approval && isTronTrade(quoteResponse.approval)) {
-                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                        name: isBridgeTx
-                            ? TraceName.BridgeTransactionApprovalCompleted
-                            : TraceName.SwapTransactionApprovalCompleted,
-                        data: {
-                            srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),
-                            stxEnabled: false,
-                        },
-                    }, async () => {
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getApprovalTraceParams(quoteResponse, false), async () => {
                         try {
                             return quoteResponse.approval &&
                                 isTronTrade(quoteResponse.approval)
-                                ? await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse.approval, quoteResponse, selectedAccount)
+                                ? await handleNonEvmTx(this.messenger, quoteResponse.approval, quoteResponse, selectedAccount)
                                 : /* c8 ignore start */
                                     undefined;
                             /* c8 ignore end */
@@ -769,22 +667,14 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     // Add delay after approval similar to EVM flow
                     await handleApprovalDelay(quoteResponse.quote.srcChainId);
                 }
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? TraceName.BridgeTransactionCompleted
-                        : TraceName.SwapTransactionCompleted,
-                    data: {
-                        srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),
-                        stxEnabled: false,
-                    },
-                }, async () => {
+                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getTraceParams(quoteResponse, false), async () => {
                     try {
                         if (!(isTronTrade(quoteResponse.trade) ||
                             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);
+                        return await handleNonEvmTx(this.messenger, quoteResponse.trade, quoteResponse, selectedAccount);
                     }
                     catch (error) {
                         !quoteResponse.featureId &&
@@ -802,15 +692,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 // Extension does not have this issue
                 const requireApproval = __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === BridgeClientId.MOBILE && isHardwareAccount;
                 // Handle smart transactions if enabled
-                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
-                    name: isBridgeTx
-                        ? TraceName.BridgeTransactionCompleted
-                        : TraceName.SwapTransactionCompleted,
-                    data: {
-                        srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),
-                        stxEnabled: isStxEnabledOnClient,
-                    },
-                }, async () => {
+                txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, getTraceParams(quoteResponse, isStxEnabledOnClient), async () => {
                     if (!isEvmTxData(quoteResponse.trade)) {
                         throw new Error('Failed to submit cross-chain swap transaction: trade is not an EVM transaction');
                     }
@@ -821,7 +703,8 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     isDelegatedAccount = await (async () => {
                         try {
                             const atomicBatchSupport = await this.messenger.call('TransactionController:isAtomicBatchSupported', {
-                                address: quoteResponse.trade.from,
+                                address: quoteResponse.trade
+                                    .from,
                                 chainIds: [hexChainId],
                             });
                             return atomicBatchSupport.some((entry) => entry.isSupported && entry.delegationAddress);
@@ -848,7 +731,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                         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.quote.srcChainId, quoteResponse.approval && isEvmTxData(quoteResponse.approval)
+                    const approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, isBridgeTx, quoteResponse.quote.srcChainId, quoteResponse.approval && isEvmTxData(quoteResponse.approval)
                         ? quoteResponse.approval
                         : undefined, quoteResponse.resetApproval, requireApproval);
                     approvalTxId = approvalTxMeta?.id;
@@ -944,9 +827,10 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
          */
         this.submitIntent = async (params) => {
             const { quoteResponse, accountAddress, location, abTests, activeAbTests } = params;
-            this.messenger.call('BridgeController:stopPollingForQuotes', AbortReason.TransactionSubmitted);
+            // TODO add metrics context
+            stopPollingForQuotes(this.messenger);
             // Build pre-confirmation properties for error tracking parity with submitTx
-            const account = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this, accountAddress);
+            const account = getAccountByAddress(this.messenger, accountAddress);
             const isHardwareAccount = Boolean(account) && isHardwareWallet(account);
             const preConfirmationProperties = getPreConfirmationPropertiesFromQuote(quoteResponse, false, isHardwareAccount, location, abTests, activeAbTests);
             try {
@@ -956,16 +840,17 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 const isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
                 const requireApproval = isHardwareAccount && __classPrivateFieldGet(this, _BridgeStatusController_clientId, "f") === 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 approvalTxMeta = await __classPrivateFieldGet(this, _BridgeStatusController_handleApprovalTx, "f").call(this, quoteResponse, 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, requestId } = quoteResponse.quote;
-                const signature = await this.messenger.call('KeyringController:signTypedMessage', {
-                    from: accountAddress,
-                    data: intent.typedData,
-                }, SignTypedDataVersion.V4);
+                const signature = await signTypedMessage({
+                    messenger: this.messenger,
+                    accountAddress,
+                    typedData: intent.typedData,
+                });
                 const submissionParams = {
                     srcChainId,
                     quoteId: requestId,
@@ -983,7 +868,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                     : /* c8 ignore end */
                         TransactionType.swap;
                 // Create actual transaction in Transaction Controller first
-                const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', formatChainIdToHex(srcChainId));
+                const networkClientId = getNetworkClientIdByChainId(this.messenger, srcChainId);
                 // This is a synthetic transaction whose purpose is to be able
                 // to track the order status via the history
                 const intentTransactionParams = {
@@ -1096,24 +981,36 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             };
             // This will publish events for PERPS dropped tx failures as well
             if (!txMetaId) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
+                trackMetricsEvent({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: baseProperties,
+                });
                 return;
             }
             const historyItem = this.state.txHistory[txMetaId];
             if (!historyItem) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
+                trackMetricsEvent({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: baseProperties,
+                });
                 return;
             }
             const requestParamProperties = getRequestParamFromHistory(historyItem);
             // Always publish StatusValidationFailed event, regardless of featureId
             if (eventName === UnifiedSwapBridgeEventName.StatusValidationFailed) {
-                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
-                    ...baseProperties,
-                    chain_id_source: requestParamProperties.chain_id_source,
-                    chain_id_destination: requestParamProperties.chain_id_destination,
-                    token_address_source: requestParamProperties.token_address_source,
-                    token_address_destination: requestParamProperties.token_address_destination,
-                    refresh_count: historyItem.attempts?.counter ?? 0,
+                trackMetricsEvent({
+                    messenger: this.messenger,
+                    eventName,
+                    properties: {
+                        ...baseProperties,
+                        chain_id_source: requestParamProperties.chain_id_source,
+                        chain_id_destination: requestParamProperties.chain_id_destination,
+                        token_address_source: requestParamProperties.token_address_source,
+                        token_address_destination: requestParamProperties.token_address_destination,
+                        refresh_count: historyItem.attempts?.counter ?? 0,
+                    },
                 });
                 return;
             }
@@ -1121,7 +1018,7 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             if (historyItem.featureId) {
                 return;
             }
-            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+            const selectedAccount = getAccountByAddress(this.messenger, historyItem.account);
             const { transactions } = this.messenger.call('TransactionController:getState');
             const txMeta = transactions?.find((tx) => tx.id === txMetaId);
             const approvalTxMeta = transactions?.find((tx) => tx.id === historyItem.approvalTxId);
@@ -1134,7 +1031,11 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
                 ...getFinalizedTxProperties(historyItem, txMeta, approvalTxMeta),
                 ...getPriceImpactFromQuote(historyItem.quote),
             };
-            this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, requiredEventProperties);
+            trackMetricsEvent({
+                messenger: this.messenger,
+                eventName,
+                properties: requiredEventProperties,
+            });
         });
         __classPrivateFieldSet(this, _BridgeStatusController_clientId, clientId, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_fetchFn, fetchFn, "f");
@@ -1151,7 +1052,6 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
             updateTransactionFn: __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "f"),
             customBridgeApiBaseUrl: __classPrivateFieldGet(this, _BridgeStatusController_config, "f").customBridgeApiBaseUrl,
             fetchFn: __classPrivateFieldGet(this, _BridgeStatusController_fetchFn, "f"),
-            getJwt: __classPrivateFieldGet(this, _BridgeStatusController_getJwt, "f"),
         }), "f");
         // Register action handlers
         this.messenger.registerActionHandler(`${BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
@@ -1208,7 +1108,5 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
         __classPrivateFieldGet(this, _BridgeStatusController_restartPollingForIncompleteHistoryItems, "f").call(this);
     }
 }
-_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_updateTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_shouldPollHistoryItem = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getJwt = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleNonEvmTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_waitForTxConfirmation = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap(), _BridgeStatusController_instances = new WeakSet(), _BridgeStatusController_getMultichainSelectedAccount = function _BridgeStatusController_getMultichainSelectedAccount(accountAddress) {
-    return this.messenger.call('AccountsController:getAccountByAddress', accountAddress);
-};
+_BridgeStatusController_pollingTokensByTxMetaId = new WeakMap(), _BridgeStatusController_intentManager = new WeakMap(), _BridgeStatusController_clientId = new WeakMap(), _BridgeStatusController_fetchFn = new WeakMap(), _BridgeStatusController_config = new WeakMap(), _BridgeStatusController_addTransactionFn = new WeakMap(), _BridgeStatusController_addTransactionBatchFn = new WeakMap(), _BridgeStatusController_updateTransactionFn = new WeakMap(), _BridgeStatusController_estimateGasFeeFn = new WeakMap(), _BridgeStatusController_trace = new WeakMap(), _BridgeStatusController_markTxAsFailed = new WeakMap(), _BridgeStatusController_restartPollingForIncompleteHistoryItems = new WeakMap(), _BridgeStatusController_addTxToHistory = new WeakMap(), _BridgeStatusController_rekeyHistoryItem = new WeakMap(), _BridgeStatusController_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = new WeakMap(), _BridgeStatusController_waitForTxConfirmation = new WeakMap(), _BridgeStatusController_handleApprovalTx = new WeakMap(), _BridgeStatusController_handleEvmTransaction = new WeakMap(), _BridgeStatusController_handleUSDTAllowanceReset = new WeakMap(), _BridgeStatusController_calculateGasFees = new WeakMap(), _BridgeStatusController_handleEvmTransactionBatch = new WeakMap(), _BridgeStatusController_trackUnifiedSwapBridgeEvent = new WeakMap();
 //# sourceMappingURL=bridge-status-controller.mjs.map