@metamask/transaction-controller 60.9.0 → 61.0.0

package/CHANGELOG.md

@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [61.0.0]
+
+### Changed
+
+- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6386](https://github.com/MetaMask/core/pull/6386))
+  - Previously, `TransactionController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
+- **BREAKING:** Bump `@metamask/accounts-controller` from `^33.0.0` to `^34.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/approval-controller` from `^7.0.0` to `^8.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/gas-fee-controller` from `^24.0.0` to `^25.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/network-controller` from `^24.0.0` to `^25.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/remote-feature-flag-controller` from `^1.5.0` to `^2.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- Bump `@metamask/base-controller` from `^8.4.2` to `^9.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- Bump `@metamask/polling-controller` from `^14.0.2` to `^15.0.0` ( [#6962](https://github.com/MetaMask/core/pull/6962))
+
+## [60.10.0]
+
+### Added
+
+- Add actions `TransactionController:emulateNewTransaction` and `TransactionController:emulateTransactionUpdate` ([#6935](https://github.com/MetaMask/core/pull/6935))
+
+### Changed
+
+- Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
+
+### Fixed
+
+- Prevent race condition causing excessive incoming transaction polling ([#6913](https://github.com/MetaMask/core/pull/6913))
+
 ## [60.9.0]
 
 ### Added
@@ -1877,7 +1905,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.9.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@61.0.0...HEAD
+[61.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.10.0...@metamask/transaction-controller@61.0.0
+[60.10.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.9.0...@metamask/transaction-controller@60.10.0
 [60.9.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.8.0...@metamask/transaction-controller@60.9.0
 [60.8.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.7.0...@metamask/transaction-controller@60.8.0
 [60.7.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.6.1...@metamask/transaction-controller@60.7.0

package/dist/TransactionController.cjs

@@ -70,31 +70,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,
     },
 };
@@ -199,7 +199,7 @@ class TransactionController extends base_controller_1.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");
@@ -235,19 +235,19 @@ class TransactionController extends base_controller_1.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_1.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();
@@ -261,9 +261,9 @@ class TransactionController extends base_controller_1.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));
@@ -283,7 +283,7 @@ class TransactionController extends base_controller_1.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_1.AccountsApiRemoteTransactionSource(),
             trimTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_trimTransactionsForState).bind(this),
             updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
@@ -291,11 +291,11 @@ class TransactionController extends base_controller_1.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_1.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,
         });
@@ -326,7 +326,7 @@ class TransactionController extends base_controller_1.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 (0, batch_1.addTransactionBatch)({
             addTransaction: this.addTransaction.bind(this),
             estimateGas: this.estimateGas.bind(this),
@@ -343,7 +343,7 @@ class TransactionController extends base_controller_1.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),
@@ -363,7 +363,7 @@ class TransactionController extends base_controller_1.BaseController {
         return (0, batch_1.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"),
         });
     }
@@ -472,7 +472,7 @@ class TransactionController extends base_controller_1.BaseController {
             addedTransactionMeta = (0, swaps_1.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) {
@@ -497,7 +497,7 @@ class TransactionController extends base_controller_1.BaseController {
             else {
                 (0, logger_1.projectLogger)('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, {
@@ -550,7 +550,7 @@ class TransactionController extends base_controller_1.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);
             },
         });
@@ -574,7 +574,7 @@ class TransactionController extends base_controller_1.BaseController {
             transactionId,
             transactionType: types_1.TransactionType.retry,
             afterSubmit: (newTransactionMeta) => {
-                this.messagingSystem.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
+                this.messenger.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
             },
         });
     }
@@ -597,7 +597,7 @@ class TransactionController extends base_controller_1.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 };
@@ -619,7 +619,7 @@ class TransactionController extends base_controller_1.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 = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
@@ -721,7 +721,7 @@ class TransactionController extends base_controller_1.BaseController {
                 (0, logger_1.projectLogger)('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);
@@ -918,7 +918,7 @@ class TransactionController extends base_controller_1.BaseController {
         }
         await (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             provider,
             transactionMeta: updatedTransaction,
         });
@@ -1046,7 +1046,7 @@ class TransactionController extends base_controller_1.BaseController {
         this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateCustodialTransaction - Custodial transaction updated`);
         if (status &&
             [types_1.TransactionStatus.submitted, types_1.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;
@@ -1143,7 +1143,7 @@ class TransactionController extends base_controller_1.BaseController {
             networkClientId,
         };
         // Guaranteed as the default gas fee flow matches all transactions.
-        const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messagingSystem);
+        const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messenger);
         const ethQuery = new eth_query_1.default(provider);
         const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
@@ -1151,7 +1151,7 @@ class TransactionController extends base_controller_1.BaseController {
         return gasFeeFlow.getGasFees({
             ethQuery,
             gasFeeControllerData,
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             transactionMeta,
         });
     }
@@ -1171,7 +1171,7 @@ class TransactionController extends base_controller_1.BaseController {
         });
         return await (0, layer1_gas_fee_flow_1.getTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messagingSystem,
+            messenger: this.messenger,
             provider,
             transactionMeta: {
                 txParams: transactionParams,
@@ -1303,6 +1303,50 @@ class TransactionController extends base_controller_1.BaseController {
             ];
         });
     }
+    /**
+     * Emulate a new transaction.
+     *
+     * @param transactionId - The transaction ID.
+     */
+    emulateNewTransaction(transactionId) {
+        const transactionMeta = this.state.transactions.find((tx) => tx.id === transactionId);
+        if (!transactionMeta) {
+            return;
+        }
+        if (transactionMeta.type === types_1.TransactionType.swap) {
+            this.messenger.publish('TransactionController:transactionNewSwap', {
+                transactionMeta,
+            });
+        }
+        else if (transactionMeta.type === types_1.TransactionType.swapApproval) {
+            this.messenger.publish('TransactionController:transactionNewSwapApproval', { transactionMeta });
+        }
+    }
+    /**
+     * Emulate a transaction update.
+     *
+     * @param transactionMeta - Transaction metadata.
+     */
+    emulateTransactionUpdate(transactionMeta) {
+        const updatedTransactionMeta = {
+            ...transactionMeta,
+            txParams: {
+                ...transactionMeta.txParams,
+                from: this.messenger.call('AccountsController:getSelectedAccount')
+                    .address,
+            },
+        };
+        const transactionExists = this.state.transactions.some((tx) => tx.id === updatedTransactionMeta.id);
+        if (!transactionExists) {
+            this.update((state) => {
+                state.transactions.push(updatedTransactionMeta);
+            });
+        }
+        this.updateTransaction(updatedTransactionMeta, 'Generated from user operation');
+        this.messenger.publish('TransactionController:transactionStatusUpdated', {
+            transactionMeta: updatedTransactionMeta,
+        });
+    }
 }
 exports.TransactionController = TransactionController;
 _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isHistoryDisabled = new WeakMap(), _TransactionController_isSendFlowHistoryDisabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_securityProviderRequest = new WeakMap(), _TransactionController_sign = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
@@ -1361,11 +1405,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,
     });
@@ -1412,12 +1456,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 (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
         layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         provider,
         transactionMeta,
     }));
@@ -1462,7 +1506,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,
                 });
@@ -1550,7 +1594,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))) {
             (0, logger_1.projectLogger)('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) {
@@ -1596,10 +1640,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
                 (0, logger_1.projectLogger)('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;
@@ -1633,9 +1677,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         status: types_1.TransactionStatus.rejected,
         error: (0, utils_2.normalizeTxError)(error ?? rpc_errors_1.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,
     });
@@ -1682,7 +1726,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 || controller_utils_1.ORIGIN_METAMASK,
         type,
@@ -1753,7 +1797,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ]);
         (0, logger_1.projectLogger)('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 === controller_utils_1.ORIGIN_METAMASK) {
         return undefined;
@@ -1835,7 +1879,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ...transactionMeta,
         status: types_1.TransactionStatus.dropped,
     };
-    this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
+    this.messenger.publish(`${controllerName}:transactionDropped`, {
         transactionMeta: updatedTransactionMeta,
     });
     this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
@@ -1871,7 +1915,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const { authorizationList, from } = txParams;
     const signedAuthorizationList = await (0, eip7702_1.signAuthorizationList)({
         authorizationList,
-        messenger: this.messagingSystem,
+        messenger: this.messenger,
         transactionMeta,
     });
     if (signedAuthorizationList) {
@@ -1919,7 +1963,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) {
@@ -1927,7 +1971,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
 }, _TransactionController_onConfirmedTransaction = function _TransactionController_onConfirmedTransaction(transactionMeta) {
     (0, logger_1.projectLogger)('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) => {
@@ -1946,7 +1990,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,
         });
@@ -1977,7 +2021,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,
         }),
@@ -2107,7 +2151,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,
         });
@@ -2159,9 +2203,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);
@@ -2201,18 +2245,20 @@ 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));
+    this.messenger.registerActionHandler(`${controllerName}:emulateNewTransaction`, this.emulateNewTransaction.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:emulateTransactionUpdate`, this.emulateTransactionUpdate.bind(this));
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
     this.update((state) => {
         const transactions = state.transactions.filter(({ id }) => id !== transactionId);
@@ -2252,13 +2298,13 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             error: (0, utils_2.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) {
     (0, logger_1.projectLogger)('Calling afterSimulate hook', transactionMeta);