@metamask/transaction-controller 52.0.0 → 52.2.0

package/CHANGELOG.md

@@ -7,6 +7,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [52.2.0]
+
+### Added
+
+- Add `gasFeeTokens` to `TransactionMeta` ([#5524](https://github.com/MetaMask/core/pull/5524))
+  - Add `GasFeeToken` type.
+  - Add `selectedGasFeeToken` to `TransactionMeta`.
+  - Add `updateSelectedGasFeeToken` method.
+- Support security validation of transaction batches ([#5526](https://github.com/MetaMask/core/pull/5526))
+  - Add `ValidateSecurityRequest` type.
+  - Add optional `securityAlertId` to `SecurityAlertResponse`.
+  - Add optional `securityAlertId` to `TransactionBatchRequest`.
+  - Add optional `validateSecurity` callback to `TransactionBatchRequest`.
+- Support publish batch hook ([#5401](https://github.com/MetaMask/core/pull/5401))
+  - Add `hooks.publishBatch` option to constructor.
+  - Add `updateBatchTransactions` method.
+  - Add `maxFeePerGas` and `maxPriorityFeePerGas` to `updateEditableParams` options.
+  - Add types.
+    - `PublishBatchHook`
+    - `PublishBatchHookRequest`
+    - `PublishBatchHookResult`
+    - `PublishBatchHookTransaction`
+    - `PublishHook`
+    - `PublishHookResult`
+  - Add optional properties to `TransactionMeta`.
+    - `batchTransactions`
+    - `disableGasBuffer`
+  - Add optional properties to `BatchTransactionParams`.
+    - `gas`
+    - `maxFeePerGas`
+    - `maxPriorityFeePerGas`
+  - Add optional `existingTransaction` property to `TransactionBatchSingleRequest`.
+  - Add optional `useHook` property to `TransactionBatchRequest`.
+
+## [52.1.0]
+
+### Added
+
+- Add `enableTxParamsGasFeeUpdates` constructor option ([5394](https://github.com/MetaMask/core/pull/5394))
+  - If not set it will default to `false`.
+  - Automatically update gas fee properties in `txParams` when the `gasFeeEstimates` are updated via polling.
+
+### Fixed
+
+- Fix gas estimation for type 4 transactions ([#5519](https://github.com/MetaMask/core/pull/5519))
+
 ## [52.0.0]
 
 ### Changed
@@ -29,7 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Add additional metadata for batch metrics ([#5488](https://github.com/MetaMask/core/pull/5488))
-  - Add `delegationAddress` to `TransactionMetadata`.
+  - Add `delegationAddress` to `TransactionMeta`.
   - Add `NestedTransactionMetadata` type containing `BatchTransactionParams` and `type`.
   - Add optional `type` to `TransactionBatchSingleRequest`.
 - Verify EIP-7702 contract address using signatures ([#5472](https://github.com/MetaMask/core/pull/5472))
@@ -40,8 +86,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **BREAKING:** Bump `@metamask/accounts-controller` peer dependency to `^26.1.0` ([#5481](https://github.com/MetaMask/core/pull/5481))
 - **BREAKING:** Add additional metadata for batch metrics ([#5488](https://github.com/MetaMask/core/pull/5488))
-  - Change `error` in `TransactionMetadata` to optional for all statuses.
-  - Change `nestedTransactions` in `TransactionMetadata` to array of `NestedTransactionMetadata`.
+  - Change `error` in `TransactionMeta` to optional for all statuses.
+  - Change `nestedTransactions` in `TransactionMeta` to array of `NestedTransactionMetadata`.
 - Throw if `addTransactionBatch` called with external origin and size limit exceeded ([#5489](https://github.com/MetaMask/core/pull/5489))
 - Verify EIP-7702 contract address using signatures ([#5472](https://github.com/MetaMask/core/pull/5472))
   - Use new `contracts` property from feature flags instead of `contractAddresses`.
@@ -1397,7 +1443,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
     All changes listed after this point were applied to this package following the monorepo conversion.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@52.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@52.2.0...HEAD
+[52.2.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@52.1.0...@metamask/transaction-controller@52.2.0
+[52.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@52.0.0...@metamask/transaction-controller@52.1.0
 [52.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@51.0.0...@metamask/transaction-controller@52.0.0
 [51.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@50.0.0...@metamask/transaction-controller@51.0.0
 [50.0.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@49.0.0...@metamask/transaction-controller@50.0.0

package/dist/TransactionController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_methodDataHelper, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_rejectTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateFirstTimeInteraction, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow;
+var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_methodDataHelper, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_publishBatchHook, _TransactionController_publicKeyEIP7702, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_rejectTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateFirstTimeInteraction, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionController = exports.ApprovalState = exports.SPEED_UP_RATE = exports.CANCEL_RATE = void 0;
 const base_controller_1 = require("@metamask/base-controller");
@@ -23,7 +23,6 @@ const network_controller_1 = require("@metamask/network-controller");
 const nonce_tracker_1 = require("@metamask/nonce-tracker");
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const utils_1 = require("@metamask/utils");
-const async_mutex_1 = require("async-mutex");
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 const events_1 = require("events");
@@ -42,6 +41,7 @@ const MethodDataHelper_1 = require("./helpers/MethodDataHelper.cjs");
 const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper.cjs");
 const PendingTransactionTracker_1 = require("./helpers/PendingTransactionTracker.cjs");
 const ResimulateHelper_1 = require("./helpers/ResimulateHelper.cjs");
+const ExtraTransactionsPublishHook_1 = require("./hooks/ExtraTransactionsPublishHook.cjs");
 const logger_1 = require("./logger.cjs");
 const types_1 = require("./types.cjs");
 const batch_1 = require("./utils/batch.cjs");
@@ -156,7 +156,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options - The controller options.
      */
     constructor(options) {
-        const { disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, } = options;
+        const { disableHistory, disableSendFlowHistory, disableSwaps, enableTxParamsGasFeeUpdates, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isFirstTimeInteractionEnabled, isSimulationEnabled, messenger, pendingTransactions = {}, publicKeyEIP7702, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, } = options;
         super({
             name: controllerName,
             metadata,
@@ -170,10 +170,10 @@ class TransactionController extends base_controller_1.BaseController {
         _TransactionController_internalEvents.set(this, new events_1.EventEmitter());
         this.approvingTransactionIds = new Set();
         _TransactionController_methodDataHelper.set(this, void 0);
-        this.mutex = new async_mutex_1.Mutex();
         _TransactionController_incomingTransactionHelper.set(this, void 0);
         _TransactionController_incomingTransactionOptions.set(this, void 0);
         _TransactionController_pendingTransactionOptions.set(this, void 0);
+        _TransactionController_publishBatchHook.set(this, void 0);
         _TransactionController_publicKeyEIP7702.set(this, void 0);
         this.signAbortCallbacks = new Map();
         _TransactionController_trace.set(this, void 0);
@@ -186,6 +186,7 @@ class TransactionController extends base_controller_1.BaseController {
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
         this.messagingSystem = messenger;
+        this.isTxParamsGasFeeUpdatesEnabled = enableTxParamsGasFeeUpdates ?? false;
         this.getNetworkState = getNetworkState;
         this.isSendFlowHistoryDisabled = disableSendFlowHistory ?? false;
         this.isHistoryDisabled = disableHistory ?? false;
@@ -205,6 +206,7 @@ class TransactionController extends base_controller_1.BaseController {
         this.securityProviderRequest = securityProviderRequest;
         __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
         __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_publishBatchHook, hooks?.publishBatch, "f");
         __classPrivateFieldSet(this, _TransactionController_publicKeyEIP7702, publicKeyEIP7702, "f");
         __classPrivateFieldSet(this, _TransactionController_transactionHistoryLimit, transactionHistoryLimit, "f");
         this.sign = sign;
@@ -319,9 +321,12 @@ class TransactionController extends base_controller_1.BaseController {
             getChainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).bind(this),
             getEthQuery: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId }),
             getInternalAccounts: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getInternalAccounts).bind(this),
+            getTransaction: (transactionId) => this.getTransactionOrThrow(transactionId),
             messenger: this.messagingSystem,
+            publishBatchHook: __classPrivateFieldGet(this, _TransactionController_publishBatchHook, "f"),
             publicKeyEIP7702: __classPrivateFieldGet(this, _TransactionController_publicKeyEIP7702, "f"),
             request,
+            updateTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).bind(this),
         });
     }
     /**
@@ -348,9 +353,11 @@ class TransactionController extends base_controller_1.BaseController {
      * @param options.actionId - Unique ID to prevent duplicate requests.
      * @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.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.
@@ -364,7 +371,7 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, batchId, deviceConfirmedOn, method, nestedTransactions, networkClientId, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
+        const { actionId, batchId, deviceConfirmedOn, disableGasBuffer, method, nestedTransactions, networkClientId, origin, publishHook, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
@@ -393,7 +400,7 @@ class TransactionController extends base_controller_1.BaseController {
         (0, validation_1.validateTxParams)(txParams, isEIP1559Compatible);
         const isDuplicateBatchId = batchId?.length &&
             this.state.transactions.some((tx) => tx.batchId?.toLowerCase() === batchId?.toLowerCase());
-        if (isDuplicateBatchId) {
+        if (isDuplicateBatchId && origin && origin !== controller_utils_1.ORIGIN_METAMASK) {
             throw rpc_errors_1.rpcErrors.invalidInput('Batch ID already exists');
         }
         const dappSuggestedGasFees = this.generateDappSuggestedGasFees(txParams, origin);
@@ -411,6 +418,7 @@ class TransactionController extends base_controller_1.BaseController {
                 dappSuggestedGasFees,
                 delegationAddress,
                 deviceConfirmedOn,
+                disableGasBuffer,
                 id: (0, uuid_1.v1)(),
                 isFirstTimeInteraction: undefined,
                 nestedTransactions,
@@ -468,9 +476,10 @@ class TransactionController extends base_controller_1.BaseController {
         }
         return {
             result: this.processApproval(addedTransactionMeta, {
+                actionId,
                 isExisting: Boolean(existingTransactionMeta),
+                publishHook,
                 requireApproval,
-                actionId,
                 traceContext,
             }),
             transactionMeta: addedTransactionMeta,
@@ -549,7 +558,12 @@ class TransactionController extends base_controller_1.BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { estimatedGas, simulationFails } = await (0, gas_1.estimateGas)(transaction, ethQuery);
+        const { estimatedGas, simulationFails } = await (0, gas_1.estimateGas)({
+            chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
+            ethQuery,
+            isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
+            txParams: transaction,
+        });
         return { gas: estimatedGas, simulationFails };
     }
     /**
@@ -564,7 +578,12 @@ class TransactionController extends base_controller_1.BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { blockGasLimit, estimatedGas, simulationFails } = await (0, gas_1.estimateGas)(transaction, ethQuery);
+        const { blockGasLimit, estimatedGas, simulationFails } = await (0, gas_1.estimateGas)({
+            chainId: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId),
+            ethQuery,
+            isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
+            txParams: transaction,
+        });
         const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
         return {
             gas,
@@ -783,14 +802,16 @@ class TransactionController extends base_controller_1.BaseController {
      * @param txId - The ID of the transaction to update.
      * @param params - The editable parameters to update.
      * @param params.data - Data to pass with the transaction.
+     * @param params.from - Address to send the transaction from.
      * @param params.gas - Maximum number of units of gas to use for the transaction.
      * @param params.gasPrice - Price per gas for legacy transactions.
-     * @param params.from - Address to send the transaction from.
+     * @param params.maxFeePerGas - Maximum amount per gas to pay for the transaction, including the priority fee.
+     * @param params.maxPriorityFeePerGas - Maximum amount per gas to give to validator as incentive.
      * @param params.to - Address to send the transaction to.
      * @param params.value - Value associated with the transaction.
      * @returns The updated transaction metadata.
      */
-    async updateEditableParams(txId, { data, gas, gasPrice, from, to, value, }) {
+    async updateEditableParams(txId, { data, from, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, to, value, }) {
         const transactionMeta = this.getTransaction(txId);
         if (!transactionMeta) {
             throw new Error(`Cannot update editable params as no transaction metadata found`);
@@ -804,6 +825,8 @@ class TransactionController extends base_controller_1.BaseController {
                 value,
                 gas,
                 gasPrice,
+                maxFeePerGas,
+                maxPriorityFeePerGas,
             },
         };
         editableParams.txParams = (0, lodash_1.pickBy)(editableParams.txParams);
@@ -1156,6 +1179,38 @@ class TransactionController extends base_controller_1.BaseController {
         });
         return updatedTransactionMeta.txParams.data;
     }
+    /**
+     * Update the batch transactions associated with a transaction.
+     * These transactions will be submitted with the main transaction as a batch.
+     *
+     * @param request - The request object.
+     * @param request.transactionId - The ID of the transaction to update.
+     * @param request.batchTransactions - The new batch transactions.
+     */
+    updateBatchTransactions({ transactionId, batchTransactions, }) {
+        (0, logger_1.projectLogger)('Updating batch transactions', { transactionId, batchTransactions });
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
+            transactionId,
+            note: 'TransactionController#updateBatchTransactions - Batch transactions updated',
+        }, (transactionMeta) => {
+            transactionMeta.batchTransactions = batchTransactions;
+        });
+    }
+    /**
+     * Update the selected gas fee token for a transaction.
+     *
+     * @param transactionId - The ID of the transaction to update.
+     * @param contractAddress - The contract address of the selected gas fee token.
+     */
+    updateSelectedGasFeeToken(transactionId, contractAddress) {
+        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId }, (transactionMeta) => {
+            const hasMatchingGasFeeToken = transactionMeta.gasFeeTokens?.some((token) => token.tokenAddress.toLowerCase() === contractAddress?.toLowerCase());
+            if (contractAddress && !hasMatchingGasFeeToken) {
+                throw new Error(`No matching gas fee token found with address - ${contractAddress}`);
+            }
+            transactionMeta.selectedGasFeeToken = contractAddress;
+        });
+    }
     addMetadata(transactionMeta) {
         (0, validation_1.validateTxParams)(transactionMeta.txParams);
         this.update((state) => {
@@ -1198,7 +1253,7 @@ class TransactionController extends base_controller_1.BaseController {
             this.failTransaction(transactionMeta, new Error('Transaction incomplete at startup'));
         }
     }
-    async processApproval(transactionMeta, { isExisting = false, requireApproval, shouldShowRequest = true, actionId, traceContext, }) {
+    async processApproval(transactionMeta, { actionId, isExisting = false, publishHook, requireApproval, shouldShowRequest = true, traceContext, }) {
         const transactionId = transactionMeta.id;
         let resultCallbacks;
         const { meta, isCompleted } = this.isTransactionCompleted(transactionId);
@@ -1225,7 +1280,7 @@ class TransactionController extends base_controller_1.BaseController {
                 }
                 const { isCompleted: isTxCompleted } = this.isTransactionCompleted(transactionId);
                 if (!isTxCompleted) {
-                    const approvalResult = await this.approveTransaction(transactionId, traceContext);
+                    const approvalResult = await this.approveTransaction(transactionId, traceContext, publishHook);
                     if (approvalResult === ApprovalState.SkippedViaBeforePublishHook &&
                         resultCallbacks) {
                         resultCallbacks.success();
@@ -1273,12 +1328,14 @@ class TransactionController extends base_controller_1.BaseController {
      *
      * @param transactionId - The ID of the transaction to approve.
      * @param traceContext - The parent context for any new traces.
+     * @param publishHookOverride - Custom logic to publish the transaction.
      * @returns The state of the approval.
      */
-    async approveTransaction(transactionId, traceContext) {
-        const cleanupTasks = new Array();
-        cleanupTasks.push(await this.mutex.acquire());
+    async approveTransaction(transactionId, traceContext, publishHookOverride) {
+        let clearApprovingTransactionId;
+        let clearNonceLock;
         let transactionMeta = this.getTransactionOrThrow(transactionId);
+        (0, logger_1.projectLogger)('Approving transaction', transactionMeta);
         try {
             if (!this.sign) {
                 this.failTransaction(transactionMeta, new Error('No sign method defined.'));
@@ -1293,10 +1350,9 @@ class TransactionController extends base_controller_1.BaseController {
                 return ApprovalState.NotApproved;
             }
             this.approvingTransactionIds.add(transactionId);
-            cleanupTasks.push(() => this.approvingTransactionIds.delete(transactionId));
+            clearApprovingTransactionId = () => this.approvingTransactionIds.delete(transactionId);
             const [nonce, releaseNonce] = await (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
-            // must set transaction to submitted/failed before releasing lock
-            releaseNonce && cleanupTasks.push(releaseNonce);
+            clearNonceLock = releaseNonce;
             transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
                 transactionId,
                 note: 'TransactionController#approveTransaction - Transaction approved',
@@ -1333,8 +1389,19 @@ class TransactionController extends base_controller_1.BaseController {
             }
             (0, logger_1.projectLogger)('Publishing transaction', transactionMeta.txParams);
             let hash;
+            clearNonceLock?.();
+            clearNonceLock = undefined;
+            if (transactionMeta.batchTransactions?.length) {
+                (0, logger_1.projectLogger)('Found batch transactions', transactionMeta.batchTransactions);
+                const extraTransactionsPublishHook = new ExtraTransactionsPublishHook_1.ExtraTransactionsPublishHook({
+                    addTransactionBatch: this.addTransactionBatch.bind(this),
+                    transactions: transactionMeta.batchTransactions,
+                });
+                publishHookOverride = extraTransactionsPublishHook.getHook();
+            }
             await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
-                ({ transactionHash: hash } = await this.publish(transactionMeta, rawTx));
+                const publishHook = publishHookOverride ?? this.publish;
+                ({ transactionHash: hash } = await publishHook(transactionMeta, rawTx));
                 if (hash === undefined) {
                     hash = await this.publishTransaction(ethQuery, {
                         ...transactionMeta,
@@ -1370,7 +1437,8 @@ class TransactionController extends base_controller_1.BaseController {
             return ApprovalState.NotApproved;
         }
         finally {
-            cleanupTasks.forEach((task) => task());
+            clearApprovingTransactionId?.();
+            clearNonceLock?.();
         }
     }
     async publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
@@ -1697,8 +1765,8 @@ class TransactionController extends base_controller_1.BaseController {
             transactionMeta,
         });
     }
-    getNonceTrackerTransactions(status, address, chainId) {
-        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(chainId, address, status, this.state.transactions);
+    getNonceTrackerTransactions(statuses, address, chainId) {
+        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(chainId, address, statuses, this.state.transactions);
     }
     onConfirmedTransaction(transactionMeta) {
         (0, logger_1.projectLogger)('Processing confirmed transaction', transactionMeta.id);
@@ -1759,7 +1827,7 @@ class TransactionController extends base_controller_1.BaseController {
     }
 }
 exports.TransactionController = TransactionController;
-_TransactionController_internalEvents = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
+_TransactionController_internalEvents = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
     // If transaction is found for same action id, do not create a new transaction.
     if (this.getTransactionWithActionId(actionId)) {
         return;
@@ -1867,7 +1935,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         // TODO: Fix types
         blockTracker,
         getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
-        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed, chainId),
+        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, [types_1.TransactionStatus.confirmed], chainId),
     });
 }, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, networkClientId, }) {
     const ethQuery = new eth_query_1.default(provider);
@@ -1906,7 +1974,11 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
     pendingTransactionTracker.hub.on('transaction-failed', this.failTransaction.bind(this));
     pendingTransactionTracker.hub.on('transaction-updated', this.updateTransaction.bind(this));
 }, _TransactionController_getNonceTrackerPendingTransactions = function _TransactionController_getNonceTrackerPendingTransactions(chainId, address) {
-    const standardPendingTransactions = this.getNonceTrackerTransactions(types_1.TransactionStatus.submitted, address, chainId);
+    const standardPendingTransactions = this.getNonceTrackerTransactions([
+        types_1.TransactionStatus.approved,
+        types_1.TransactionStatus.signed,
+        types_1.TransactionStatus.submitted,
+    ], address, chainId);
     const externalPendingTransactions = this.getExternalPendingTransactions(address, chainId);
     return [...standardPendingTransactions, ...externalPendingTransactions];
 }, _TransactionController_getGasFeeFlows = function _TransactionController_getGasFeeFlows() {
@@ -2001,8 +2073,9 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         },
         tokenBalanceChanges: [],
     };
+    let gasFeeTokens = [];
     if (__classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this)) {
-        simulationData = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Simulate', parentContext: traceContext }, () => (0, simulation_1.getSimulationData)({
+        const result = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Simulate', parentContext: traceContext }, () => (0, simulation_1.getSimulationData)({
             chainId,
             from: from,
             to: to,
@@ -2011,6 +2084,8 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         }, {
             blockTime,
         }));
+        gasFeeTokens = result?.gasFeeTokens;
+        simulationData = result?.simulationData;
         if (blockTime &&
             prevSimulationData &&
             (0, ResimulateHelper_1.hasSimulationDataChanged)(prevSimulationData, simulationData)) {
@@ -2031,20 +2106,21 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         note: 'TransactionController#updateSimulationData - Update simulation data',
         skipResimulateCheck: Boolean(blockTime),
     }, (txMeta) => {
+        txMeta.gasFeeTokens = gasFeeTokens;
         txMeta.simulationData = simulationData;
     });
     (0, logger_1.projectLogger)('Updated simulation data', transactionId, simulationData);
 }, _TransactionController_onGasFeePollerTransactionUpdate = function _TransactionController_onGasFeePollerTransactionUpdate({ transactionId, gasFeeEstimates, gasFeeEstimatesLoaded, layer1GasFee, }) {
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, { transactionId, skipHistory: true }, (txMeta) => {
-        if (gasFeeEstimates) {
-            txMeta.gasFeeEstimates = gasFeeEstimates;
-        }
-        if (gasFeeEstimatesLoaded !== undefined) {
-            txMeta.gasFeeEstimatesLoaded = gasFeeEstimatesLoaded;
-        }
-        if (layer1GasFee) {
-            txMeta.layer1GasFee = layer1GasFee;
-        }
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        (0, GasFeePoller_1.updateTransactionGasFees)({
+            txMeta,
+            gasFeeEstimates,
+            gasFeeEstimatesLoaded,
+            getEIP1559Compatibility: this.getEIP1559Compatibility.bind(this),
+            isTxParamsGasFeeUpdatesEnabled: this.isTxParamsGasFeeUpdatesEnabled,
+            layer1GasFee,
+        });
     });
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
@@ -2087,6 +2163,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         chainId,
         ethQuery,
         isCustomNetwork,
+        isSimulationEnabled: __classPrivateFieldGet(this, _TransactionController_isSimulationEnabled, "f").call(this),
         txMeta: transactionMeta,
     });
 }, _TransactionController_deleteTransaction = function _TransactionController_deleteTransaction(transactionId) {