@metamask-previews/transaction-controller 60.4.0-preview-b896289e → 60.5.0-preview-5eac8e7

package/CHANGELOG.md

@@ -7,15 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Changed
+### Added
+
+- Expose `addTransaction` and `addTransactionBatch` methods through the messenger ([#6749](https://github.com/MetaMask/core/pull/6749))
+  - Add types:
+    - `AddTransactionOptions`
+    - `TransactionControllerAddTransactionAction`
+    - `TransactionControllerAddTransactionBatchAction`
 
-- **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`.
+## [60.5.0]
 
 ### Added
 
 - Add `predictBuy`, `predictClaim`, `predictDeposit` and `predictSell` to `TransactionType` ([#6690](https://github.com/MetaMask/core/pull/6690))
 
+### Changed
+
+- Bump `@metamask/utils` from `^11.8.0` to `^11.8.1` ([#6708](https://github.com/MetaMask/core/pull/6708))
+
+### Fixed
+
+- Update `isFirstTimeInteraction` to be determined using recipient if token transfer. ([#6686](https://github.com/MetaMask/core/pull/6686))
+
 ## [60.4.0]
 
 ### Added
@@ -1827,7 +1840,8 @@ 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.4.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.5.0...HEAD
+[60.5.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.4.0...@metamask/transaction-controller@60.5.0
 [60.4.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.3.0...@metamask/transaction-controller@60.4.0
 [60.3.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.2.0...@metamask/transaction-controller@60.3.0
 [60.2.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@60.1.0...@metamask/transaction-controller@60.2.0

package/dist/TransactionController.cjs

@@ -13,10 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isHistoryDisabled, _TransactionController_isSendFlowHistoryDisabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateFirstTimeInteraction, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook;
+var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isHistoryDisabled, _TransactionController_isSendFlowHistoryDisabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
-const next_1 = require("@metamask/base-controller/next");
+const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const eth_query_1 = __importDefault(require("@metamask/eth-query"));
 const network_controller_1 = require("@metamask/network-controller");
@@ -28,7 +28,6 @@ const utils_1 = require("@metamask/utils");
 const events_1 = require("events");
 const lodash_1 = require("lodash");
 const uuid_1 = require("uuid");
-const accounts_api_1 = require("./api/accounts-api.cjs");
 const DefaultGasFeeFlow_1 = require("./gas-flows/DefaultGasFeeFlow.cjs");
 const LineaGasFeeFlow_1 = require("./gas-flows/LineaGasFeeFlow.cjs");
 const OptimismLayer1GasFeeFlow_1 = require("./gas-flows/OptimismLayer1GasFeeFlow.cjs");
@@ -49,6 +48,7 @@ const balance_changes_1 = require("./utils/balance-changes.cjs");
 const batch_1 = require("./utils/batch.cjs");
 const eip7702_1 = require("./utils/eip7702.cjs");
 const external_transactions_1 = require("./utils/external-transactions.cjs");
+const first_time_interaction_1 = require("./utils/first-time-interaction.cjs");
 const gas_1 = require("./utils/gas.cjs");
 const gas_fee_tokens_1 = require("./utils/gas-fee-tokens.cjs");
 const gas_fees_1 = require("./utils/gas-fees.cjs");
@@ -70,31 +70,31 @@ const metadata = {
     transactions: {
         includeInStateLogs: true,
         persist: true,
-        includeInDebugSnapshot: false,
+        anonymous: false,
         usedInUi: true,
     },
     transactionBatches: {
         includeInStateLogs: true,
         persist: true,
-        includeInDebugSnapshot: false,
+        anonymous: false,
         usedInUi: true,
     },
     methodData: {
         includeInStateLogs: true,
         persist: true,
-        includeInDebugSnapshot: false,
+        anonymous: false,
         usedInUi: true,
     },
     lastFetchedBlockNumbers: {
         includeInStateLogs: true,
         persist: true,
-        includeInDebugSnapshot: false,
+        anonymous: false,
         usedInUi: false,
     },
     submitHistory: {
         includeInStateLogs: true,
         persist: true,
-        includeInDebugSnapshot: false,
+        anonymous: false,
         usedInUi: false,
     },
 };
@@ -137,7 +137,7 @@ function getDefaultTransactionControllerState() {
 /**
  * Controller responsible for submitting and managing transactions.
  */
-class TransactionController extends next_1.BaseController {
+class TransactionController extends base_controller_1.BaseController {
     /**
      * Constructs a TransactionController.
      *
@@ -199,7 +199,7 @@ class TransactionController extends next_1.BaseController {
         _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
-        this.messenger = messenger;
+        this.messagingSystem = 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 next_1.BaseController {
         __classPrivateFieldSet(this, _TransactionController_trace, trace ?? ((_request, fn) => fn?.()), "f");
         __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
         const findNetworkClientIdByChainId = (chainId) => {
-            return this.messenger.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
+            return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
         };
         __classPrivateFieldSet(this, _TransactionController_multichainTrackingHelper, new MultichainTrackingHelper_1.MultichainTrackingHelper({
             findNetworkClientIdByChainId,
             getNetworkClientById: ((networkClientId) => {
-                return this.messenger.call(`NetworkController:getNetworkClientById`, networkClientId);
+                return this.messagingSystem.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.messenger.subscribe('NetworkController:stateChange', listener);
+                this.messagingSystem.subscribe('NetworkController:stateChange', listener);
             },
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
@@ -261,9 +261,9 @@ class TransactionController extends next_1.BaseController {
             getTransactions: () => this.state.transactions,
             getTransactionBatches: () => this.state.transactionBatches,
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             onStateChange: (listener) => {
-                this.messenger.subscribe('TransactionController:stateChange', listener);
+                this.messagingSystem.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 next_1.BaseController {
             getLocalTransactions: () => this.state.transactions,
             includeTokenTransfers: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").includeTokenTransfers,
             isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             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 next_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.messenger.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        this.messagingSystem.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.messenger.subscribe('TransactionController:stateChange', listener, (controllerState) => controllerState.transactions);
+                this.messagingSystem.subscribe('TransactionController:stateChange', listener, (controllerState) => controllerState.transactions);
             },
             getTransactions: () => this.state.transactions,
         });
@@ -326,7 +326,7 @@ class TransactionController extends next_1.BaseController {
      * @returns Result object containing the generated batch ID.
      */
     async addTransactionBatch(request) {
-        const { blockTracker } = this.messenger.call(`NetworkController:getNetworkClientById`, request.networkClientId);
+        const { blockTracker } = this.messagingSystem.call(`NetworkController:getNetworkClientById`, request.networkClientId);
         return await (0, batch_1.addTransactionBatch)({
             addTransaction: this.addTransaction.bind(this),
             getChainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).bind(this),
@@ -342,7 +342,7 @@ class TransactionController extends next_1.BaseController {
             }),
             getTransaction: (transactionId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId),
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             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),
@@ -362,36 +362,17 @@ class TransactionController extends next_1.BaseController {
         return (0, batch_1.isAtomicBatchSupported)({
             ...request,
             getEthQuery: (chainId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { chainId }),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
         });
     }
     /**
      * Add a new unapproved transaction to state. Parameters will be validated, a
-     * unique transaction id will be generated, and gas and gasPrice will be calculated
-     * if not provided. If A `<tx.id>:unapproved` hub event will be emitted once added.
+     * unique transaction ID will be generated, and `gas` and `gasPrice` will be calculated
+     * if not provided. A `<tx.id>:unapproved` hub event will be emitted once added.
      *
      * @param txParams - Standard parameters for an Ethereum transaction.
      * @param options - Additional options to control how the transaction is added.
-     * @param options.actionId - Unique ID to prevent duplicate requests.
-     * @param options.assetsFiatValues - The fiat values of the assets being sent and received.
-     * @param options.batchId - A custom ID for the batch this transaction belongs to.
-     * @param options.deviceConfirmedOn - An enum to indicate what device confirmed the transaction.
-     * @param options.disableGasBuffer - Whether to disable the gas estimation buffer.
-     * @param options.isGasFeeIncluded - Whether MetaMask will be compensated for the gas fee by the transaction.
-     * @param options.method - RPC method that requested the transaction.
-     * @param options.nestedTransactions - Params for any nested transactions encoded in the data.
-     * @param options.origin - The origin of the transaction request, such as a dApp hostname.
-     * @param options.publishHook - Custom logic to publish the transaction.
-     * @param options.requireApproval - Whether the transaction requires approval by the user, defaults to true unless explicitly disabled.
-     * @param options.securityAlertResponse - Response from security validator.
-     * @param options.sendFlowHistory - The sendFlowHistory entries to add.
-     * @param options.type - Type of transaction to add, such as 'cancel' or 'swap'.
-     * @param options.swaps - Options for swaps transactions.
-     * @param options.swaps.hasApproveTx - Whether the transaction has an approval transaction.
-     * @param options.swaps.meta - Metadata for swap transaction.
-     * @param options.networkClientId - The id of the network client for this transaction.
-     * @param options.traceContext - The parent context for any new traces.
      * @returns Object containing a promise resolving to the transaction hash if approved.
      */
     async addTransaction(txParams, options) {
@@ -490,7 +471,7 @@ class TransactionController extends next_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.messenger,
+                messenger: this.messagingSystem,
             });
             __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addMetadata).call(this, addedTransactionMeta);
             if (requireApproval !== false) {
@@ -500,8 +481,14 @@ class TransactionController extends next_1.BaseController {
                     (0, logger_1.projectLogger)('Error while updating simulation data', error);
                     throw error;
                 });
-                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateFirstTimeInteraction).call(this, addedTransactionMeta, {
+                (0, first_time_interaction_1.updateFirstTimeInteraction)({
+                    existingTransactions: this.state.transactions,
+                    getTransaction: (transactionId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId),
+                    isFirstTimeInteractionEnabled: __classPrivateFieldGet(this, _TransactionController_isFirstTimeInteractionEnabled, "f"),
+                    trace: __classPrivateFieldGet(this, _TransactionController_trace, "f"),
                     traceContext,
+                    transactionMeta: addedTransactionMeta,
+                    updateTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).bind(this),
                 }).catch((error) => {
                     (0, logger_1.projectLogger)('Error while updating first interaction properties', error);
                 });
@@ -509,7 +496,7 @@ class TransactionController extends next_1.BaseController {
             else {
                 (0, logger_1.projectLogger)('Skipping simulation & first interaction update as approval not required');
             }
-            this.messenger.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
         }
         return {
             result: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_processApproval).call(this, addedTransactionMeta, {
@@ -562,7 +549,7 @@ class TransactionController extends next_1.BaseController {
                 txParams.value = '0x0';
             },
             afterSubmit: (newTransactionMeta) => {
-                this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+                this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
                 __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${newTransactionMeta.id}:finished`, newTransactionMeta);
             },
         });
@@ -586,7 +573,7 @@ class TransactionController extends next_1.BaseController {
             transactionId,
             transactionType: types_1.TransactionType.retry,
             afterSubmit: (newTransactionMeta) => {
-                this.messenger.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
+                this.messagingSystem.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
             },
         });
     }
@@ -609,7 +596,7 @@ class TransactionController extends next_1.BaseController {
             ignoreDelegationSignatures,
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             txParams: transaction,
         });
         return { gas: estimatedGas, simulationFails };
@@ -631,7 +618,7 @@ class TransactionController extends next_1.BaseController {
             ethQuery,
             isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             txParams: transaction,
         });
         const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
@@ -733,7 +720,7 @@ class TransactionController extends next_1.BaseController {
                 (0, logger_1.projectLogger)('Error while updating post balance', error);
                 throw error;
             });
-            this.messenger.publish(`${controllerName}:transactionConfirmed`, updatedTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, updatedTransactionMeta);
         }
         catch (error) {
             console.error('Failed to confirm external transaction', error);
@@ -930,7 +917,7 @@ class TransactionController extends next_1.BaseController {
         }
         await (0, layer1_gas_fee_flow_1.updateTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             provider,
             transactionMeta: updatedTransaction,
         });
@@ -1058,7 +1045,7 @@ class TransactionController extends next_1.BaseController {
         this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateCustodialTransaction - Custodial transaction updated`);
         if (status &&
             [types_1.TransactionStatus.submitted, types_1.TransactionStatus.failed].includes(status)) {
-            this.messenger.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
             __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${updatedTransactionMeta.id}:finished`, updatedTransactionMeta);
         }
         return updatedTransactionMeta;
@@ -1155,7 +1142,7 @@ class TransactionController extends next_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.messenger);
+        const gasFeeFlow = (0, gas_flow_1.getGasFeeFlow)(transactionMeta, __classPrivateFieldGet(this, _TransactionController_gasFeeFlows, "f"), this.messagingSystem);
         const ethQuery = new eth_query_1.default(provider);
         const gasFeeControllerData = await __classPrivateFieldGet(this, _TransactionController_getGasFeeEstimates, "f").call(this, {
             networkClientId,
@@ -1163,7 +1150,7 @@ class TransactionController extends next_1.BaseController {
         return gasFeeFlow.getGasFees({
             ethQuery,
             gasFeeControllerData,
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             transactionMeta,
         });
     }
@@ -1183,7 +1170,7 @@ class TransactionController extends next_1.BaseController {
         });
         return await (0, layer1_gas_fee_flow_1.getTransactionLayer1GasFee)({
             layer1GasFeeFlows: __classPrivateFieldGet(this, _TransactionController_layer1GasFeeFlows, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             provider,
             transactionMeta: {
                 txParams: transactionParams,
@@ -1373,11 +1360,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.messenger.publish(`${controllerName}:transactionApproved`, {
+    this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
         transactionMeta: newTransactionMeta,
         actionId,
     });
-    this.messenger.publish(`${controllerName}:transactionSubmitted`, {
+    this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
         transactionMeta: newTransactionMeta,
         actionId,
     });
@@ -1424,12 +1411,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.messenger,
+        messenger: this.messagingSystem,
         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.messenger,
+        messenger: this.messagingSystem,
         provider,
         transactionMeta,
     }));
@@ -1474,7 +1461,7 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
                     resultCallbacks.success();
                 }
                 const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
-                this.messenger.publish(`${controllerName}:transactionApproved`, {
+                this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
                     transactionMeta: updatedTransactionMeta,
                     actionId,
                 });
@@ -1562,7 +1549,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.messenger.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
+            this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, transactionMeta);
             return ApprovalState.SkippedViaBeforePublishHook;
         }
         if (!rawTx && !transactionMeta.isExternalSign) {
@@ -1612,10 +1599,10 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
                 (0, logger_1.projectLogger)('Updated pre-transaction balance', preTxBalance);
             }
         });
-        this.messenger.publish(`${controllerName}:transactionSubmitted`, {
+        this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
             transactionMeta,
         });
-        this.messenger.publish(`${controllerName}:transactionFinished`, transactionMeta);
+        this.messagingSystem.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;
@@ -1649,9 +1636,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         status: types_1.TransactionStatus.rejected,
         error: (0, utils_2.normalizeTxError)(error ?? rpc_errors_1.providerErrors.userRejectedRequest()),
     };
-    this.messenger.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+    this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
     __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
-    this.messenger.publish(`${controllerName}:transactionRejected`, {
+    this.messagingSystem.publish(`${controllerName}:transactionRejected`, {
         transactionMeta: updatedTransactionMeta,
         actionId,
     });
@@ -1698,7 +1685,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         id,
         parentContext: traceContext,
     });
-    return (await this.messenger.call('ApprovalController:addRequest', {
+    return (await this.messagingSystem.call('ApprovalController:addRequest', {
         id,
         origin: origin || controller_utils_1.ORIGIN_METAMASK,
         type,
@@ -1769,7 +1756,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ]);
         (0, logger_1.projectLogger)('Added incoming transactions to state', finalTransactions.length, finalTransactions);
     });
-    this.messenger.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
+    this.messagingSystem.publish(`${controllerName}:incomingTransactionsReceived`, finalTransactions);
 }, _TransactionController_generateDappSuggestedGasFees = function _TransactionController_generateDappSuggestedGasFees(txParams, origin) {
     if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
         return undefined;
@@ -1851,7 +1838,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         ...transactionMeta,
         status: types_1.TransactionStatus.dropped,
     };
-    this.messenger.publish(`${controllerName}:transactionDropped`, {
+    this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
         transactionMeta: updatedTransactionMeta,
     });
     this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
@@ -1887,7 +1874,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const { authorizationList, from } = txParams;
     const signedAuthorizationList = await (0, eip7702_1.signAuthorizationList)({
         authorizationList,
-        messenger: this.messenger,
+        messenger: this.messagingSystem,
         transactionMeta,
     });
     if (signedAuthorizationList) {
@@ -1935,7 +1922,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     this.updateTransaction(transactionMetaWithRawTx, 'TransactionController#approveTransaction - RawTransaction added');
     return rawTx;
 }, _TransactionController_onTransactionStatusChange = function _TransactionController_onTransactionStatusChange(transactionMeta) {
-    this.messenger.publish(`${controllerName}:transactionStatusUpdated`, {
+    this.messagingSystem.publish(`${controllerName}:transactionStatusUpdated`, {
         transactionMeta,
     });
 }, _TransactionController_getNonceTrackerTransactions = function _TransactionController_getNonceTrackerTransactions(statuses, address, chainId) {
@@ -1943,7 +1930,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.messenger.publish(`${controllerName}:transactionConfirmed`, transactionMeta);
+    this.messagingSystem.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) => {
@@ -1962,7 +1949,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             getTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).bind(this),
             updateTransaction: this.updateTransaction.bind(this),
         });
-        this.messenger.publish(`${controllerName}:postTransactionBalanceUpdated`, {
+        this.messagingSystem.publish(`${controllerName}:postTransactionBalanceUpdated`, {
             transactionMeta: updatedTransactionMeta,
             approvalTransactionMeta,
         });
@@ -1993,7 +1980,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
             chainId,
         }),
-        messenger: this.messenger,
+        messenger: this.messagingSystem,
         publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
             skipSubmitHistory: true,
         }),
@@ -2082,48 +2069,6 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         });
     }
     return transactionMeta;
-}, _TransactionController_updateFirstTimeInteraction = async function _TransactionController_updateFirstTimeInteraction(transactionMeta, { traceContext, } = {}) {
-    if (!__classPrivateFieldGet(this, _TransactionController_isFirstTimeInteractionEnabled, "f").call(this)) {
-        return;
-    }
-    const { chainId, id: transactionId, txParams: { to, from }, } = transactionMeta;
-    const request = {
-        chainId: (0, utils_1.hexToNumber)(chainId),
-        to: to,
-        from,
-    };
-    (0, validation_1.validateParamTo)(to);
-    const existingTransaction = this.state.transactions.find((tx) => tx.chainId === chainId &&
-        tx.txParams.from === from &&
-        tx.txParams.to === to &&
-        tx.id !== transactionId);
-    // Check if there is an existing transaction with the same from, to, and chainId
-    // else we continue to check the account address relationship from API
-    if (existingTransaction) {
-        return;
-    }
-    try {
-        const { count } = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Account Address Relationship', parentContext: traceContext }, () => (0, accounts_api_1.getAccountAddressRelationship)(request));
-        const isFirstTimeInteraction = count === undefined ? undefined : count === 0;
-        const finalTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
-        /* istanbul ignore if */
-        if (!finalTransactionMeta) {
-            (0, logger_1.projectLogger)('Cannot update first time interaction as transaction not found', transactionId);
-            return;
-        }
-        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
-            transactionId,
-            note: 'TransactionController#updateFirstInteraction - Update first time interaction',
-        }, (txMeta) => {
-            txMeta.isFirstTimeInteraction = isFirstTimeInteraction;
-        });
-        (0, logger_1.projectLogger)('Updated first time interaction', transactionId, {
-            isFirstTimeInteraction,
-        });
-    }
-    catch (error) {
-        (0, logger_1.projectLogger)('Error fetching account address relationship, skipping first time interaction update', error);
-    }
 }, _TransactionController_updateSimulationData = async function _TransactionController_updateSimulationData(transactionMeta, { blockTime, traceContext, } = {}) {
     const { chainId, id: transactionId, nestedTransactions, networkClientId, simulationData: prevSimulationData, txParams, } = transactionMeta;
     let simulationData = {
@@ -2160,7 +2105,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             chainId,
             getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
             isEIP7702GasFeeTokensEnabled: __classPrivateFieldGet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, "f"),
-            messenger: this.messenger,
+            messenger: this.messagingSystem,
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
             transactionMeta,
         });
@@ -2212,9 +2157,9 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         state.transactionBatches[index] = updated ?? batch;
     });
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
-    return this.messenger.call('AccountsController:getSelectedAccount');
+    return this.messagingSystem.call('AccountsController:getSelectedAccount');
 }, _TransactionController_getInternalAccounts = function _TransactionController_getInternalAccounts() {
-    const state = this.messenger.call('AccountsController:getState');
+    const state = this.messagingSystem.call('AccountsController:getState');
     return Object.values(state.internalAccounts?.accounts ?? {})
         .filter((account) => account.type === 'eip155:eoa')
         .map((account) => account.address);
@@ -2254,16 +2199,18 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         isCustomNetwork,
         isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
-        messenger: this.messenger,
+        messenger: this.messagingSystem,
         txMeta: transactionMeta,
     });
 }, _TransactionController_registerActionHandlers = function _TransactionController_registerActionHandlers() {
-    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.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));
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {
     this.update((state) => {
         const transactions = state.transactions.filter(({ id }) => id !== transactionId);
@@ -2303,13 +2250,13 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             error: (0, utils_2.normalizeTxError)(error),
         };
     }
-    this.messenger.publish(`${controllerName}:transactionFailed`, {
+    this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
         actionId,
         error: error.message,
         transactionMeta: newTransactionMeta,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, newTransactionMeta);
-    this.messenger.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+    this.messagingSystem.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);