@metamask-previews/transaction-controller 60.9.0-preview-cd26f001 → 60.9.0-preview-e9856975

package/dist/TransactionController.mjs

@@ -16,7 +16,7 @@ function $importDefault(module) {
     }
     return module;
 }
-import { BaseController } from "@metamask/base-controller";
+import { BaseController } from "@metamask/base-controller/next";
 import { query, ApprovalType, ORIGIN_METAMASK, convertHexToDecimal } from "@metamask/controller-utils";
 import $EthQuery from "@metamask/eth-query";
 const EthQuery = $importDefault($EthQuery);
@@ -72,31 +72,31 @@ const metadata = {
     transactions: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: true,
     },
     transactionBatches: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: true,
     },
     methodData: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: true,
     },
     lastFetchedBlockNumbers: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: false,
     },
     submitHistory: {
         includeInStateLogs: true,
         persist: true,
-        anonymous: false,
+        includeInDebugSnapshot: false,
         usedInUi: false,
     },
 };
@@ -201,7 +201,7 @@ export class TransactionController extends BaseController {
         _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
-        this.messagingSystem = messenger;
+        this.messenger = messenger;
         __classPrivateFieldSet(this, _TransactionController_afterAdd, hooks?.afterAdd ?? (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_afterSign, hooks?.afterSign ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_afterSimulate, hooks?.afterSimulate ?? (() => Promise.resolve({})), "f");
@@ -237,19 +237,19 @@ export class TransactionController extends BaseController {
         __classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
         __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
         const findNetworkClientIdByChainId = (chainId) => {
-            return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
+            return this.messenger.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
         };
         __classPrivateFieldSet(this, _TransactionController_multichainTrackingHelper, new MultichainTrackingHelper({
             findNetworkClientIdByChainId,
             getNetworkClientById: ((networkClientId) => {
-                return this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId);
+                return this.messenger.call(`NetworkController:getNetworkClientById`, networkClientId);
             }),
             getNetworkClientRegistry,
             removePendingTransactionTrackerListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).bind(this),
             createNonceTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).bind(this),
             createPendingTransactionTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).bind(this),
             onNetworkStateChange: (listener) => {
-                this.messagingSystem.subscribe('NetworkController:stateChange', listener);
+                this.messenger.subscribe('NetworkController:stateChange', listener);
             },
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
@@ -263,9 +263,9 @@ export class TransactionController extends BaseController {
             getTransactions: () => this.state.transactions,
             getTransactionBatches: () => this.state.transactionBatches,
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             onStateChange: (listener) => {
-                this.messagingSystem.subscribe('TransactionController:stateChange', listener);
+                this.messenger.subscribe('TransactionController:stateChange', listener);
             },
         });
         gasFeePoller.hub.on('transaction-updated', __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onGasFeePollerTransactionUpdate).bind(this));
@@ -285,7 +285,7 @@ export class TransactionController extends BaseController {
             getLocalTransactions: () => this.state.transactions,
             includeTokenTransfers: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").includeTokenTransfers,
             isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             remoteTransactionSource: new AccountsApiRemoteTransactionSource(),
             trimTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).bind(this),
             updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
@@ -293,11 +293,11 @@ export class TransactionController extends BaseController {
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, __classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f"));
         // when transactionsController state changes
         // check for pending transactions and start polling if there are any
-        this.messagingSystem.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        this.messenger.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
         new ResimulateHelper({
             simulateTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).bind(this),
             onTransactionsUpdate: (listener) => {
-                this.messagingSystem.subscribe('TransactionController:stateChange', listener, (controllerState) => controllerState.transactions);
+                this.messenger.subscribe('TransactionController:stateChange', listener, (controllerState) => controllerState.transactions);
             },
             getTransactions: () => this.state.transactions,
         });
@@ -328,7 +328,7 @@ export class TransactionController extends BaseController {
      * @returns Result object containing the generated batch ID.
      */
     async addTransactionBatch(request) {
-        const { blockTracker } = this.messagingSystem.call(`NetworkController:getNetworkClientById`, request.networkClientId);
+        const { blockTracker } = this.messenger.call(`NetworkController:getNetworkClientById`, request.networkClientId);
         return await addTransactionBatch({
             addTransaction: this.addTransaction.bind(this),
             estimateGas: this.estimateGas.bind(this),
@@ -345,7 +345,7 @@ export class TransactionController extends BaseController {
             }),
             getTransaction: (transactionId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId),
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             publishBatchHook: __classPrivateFieldGet(this, _TransactionController_publishBatchHook, "f"),
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
             publishTransaction: (ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, transactionMeta),
@@ -365,7 +365,7 @@ export class TransactionController extends BaseController {
         return isAtomicBatchSupported({
             ...request,
             getEthQuery: (chainId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId }),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
         });
     }
@@ -474,7 +474,7 @@ export class TransactionController extends BaseController {
             addedTransactionMeta = updateSwapsTransaction(addedTransactionMeta, transactionType, swaps, {
                 isSwapsDisabled: __classPrivateFieldGet(this, _TransactionController_isSwapsDisabled, "f"),
                 cancelTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_rejectTransaction).bind(this),
-                messenger: this.messagingSystem,
+                messenger: this.messenger,
             });
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, addedTransactionMeta);
             if (requireApproval !== false) {
@@ -499,7 +499,7 @@ export class TransactionController extends BaseController {
             else {
                 log('Skipping simulation & first interaction update as approval not required');
             }
-            this.messagingSystem.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
+            this.messenger.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
         }
         return {
             result: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_processApproval).call(this, addedTransactionMeta, {
@@ -552,7 +552,7 @@ export class TransactionController extends BaseController {
                 txParams.value = '0x0';
             },
             afterSubmit: (newTransactionMeta) => {
-                this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+                this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
                 __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${newTransactionMeta.id}:finished`, newTransactionMeta);
             },
         });
@@ -576,7 +576,7 @@ export class TransactionController extends BaseController {
             transactionId,
             transactionType: TransactionType.retry,
             afterSubmit: (newTransactionMeta) => {
-                this.messagingSystem.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
+                this.messenger.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
             },
         });
     }
@@ -599,7 +599,7 @@ export class TransactionController extends BaseController {
             ignoreDelegationSignatures,
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             txParams: transaction,
         });
         return { gas: estimatedGas, simulationFails };
@@ -621,7 +621,7 @@ export class TransactionController extends BaseController {
             ethQuery,
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             txParams: transaction,
         });
         const gas = addGasBuffer(estimatedGas, blockGasLimit, multiplier);
@@ -723,7 +723,7 @@ export class TransactionController extends BaseController {
                 log('Error while updating post balance', error);
                 throw error;
             });
-            this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, updatedTransactionMeta);
+            this.messenger.publish(`${controllerName}:transactionConfirmed`, updatedTransactionMeta);
         }
         catch (error) {
             console.error('Failed to confirm external transaction', error);
@@ -920,7 +920,7 @@ export class TransactionController extends BaseController {
         }
         await updateTransactionLayer1GasFee({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             provider,
             transactionMeta: updatedTransaction,
         });
@@ -1048,7 +1048,7 @@ export class TransactionController extends BaseController {
         this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateCustodialTransaction - Custodial transaction updated`);
         if (status &&
             [TransactionStatus.submitted, TransactionStatus.failed].includes(status)) {
-            this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+            this.messenger.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
             __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${updatedTransactionMeta.id}:finished`, updatedTransactionMeta);
         }
         return updatedTransactionMeta;
@@ -1145,7 +1145,7 @@ export class TransactionController extends BaseController {
             networkClientId,
         };
         // Guaranteed as the default gas fee flow matches all transactions.
-        const gasFeeFlow = getGasFeeFlow(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messagingSystem);
+        const gasFeeFlow = getGasFeeFlow(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
         const ethQuery = new EthQuery(provider);
         const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
@@ -1153,7 +1153,7 @@ export class TransactionController extends BaseController {
         return gasFeeFlow.getGasFees({
             ethQuery,
             gasFeeControllerData,
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             transactionMeta,
         });
     }
@@ -1173,7 +1173,7 @@ export class TransactionController extends BaseController {
         });
         return await getTransactionLayer1GasFee({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             provider,
             transactionMeta: {
                 txParams: transactionParams,
@@ -1362,11 +1362,11 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     newTransactionMeta.hash = hash;
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, newTransactionMeta);
     // speedUpTransaction has no approval request, so we assume the user has already approved the transaction
-    this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
+    this.messenger.publish(`${controllerName}:transactionApproved`, {
         transactionMeta: newTransactionMeta,
         actionId,
     });
-    this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
+    this.messenger.publish(`${controllerName}:transactionSubmitted`, {
         transactionMeta: newTransactionMeta,
         actionId,
     });
@@ -1413,12 +1413,12 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
         gasFeeFlows: __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"),
         getGasFeeEstimates: __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f"),
         getSavedGasFees: __classPrivateFieldGet(this, _TransactionController_getSavedGasFees, "f").bind(this),
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         txMeta: transactionMeta,
     }));
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Layer 1 Gas Fees', parentContext: traceContext }, async () => await updateTransactionLayer1GasFee({
         layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         provider,
         transactionMeta,
     }));
@@ -1463,7 +1463,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
                     resultCallbacks.success();
                 }
                 const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
-                this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
+                this.messenger.publish(`${controllerName}:transactionApproved`, {
                     transactionMeta: updatedTransactionMeta,
                     actionId,
                 });
@@ -1551,7 +1551,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).call(this, transactionMeta));
         if (!(await __classPrivateFieldGet(this, _TransactionController_beforePublish, "f").call(this, transactionMeta))) {
             log('Skipping publishing transaction based on hook');
-            this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
+            this.messenger.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
             return ApprovalState.SkippedViaBeforePublishHook;
         }
         if (!rawTx && !transactionMeta.isExternalSign) {
@@ -1597,10 +1597,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
                 log('Updated pre-transaction balance', preTxBalance);
             }
         });
-        this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
+        this.messenger.publish(`${controllerName}:transactionSubmitted`, {
             transactionMeta,
         });
-        this.messagingSystem.publish(`${controllerName}:transactionFinished`, transactionMeta);
+        this.messenger.publish(`${controllerName}:transactionFinished`, transactionMeta);
         __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionId}:finished`, transactionMeta);
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
         return ApprovalState.Approved;
@@ -1634,9 +1634,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         status: TransactionStatus.rejected,
         error: normalizeTxError(error ?? providerErrors.userRejectedRequest()),
     };
-    this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+    this.messenger.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
     __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
-    this.messagingSystem.publish(`${controllerName}:transactionRejected`, {
+    this.messenger.publish(`${controllerName}:transactionRejected`, {
         transactionMeta: updatedTransactionMeta,
         actionId,
     });
@@ -1683,7 +1683,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         id,
         parentContext: traceContext,
     });
-    return (await this.messagingSystem.call('ApprovalController:addRequest', {
+    return (await this.messenger.call('ApprovalController:addRequest', {
         id,
         origin: origin || ORIGIN_METAMASK,
         type,
@@ -1754,7 +1754,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ]);
         log('Added incoming transactions to state', finalTransactions.length, finalTransactions);
     });
-    this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
+    this.messenger.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
 }, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin) {
     if (!origin || origin === ORIGIN_METAMASK) {
         return undefined;
@@ -1836,7 +1836,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ...transactionMeta,
         status: TransactionStatus.dropped,
     };
-    this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
+    this.messenger.publish(`${controllerName}:transactionDropped`, {
         transactionMeta: updatedTransactionMeta,
     });
     this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
@@ -1872,7 +1872,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const { authorizationList, from } = txParams;
     const signedAuthorizationList = await signAuthorizationList({
         authorizationList,
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         transactionMeta,
     });
     if (signedAuthorizationList) {
@@ -1920,7 +1920,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     this.updateTransaction(transactionMetaWithRawTx, 'TransactionController#approveTransaction - RawTransaction added');
     return rawTx;
 }, _TransactionController_onTransactionStatusChange = function _TransactionController_onTransactionStatusChange(transactionMeta) {
-    this.messagingSystem.publish(`${controllerName}:transactionStatusUpdated`, {
+    this.messenger.publish(`${controllerName}:transactionStatusUpdated`, {
         transactionMeta,
     });
 }, _TransactionController_getNonceTrackerTransactions = function _TransactionController_getNonceTrackerTransactions(statuses, address, chainId) {
@@ -1928,7 +1928,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
 }, _TransactionController_onConfirmedTransaction = function _TransactionController_onConfirmedTransaction(transactionMeta) {
     log('Processing confirmed transaction', transactionMeta.id);
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_markNonceDuplicatesDropped).call(this, transactionMeta.id);
-    this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, transactionMeta);
+    this.messenger.publish(`${controllerName}:transactionConfirmed`, transactionMeta);
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
     // Intentional given potential duration of process.
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updatePostBalance).call(this, transactionMeta).catch((error) => {
@@ -1947,7 +1947,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             getTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).bind(this),
             updateTransaction: this.updateTransaction.bind(this),
         });
-        this.messagingSystem.publish(`${controllerName}:postTransactionBalanceUpdated`, {
+        this.messenger.publish(`${controllerName}:postTransactionBalanceUpdated`, {
             transactionMeta: updatedTransactionMeta,
             approvalTransactionMeta,
         });
@@ -1978,7 +1978,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
             chainId,
         }),
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
             skipSubmitHistory: true,
         }),
@@ -2108,7 +2108,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             chainId,
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             isEIP7702GasFeeTokensEnabled: __classPrivateFieldGet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
             transactionMeta,
         });
@@ -2160,9 +2160,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         state.transactionBatches[index] = updated ?? batch;
     });
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
-    return this.messagingSystem.call('AccountsController:getSelectedAccount');
+    return this.messenger.call('AccountsController:getSelectedAccount');
 }, _TransactionController_getInternalAccounts = function _TransactionController_getInternalAccounts() {
-    const state = this.messagingSystem.call('AccountsController:getState');
+    const state = this.messenger.call('AccountsController:getState');
     return Object.values(state.internalAccounts?.accounts ?? {})
         .filter((account) => account.type === 'eip155:eoa')
         .map((account) => account.address);
@@ -2202,18 +2202,18 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         isCustomNetwork,
         isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         txMeta: transactionMeta,
     });
 }, _TransactionController_registerActionHandlers = function _TransactionController_registerActionHandlers() {
-    this.messagingSystem.registerActionHandler(`${controllerName}:addTransaction`, this.addTransaction.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:addTransactionBatch`, this.addTransactionBatch.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:confirmExternalTransaction`, this.confirmExternalTransaction.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:estimateGas`, this.estimateGas.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:getNonceLock`, this.getNonceLock.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:getTransactions`, this.getTransactions.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:updateCustodialTransaction`, this.updateCustodialTransaction.bind(this));
-    this.messagingSystem.registerActionHandler(`${controllerName}:updateTransaction`, this.updateTransaction.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:addTransaction`, this.addTransaction.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:addTransactionBatch`, this.addTransactionBatch.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:confirmExternalTransaction`, this.confirmExternalTransaction.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:estimateGas`, this.estimateGas.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:getNonceLock`, this.getNonceLock.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:getTransactions`, this.getTransactions.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:updateCustodialTransaction`, this.updateCustodialTransaction.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:updateTransaction`, this.updateTransaction.bind(this));
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
     this.update((state) => {
         const transactions = state.transactions.filter(({ id }) => id !== transactionId);
@@ -2253,13 +2253,13 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             error: normalizeTxError(error),
         };
     }
-    this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
+    this.messenger.publish(`${controllerName}:transactionFailed`, {
         actionId,
         error: error.message,
         transactionMeta: newTransactionMeta,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, newTransactionMeta);
-    this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+    this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
     __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
 }, _TransactionController_runAfterSimulateHook = async function _TransactionController_runAfterSimulateHook(transactionMeta) {
     log('Calling afterSimulate hook', transactionMeta);