@metamask-previews/transaction-controller 24.0.0-preview.6dad403 → 24.0.0-preview.d78968a2

package/dist/TransactionController.js

@@ -22,9 +22,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TransactionController_instances, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_multichainTrackingHelper, _TransactionController_createNonceTracker, _TransactionController_createIncomingTransactionHelper, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_removeIncomingTransactionHelperListeners, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_updateTransactionInternal;
+var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_transactionHistoryLimit, _TransactionController_multichainTrackingHelper, _TransactionController_createNonceTracker, _TransactionController_createIncomingTransactionHelper, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_removeIncomingTransactionHelperListeners, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_updateTransactionInternal;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionController = exports.SPEED_UP_RATE = exports.CANCEL_RATE = exports.HARDFORK = void 0;
+exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = exports.HARDFORK = void 0;
 const common_1 = require("@ethereumjs/common");
 const tx_1 = require("@ethereumjs/tx");
 const util_1 = require("@ethereumjs/util");
@@ -58,6 +58,24 @@ const swaps_1 = require("./utils/swaps");
 const transaction_type_1 = require("./utils/transaction-type");
 const utils_2 = require("./utils/utils");
 const validation_1 = require("./utils/validation");
+/**
+ * Metadata for the TransactionController state, describing how to "anonymize"
+ * the state and which parts should be persisted.
+ */
+const metadata = {
+    transactions: {
+        persist: true,
+        anonymous: false,
+    },
+    methodData: {
+        persist: true,
+        anonymous: false,
+    },
+    lastFetchedBlockNumbers: {
+        persist: true,
+        anonymous: false,
+    },
+};
 exports.HARDFORK = common_1.Hardfork.London;
 /**
  * Multiplier used to determine a transaction's increased gas fee during cancellation
@@ -71,42 +89,82 @@ exports.SPEED_UP_RATE = 1.1;
  * The name of the {@link TransactionController}.
  */
 const controllerName = 'TransactionController';
+/**
+ * Possible states of the approve transaction step.
+ */
+var ApprovalState;
+(function (ApprovalState) {
+    ApprovalState["Approved"] = "approved";
+    ApprovalState["NotApproved"] = "not-approved";
+    ApprovalState["SkippedViaBeforePublishHook"] = "skipped-via-before-publish-hook";
+})(ApprovalState = exports.ApprovalState || (exports.ApprovalState = {}));
+/**
+ * Get the default TransactionsController state.
+ *
+ * @returns The default TransactionsController state.
+ */
+function getDefaultTransactionControllerState() {
+    return {
+        methodData: {},
+        transactions: [],
+        lastFetchedBlockNumbers: {},
+    };
+}
 /**
  * Controller responsible for submitting and managing transactions.
  */
-class TransactionController extends base_controller_1.BaseControllerV1 {
-    constructor({ blockTracker, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkState, getPermittedAccounts, getSavedGasFees, getSelectedAddress, incomingTransactions = {}, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, getNetworkClientRegistry, isMultichainEnabled = false, hooks, }, config, state) {
+class TransactionController extends base_controller_1.BaseController {
+    /**
+     * Constructs a TransactionController.
+     *
+     * @param options - The controller options.
+     * @param options.blockTracker - The block tracker used to poll for new blocks data.
+     * @param options.disableHistory - Whether to disable storing history in transaction metadata.
+     * @param options.disableSendFlowHistory - Explicitly disable transaction metadata history.
+     * @param options.disableSwaps - Whether to disable additional processing on swaps transactions.
+     * @param options.getCurrentAccountEIP1559Compatibility - Whether or not the account supports EIP-1559.
+     * @param options.getCurrentNetworkEIP1559Compatibility - Whether or not the network supports EIP-1559.
+     * @param options.getExternalPendingTransactions - Callback to retrieve pending transactions from external sources.
+     * @param options.getGasFeeEstimates - Callback to retrieve gas fee estimates.
+     * @param options.getNetworkClientRegistry - Gets the network client registry.
+     * @param options.getNetworkState - Gets the state of the network controller.
+     * @param options.getPermittedAccounts - Get accounts that a given origin has permissions for.
+     * @param options.getSavedGasFees - Gets the saved gas fee config.
+     * @param options.getSelectedAddress - Gets the address of the currently selected account.
+     * @param options.incomingTransactions - Configuration options for incoming transaction support.
+     * @param options.isMultichainEnabled - Enable multichain support.
+     * @param options.messenger - The controller messenger.
+     * @param options.onNetworkStateChange - Allows subscribing to network controller state changes.
+     * @param options.pendingTransactions - Configuration options for pending transaction support.
+     * @param options.provider - The provider used to create the underlying EthQuery instance.
+     * @param options.securityProviderRequest - A function for verifying a transaction, whether it is malicious or not.
+     * @param options.sign - Function used to sign transactions.
+     * @param options.state - Initial state to set on this controller.
+     * @param options.transactionHistoryLimit - Transaction history limit.
+     * @param options.hooks - The controller hooks.
+     */
+    constructor({ blockTracker, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, getSelectedAddress, incomingTransactions = {}, isMultichainEnabled = false, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, sign, state, transactionHistoryLimit = 40, hooks, }) {
         var _a, _b, _c, _d, _e, _f;
-        super(config, state);
+        super({
+            name: controllerName,
+            metadata,
+            messenger,
+            state: Object.assign(Object.assign({}, getDefaultTransactionControllerState()), state),
+        });
         _TransactionController_instances.add(this);
+        _TransactionController_internalEvents.set(this, new events_1.EventEmitter());
         this.inProcessOfSigning = new Set();
         this.mutex = new async_mutex_1.Mutex();
         _TransactionController_incomingTransactionOptions.set(this, void 0);
         _TransactionController_pendingTransactionOptions.set(this, void 0);
         this.signAbortCallbacks = new Map();
+        _TransactionController_transactionHistoryLimit.set(this, void 0);
         _TransactionController_multichainTrackingHelper.set(this, void 0);
-        /**
-         * EventEmitter instance used to listen to specific transactional events
-         */
-        this.hub = new events_1.EventEmitter();
-        /**
-         * Name of this controller used during composition
-         */
-        this.name = 'TransactionController';
         _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
             // PendingTransactionTracker reads state through its getTransactions hook
             this.pendingTransactionTracker.startIfPendingTransactions();
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
-        this.defaultConfig = {
-            txHistoryLimit: 40,
-        };
-        this.defaultState = {
-            methodData: {},
-            transactions: [],
-            lastFetchedBlockNumbers: {},
-        };
-        this.initialize();
         this.messagingSystem = messenger;
         this.getNetworkState = getNetworkState;
         this.isSendFlowHistoryDisabled = disableSendFlowHistory !== null && disableSendFlowHistory !== void 0 ? disableSendFlowHistory : false;
@@ -128,6 +186,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.securityProviderRequest = securityProviderRequest;
         __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
         __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
+        this.sign = sign;
         this.afterSign = (_a = hooks === null || hooks === void 0 ? void 0 : hooks.afterSign) !== null && _a !== void 0 ? _a : (() => true);
         this.beforeApproveOnInit = (_b = hooks === null || hooks === void 0 ? void 0 : hooks.beforeApproveOnInit) !== null && _b !== void 0 ? _b : (() => true);
         this.beforeCheckPendingTransaction =
@@ -187,13 +247,13 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             getGasFeeControllerEstimates: this.getGasFeeEstimates,
             getTransactions: () => this.state.transactions,
             onStateChange: (listener) => {
-                this.subscribe(listener);
+                this.messagingSystem.subscribe('TransactionController:stateChange', listener);
             },
         });
         gasFeePoller.hub.on('transaction-updated', (transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, transactionMeta, { skipHistory: true }));
         // when transactionsController state changes
         // check for pending transactions and start polling if there are any
-        this.subscribe(__classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        this.messagingSystem.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
         // TODO once v2 is merged make sure this only runs when
         // selectedNetworkClientId changes
         onNetworkStateChange(() => {
@@ -204,19 +264,29 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.onBootCleanup();
     }
     failTransaction(transactionMeta, error, actionId) {
-        const newTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { error: (0, utils_2.normalizeTxError)(error), status: types_1.TransactionStatus.failed });
-        this.hub.emit('transaction-failed', {
+        const newTransactionMeta = (0, lodash_1.merge)({}, transactionMeta, {
+            error: (0, utils_2.normalizeTxError)(error),
+            status: types_1.TransactionStatus.failed,
+        });
+        this.messagingSystem.publish(`${controllerName}:transactionFailed`, {
             actionId,
             error: error.message,
             transactionMeta: newTransactionMeta,
         });
         this.updateTransaction(newTransactionMeta, 'TransactionController#failTransaction - Add error message and set status to failed');
         this.onTransactionStatusChange(newTransactionMeta);
-        this.hub.emit(`${transactionMeta.id}:finished`, newTransactionMeta);
+        this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
+        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
     }
     registryLookup(fourBytePrefix) {
         return __awaiter(this, void 0, void 0, function* () {
             const registryMethod = yield this.registry.lookup(fourBytePrefix);
+            if (!registryMethod) {
+                return {
+                    registryMethod: '',
+                    parsedRegistryMethod: { name: undefined, args: undefined },
+                };
+            }
             const parsedRegistryMethod = this.registry.parse(registryMethod);
             return { registryMethod, parsedRegistryMethod };
         });
@@ -243,8 +313,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     return methodData[fourBytePrefix];
                 }
                 const registry = yield this.registryLookup(fourBytePrefix);
-                this.update({
-                    methodData: Object.assign(Object.assign({}, methodData), { [fourBytePrefix]: registry }),
+                this.update((state) => {
+                    state.methodData[fourBytePrefix] = registry;
                 });
                 return registry;
             }
@@ -296,55 +366,56 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             const transactionType = type !== null && type !== void 0 ? type : (yield (0, transaction_type_1.determineTransactionType)(txParams, ethQuery)).type;
             const existingTransactionMeta = this.getTransactionWithActionId(actionId);
             // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
-            const transactionMeta = existingTransactionMeta || {
-                // Add actionId to txMeta to check if same actionId is seen again
-                actionId,
-                chainId,
-                dappSuggestedGasFees,
-                deviceConfirmedOn,
-                id: (0, uuid_1.v1)(),
-                origin,
-                securityAlertResponse,
-                status: types_1.TransactionStatus.unapproved,
-                time: Date.now(),
-                txParams,
-                userEditedGasLimit: false,
-                verifiedOnBlockchain: false,
-                type: transactionType,
-                networkClientId,
-            };
-            yield this.updateGasProperties(transactionMeta);
+            let addedTransactionMeta = existingTransactionMeta
+                ? (0, lodash_1.cloneDeep)(existingTransactionMeta)
+                : {
+                    // Add actionId to txMeta to check if same actionId is seen again
+                    actionId,
+                    chainId,
+                    dappSuggestedGasFees,
+                    deviceConfirmedOn,
+                    id: (0, uuid_1.v1)(),
+                    origin,
+                    securityAlertResponse,
+                    status: types_1.TransactionStatus.unapproved,
+                    time: Date.now(),
+                    txParams,
+                    userEditedGasLimit: false,
+                    verifiedOnBlockchain: false,
+                    type: transactionType,
+                    networkClientId,
+                };
+            yield this.updateGasProperties(addedTransactionMeta);
             // Checks if a transaction already exists with a given actionId
             if (!existingTransactionMeta) {
                 // Set security provider response
                 if (method && this.securityProviderRequest) {
-                    const securityProviderResponse = yield this.securityProviderRequest(transactionMeta, method);
-                    transactionMeta.securityProviderResponse = securityProviderResponse;
+                    const securityProviderResponse = yield this.securityProviderRequest(addedTransactionMeta, method);
+                    addedTransactionMeta.securityProviderResponse =
+                        securityProviderResponse;
                 }
                 if (!this.isSendFlowHistoryDisabled) {
-                    transactionMeta.sendFlowHistory = sendFlowHistory !== null && sendFlowHistory !== void 0 ? sendFlowHistory : [];
+                    addedTransactionMeta.sendFlowHistory = sendFlowHistory !== null && sendFlowHistory !== void 0 ? sendFlowHistory : [];
                 }
                 // Initial history push
                 if (!this.isHistoryDisabled) {
-                    (0, history_1.addInitialHistorySnapshot)(transactionMeta);
+                    addedTransactionMeta = (0, history_1.addInitialHistorySnapshot)(addedTransactionMeta);
                 }
-                yield (0, swaps_1.updateSwapsTransaction)(transactionMeta, transactionType, swaps, {
+                addedTransactionMeta = (0, swaps_1.updateSwapsTransaction)(addedTransactionMeta, transactionType, swaps, {
                     isSwapsDisabled: this.isSwapsDisabled,
                     cancelTransaction: this.cancelTransaction.bind(this),
-                    // TODO: Replace `any` with type
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    controllerHubEmitter: this.hub.emit.bind(this.hub),
+                    messenger: this.messagingSystem,
                 });
-                this.addMetadata(transactionMeta);
-                this.hub.emit(`unapprovedTransaction`, transactionMeta);
+                this.addMetadata(addedTransactionMeta);
+                this.messagingSystem.publish(`${controllerName}:unapprovedTransactionAdded`, addedTransactionMeta);
             }
             return {
-                result: this.processApproval(transactionMeta, {
+                result: this.processApproval(addedTransactionMeta, {
                     isExisting: Boolean(existingTransactionMeta),
                     requireApproval,
                     actionId,
                 }),
-                transactionMeta,
+                transactionMeta: addedTransactionMeta,
             };
         });
     }
@@ -476,15 +547,16 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             };
             this.addMetadata(cancelTransactionMeta);
             // stopTransaction has no approval request, so we assume the user has already approved the transaction
-            this.hub.emit('transaction-approved', {
+            this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
                 transactionMeta: cancelTransactionMeta,
                 actionId,
             });
-            this.hub.emit('transaction-submitted', {
+            this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
                 transactionMeta: cancelTransactionMeta,
                 actionId,
             });
-            this.hub.emit(`${cancelTransactionMeta.id}:finished`, cancelTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:transactionFinished`, cancelTransactionMeta);
+            __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, cancelTransactionMeta);
         });
     }
     /**
@@ -542,33 +614,33 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 ? Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas, maxFeePerGas: newMaxFeePerGas, maxPriorityFeePerGas: newMaxPriorityFeePerGas, type: types_1.TransactionEnvelopeType.feeMarket }) : Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas, gasPrice: newGasPrice });
             const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, txParams);
             const signedTx = yield this.sign(unsignedEthTx, transactionMeta.txParams.from);
-            yield this.updateTransactionMetaRSV(transactionMeta, signedTx);
+            const transactionMetaWithRsv = yield this.updateTransactionMetaRSV(transactionMeta, signedTx);
             const rawTx = (0, util_1.bufferToHex)(signedTx.serialize());
             const newFee = (_c = txParams.maxFeePerGas) !== null && _c !== void 0 ? _c : txParams.gasPrice;
             const oldFee = txParams.maxFeePerGas
-                ? transactionMeta.txParams.maxFeePerGas
-                : transactionMeta.txParams.gasPrice;
+                ? transactionMetaWithRsv.txParams.maxFeePerGas
+                : transactionMetaWithRsv.txParams.gasPrice;
             (0, logger_1.projectLogger)('Submitting speed up transaction', { oldFee, newFee, txParams });
             const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
                 networkClientId: transactionMeta.networkClientId,
                 chainId: transactionMeta.chainId,
             });
             const hash = yield this.publishTransactionForRetry(ethQuery, rawTx, transactionMeta);
-            const baseTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { estimatedBaseFee, id: (0, uuid_1.v1)(), time: Date.now(), hash,
+            const baseTransactionMeta = Object.assign(Object.assign({}, transactionMetaWithRsv), { estimatedBaseFee, id: (0, uuid_1.v1)(), time: Date.now(), hash,
                 actionId, originalGasEstimate: transactionMeta.txParams.gas, type: types_1.TransactionType.retry, originalType: transactionMeta.type });
             const newTransactionMeta = newMaxFeePerGas && newMaxPriorityFeePerGas
                 ? Object.assign(Object.assign({}, baseTransactionMeta), { txParams: Object.assign(Object.assign({}, transactionMeta.txParams), { maxFeePerGas: newMaxFeePerGas, maxPriorityFeePerGas: newMaxPriorityFeePerGas }) }) : Object.assign(Object.assign({}, baseTransactionMeta), { txParams: Object.assign(Object.assign({}, transactionMeta.txParams), { gasPrice: newGasPrice }) });
             this.addMetadata(newTransactionMeta);
             // speedUpTransaction has no approval request, so we assume the user has already approved the transaction
-            this.hub.emit('transaction-approved', {
+            this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
                 transactionMeta: newTransactionMeta,
                 actionId,
             });
-            this.hub.emit('transaction-submitted', {
+            this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
                 transactionMeta: newTransactionMeta,
                 actionId,
             });
-            this.hub.emit(`${transactionMeta.id}:speedup`, newTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:speedupTransactionAdded`, newTransactionMeta);
         });
     }
     /**
@@ -633,8 +705,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         if (!transactionMeta) {
             throw new Error(`Cannot update security alert response as no transaction metadata found`);
         }
-        const updatedMeta = (0, lodash_1.merge)(transactionMeta, { securityAlertResponse });
-        this.updateTransaction(updatedMeta, 'TransactionController:updatesecurityAlertResponse - securityAlertResponse updated');
+        const updatedTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { securityAlertResponse });
+        this.updateTransaction(updatedTransactionMeta, `${controllerName}:updatesecurityAlertResponse - securityAlertResponse updated`);
     }
     /**
      * Removes all transactions from state, optionally based on the current network.
@@ -647,7 +719,9 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     wipeTransactions(ignoreNetwork, address) {
         /* istanbul ignore next */
         if (ignoreNetwork && !address) {
-            this.update({ transactions: [] });
+            this.update((state) => {
+                state.transactions = [];
+            });
             return;
         }
         const currentChainId = this.getChainId();
@@ -660,8 +734,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             const isMatchingAddress = !address || ((_a = txParams.from) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === address.toLowerCase();
             return !isMatchingAddress;
         });
-        this.update({
-            transactions: this.trimTransactionsForState(newTransactions),
+        this.update((state) => {
+            state.transactions = this.trimTransactionsForState(newTransactions);
         });
     }
     /**
@@ -674,26 +748,23 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     confirmExternalTransaction(transactionMeta, transactionReceipt, baseFeePerGas) {
         return __awaiter(this, void 0, void 0, function* () {
             // Run validation and add external transaction to state.
-            this.addExternalTransaction(transactionMeta);
+            const newTransactionMeta = this.addExternalTransaction(transactionMeta);
             try {
-                const transactionId = transactionMeta.id;
+                const transactionId = newTransactionMeta.id;
                 // Make sure status is confirmed and define gasUsed as in receipt.
-                transactionMeta.status = types_1.TransactionStatus.confirmed;
-                transactionMeta.txReceipt = transactionReceipt;
+                const updatedTransactionMeta = Object.assign(Object.assign({}, newTransactionMeta), { status: types_1.TransactionStatus.confirmed, txReceipt: transactionReceipt });
                 if (baseFeePerGas) {
-                    transactionMeta.baseFeePerGas = baseFeePerGas;
+                    updatedTransactionMeta.baseFeePerGas = baseFeePerGas;
                 }
                 // Update same nonce local transactions as dropped and define replacedBy properties.
                 this.markNonceDuplicatesDropped(transactionId);
                 // Update external provided transaction with updated gas values and confirmed status.
-                this.updateTransaction(transactionMeta, 'TransactionController:confirmExternalTransaction - Add external transaction');
-                this.onTransactionStatusChange(transactionMeta);
+                this.updateTransaction(updatedTransactionMeta, `${controllerName}:confirmExternalTransaction - Add external transaction`);
+                this.onTransactionStatusChange(updatedTransactionMeta);
                 // Intentional given potential duration of process.
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                this.updatePostBalance(transactionMeta);
-                this.hub.emit('transaction-confirmed', {
-                    transactionMeta,
-                });
+                this.updatePostBalance(updatedTransactionMeta);
+                this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, updatedTransactionMeta);
             }
             catch (error) {
                 console.error('Failed to confirm external transaction', error);
@@ -709,7 +780,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * @returns The updated transactionMeta.
      */
     updateTransactionSendFlowHistory(transactionID, currentSendFlowHistoryLength, sendFlowHistoryToAdd) {
-        var _a, _b;
+        var _a;
         if (this.isSendFlowHistoryDisabled) {
             throw new Error('Send flow history is disabled for the current transaction controller');
         }
@@ -718,13 +789,10 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             throw new Error(`Cannot update send flow history as no transaction metadata found`);
         }
         (0, utils_2.validateIfTransactionUnapproved)(transactionMeta, 'updateTransactionSendFlowHistory');
-        if (currentSendFlowHistoryLength ===
-            (((_a = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.sendFlowHistory) === null || _a === void 0 ? void 0 : _a.length) || 0)) {
-            transactionMeta.sendFlowHistory = [
-                ...((_b = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.sendFlowHistory) !== null && _b !== void 0 ? _b : []),
-                ...sendFlowHistoryToAdd,
-            ];
-            this.updateTransaction(transactionMeta, 'TransactionController:updateTransactionSendFlowHistory - sendFlowHistory updated');
+        const sendFlowHistory = (_a = transactionMeta.sendFlowHistory) !== null && _a !== void 0 ? _a : [];
+        if (currentSendFlowHistoryLength === sendFlowHistory.length) {
+            const updatedTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { sendFlowHistory: [...sendFlowHistory, ...sendFlowHistoryToAdd] });
+            this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateTransactionSendFlowHistory - sendFlowHistory updated`);
         }
         return this.getTransaction(transactionID);
     }
@@ -773,8 +841,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         transactionGasFees.txParams = (0, lodash_1.pickBy)(transactionGasFees.txParams);
         transactionGasFees = (0, lodash_1.pickBy)(transactionGasFees);
         // merge updated gas values with existing transaction meta
-        const updatedMeta = (0, lodash_1.merge)(transactionMeta, transactionGasFees);
-        this.updateTransaction(updatedMeta, 'TransactionController:updateTransactionGasFees - gas values updated');
+        const updatedMeta = (0, lodash_1.merge)({}, transactionMeta, transactionGasFees);
+        this.updateTransaction(updatedMeta, `${controllerName}:updateTransactionGasFees - gas values updated`);
         return this.getTransaction(transactionId);
     }
     /**
@@ -805,8 +873,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         // only update what is defined
         transactionPreviousGas.previousGas = (0, lodash_1.pickBy)(transactionPreviousGas.previousGas);
         // merge updated previous gas values with existing transaction meta
-        const updatedMeta = (0, lodash_1.merge)(transactionMeta, transactionPreviousGas);
-        this.updateTransaction(updatedMeta, 'TransactionController:updatePreviousGasParams - Previous gas values updated');
+        const updatedMeta = (0, lodash_1.merge)({}, transactionMeta, transactionPreviousGas);
+        this.updateTransaction(updatedMeta, `${controllerName}:updatePreviousGasParams - Previous gas values updated`);
         return this.getTransaction(transactionId);
     }
     getNonceLock(address, networkClientId) {
@@ -845,7 +913,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 },
             };
             editableParams.txParams = (0, lodash_1.pickBy)(editableParams.txParams);
-            const updatedTransaction = (0, lodash_1.merge)(transactionMeta, editableParams);
+            const updatedTransaction = (0, lodash_1.merge)({}, transactionMeta, editableParams);
             const { type } = yield (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
                 networkClientId: transactionMeta.networkClientId,
                 chainId: transactionMeta.chainId,
@@ -950,16 +1018,16 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             ].includes(status)) {
             throw new Error(`Cannot update custodial transaction with status: ${status}`);
         }
-        const updatedTransactionMeta = (0, lodash_1.merge)(transactionMeta, (0, lodash_1.pickBy)({ hash, status }));
+        const updatedTransactionMeta = (0, lodash_1.merge)({}, transactionMeta, (0, lodash_1.pickBy)({ hash, status }));
         if (status === types_1.TransactionStatus.submitted) {
             updatedTransactionMeta.submittedTime = new Date().getTime();
         }
         if (status === types_1.TransactionStatus.failed) {
             updatedTransactionMeta.error = (0, utils_2.normalizeTxError)(new Error(errorMessage));
         }
-        this.updateTransaction(updatedTransactionMeta, `TransactionController:updateCustodialTransaction - Custodial transaction updated`);
+        this.updateTransaction(updatedTransactionMeta, `${controllerName}:updateCustodialTransaction - Custodial transaction updated`);
         if ([types_1.TransactionStatus.submitted, types_1.TransactionStatus.failed].includes(status)) {
-            this.hub.emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
+            this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
         }
     }
     /**
@@ -1090,7 +1158,9 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     clearUnapprovedTransactions() {
         const transactions = this.state.transactions.filter(({ status }) => status !== types_1.TransactionStatus.unapproved);
-        this.update({ transactions: this.trimTransactionsForState(transactions) });
+        this.update((state) => {
+            state.transactions = this.trimTransactionsForState(transactions);
+        });
     }
     /**
      * Stop the signing process for a specific transaction.
@@ -1110,9 +1180,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.signAbortCallbacks.delete(transactionId);
     }
     addMetadata(transactionMeta) {
-        const { transactions } = this.state;
-        transactions.push(transactionMeta);
-        this.update({ transactions: this.trimTransactionsForState(transactions) });
+        this.update((state) => {
+            state.transactions = this.trimTransactionsForState([
+                ...state.transactions,
+                transactionMeta,
+            ]);
+        });
     }
     updateGasProperties(transactionMeta) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1176,13 +1249,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                             shouldShowRequest,
                         });
                         resultCallbacks = acceptResult.resultCallbacks;
-                        if (resultCallbacks) {
-                            this.hub.once(`${transactionId}:publish-skip`, () => {
-                                resultCallbacks === null || resultCallbacks === void 0 ? void 0 : resultCallbacks.success();
-                                // Remove the reference to prevent additional reports once submitted.
-                                resultCallbacks = undefined;
-                            });
-                        }
                         const approvalValue = acceptResult.value;
                         const updatedTransaction = approvalValue === null || approvalValue === void 0 ? void 0 : approvalValue.txMeta;
                         if (updatedTransaction) {
@@ -1195,9 +1261,13 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     }
                     const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
                     if (!isTxCompleted) {
-                        yield this.approveTransaction(transactionId);
+                        const approvalResult = yield this.approveTransaction(transactionId);
+                        if (approvalResult === ApprovalState.SkippedViaBeforePublishHook &&
+                            resultCallbacks) {
+                            resultCallbacks.success();
+                        }
                         const updatedTransactionMeta = this.getTransaction(transactionId);
-                        this.hub.emit('transaction-approved', {
+                        this.messagingSystem.publish(`${controllerName}:transactionApproved`, {
                             transactionMeta: updatedTransactionMeta,
                             actionId,
                         });
@@ -1247,42 +1317,42 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             const releaseLock = yield this.mutex.acquire();
             const index = transactions.findIndex(({ id }) => transactionId === id);
             const transactionMeta = transactions[index];
+            const updatedTransactionMeta = (0, lodash_1.cloneDeep)(transactionMeta);
             const { txParams: { from }, networkClientId, } = transactionMeta;
             let releaseNonceLock;
             try {
                 if (!this.sign) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No sign method defined.'));
-                    return;
+                    return ApprovalState.NotApproved;
                 }
                 else if (!transactionMeta.chainId) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No chainId defined.'));
-                    return;
+                    return ApprovalState.NotApproved;
                 }
                 if (this.inProcessOfSigning.has(transactionId)) {
                     (0, logger_1.projectLogger)('Skipping approval as signing in progress', transactionId);
-                    return;
+                    return ApprovalState.NotApproved;
                 }
                 const [nonce, releaseNonce] = yield (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, networkClientId));
                 releaseNonceLock = releaseNonce;
-                transactionMeta.status = types_1.TransactionStatus.approved;
-                transactionMeta.txParams.nonce = nonce;
-                transactionMeta.txParams.chainId = transactionMeta.chainId;
-                const baseTxParams = Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas });
-                this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - Transaction approved');
-                this.onTransactionStatusChange(transactionMeta);
-                const isEIP1559 = (0, utils_2.isEIP1559Transaction)(transactionMeta.txParams);
+                updatedTransactionMeta.status = types_1.TransactionStatus.approved;
+                updatedTransactionMeta.txParams = Object.assign(Object.assign({}, updatedTransactionMeta.txParams), { nonce, chainId: transactionMeta.chainId });
+                const baseTxParams = Object.assign(Object.assign({}, updatedTransactionMeta.txParams), { gasLimit: updatedTransactionMeta.txParams.gas });
+                this.updateTransaction(updatedTransactionMeta, 'TransactionController#approveTransaction - Transaction approved');
+                this.onTransactionStatusChange(updatedTransactionMeta);
+                const isEIP1559 = (0, utils_2.isEIP1559Transaction)(updatedTransactionMeta.txParams);
                 const txParams = isEIP1559
-                    ? Object.assign(Object.assign({}, baseTxParams), { estimatedBaseFee: transactionMeta.txParams.estimatedBaseFee, type: types_1.TransactionEnvelopeType.feeMarket }) : baseTxParams;
-                const rawTx = yield this.signTransaction(transactionMeta, txParams);
-                if (!this.beforePublish(transactionMeta)) {
+                    ? Object.assign(Object.assign({}, baseTxParams), { estimatedBaseFee: updatedTransactionMeta.txParams.estimatedBaseFee, type: types_1.TransactionEnvelopeType.feeMarket }) : baseTxParams;
+                const rawTx = yield this.signTransaction(updatedTransactionMeta, txParams);
+                if (!this.beforePublish(updatedTransactionMeta)) {
                     (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
-                    this.hub.emit(`${transactionMeta.id}:publish-skip`, transactionMeta);
-                    return;
+                    this.messagingSystem.publish(`${controllerName}:transactionPublishingSkipped`, updatedTransactionMeta);
+                    return ApprovalState.SkippedViaBeforePublishHook;
                 }
                 if (!rawTx) {
-                    return;
+                    return ApprovalState.NotApproved;
                 }
                 const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
                     networkClientId: transactionMeta.networkClientId,
@@ -1291,8 +1361,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 if (transactionMeta.type === types_1.TransactionType.swap) {
                     (0, logger_1.projectLogger)('Determining pre-transaction balance');
                     const preTxBalance = yield (0, controller_utils_1.query)(ethQuery, 'getBalance', [from]);
-                    transactionMeta.preTxBalance = preTxBalance;
-                    (0, logger_1.projectLogger)('Updated pre-transaction balance', transactionMeta.preTxBalance);
+                    updatedTransactionMeta.preTxBalance = preTxBalance;
+                    (0, logger_1.projectLogger)('Updated pre-transaction balance', updatedTransactionMeta.preTxBalance);
                 }
                 (0, logger_1.projectLogger)('Publishing transaction', txParams);
                 let { transactionHash: hash } = yield this.publish(transactionMeta, rawTx);
@@ -1300,20 +1370,23 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     hash = yield this.publishTransaction(ethQuery, rawTx);
                 }
                 (0, logger_1.projectLogger)('Publish successful', hash);
-                transactionMeta.hash = hash;
-                transactionMeta.status = types_1.TransactionStatus.submitted;
-                transactionMeta.submittedTime = new Date().getTime();
-                this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - Transaction submitted');
-                this.hub.emit('transaction-submitted', {
-                    transactionMeta,
+                updatedTransactionMeta.hash = hash;
+                updatedTransactionMeta.status = types_1.TransactionStatus.submitted;
+                updatedTransactionMeta.submittedTime = new Date().getTime();
+                this.updateTransaction(updatedTransactionMeta, 'TransactionController#approveTransaction - Transaction submitted');
+                this.messagingSystem.publish(`${controllerName}:transactionSubmitted`, {
+                    transactionMeta: updatedTransactionMeta,
                 });
-                this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
-                this.onTransactionStatusChange(transactionMeta);
+                this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+                __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${updatedTransactionMeta.id}:finished`, updatedTransactionMeta);
+                this.onTransactionStatusChange(updatedTransactionMeta);
+                return ApprovalState.Approved;
                 // TODO: Replace `any` with type
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
             }
             catch (error) {
                 this.failTransaction(transactionMeta, error);
+                return ApprovalState.NotApproved;
             }
             finally {
                 this.inProcessOfSigning.delete(transactionId);
@@ -1340,15 +1413,18 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         if (!transactionMeta) {
             return;
         }
-        transactionMeta.status = types_1.TransactionStatus.rejected;
-        const transactions = this.state.transactions.filter(({ id }) => id !== transactionId);
-        this.update({ transactions: this.trimTransactionsForState(transactions) });
-        this.hub.emit(`${transactionMeta.id}:finished`, transactionMeta);
-        this.hub.emit('transaction-rejected', {
-            transactionMeta,
+        this.update((state) => {
+            const transactions = state.transactions.filter(({ id }) => id !== transactionId);
+            state.transactions = this.trimTransactionsForState(transactions);
+        });
+        const updatedTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { status: types_1.TransactionStatus.rejected });
+        this.messagingSystem.publish(`${controllerName}:transactionFinished`, updatedTransactionMeta);
+        __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, updatedTransactionMeta);
+        this.messagingSystem.publish(`${controllerName}:transactionRejected`, {
+            transactionMeta: updatedTransactionMeta,
             actionId,
         });
-        this.onTransactionStatusChange(transactionMeta);
+        this.onTransactionStatusChange(updatedTransactionMeta);
     }
     /**
      * Trim the amount of transactions that are set on the state. Checks
@@ -1357,25 +1433,25 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * Pending or unapproved transactions will not be removed by this
      * operation. For safety of presenting a fully functional transaction UI
      * representation, this function will not break apart transactions with the
-     * same nonce, created on the same day, per network. Not accounting for transactions of the same
-     * nonce, same day and network combo can result in confusing or broken experiences
-     * in the UI. The transactions are then updated using the BaseControllerV1 update.
+     * same nonce, created on the same day, per network. Not accounting for
+     * transactions of the same nonce, same day and network combo can result in
+     * confusing or broken experiences in the UI.
      *
      * @param transactions - The transactions to be applied to the state.
      * @returns The trimmed list of transactions.
      */
     trimTransactionsForState(transactions) {
         const nonceNetworkSet = new Set();
-        const txsToKeep = transactions
+        const txsToKeep = [...transactions]
             .sort((a, b) => (a.time > b.time ? -1 : 1)) // Descending time order
             .filter((tx) => {
             const { chainId, status, txParams, time } = tx;
             if (txParams) {
-                const key = `${txParams.nonce}-${(0, controller_utils_1.convertHexToDecimal)(chainId)}-${new Date(time).toDateString()}`;
+                const key = `${String(txParams.nonce)}-${(0, controller_utils_1.convertHexToDecimal)(chainId)}-${new Date(time).toDateString()}`;
                 if (nonceNetworkSet.has(key)) {
                     return true;
                 }
-                else if (nonceNetworkSet.size < this.config.txHistoryLimit ||
+                else if (nonceNetworkSet.size < __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f") ||
                     !this.isFinalState(status)) {
                     nonceNetworkSet.add(key);
                     return true;
@@ -1472,21 +1548,23 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         return common_1.Common.custom(customChainParams);
     }
     onIncomingTransactions({ added, updated, }) {
-        const { transactions: currentTransactions } = this.state;
-        const updatedTransactions = [
-            ...added,
-            ...currentTransactions.map((originalTransaction) => {
-                const updatedTransaction = updated.find(({ hash }) => hash === originalTransaction.hash);
-                return updatedTransaction !== null && updatedTransaction !== void 0 ? updatedTransaction : originalTransaction;
-            }),
-        ];
-        this.update({
-            transactions: this.trimTransactionsForState(updatedTransactions),
+        this.update((state) => {
+            const { transactions: currentTransactions } = state;
+            const updatedTransactions = [
+                ...added,
+                ...currentTransactions.map((originalTransaction) => {
+                    const updatedTransaction = updated.find(({ hash }) => hash === originalTransaction.hash);
+                    return updatedTransaction !== null && updatedTransaction !== void 0 ? updatedTransaction : originalTransaction;
+                }),
+            ];
+            state.transactions = this.trimTransactionsForState(updatedTransactions);
         });
     }
     onUpdatedLastFetchedBlockNumbers({ lastFetchedBlockNumbers, blockNumber, }) {
-        this.update({ lastFetchedBlockNumbers });
-        this.hub.emit('incomingTransactionBlock', blockNumber);
+        this.update((state) => {
+            state.lastFetchedBlockNumbers = lastFetchedBlockNumbers;
+        });
+        this.messagingSystem.publish(`${controllerName}:incomingTransactionBlockReceived`, blockNumber);
     }
     generateDappSuggestedGasFees(txParams, origin) {
         if (!origin || origin === controller_utils_1.ORIGIN_METAMASK) {
@@ -1517,6 +1595,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * Validates and adds external provided transaction to state.
      *
      * @param transactionMeta - Nominated external transaction to be added to state.
+     * @returns The new transaction.
      */
     addExternalTransaction(transactionMeta) {
         var _a, _b;
@@ -1529,15 +1608,16 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         const pendingTxs = sameFromAndNetworkTransactions.filter((transaction) => transaction.status === types_1.TransactionStatus.submitted);
         (0, external_transactions_1.validateConfirmedExternalTransaction)(transactionMeta, confirmedTxs, pendingTxs);
         // Make sure provided external transaction has non empty history array
-        if (!((_b = transactionMeta.history) !== null && _b !== void 0 ? _b : []).length) {
-            if (!this.isHistoryDisabled) {
-                (0, history_1.addInitialHistorySnapshot)(transactionMeta);
-            }
-        }
-        const updatedTransactions = [...transactions, transactionMeta];
-        this.update({
-            transactions: this.trimTransactionsForState(updatedTransactions),
+        const newTransactionMeta = ((_b = transactionMeta.history) !== null && _b !== void 0 ? _b : []).length === 0 && !this.isHistoryDisabled
+            ? (0, history_1.addInitialHistorySnapshot)(transactionMeta)
+            : transactionMeta;
+        this.update((state) => {
+            state.transactions = this.trimTransactionsForState([
+                ...state.transactions,
+                newTransactionMeta,
+            ]);
         });
+        return newTransactionMeta;
     }
     /**
      * Sets other txMeta statuses to dropped if the txMeta that has been confirmed has other transactions
@@ -1554,20 +1634,26 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         const nonce = (_a = transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.nonce;
         const from = (_b = transactionMeta.txParams) === null || _b === void 0 ? void 0 : _b.from;
         const { chainId } = transactionMeta;
-        const sameNonceTxs = this.state.transactions.filter((transaction) => transaction.id !== transactionId &&
+        const sameNonceTransactions = this.state.transactions.filter((transaction) => transaction.id !== transactionId &&
             transaction.txParams.from === from &&
             transaction.txParams.nonce === nonce &&
             transaction.chainId === chainId &&
             transaction.type !== types_1.TransactionType.incoming);
-        if (!sameNonceTxs.length) {
+        const sameNonceTransactionIds = sameNonceTransactions.map((transaction) => transaction.id);
+        if (sameNonceTransactions.length === 0) {
             return;
         }
-        // Mark all same nonce transactions as dropped and give it a replacedBy hash
-        for (const transaction of sameNonceTxs) {
-            transaction.replacedBy = transactionMeta.hash;
-            transaction.replacedById = transactionMeta.id;
-            // Drop any transaction that wasn't previously failed (off chain failure)
-            if (transaction.status !== types_1.TransactionStatus.failed) {
+        this.update((state) => {
+            for (const transaction of state.transactions) {
+                if (sameNonceTransactionIds.includes(transaction.id)) {
+                    transaction.replacedBy = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.hash;
+                    transaction.replacedById = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.id;
+                }
+            }
+        });
+        for (const transaction of this.state.transactions) {
+            if (sameNonceTransactionIds.includes(transaction.id) &&
+                transaction.status !== types_1.TransactionStatus.failed) {
                 this.setTransactionStatusDropped(transaction);
             }
         }
@@ -1578,12 +1664,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * @param transactionMeta - TransactionMeta of transaction to be marked as dropped.
      */
     setTransactionStatusDropped(transactionMeta) {
-        transactionMeta.status = types_1.TransactionStatus.dropped;
-        this.hub.emit('transaction-dropped', {
-            transactionMeta,
+        const updatedTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { status: types_1.TransactionStatus.dropped });
+        this.messagingSystem.publish(`${controllerName}:transactionDropped`, {
+            transactionMeta: updatedTransactionMeta,
         });
-        this.updateTransaction(transactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
-        this.onTransactionStatusChange(transactionMeta);
+        this.updateTransaction(updatedTransactionMeta, 'TransactionController#setTransactionStatusDropped - Transaction dropped');
+        this.onTransactionStatusChange(updatedTransactionMeta);
     }
     /**
      * Get transaction with provided actionId.
@@ -1597,7 +1683,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     waitForTransactionFinished(transactionId) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
-                this.hub.once(`${transactionId}:finished`, (txMeta) => {
+                __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").once(`${transactionId}:finished`, (txMeta) => {
                     resolve(txMeta);
                 });
             });
@@ -1612,13 +1698,15 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     updateTransactionMetaRSV(transactionMeta, signedTx) {
         return __awaiter(this, void 0, void 0, function* () {
+            const transactionMetaWithRsv = (0, lodash_1.cloneDeep)(transactionMeta);
             for (const key of ['r', 's', 'v']) {
                 const value = signedTx[key];
                 if (value === undefined || value === null) {
                     continue;
                 }
-                transactionMeta[key] = (0, utils_1.add0x)(value.toString(16));
+                transactionMetaWithRsv[key] = (0, utils_1.add0x)(value.toString(16));
             }
+            return transactionMetaWithRsv;
         });
     }
     getEIP1559Compatibility(networkClientId) {
@@ -1648,18 +1736,21 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 (0, logger_1.projectLogger)('Skipping signed status based on hook');
                 return undefined;
             }
-            yield this.updateTransactionMetaRSV(transactionMeta, signedTx);
-            transactionMeta.status = types_1.TransactionStatus.signed;
-            this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - Transaction signed');
-            this.onTransactionStatusChange(transactionMeta);
+            const transactionMetaWithRsv = Object.assign(Object.assign({}, (yield this.updateTransactionMetaRSV(transactionMeta, signedTx))), { status: types_1.TransactionStatus.signed });
+            this.updateTransaction(transactionMetaWithRsv, 'TransactionController#approveTransaction - Transaction signed');
+            this.onTransactionStatusChange(transactionMetaWithRsv);
             const rawTx = (0, util_1.bufferToHex)(signedTx.serialize());
-            transactionMeta.rawTx = rawTx;
-            this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - RawTransaction added');
+            const transactionMetaWithRawTx = (0, lodash_1.merge)({}, transactionMetaWithRsv, {
+                rawTx,
+            });
+            this.updateTransaction(transactionMetaWithRawTx, 'TransactionController#approveTransaction - RawTransaction added');
             return rawTx;
         });
     }
     onTransactionStatusChange(transactionMeta) {
-        this.hub.emit('transaction-status-update', { transactionMeta });
+        this.messagingSystem.publish(`${controllerName}:transactionStatusUpdated`, {
+            transactionMeta,
+        });
     }
     getNonceTrackerTransactions(status, address, chainId = this.getChainId()) {
         return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(chainId, address, status, this.state.transactions);
@@ -1667,8 +1758,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     onConfirmedTransaction(transactionMeta) {
         (0, logger_1.projectLogger)('Processing confirmed transaction', transactionMeta.id);
         this.markNonceDuplicatesDropped(transactionMeta.id);
-        this.hub.emit('transaction-confirmed', { transactionMeta });
-        this.hub.emit(`${transactionMeta.id}:confirmed`, transactionMeta);
+        this.messagingSystem.publish(`${controllerName}:transactionConfirmed`, transactionMeta);
         this.onTransactionStatusChange(transactionMeta);
         // Intentional given potential duration of process.
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -1689,7 +1779,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     getTransaction: this.getTransaction.bind(this),
                     updateTransaction: this.updateTransaction.bind(this),
                 });
-                this.hub.emit('post-transaction-balance-updated', {
+                this.messagingSystem.publish(`${controllerName}:postTransactionBalanceUpdated`, {
                     transactionMeta: updatedTransactionMeta,
                     approvalTransactionMeta,
                 });
@@ -1731,7 +1821,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     }
 }
 exports.TransactionController = TransactionController;
-_TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_createNonceTracker = function _TransactionController_createNonceTracker({ provider, blockTracker, chainId, }) {
+_TransactionController_internalEvents = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_createNonceTracker = function _TransactionController_createNonceTracker({ provider, blockTracker, chainId, }) {
     return new nonce_tracker_1.NonceTracker({
         // TODO: Replace `any` with type
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1749,7 +1839,7 @@ _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionC
         isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
         queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
         remoteTransactionSource: etherscanRemoteTransactionSource,
-        transactionLimit: this.config.txHistoryLimit,
+        transactionLimit: __classPrivateFieldGet(this, _TransactionController_transactionHistoryLimit, "f"),
         updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, incomingTransactionHelper);
@@ -1758,7 +1848,9 @@ _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionC
     const ethQuery = new eth_query_1.default(provider);
     const getChainId = chainId ? () => chainId : this.getChainId.bind(this);
     const pendingTransactionTracker = new PendingTransactionTracker_1.PendingTransactionTracker({
-        approveTransaction: this.approveTransaction.bind(this),
+        approveTransaction: (transactionId) => __awaiter(this, void 0, void 0, function* () {
+            yield this.approveTransaction(transactionId);
+        }),
         blockTracker,
         getChainId,
         getEthQuery: () => ethQuery,
@@ -1804,14 +1896,14 @@ _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionC
 }, _TransactionController_getGasFeeFlows = function _TransactionController_getGasFeeFlows() {
     return [new LineaGasFeeFlow_1.LineaGasFeeFlow(), new DefaultGasFeeFlow_1.DefaultGasFeeFlow()];
 }, _TransactionController_updateTransactionInternal = function _TransactionController_updateTransactionInternal(transactionMeta, { note, skipHistory }) {
-    const { transactions } = this.state;
-    transactionMeta.txParams = (0, utils_2.normalizeTransactionParams)(transactionMeta.txParams);
-    (0, validation_1.validateTxParams)(transactionMeta.txParams);
-    if (skipHistory !== true) {
-        (0, history_1.updateTransactionHistory)(transactionMeta, note !== null && note !== void 0 ? note : 'Transaction updated');
-    }
-    const index = transactions.findIndex(({ id }) => transactionMeta.id === id);
-    transactions[index] = transactionMeta;
-    this.update({ transactions: this.trimTransactionsForState(transactions) });
+    const normalizedTransaction = Object.assign(Object.assign({}, transactionMeta), { txParams: (0, utils_2.normalizeTransactionParams)(transactionMeta.txParams) });
+    (0, validation_1.validateTxParams)(normalizedTransaction.txParams);
+    const transactionWithUpdatedHistory = skipHistory === true
+        ? normalizedTransaction
+        : (0, history_1.updateTransactionHistory)(normalizedTransaction, note !== null && note !== void 0 ? note : 'Transaction updated');
+    this.update((state) => {
+        const index = state.transactions.findIndex(({ id }) => transactionMeta.id === id);
+        state.transactions[index] = transactionWithUpdatedHistory;
+    });
 };
 //# sourceMappingURL=TransactionController.js.map