@metamask-previews/bridge-status-controller 44.0.0-preview-5a701133 → 44.0.0-preview-b896289e

package/CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6444](https://github.com/MetaMask/core/pull/6444))
+  - Previously, `BridgeStatusController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
 - Refactor `handleLineaDelay` to `handleApprovalDelay` for improved abstraction and add support for Base chain by using an array and `includes` for chain ID checks ([#6674](https://github.com/MetaMask/core/pull/6674))
 
 ## [44.0.0]
@@ -21,41 +23,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add support for Bitcoin bridge transactions ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Handle Bitcoin PSBT (Partially Signed Bitcoin Transaction) format in trade data
-  - Support Bitcoin transaction submission through unified Snap interface
-  - Add Bitcoin-specific transaction handling in `#handleNonEvmTx` method
-  - Support extraction of `unsignedPsbtBase64` from trade data for Bitcoin transactions
 - Add new controller metadata properties to `BridgeStatusController` ([#6589](https://github.com/MetaMask/core/pull/6589))
 
 ### Changed
 
-- Update transaction submission to use new unified Snap interface for all non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Replace `signAndSendTransactionWithoutConfirmation` with `ClientRequest:signAndSendTransaction` method
-  - Update response handling to support new `transactionId` format from unified interface
-  - Support multiple response formats: string, `{ transactionId }`, `{ result: { signature } }`, and `{ signature }`
-  - Maintain backward compatibility with legacy response formats
-- Rename transaction handling functions for clarity ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Rename `handleSolanaTxResponse` to `handleNonEvmTxResponse` to reflect support for all non-EVM chains
-  - Rename `#handleSolanaTx` to `#handleNonEvmTx` in BridgeStatusController
-  - Export `handleSolanaTxResponse` as an alias for backward compatibility (deprecated)
-- Update transaction detection logic to identify non-EVM transactions ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Check for Bitcoin PSBT format (`unsignedPsbtBase64` in trade object) alongside string trade data
-  - Use `isNonEvmChainId` for determining non-EVM transaction handling
-- Update chain ID handling for non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Add fallback chain ID (`0x0`) when CAIP format can't be converted to hex for source chains
-  - Add fallback chain ID (`0x1`) for non-EVM destination chains
-- Update `getClientRequest` to create proper requests for all non-EVM chains ([#6454](https://github.com/MetaMask/core/pull/6454))
-  - Use `formatChainIdToCaip` to get proper scope for each chain
-  - Extract transaction data from either string or PSBT object format
-- Remove dependency on `@metamask/keyring-api` ([#6454](https://github.com/MetaMask/core/pull/6454))
 - Bump `@metamask/controller-utils` from `^11.12.0` to `^11.14.0` ([#6620](https://github.com/MetaMask/core/pull/6620), [#6629](https://github.com/MetaMask/core/pull/6629))
 - Bump `@metamask/base-controller` from `^8.3.0` to `^8.4.0` ([#6632](https://github.com/MetaMask/core/pull/6632))
 
-### Removed
-
-- Remove direct dependency on `@metamask/keyring-api` - no longer needed with unified Snap interface ([#6454](https://github.com/MetaMask/core/pull/6454))
-
 ## [43.0.0]
 
 ### Changed

package/dist/bridge-status-controller.cjs

@@ -10,7 +10,7 @@ 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_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleNonEvmTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
+var _BridgeStatusController_instances, _BridgeStatusController_pollingTokensByTxMetaId, _BridgeStatusController_clientId, _BridgeStatusController_fetchFn, _BridgeStatusController_config, _BridgeStatusController_addTransactionFn, _BridgeStatusController_addTransactionBatchFn, _BridgeStatusController_updateTransactionFn, _BridgeStatusController_estimateGasFeeFn, _BridgeStatusController_trace, _BridgeStatusController_markTxAsFailed, _BridgeStatusController_restartPollingForIncompleteHistoryItems, _BridgeStatusController_addTxToHistory, _BridgeStatusController_startPollingForTxId, _BridgeStatusController_getMultichainSelectedAccount, _BridgeStatusController_handleFetchFailure, _BridgeStatusController_fetchBridgeTxStatus, _BridgeStatusController_getSrcTxHash, _BridgeStatusController_updateSrcTxHash, _BridgeStatusController_wipeBridgeStatusByChainId, _BridgeStatusController_handleSolanaTx, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, _BridgeStatusController_handleApprovalTx, _BridgeStatusController_handleEvmTransaction, _BridgeStatusController_handleUSDTAllowanceReset, _BridgeStatusController_calculateGasFees, _BridgeStatusController_handleEvmTransactionBatch, _BridgeStatusController_trackUnifiedSwapBridgeEvent;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeStatusController = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
@@ -24,13 +24,14 @@ const bridge_status_1 = require("./utils/bridge-status.cjs");
 const gas_1 = require("./utils/gas.cjs");
 const metrics_1 = require("./utils/metrics.cjs");
 const transaction_1 = require("./utils/transaction.cjs");
+const transaction_2 = require("./utils/transaction.cjs");
 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
     txHistory: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: true,
     },
 };
@@ -81,8 +82,8 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 });
             }
             else {
-                const { selectedNetworkClientId } = this.messagingSystem.call('NetworkController:getState');
-                const selectedNetworkClient = this.messagingSystem.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+                const { selectedNetworkClientId } = this.messenger.call('NetworkController:getState');
+                const selectedNetworkClient = this.messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
                 const selectedChainId = selectedNetworkClient.configuration.chainId;
                 __classPrivateFieldGet(this, _BridgeStatusController_wipeBridgeStatusByChainId, "f").call(this, address, selectedChainId);
             }
@@ -349,7 +350,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 return srcTxHash;
             }
             // Look up in TransactionController if txMeta has been updated with the srcTxHash
-            const txControllerState = this.messagingSystem.call('TransactionController:getState');
+            const txControllerState = this.messenger.call('TransactionController:getState');
             const txMeta = txControllerState.transactions.find((tx) => tx.id === bridgeTxMetaId);
             return txMeta?.hash;
         });
@@ -390,8 +391,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          *******************************************************
          */
         /**
-         * Submits the transaction to the snap using the new unified ClientRequest interface
-         * Works for all non-EVM chains (Solana, BTC, Tron)
+         * Submits the transaction to the snap using the keyring rpc method
          * 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
          *
@@ -400,20 +400,21 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @param selectedAccount - The account to submit the transaction for
          * @returns The transaction meta
          */
-        _BridgeStatusController_handleNonEvmTx.set(this, async (quoteResponse, selectedAccount) => {
+        _BridgeStatusController_handleSolanaTx.set(this, async (quoteResponse, selectedAccount) => {
             if (!selectedAccount.metadata?.snap?.id) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined snap id');
             }
             const request = (0, transaction_1.getClientRequest)(quoteResponse, selectedAccount);
-            const requestResponse = (await this.messagingSystem.call('SnapController:handleRequest', request));
-            const txMeta = (0, transaction_1.handleNonEvmTxResponse)(requestResponse, quoteResponse, selectedAccount);
+            const requestResponse = (await this.messenger.call('SnapController:handleRequest', request));
+            // The extension client actually redirects before it can do anytyhing with this meta
+            const txMeta = (0, transaction_1.handleSolanaTxResponse)(requestResponse, quoteResponse, 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.messagingSystem
+            const finalTransactionMeta = this.messenger
                 .call('TransactionController:getState')
                 .transactions.find((tx) => tx.hash === transactionHash);
             if (!finalTransactionMeta) {
@@ -458,13 +459,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @returns The transaction meta
          */
         _BridgeStatusController_handleEvmTransaction.set(this, async ({ transactionType, trade, requireApproval = false, }) => {
-            const actionId = (0, transaction_1.generateActionId)().toString();
-            const selectedAccount = this.messagingSystem.call('AccountsController:getAccountByAddress', trade.from);
+            const actionId = (0, transaction_2.generateActionId)().toString();
+            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', trade.from);
             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 networkClientId = this.messagingSystem.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
+            const networkClientId = this.messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
             const requestOptions = {
                 actionId,
                 networkClientId,
@@ -486,7 +487,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             return await __classPrivateFieldGet(this, _BridgeStatusController_waitForHashAndReturnFinalTxMeta, "f").call(this, result);
         });
         _BridgeStatusController_handleUSDTAllowanceReset.set(this, async (quoteResponse) => {
-            const resetApproval = await (0, transaction_1.getUSDTAllowanceResetTx)(this.messagingSystem, quoteResponse);
+            const resetApproval = await (0, transaction_1.getUSDTAllowanceResetTx)(this.messenger, quoteResponse);
             if (resetApproval) {
                 await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransaction, "f").call(this, {
                     transactionType: transaction_controller_1.TransactionType.bridgeApproval,
@@ -495,7 +496,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             }
         });
         _BridgeStatusController_calculateGasFees.set(this, async (transactionParams, networkClientId, chainId) => {
-            const { gasFeeEstimates } = this.messagingSystem.call('GasFeeController:getState');
+            const { gasFeeEstimates } = this.messenger.call('GasFeeController:getState');
             const { estimates: txGasFeeEstimates } = await __classPrivateFieldGet(this, _BridgeStatusController_estimateGasFeeFn, "f").call(this, {
                 transactionParams,
                 chainId,
@@ -526,7 +527,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          */
         _BridgeStatusController_handleEvmTransactionBatch.set(this, async (args) => {
             const transactionParams = await (0, transaction_1.getAddTransactionBatchParams)({
-                messagingSystem: this.messagingSystem,
+                messenger: this.messenger,
                 estimateGasFeeFn: __classPrivateFieldGet(this, _BridgeStatusController_estimateGasFeeFn, "f"),
                 ...args,
             });
@@ -538,7 +539,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             };
             const { batchId } = await __classPrivateFieldGet(this, _BridgeStatusController_addTransactionBatchFn, "f").call(this, transactionParams);
             const { approvalMeta, tradeMeta } = (0, transaction_1.findAndUpdateTransactionsInBatch)({
-                messagingSystem: this.messagingSystem,
+                messenger: this.messenger,
                 updateTransactionFn: __classPrivateFieldGet(this, _BridgeStatusController_updateTransactionFn, "f"),
                 batchId,
                 txDataByType,
@@ -556,7 +557,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
          * @returns The transaction meta
          */
         this.submitTx = async (quoteResponse, isStxEnabledOnClient) => {
-            this.messagingSystem.call('BridgeController:stopPollingForQuotes');
+            this.messenger.call('BridgeController:stopPollingForQuotes');
             const selectedAccount = __classPrivateFieldGet(this, _BridgeStatusController_instances, "m", _BridgeStatusController_getMultichainSelectedAccount).call(this);
             if (!selectedAccount) {
                 throw new Error('Failed to submit cross-chain swap transaction: undefined multichain account');
@@ -569,13 +570,9 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
             let approvalTxId;
             const startTime = Date.now();
             const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-            // Submit non-EVM tx (Solana, BTC, Tron)
-            // Bitcoin trades come as objects with unsignedPsbtBase64, others as strings
-            const isNonEvmTrade = (0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId) &&
-                (typeof quoteResponse.trade === 'string' ||
-                    (typeof quoteResponse.trade === 'object' &&
-                        'unsignedPsbtBase64' in quoteResponse.trade));
-            if (isNonEvmTrade) {
+            // Submit SOLANA tx
+            if ((0, bridge_controller_1.isSolanaChainId)(quoteResponse.quote.srcChainId) &&
+                typeof quoteResponse.trade === 'string') {
                 txMeta = await __classPrivateFieldGet(this, _BridgeStatusController_trace, "f").call(this, {
                     name: isBridgeTx
                         ? constants_1.TraceName.BridgeTransactionCompleted
@@ -586,7 +583,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     },
                 }, async () => {
                     try {
-                        return await __classPrivateFieldGet(this, _BridgeStatusController_handleNonEvmTx, "f").call(this, quoteResponse, selectedAccount);
+                        return await __classPrivateFieldGet(this, _BridgeStatusController_handleSolanaTx, "f").call(this, quoteResponse, selectedAccount);
                     }
                     catch (error) {
                         __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Failed, txMeta?.id, {
@@ -615,7 +612,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     if (isStxEnabledOnClient || quoteResponse.quote.gasIncluded7702) {
                         const { tradeMeta, approvalMeta } = await __classPrivateFieldGet(this, _BridgeStatusController_handleEvmTransactionBatch, "f").call(this, {
                             isBridgeTx,
-                            resetApproval: await (0, transaction_1.getUSDTAllowanceResetTx)(this.messagingSystem, quoteResponse),
+                            resetApproval: await (0, transaction_1.getUSDTAllowanceResetTx)(this.messenger, quoteResponse),
                             approval: quoteResponse.approval,
                             trade: quoteResponse.trade,
                             quoteResponse,
@@ -652,10 +649,10 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                     startTime,
                     approvalTxId,
                 });
-                if ((0, bridge_controller_1.isNonEvmChainId)(quoteResponse.quote.srcChainId)) {
+                if ((0, bridge_controller_1.isSolanaChainId)(quoteResponse.quote.srcChainId)) {
                     // Start polling for bridge tx status
                     __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, txMeta.id);
-                    // Track non-EVM Swap completed event
+                    // Track Solana Swap completed event
                     if (!isBridgeTx) {
                         __classPrivateFieldGet(this, _BridgeStatusController_trackUnifiedSwapBridgeEvent, "f").call(this, bridge_controller_1.UnifiedSwapBridgeEventName.Completed, txMeta.id);
                     }
@@ -679,22 +676,22 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...(eventProperties ?? {}),
             };
             if (!txMetaId) {
-                this.messagingSystem.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, baseProperties);
                 return;
             }
             const historyItem = this.state.txHistory[txMetaId];
             if (!historyItem) {
-                this.messagingSystem.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, eventProperties ?? {});
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, eventProperties ?? {});
                 return;
             }
-            const selectedAccount = this.messagingSystem.call('AccountsController:getAccountByAddress', historyItem.account);
-            const { transactions } = this.messagingSystem.call('TransactionController:getState');
+            const selectedAccount = this.messenger.call('AccountsController:getAccountByAddress', historyItem.account);
+            const { transactions } = this.messenger.call('TransactionController:getState');
             const txMeta = transactions?.find(({ id }) => id === txMetaId);
             const approvalTxMeta = transactions?.find(({ id }) => id === historyItem.approvalTxId);
             const requestParamProperties = (0, metrics_1.getRequestParamFromHistory)(historyItem);
             if (eventName === bridge_controller_1.UnifiedSwapBridgeEventName.StatusValidationFailed) {
                 const { chain_id_source, chain_id_destination, token_address_source, token_address_destination, } = requestParamProperties;
-                this.messagingSystem.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
+                this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, {
                     ...baseProperties,
                     chain_id_source,
                     chain_id_destination,
@@ -713,7 +710,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 ...(0, metrics_1.getFinalizedTxProperties)(historyItem, txMeta, approvalTxMeta),
                 ...(0, metrics_1.getPriceImpactFromQuote)(historyItem.quote),
             };
-            this.messagingSystem.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, requiredEventProperties);
+            this.messenger.call('BridgeController:trackUnifiedSwapBridgeEvent', eventName, requiredEventProperties);
         });
         __classPrivateFieldSet(this, _BridgeStatusController_clientId, clientId, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_fetchFn, fetchFn, "f");
@@ -726,15 +723,15 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
         }, "f");
         __classPrivateFieldSet(this, _BridgeStatusController_trace, traceFn ?? ((_request, fn) => fn?.()), "f");
         // Register action handlers
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:wipeBridgeStatus`, this.wipeBridgeStatus.bind(this));
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:resetState`, this.resetState.bind(this));
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:submitTx`, this.submitTx.bind(this));
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:restartPollingForFailedAttempts`, this.restartPollingForFailedAttempts.bind(this));
-        this.messagingSystem.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:getBridgeHistoryItemByTxMetaId`, this.getBridgeHistoryItemByTxMetaId.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:startPollingForBridgeTxStatus`, this.startPollingForBridgeTxStatus.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:wipeBridgeStatus`, this.wipeBridgeStatus.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:resetState`, this.resetState.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:submitTx`, this.submitTx.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:restartPollingForFailedAttempts`, this.restartPollingForFailedAttempts.bind(this));
+        this.messenger.registerActionHandler(`${constants_1.BRIDGE_STATUS_CONTROLLER_NAME}:getBridgeHistoryItemByTxMetaId`, this.getBridgeHistoryItemByTxMetaId.bind(this));
         // Set interval
         this.setIntervalLength(constants_1.REFRESH_INTERVAL_MS);
-        this.messagingSystem.subscribe('TransactionController:transactionFailed', ({ transactionMeta }) => {
+        this.messenger.subscribe('TransactionController:transactionFailed', ({ transactionMeta }) => {
             const { type, status, id } = transactionMeta;
             if (type &&
                 [
@@ -756,12 +753,12 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
                 }
             }
         });
-        this.messagingSystem.subscribe('TransactionController:transactionConfirmed', (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);
             }
-            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_1.isNonEvmChainId)(chainId)) {
+            if (type === transaction_controller_1.TransactionType.bridge && !(0, bridge_controller_1.isSolanaChainId)(chainId)) {
                 __classPrivateFieldGet(this, _BridgeStatusController_startPollingForTxId, "f").call(this, id);
             }
         });
@@ -772,7 +769,7 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
     }
 }
 exports.BridgeStatusController = BridgeStatusController;
-_BridgeStatusController_pollingTokensByTxMetaId = 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_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleNonEvmTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = 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() {
-    return this.messagingSystem.call('AccountsController:getSelectedMultichainAccount');
+_BridgeStatusController_pollingTokensByTxMetaId = 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_startPollingForTxId = new WeakMap(), _BridgeStatusController_handleFetchFailure = new WeakMap(), _BridgeStatusController_fetchBridgeTxStatus = new WeakMap(), _BridgeStatusController_getSrcTxHash = new WeakMap(), _BridgeStatusController_updateSrcTxHash = new WeakMap(), _BridgeStatusController_wipeBridgeStatusByChainId = new WeakMap(), _BridgeStatusController_handleSolanaTx = new WeakMap(), _BridgeStatusController_waitForHashAndReturnFinalTxMeta = 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() {
+    return this.messenger.call('AccountsController:getSelectedMultichainAccount');
 };
 //# sourceMappingURL=bridge-status-controller.cjs.map