@metamask/transaction-controller 52.0.0 → 52.2.0

package/dist/TransactionController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-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;
 function $importDefault(module) {
     if (module?.__esModule) {
         return module.default;
@@ -24,7 +24,6 @@ import { NetworkClientType } from "@metamask/network-controller";
 import { NonceTracker } from "@metamask/nonce-tracker";
 import { errorCodes, rpcErrors, providerErrors } from "@metamask/rpc-errors";
 import { add0x, hexToNumber } from "@metamask/utils";
-import { Mutex } from "async-mutex";
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 import { EventEmitter } from "events";
@@ -38,12 +37,13 @@ import { OptimismLayer1GasFeeFlow } from "./gas-flows/OptimismLayer1GasFeeFlow.m
 import { ScrollLayer1GasFeeFlow } from "./gas-flows/ScrollLayer1GasFeeFlow.mjs";
 import { TestGasFeeFlow } from "./gas-flows/TestGasFeeFlow.mjs";
 import { AccountsApiRemoteTransactionSource } from "./helpers/AccountsApiRemoteTransactionSource.mjs";
-import { GasFeePoller } from "./helpers/GasFeePoller.mjs";
+import { GasFeePoller, updateTransactionGasFees } from "./helpers/GasFeePoller.mjs";
 import { IncomingTransactionHelper } from "./helpers/IncomingTransactionHelper.mjs";
 import { MethodDataHelper } from "./helpers/MethodDataHelper.mjs";
 import { MultichainTrackingHelper } from "./helpers/MultichainTrackingHelper.mjs";
 import { PendingTransactionTracker } from "./helpers/PendingTransactionTracker.mjs";
 import { ResimulateHelper, hasSimulationDataChanged, shouldResimulate } from "./helpers/ResimulateHelper.mjs";
+import { ExtraTransactionsPublishHook } from "./hooks/ExtraTransactionsPublishHook.mjs";
 import { projectLogger as log } from "./logger.mjs";
 import { TransactionEnvelopeType, TransactionType, TransactionStatus, SimulationErrorCode } from "./types.mjs";
 import { addTransactionBatch, isAtomicBatchSupported } from "./utils/batch.mjs";
@@ -158,7 +158,7 @@ export class TransactionController extends 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,
@@ -172,10 +172,10 @@ export class TransactionController extends BaseController {
         _TransactionController_internalEvents.set(this, new EventEmitter());
         this.approvingTransactionIds = new Set();
         _TransactionController_methodDataHelper.set(this, void 0);
-        this.mutex = new 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);
@@ -188,6 +188,7 @@ export class TransactionController extends 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;
@@ -207,6 +208,7 @@ export class TransactionController extends 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;
@@ -321,9 +323,12 @@ export class TransactionController extends 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),
         });
     }
     /**
@@ -350,9 +355,11 @@ export class TransactionController extends 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.
@@ -366,7 +373,7 @@ export class TransactionController extends BaseController {
      */
     async addTransaction(txParams, options) {
         log('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 = normalizeTransactionParams(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
@@ -395,7 +402,7 @@ export class TransactionController extends BaseController {
         validateTxParams(txParams, isEIP1559Compatible);
         const isDuplicateBatchId = batchId?.length &&
             this.state.transactions.some((tx) => tx.batchId?.toLowerCase() === batchId?.toLowerCase());
-        if (isDuplicateBatchId) {
+        if (isDuplicateBatchId && origin && origin !== ORIGIN_METAMASK) {
             throw rpcErrors.invalidInput('Batch ID already exists');
         }
         const dappSuggestedGasFees = this.generateDappSuggestedGasFees(txParams, origin);
@@ -413,6 +420,7 @@ export class TransactionController extends BaseController {
                 dappSuggestedGasFees,
                 delegationAddress,
                 deviceConfirmedOn,
+                disableGasBuffer,
                 id: random(),
                 isFirstTimeInteraction: undefined,
                 nestedTransactions,
@@ -470,9 +478,10 @@ export class TransactionController extends BaseController {
         }
         return {
             result: this.processApproval(addedTransactionMeta, {
+                actionId,
                 isExisting: Boolean(existingTransactionMeta),
+                publishHook,
                 requireApproval,
-                actionId,
                 traceContext,
             }),
             transactionMeta: addedTransactionMeta,
@@ -551,7 +560,12 @@ export class TransactionController extends BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { estimatedGas, simulationFails } = await estimateGas(transaction, ethQuery);
+        const { estimatedGas, simulationFails } = await 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 };
     }
     /**
@@ -566,7 +580,12 @@ export class TransactionController extends BaseController {
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
             networkClientId,
         });
-        const { blockGasLimit, estimatedGas, simulationFails } = await estimateGas(transaction, ethQuery);
+        const { blockGasLimit, estimatedGas, simulationFails } = await 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 = addGasBuffer(estimatedGas, blockGasLimit, multiplier);
         return {
             gas,
@@ -785,14 +804,16 @@ export class TransactionController extends 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`);
@@ -806,6 +827,8 @@ export class TransactionController extends BaseController {
                 value,
                 gas,
                 gasPrice,
+                maxFeePerGas,
+                maxPriorityFeePerGas,
             },
         };
         editableParams.txParams = pickBy(editableParams.txParams);
@@ -1158,6 +1181,38 @@ export class TransactionController extends 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, }) {
+        log('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) {
         validateTxParams(transactionMeta.txParams);
         this.update((state) => {
@@ -1200,7 +1255,7 @@ export class TransactionController extends 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);
@@ -1227,7 +1282,7 @@ export class TransactionController extends 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();
@@ -1275,12 +1330,14 @@ export class TransactionController extends 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);
+        log('Approving transaction', transactionMeta);
         try {
             if (!this.sign) {
                 this.failTransaction(transactionMeta, new Error('No sign method defined.'));
@@ -1295,10 +1352,9 @@ export class TransactionController extends BaseController {
                 return ApprovalState.NotApproved;
             }
             this.approvingTransactionIds.add(transactionId);
-            cleanupTasks.push(() => this.approvingTransactionIds.delete(transactionId));
+            clearApprovingTransactionId = () => this.approvingTransactionIds.delete(transactionId);
             const [nonce, releaseNonce] = await 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',
@@ -1335,8 +1391,19 @@ export class TransactionController extends BaseController {
             }
             log('Publishing transaction', transactionMeta.txParams);
             let hash;
+            clearNonceLock?.();
+            clearNonceLock = undefined;
+            if (transactionMeta.batchTransactions?.length) {
+                log('Found batch transactions', transactionMeta.batchTransactions);
+                const extraTransactionsPublishHook = new 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,
@@ -1372,7 +1439,8 @@ export class TransactionController extends BaseController {
             return ApprovalState.NotApproved;
         }
         finally {
-            cleanupTasks.forEach((task) => task());
+            clearApprovingTransactionId?.();
+            clearNonceLock?.();
         }
     }
     async publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
@@ -1699,8 +1767,8 @@ export class TransactionController extends BaseController {
             transactionMeta,
         });
     }
-    getNonceTrackerTransactions(status, address, chainId) {
-        return getAndFormatTransactionsForNonceTracker(chainId, address, status, this.state.transactions);
+    getNonceTrackerTransactions(statuses, address, chainId) {
+        return getAndFormatTransactionsForNonceTracker(chainId, address, statuses, this.state.transactions);
     }
     onConfirmedTransaction(transactionMeta) {
         log('Processing confirmed transaction', transactionMeta.id);
@@ -1760,7 +1828,7 @@ export class TransactionController extends BaseController {
             error?.data?.message?.includes('nonce too low'));
     }
 }
-_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;
@@ -1868,7 +1936,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, TransactionStatus.confirmed, chainId),
+        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, [TransactionStatus.confirmed], chainId),
     });
 }, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, networkClientId, }) {
     const ethQuery = new EthQuery(provider);
@@ -1907,7 +1975,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(TransactionStatus.submitted, address, chainId);
+    const standardPendingTransactions = this.getNonceTrackerTransactions([
+        TransactionStatus.approved,
+        TransactionStatus.signed,
+        TransactionStatus.submitted,
+    ], address, chainId);
     const externalPendingTransactions = this.getExternalPendingTransactions(address, chainId);
     return [...standardPendingTransactions, ...externalPendingTransactions];
 }, _TransactionController_getGasFeeFlows = function _TransactionController_getGasFeeFlows() {
@@ -2002,8 +2074,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 }, () => getSimulationData({
+        const result = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Simulate', parentContext: traceContext }, () => getSimulationData({
             chainId,
             from: from,
             to: to,
@@ -2012,6 +2085,8 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         }, {
             blockTime,
         }));
+        gasFeeTokens = result?.gasFeeTokens;
+        simulationData = result?.simulationData;
         if (blockTime &&
             prevSimulationData &&
             hasSimulationDataChanged(prevSimulationData, simulationData)) {
@@ -2032,20 +2107,21 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_me
         note: 'TransactionController#updateSimulationData - Update simulation data',
         skipResimulateCheck: Boolean(blockTime),
     }, (txMeta) => {
+        txMeta.gasFeeTokens = gasFeeTokens;
         txMeta.simulationData = simulationData;
     });
     log('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
+        updateTransactionGasFees({
+            txMeta,
+            gasFeeEstimates,
+            gasFeeEstimatesLoaded,
+            getEIP1559Compatibility: this.getEIP1559Compatibility.bind(this),
+            isTxParamsGasFeeUpdatesEnabled: this.isTxParamsGasFeeUpdatesEnabled,
+            layer1GasFee,
+        });
     });
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
@@ -2088,6 +2164,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) {