@metamask/transaction-controller 62.5.0 → 62.7.0

package/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [62.7.0]
+
+### Added
+
+- Adding a new transaction meta property `requestId`. It is supported for both simple and batched transactions ([#7415](https://github.com/MetaMask/core/pull/7415))
+
+## [62.6.0]
+
+### Added
+
+- Add `estimateGasBatch` function and messenger action to estimate gas for batch transactions ([#7405](https://github.com/MetaMask/core/pull/7405))
+  - Add optional `gasLimit7702` property to `TransactionBatchRequest`.
+- Automatically fail pending transactions if no receipt and hash not recognised by network after multiple attempts ([#7329](https://github.com/MetaMask/core/pull/7329))
+  - Add optional `isTimeoutEnabled` callback to disable for specific transactions.
+  - Ignores transactions with future nonce.
+  - Threshold determined by feature flag.
+- Adding a new transaction meta property `requestId`. It is supported for both simple and batched transactions ([#7415](https://github.com/MetaMask/core/pull/7415))
+
+### Changed
+
+- Throw with more specific error message if publish fails ([#7418](https://github.com/MetaMask/core/pull/7418))
+
+### Fixed
+
+- Prevent `TransactionController:transactionApproved` event firing if keyring throws during signing ([#7410](https://github.com/MetaMask/core/pull/7410))
+
 ## [62.5.0]
 
 ### Changed
@@ -2009,7 +2035,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@62.5.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.7.0...HEAD
+[62.7.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.6.0...@metamask/transaction-controller@62.7.0
+[62.6.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.5.0...@metamask/transaction-controller@62.6.0
 [62.5.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.4.0...@metamask/transaction-controller@62.5.0
 [62.4.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.3.1...@metamask/transaction-controller@62.4.0
 [62.3.1]: https://github.com/MetaMask/core/compare/@metamask/transaction-controller@62.3.0...@metamask/transaction-controller@62.3.1

package/dist/TransactionController.cjs

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isHistoryDisabled, _TransactionController_isSendFlowHistoryDisabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens, _TransactionController_getGasFeeTokensAction;
+var _TransactionController_instances, _TransactionController_afterAdd, _TransactionController_afterSign, _TransactionController_afterSimulate, _TransactionController_approvingTransactionIds, _TransactionController_beforeCheckPendingTransaction, _TransactionController_beforePublish, _TransactionController_beforeSign, _TransactionController_gasFeeFlows, _TransactionController_getAdditionalSignArguments, _TransactionController_getCurrentAccountEIP1559Compatibility, _TransactionController_getCurrentNetworkEIP1559Compatibility, _TransactionController_getExternalPendingTransactions, _TransactionController_getGasFeeEstimates, _TransactionController_getNetworkState, _TransactionController_getPermittedAccounts, _TransactionController_getSavedGasFees, _TransactionController_getSimulationConfig, _TransactionController_incomingTransactionHelper, _TransactionController_incomingTransactionOptions, _TransactionController_internalEvents, _TransactionController_isAutomaticGasFeeUpdateEnabled, _TransactionController_isEIP7702GasFeeTokensEnabled, _TransactionController_isFirstTimeInteractionEnabled, _TransactionController_isHistoryDisabled, _TransactionController_isSendFlowHistoryDisabled, _TransactionController_isSimulationEnabled, _TransactionController_isSwapsDisabled, _TransactionController_isTimeoutEnabled, _TransactionController_layer1GasFeeFlows, _TransactionController_methodDataHelper, _TransactionController_multichainTrackingHelper, _TransactionController_pendingTransactionOptions, _TransactionController_publicKeyEIP7702, _TransactionController_publish, _TransactionController_publishBatchHook, _TransactionController_securityProviderRequest, _TransactionController_sign, _TransactionController_signAbortCallbacks, _TransactionController_skipSimulationTransactionIds, _TransactionController_testGasFeeFlows, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_retryTransaction, _TransactionController_signExternalTransaction, _TransactionController_addMetadata, _TransactionController_updateGasProperties, _TransactionController_onBootCleanup, _TransactionController_failIncompleteTransactions, _TransactionController_processApproval, _TransactionController_approveTransaction, _TransactionController_publishTransaction, _TransactionController_rejectTransaction, _TransactionController_trimTransactionsForState, _TransactionController_isFinalState, _TransactionController_isLocalFinalState, _TransactionController_requestApproval, _TransactionController_getTransaction, _TransactionController_getTransactionOrThrow, _TransactionController_getApprovalId, _TransactionController_isTransactionCompleted, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_onIncomingTransactions, _TransactionController_generateDappSuggestedGasFees, _TransactionController_addExternalTransaction, _TransactionController_markNonceDuplicatesDropped, _TransactionController_setTransactionStatusDropped, _TransactionController_getTransactionWithActionId, _TransactionController_waitForTransactionFinished, _TransactionController_updateTransactionMetaRSV, _TransactionController_getEIP1559Compatibility, _TransactionController_signTransaction, _TransactionController_onTransactionStatusChange, _TransactionController_getNonceTrackerTransactions, _TransactionController_onConfirmedTransaction, _TransactionController_updatePostBalance, _TransactionController_createNonceTracker, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_publishTransactionForRetry, _TransactionController_isTransactionAlreadyConfirmedError, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_onGasFeePollerTransactionBatchUpdate, _TransactionController_updateTransactionBatch, _TransactionController_getSelectedAccount, _TransactionController_getInternalAccounts, _TransactionController_updateSubmitHistory, _TransactionController_updateGasEstimate, _TransactionController_registerActionHandlers, _TransactionController_deleteTransaction, _TransactionController_isRejectError, _TransactionController_rejectTransactionAndThrow, _TransactionController_failTransaction, _TransactionController_runAfterSimulateHook, _TransactionController_defaultPublishHook, _TransactionController_getGasFeeTokens, _TransactionController_getGasFeeTokensAction;
 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");
@@ -182,6 +182,7 @@ class TransactionController extends base_controller_1.BaseController {
         _TransactionController_isSendFlowHistoryDisabled.set(this, void 0);
         _TransactionController_isSimulationEnabled.set(this, void 0);
         _TransactionController_isSwapsDisabled.set(this, void 0);
+        _TransactionController_isTimeoutEnabled.set(this, void 0);
         _TransactionController_layer1GasFeeFlows.set(this, void 0);
         _TransactionController_methodDataHelper.set(this, void 0);
         _TransactionController_multichainTrackingHelper.set(this, void 0);
@@ -202,32 +203,43 @@ class TransactionController extends base_controller_1.BaseController {
         this.messenger = messenger;
         __classPrivateFieldSet(this, _TransactionController_afterAdd, hooks?.afterAdd ?? (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_afterSign, hooks?.afterSign ?? (() => true), "f");
-        __classPrivateFieldSet(this, _TransactionController_afterSimulate, hooks?.afterSimulate ?? (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_afterSimulate, hooks?.afterSimulate ??
+            (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_beforeCheckPendingTransaction, 
         /* istanbul ignore next */
-        hooks?.beforeCheckPendingTransaction ?? (() => Promise.resolve(true)), "f");
+        hooks?.beforeCheckPendingTransaction ??
+            (() => Promise.resolve(true)), "f");
         __classPrivateFieldSet(this, _TransactionController_beforePublish, hooks?.beforePublish ?? (() => Promise.resolve(true)), "f");
-        __classPrivateFieldSet(this, _TransactionController_beforeSign, hooks?.beforeSign ?? (() => Promise.resolve({})), "f");
-        __classPrivateFieldSet(this, _TransactionController_getAdditionalSignArguments, hooks?.getAdditionalSignArguments ?? (() => []), "f");
-        __classPrivateFieldSet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, getCurrentAccountEIP1559Compatibility ?? (() => Promise.resolve(true)), "f");
+        __classPrivateFieldSet(this, _TransactionController_beforeSign, hooks?.beforeSign ??
+            (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_getAdditionalSignArguments, hooks?.getAdditionalSignArguments ??
+            (() => []), "f");
+        __classPrivateFieldSet(this, _TransactionController_getCurrentAccountEIP1559Compatibility, getCurrentAccountEIP1559Compatibility ??
+            (() => Promise.resolve(true)), "f");
         __classPrivateFieldSet(this, _TransactionController_getCurrentNetworkEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, "f");
         __classPrivateFieldSet(this, _TransactionController_getExternalPendingTransactions, getExternalPendingTransactions ?? (() => []), "f");
-        __classPrivateFieldSet(this, _TransactionController_getGasFeeEstimates, getGasFeeEstimates || (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_getGasFeeEstimates, getGasFeeEstimates ??
+            (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_getNetworkState, getNetworkState, "f");
         __classPrivateFieldSet(this, _TransactionController_getPermittedAccounts, getPermittedAccounts, "f");
         __classPrivateFieldSet(this, _TransactionController_getSavedGasFees, getSavedGasFees ?? ((_chainId) => undefined), "f");
-        __classPrivateFieldSet(this, _TransactionController_getSimulationConfig, getSimulationConfig ?? (() => Promise.resolve({})), "f");
+        __classPrivateFieldSet(this, _TransactionController_getSimulationConfig, getSimulationConfig ??
+            (() => Promise.resolve({})), "f");
         __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
-        __classPrivateFieldSet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, isAutomaticGasFeeUpdateEnabled ?? ((_txMeta) => false), "f");
-        __classPrivateFieldSet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, isEIP7702GasFeeTokensEnabled ?? (() => Promise.resolve(false)), "f");
+        __classPrivateFieldSet(this, _TransactionController_isAutomaticGasFeeUpdateEnabled, isAutomaticGasFeeUpdateEnabled ??
+            ((_txMeta) => false), "f");
+        __classPrivateFieldSet(this, _TransactionController_isEIP7702GasFeeTokensEnabled, isEIP7702GasFeeTokensEnabled ??
+            (() => Promise.resolve(false)), "f");
         __classPrivateFieldSet(this, _TransactionController_isFirstTimeInteractionEnabled, isFirstTimeInteractionEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_isHistoryDisabled, disableHistory ?? false, "f");
         __classPrivateFieldSet(this, _TransactionController_isSendFlowHistoryDisabled, disableSendFlowHistory ?? false, "f");
         __classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_isSwapsDisabled, disableSwaps ?? false, "f");
+        __classPrivateFieldSet(this, _TransactionController_isTimeoutEnabled, hooks?.isTimeoutEnabled ?? (() => true), "f");
         __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
         __classPrivateFieldSet(this, _TransactionController_publicKeyEIP7702, publicKeyEIP7702, "f");
-        __classPrivateFieldSet(this, _TransactionController_publish, hooks?.publish ?? (() => Promise.resolve({ transactionHash: undefined })), "f");
+        __classPrivateFieldSet(this, _TransactionController_publish, hooks?.publish ??
+            (() => Promise.resolve({ transactionHash: undefined })), "f");
         __classPrivateFieldSet(this, _TransactionController_publishBatchHook, hooks?.publishBatch, "f");
         __classPrivateFieldSet(this, _TransactionController_securityProviderRequest, securityProviderRequest, "f");
         __classPrivateFieldSet(this, _TransactionController_sign, sign, "f");
@@ -292,6 +304,7 @@ class TransactionController extends base_controller_1.BaseController {
         // when transactionsController state changes
         // check for pending transactions and start polling if there are any
         this.messenger.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        // eslint-disable-next-line no-new
         new ResimulateHelper_1.ResimulateHelper({
             simulateTransaction: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).bind(this),
             onTransactionsUpdate: (listener) => {
@@ -378,7 +391,8 @@ class TransactionController extends base_controller_1.BaseController {
      */
     async addTransaction(txParams, options) {
         (0, logger_1.projectLogger)('Adding transaction', txParams, options);
-        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requireApproval, securityAlertResponse, sendFlowHistory, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
+        const { actionId, assetsFiatValues, batchId, deviceConfirmedOn, disableGasBuffer, gasFeeToken, isGasFeeIncluded, isGasFeeSponsored, method, nestedTransactions, networkClientId, origin, publishHook, requestId, requireApproval, securityAlertResponse, sendFlowHistory, skipInitialGasEstimate, swaps = {}, traceContext, type, } = options;
+        // eslint-disable-next-line no-param-reassign
         txParams = (0, utils_2.normalizeTransactionParams)(txParams);
         if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
             throw new Error(`Network client not found - ${networkClientId}`);
@@ -435,6 +449,7 @@ class TransactionController extends base_controller_1.BaseController {
                 nestedTransactions,
                 networkClientId,
                 origin,
+                requestId,
                 securityAlertResponse,
                 selectedGasFeeToken: gasFeeToken,
                 status: types_1.TransactionStatus.unapproved,
@@ -452,6 +467,7 @@ class TransactionController extends base_controller_1.BaseController {
             addedTransactionMeta.txParamsOriginal = (0, lodash_1.cloneDeep)(addedTransactionMeta.txParams);
             updateTransaction(addedTransactionMeta);
         }
+        // eslint-disable-next-line no-negated-condition
         if (!skipInitialGasEstimate) {
             await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Estimate Gas Properties', parentContext: traceContext }, (context) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateGasProperties).call(this, addedTransactionMeta, {
                 traceContext: context,
@@ -483,10 +499,12 @@ class TransactionController extends base_controller_1.BaseController {
             // Set security provider response
             if (method && __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f")) {
                 const securityProviderResponse = await __classPrivateFieldGet(this, _TransactionController_securityProviderRequest, "f").call(this, addedTransactionMeta, method);
+                // eslint-disable-next-line require-atomic-updates
                 addedTransactionMeta.securityProviderResponse =
                     securityProviderResponse;
             }
             if (!__classPrivateFieldGet(this, _TransactionController_isSendFlowHistoryDisabled, "f")) {
+                // eslint-disable-next-line require-atomic-updates
                 addedTransactionMeta.sendFlowHistory = sendFlowHistory ?? [];
             }
             // Initial history push
@@ -512,6 +530,7 @@ class TransactionController extends base_controller_1.BaseController {
                 return undefined;
             })
                 .catch(lodash_1.noop);
+            // eslint-disable-next-line no-negated-condition
             if (requireApproval !== false) {
                 __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSimulationData).call(this, addedTransactionMeta, {
                     traceContext,
@@ -559,7 +578,7 @@ class TransactionController extends base_controller_1.BaseController {
      * @param request - Request object.
      * @param request.tags - Additional tags to identify the source of the request.
      */
-    async updateIncomingTransactions({ tags } = {}) {
+    async updateIncomingTransactions({ tags, } = {}) {
         await __classPrivateFieldGet(this, _TransactionController_incomingTransactionHelper, "f").update({ tags });
     }
     /**
@@ -639,6 +658,29 @@ class TransactionController extends base_controller_1.BaseController {
         });
         return { gas: estimatedGas, simulationFails };
     }
+    /**
+     * Estimates required gas for a batch of transactions.
+     *
+     * @param request - Request object.
+     * @param request.chainId - Chain ID of the transactions.
+     * @param request.from - Address of the sender.
+     * @param request.transactions - Array of transactions within a batch request.
+     * @returns Object containing the gas limit.
+     */
+    async estimateGasBatch({ chainId, from, transactions, }) {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+            chainId,
+        });
+        return (0, gas_1.estimateGasBatch)({
+            chainId,
+            ethQuery,
+            from,
+            getSimulationConfig: __classPrivateFieldGet(this, _TransactionController_getSimulationConfig, "f"),
+            isAtomicBatchSupported: this.isAtomicBatchSupported.bind(this),
+            messenger: this.messenger,
+            transactions,
+        });
+    }
     /**
      * Estimates required gas for a given transaction and add additional gas buffer with the given multiplier.
      *
@@ -1026,11 +1068,11 @@ class TransactionController extends base_controller_1.BaseController {
                 return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signExternalTransaction).call(this, txParams.chainId, txParams);
             }));
         }
-        catch (err) {
-            (0, logger_1.projectLogger)('Error while signing transactions with same nonce', err);
+        catch (error) {
+            (0, logger_1.projectLogger)('Error while signing transactions with same nonce', error);
             // Must set transaction to submitted/failed before releasing lock
             // continue with error chain
-            throw err;
+            throw error;
         }
         finally {
             nonceLock?.releaseLock();
@@ -1109,7 +1151,7 @@ class TransactionController extends base_controller_1.BaseController {
                 ? predicate
                 : // TODO: Replace `any` with type
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    (v) => v === predicate;
+                    (value) => value === predicate;
         });
         const transactionsToFilter = initialList ?? this.state.transactions;
         // Combine sortBy and pickBy to transform our state object into an array of
@@ -1386,13 +1428,14 @@ class TransactionController extends base_controller_1.BaseController {
     }
 }
 exports.TransactionController = TransactionController;
-_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isHistoryDisabled = new WeakMap(), _TransactionController_isSendFlowHistoryDisabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_securityProviderRequest = new WeakMap(), _TransactionController_sign = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
+_TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSign = new WeakMap(), _TransactionController_afterSimulate = new WeakMap(), _TransactionController_approvingTransactionIds = new WeakMap(), _TransactionController_beforeCheckPendingTransaction = new WeakMap(), _TransactionController_beforePublish = new WeakMap(), _TransactionController_beforeSign = new WeakMap(), _TransactionController_gasFeeFlows = new WeakMap(), _TransactionController_getAdditionalSignArguments = new WeakMap(), _TransactionController_getCurrentAccountEIP1559Compatibility = new WeakMap(), _TransactionController_getCurrentNetworkEIP1559Compatibility = new WeakMap(), _TransactionController_getExternalPendingTransactions = new WeakMap(), _TransactionController_getGasFeeEstimates = new WeakMap(), _TransactionController_getNetworkState = new WeakMap(), _TransactionController_getPermittedAccounts = new WeakMap(), _TransactionController_getSavedGasFees = new WeakMap(), _TransactionController_getSimulationConfig = new WeakMap(), _TransactionController_incomingTransactionHelper = new WeakMap(), _TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_internalEvents = new WeakMap(), _TransactionController_isAutomaticGasFeeUpdateEnabled = new WeakMap(), _TransactionController_isEIP7702GasFeeTokensEnabled = new WeakMap(), _TransactionController_isFirstTimeInteractionEnabled = new WeakMap(), _TransactionController_isHistoryDisabled = new WeakMap(), _TransactionController_isSendFlowHistoryDisabled = new WeakMap(), _TransactionController_isSimulationEnabled = new WeakMap(), _TransactionController_isSwapsDisabled = new WeakMap(), _TransactionController_isTimeoutEnabled = new WeakMap(), _TransactionController_layer1GasFeeFlows = new WeakMap(), _TransactionController_methodDataHelper = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_publicKeyEIP7702 = new WeakMap(), _TransactionController_publish = new WeakMap(), _TransactionController_publishBatchHook = new WeakMap(), _TransactionController_securityProviderRequest = new WeakMap(), _TransactionController_sign = new WeakMap(), _TransactionController_signAbortCallbacks = new WeakMap(), _TransactionController_skipSimulationTransactionIds = new WeakMap(), _TransactionController_testGasFeeFlows = new WeakMap(), _TransactionController_trace = new WeakMap(), _TransactionController_transactionHistoryLimit = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_retryTransaction = async function _TransactionController_retryTransaction({ actionId, afterSubmit, estimatedBaseFee, gasValues, label, prepareTransactionParams, rate, transactionId, transactionType, }) {
     // If transaction is found for same action id, do not create a new transaction.
     if (__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionWithActionId).call(this, actionId)) {
         return;
     }
     if (gasValues) {
         // Not good practice to reassign a parameter but temporarily avoiding a larger refactor.
+        // eslint-disable-next-line no-param-reassign
         gasValues = (0, utils_2.normalizeGasFeeValues)(gasValues);
         (0, utils_2.validateGasValues)(gasValues);
     }
@@ -1552,10 +1595,12 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
                     resultCallbacks.success();
                 }
                 const updatedTransactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
-                this.messenger.publish(`${controllerName}:transactionApproved`, {
-                    transactionMeta: updatedTransactionMeta,
-                    actionId,
-                });
+                if (approvalResult === ApprovalState.Approved) {
+                    this.messenger.publish(`${controllerName}:transactionApproved`, {
+                        transactionMeta: updatedTransactionMeta,
+                        actionId,
+                    });
+                }
             }
         }
         catch (rawError) {
@@ -1576,17 +1621,19 @@ _TransactionController_afterAdd = new WeakMap(), _TransactionController_afterSig
     }
     const finalMeta = await finishedPromise;
     switch (finalMeta?.status) {
-        case types_1.TransactionStatus.failed:
+        case types_1.TransactionStatus.failed: {
             const error = finalMeta.error;
             resultCallbacks?.error(error);
             throw rpc_errors_1.rpcErrors.internal(error.message);
+        }
         case types_1.TransactionStatus.submitted:
             resultCallbacks?.success();
             return finalMeta.hash;
-        default:
-            const internalError = rpc_errors_1.rpcErrors.internal(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finalMeta || transactionId)}`);
+        default: {
+            const internalError = rpc_errors_1.rpcErrors.internal(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finalMeta ?? transactionId)}`);
             resultCallbacks?.error(internalError);
             throw internalError;
+        }
     }
 }, _TransactionController_approveTransaction = 
 /**
@@ -1624,6 +1671,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
         const [nonce, releaseNonce] = await (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, transactionMeta.networkClientId));
         clearNonceLock = releaseNonce;
+        // eslint-disable-next-line require-atomic-updates
         transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
             transactionId,
             note: 'TransactionController#approveTransaction - Transaction approved',
@@ -1640,6 +1688,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         });
         __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_onTransactionStatusChange).call(this, transactionMeta);
         const rawTx = await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Sign', parentContext: traceContext }, () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_signTransaction).call(this, transactionMeta));
+        // eslint-disable-next-line require-atomic-updates
         transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransactionOrThrow).call(this, transactionId);
         if (!(await __classPrivateFieldGet(this, _TransactionController_beforePublish, "f").call(this, transactionMeta))) {
             (0, logger_1.projectLogger)('Skipping publishing transaction based on hook');
@@ -1675,6 +1724,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             publishHook = extraTransactionsPublishHook.getHook();
         }
         const { transactionHash: hash } = await publishHook(transactionMeta, rawTx ?? '0x');
+        // eslint-disable-next-line require-atomic-updates
         transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateTransactionInternal).call(this, {
             transactionId,
             note: 'TransactionController#approveTransaction - Transaction submitted',
@@ -1706,13 +1756,20 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         clearNonceLock?.();
     }
 }, _TransactionController_publishTransaction = async function _TransactionController_publishTransaction(ethQuery, transactionMeta, { skipSubmitHistory } = {}) {
-    const transactionHash = await (0, controller_utils_1.query)(ethQuery, 'sendRawTransaction', [
-        transactionMeta.rawTx,
-    ]);
-    if (skipSubmitHistory !== true) {
-        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
+    try {
+        const transactionHash = await (0, controller_utils_1.query)(ethQuery, 'sendRawTransaction', [
+            transactionMeta.rawTx,
+        ]);
+        if (skipSubmitHistory !== true) {
+            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_updateSubmitHistory).call(this, transactionMeta, transactionHash);
+        }
+        return transactionHash;
+    }
+    catch (error) {
+        const errorObject = error;
+        const errorMessage = errorObject?.data?.message ?? errorObject?.message ?? String(error);
+        throw new Error(errorMessage);
     }
-    return transactionHash;
 }, _TransactionController_rejectTransaction = function _TransactionController_rejectTransaction(transactionId, actionId, error) {
     const transactionMeta = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getTransaction).call(this, transactionId);
     if (!transactionMeta) {
@@ -1776,7 +1833,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     });
     return (await this.messenger.call('ApprovalController:addRequest', {
         id,
-        origin: origin || controller_utils_1.ORIGIN_METAMASK,
+        origin: origin ?? controller_utils_1.ORIGIN_METAMASK,
         type,
         requestData,
         expectsResult: true,
@@ -2076,19 +2133,20 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         blockTracker,
         getChainId: () => chainId,
         getEthQuery: () => ethQuery,
-        getNetworkClientId: () => networkClientId,
-        getTransactions: () => this.state.transactions,
-        isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
         getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
             chainId,
         }),
+        getNetworkClientId: () => networkClientId,
+        getTransactions: () => this.state.transactions,
+        hooks: {
+            beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
+        },
+        isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
+        isTimeoutEnabled: __classPrivateFieldGet(this, _TransactionController_isTimeoutEnabled, "f"),
         messenger: this.messenger,
         publishTransaction: (_ethQuery, transactionMeta) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, _ethQuery, transactionMeta, {
             skipSubmitHistory: true,
         }),
-        hooks: {
-            beforeCheckPendingTransaction: __classPrivateFieldGet(this, _TransactionController_beforeCheckPendingTransaction, "f").bind(this),
-        },
     });
     __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);
     return pendingTransactionTracker;
@@ -2125,8 +2183,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
         throw error;
     }
 }, _TransactionController_isTransactionAlreadyConfirmedError = function _TransactionController_isTransactionAlreadyConfirmedError(error) {
-    return (error?.message?.includes('nonce too low') ||
-        error?.data?.message?.includes('nonce too low'));
+    return (Boolean(error?.message?.includes('nonce too low')) ||
+        Boolean(error?.data?.message?.includes('nonce too low')));
 }, _TransactionController_getGasFeeFlows = function _TransactionController_getGasFeeFlows() {
     if (__classPrivateFieldGet(this, _TransactionController_testGasFeeFlows, "f")) {
         return [new TestGasFeeFlow_1.TestGasFeeFlow()];
@@ -2309,6 +2367,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     this.messenger.registerActionHandler(`${controllerName}:emulateNewTransaction`, this.emulateNewTransaction.bind(this));
     this.messenger.registerActionHandler(`${controllerName}:emulateTransactionUpdate`, this.emulateTransactionUpdate.bind(this));
     this.messenger.registerActionHandler(`${controllerName}:estimateGas`, this.estimateGas.bind(this));
+    this.messenger.registerActionHandler(`${controllerName}:estimateGasBatch`, this.estimateGasBatch.bind(this));
     this.messenger.registerActionHandler(`${controllerName}:getGasFeeTokens`, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeTokensAction).bind(this));
     this.messenger.registerActionHandler(`${controllerName}:getNonceLock`, this.getNonceLock.bind(this));
     this.messenger.registerActionHandler(`${controllerName}:getTransactions`, this.getTransactions.bind(this));
@@ -2345,8 +2404,8 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
             draftTransactionMeta.error = (0, utils_2.normalizeTxError)(error);
         });
     }
-    catch (err) {
-        (0, logger_1.projectLogger)('Failed to mark transaction as failed', err);
+    catch (caughtError) {
+        (0, logger_1.projectLogger)('Failed to mark transaction as failed', caughtError);
         newTransactionMeta = {
             ...transactionMeta,
             status: types_1.TransactionStatus.failed,
@@ -2367,7 +2426,7 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     const result = await __classPrivateFieldGet(this, _TransactionController_afterSimulate, "f").call(this, {
         transactionMeta,
     });
-    const { skipSimulation, updateTransaction } = result || {};
+    const { skipSimulation, updateTransaction } = result ?? {};
     if (skipSimulation) {
         __classPrivateFieldGet(this, _TransactionController_skipSimulationTransactionIds, "f").add(transactionId);
     }
@@ -2391,12 +2450,11 @@ async function _TransactionController_approveTransaction(transactionId, traceCon
     await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Publish', parentContext: traceContext }, async () => {
         const publishHook = publishHookOverride ?? __classPrivateFieldGet(this, _TransactionController_publish, "f");
         ({ transactionHash } = await publishHook(transactionMeta, signedTx));
-        if (transactionHash === undefined) {
-            transactionHash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, {
-                ...transactionMeta,
-                rawTx: signedTx,
-            });
-        }
+        // eslint-disable-next-line require-atomic-updates
+        transactionHash ?? (transactionHash = await __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_publishTransaction).call(this, ethQuery, {
+            ...transactionMeta,
+            rawTx: signedTx,
+        }));
     });
     (0, logger_1.projectLogger)('Publish successful', transactionHash);
     return { transactionHash };