perf: speed up adding transactions (#7205)

## Explanation

Minor optimisations to `addTransaction` and `addTransactionBatch`
methods:

- Don't await initial gas limit and gas fee estimation if
`skipInitialGasEstimate` set.
- Skip EIP-7702 request and upgrade check if `disableUpgrade` set.
- Do not wait for `delegationAddress` and instead update asynchronously.
- Skip unnecessary `eth_getCode` requests when determining transaction
type.
- Only decode transfer recipient for first time interaction validation
if transaction type suitable.

## References

Related to
[#6165](MetaMask/MetaMask-planning#6165)

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've communicated my changes to consumers by [updating changelogs
for packages I've
changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs),
highlighting breaking changes as necessary
- [x] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Speeds up `addTransaction`/`addTransactionBatch` by allowing async gas
estimation and skipping EIP-7702 upgrade checks, plus tighter type
handling and first‑time interaction optimizations.
> 
> - **Transaction add flow (performance)**:
> - Add `skipInitialGasEstimate` to `addTransaction` and
`addTransactionBatch`; when set, skip blocking gas calc and update gas
fields asynchronously.
> - Resolve `delegationAddress` asynchronously post-add; remove from
initial snapshot, update later.
> - **Batch (EIP-7702) changes**:
> - Add `disableUpgrade` to `TransactionBatchRequest`; when set, bypass
upgrade check and avoid type `0x4` (setCode) path.
> - Propagate `skipInitialGasEstimate` from batch to underlying
`addTransaction`.
> - Use provided nested transaction `type` directly; only infer when not
supplied.
> - **First-time interaction**:
> - Only decode recipient from `data` when `type` is
`tokenMethodTransfer` or `tokenMethodTransferFrom`; otherwise fall back
to `to`.
> - **Misc**:
> - Import `noop` to safely swallow async errors; minor test updates and
slight coverage threshold tweak.
>   - Changelog updated accordingly.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
4ed214f. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: matthewwalsh0

packages/transaction-controller/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Performance optimisations in `addTransaction` and `addTransactionBatch` methods ([#7205](https://github.com/MetaMask/core/pull/7205))
+  - Add `skipInitialGasEstimate` option to `addTransaction` and `addTransactionBatch` methods.
+  - Add `disableUpgrade` option to `addTransactionBatch` method.
+
 ## [62.0.0]
 
 ### Added

packages/transaction-controller/jest.config.js

@@ -18,7 +18,7 @@ module.exports = merge(baseConfig, {
   coverageThreshold: {
     global: {
       branches: 91.76,
-      functions: 92.76,
+      functions: 92.46,
       lines: 96.83,
       statements: 96.82,
     },

packages/transaction-controller/src/TransactionController.test.ts

@@ -1686,7 +1686,6 @@ describe('TransactionController', () => {
         batchId: undefined,
         chainId: expect.any(String),
         dappSuggestedGasFees: undefined,
-        delegationAddress: undefined,
         deviceConfirmedOn: undefined,
         disableGasBuffer: undefined,
         id: expect.any(String),

packages/transaction-controller/src/TransactionController.ts

@@ -56,7 +56,7 @@ import { add0x } from '@metamask/utils';
 // This package purposefully relies on Node's EventEmitter module.
 // eslint-disable-next-line import-x/no-nodejs-modules
 import { EventEmitter } from 'events';
-import { cloneDeep, mapValues, merge, pickBy, sortBy } from 'lodash';
+import { cloneDeep, mapValues, merge, noop, pickBy, sortBy } from 'lodash';
 import { v1 as random } from 'uuid';
 
 import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow';
@@ -1239,6 +1239,7 @@ export class TransactionController extends BaseController<
       requireApproval,
       securityAlertResponse,
       sendFlowHistory,
+      skipInitialGasEstimate,
       swaps = {},
       traceContext,
       type,
@@ -1311,8 +1312,6 @@ export class TransactionController extends BaseController<
     const transactionType =
       type ?? (await determineTransactionType(txParams, ethQuery)).type;
 
-    const delegationAddress = await delegationAddressPromise;
-
     const existingTransactionMeta = this.#getTransactionWithActionId(actionId);
 
     // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
@@ -1325,7 +1324,6 @@ export class TransactionController extends BaseController<
           batchId,
           chainId,
           dappSuggestedGasFees,
-          delegationAddress,
           deviceConfirmedOn,
           disableGasBuffer,
           id: random(),
@@ -1360,13 +1358,40 @@ export class TransactionController extends BaseController<
       updateTransaction(addedTransactionMeta);
     }
 
-    await this.#trace(
-      { name: 'Estimate Gas Properties', parentContext: traceContext },
-      (context) =>
-        this.#updateGasProperties(addedTransactionMeta, {
-          traceContext: context,
-        }),
-    );
+    if (!skipInitialGasEstimate) {
+      await this.#trace(
+        { name: 'Estimate Gas Properties', parentContext: traceContext },
+        (context) =>
+          this.#updateGasProperties(addedTransactionMeta, {
+            traceContext: context,
+          }),
+      );
+    } else {
+      const newTransactionMeta = cloneDeep(addedTransactionMeta);
+
+      this.#updateGasProperties(newTransactionMeta)
+        .then(() => {
+          this.#updateTransactionInternal(
+            {
+              transactionId: newTransactionMeta.id,
+              skipHistory: true,
+              skipResimulateCheck: true,
+              skipValidation: true,
+            },
+            (tx) => {
+              tx.txParams.gas = newTransactionMeta.txParams.gas;
+              tx.txParams.gasPrice = newTransactionMeta.txParams.gasPrice;
+              tx.txParams.maxFeePerGas =
+                newTransactionMeta.txParams.maxFeePerGas;
+              tx.txParams.maxPriorityFeePerGas =
+                newTransactionMeta.txParams.maxPriorityFeePerGas;
+            },
+          );
+
+          return undefined;
+        })
+        .catch(noop);
+    }
 
     // Checks if a transaction already exists with a given actionId
     if (!existingTransactionMeta) {
@@ -1401,6 +1426,24 @@ export class TransactionController extends BaseController<
 
       this.#addMetadata(addedTransactionMeta);
 
+      delegationAddressPromise
+        .then((delegationAddress) => {
+          this.#updateTransactionInternal(
+            {
+              transactionId: addedTransactionMeta.id,
+              skipHistory: true,
+              skipResimulateCheck: true,
+              skipValidation: true,
+            },
+            (tx) => {
+              tx.delegationAddress = delegationAddress;
+            },
+          );
+
+          return undefined;
+        })
+        .catch(noop);
+
       if (requireApproval !== false) {
         this.#updateSimulationData(addedTransactionMeta, {
           traceContext,

packages/transaction-controller/src/types.ts

@@ -1723,6 +1723,9 @@ export type TransactionBatchRequest = {
   /** Whether to disable batch transaction via sequential transactions. */
   disableSequential?: boolean;
 
+  /** Whether to disable upgrading the account to an EIP-7702. */
+  disableUpgrade?: boolean;
+
   /** Address of the account to submit the transaction batch. */
   from: Hex;
 
@@ -1747,6 +1750,9 @@ export type TransactionBatchRequest = {
   /** Security alert ID to persist on the transaction. */
   securityAlertId?: string;
 
+  /** Whether to skip the initial gas calculation and rely only on the polling. */
+  skipInitialGasEstimate?: boolean;
+
   /** Transactions to be submitted as part of the batch. */
   transactions: TransactionBatchSingleRequest[];
 
@@ -2100,6 +2106,9 @@ export type AddTransactionOptions = {
   /** Entries to add to the `sendFlowHistory`. */
   sendFlowHistory?: SendFlowHistoryEntry[];
 
+  /** Whether to skip the initial gas calculation and rely only on the polling. */
+  skipInitialGasEstimate?: boolean;
+
   /** Options for swaps transactions. */
   swaps?: {
     /** Whether the transaction has an approval transaction. */

packages/transaction-controller/src/utils/batch.test.ts

@@ -647,6 +647,44 @@ describe('Batch Utils', () => {
       );
     });
 
+    it('does not use type 4 if not upgraded but disableUpgrade set', async () => {
+      isAccountUpgradedToEIP7702Mock.mockResolvedValueOnce({
+        delegationAddress: undefined,
+        isSupported: false,
+      });
+
+      addTransactionMock.mockResolvedValueOnce({
+        transactionMeta: TRANSACTION_META_MOCK,
+        result: Promise.resolve(''),
+      });
+
+      generateEIP7702BatchTransactionMock.mockReturnValueOnce(
+        TRANSACTION_BATCH_PARAMS_MOCK,
+      );
+
+      getEIP7702UpgradeContractAddressMock.mockReturnValueOnce(
+        CONTRACT_ADDRESS_MOCK,
+      );
+
+      request.request.disableUpgrade = true;
+
+      await addTransactionBatch(request);
+
+      expect(addTransactionMock).toHaveBeenCalledTimes(1);
+      expect(addTransactionMock).toHaveBeenCalledWith(
+        {
+          from: FROM_MOCK,
+          to: TO_MOCK,
+          data: DATA_MOCK,
+          value: VALUE_MOCK,
+        },
+        expect.objectContaining({
+          networkClientId: NETWORK_CLIENT_ID_MOCK,
+          requireApproval: true,
+        }),
+      );
+    });
+
     it('passes nested transactions to add transaction', async () => {
       isAccountUpgradedToEIP7702Mock.mockResolvedValueOnce({
         delegationAddress: undefined,

packages/transaction-controller/src/utils/batch.ts

@@ -257,15 +257,21 @@ async function getNestedTransactionMeta(
   const { from } = request;
   const { params, type: requestedType } = singleRequest;
 
+  if (requestedType) {
+    return {
+      ...params,
+      type: requestedType,
+    };
+  }
+
   const { type: determinedType } = await determineTransactionType(
     { from, ...params },
     ethQuery,
   );
 
-  const type = requestedType ?? determinedType;
   return {
     ...params,
-    type,
+    type: determinedType,
   };
 }
 
@@ -288,12 +294,14 @@ async function addTransactionBatchWith7702(
 
   const {
     batchId: batchIdOverride,
+    disableUpgrade,
     from,
     gasFeeToken,
     networkClientId,
     origin,
     requireApproval,
     securityAlertId,
+    skipInitialGasEstimate,
     transactions,
     validateSecurity,
   } = userRequest;
@@ -311,19 +319,25 @@ async function addTransactionBatchWith7702(
     throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);
   }
 
-  const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(
-    from,
-    chainId,
-    publicKeyEIP7702,
-    messenger,
-    ethQuery,
-  );
+  let requiresUpgrade = false;
 
-  log('Account', { delegationAddress, isSupported });
+  if (!disableUpgrade) {
+    const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(
+      from,
+      chainId,
+      publicKeyEIP7702,
+      messenger,
+      ethQuery,
+    );
+
+    log('Account', { delegationAddress, isSupported });
+
+    if (!isSupported && delegationAddress) {
+      log('Account upgraded to unsupported contract', from, delegationAddress);
+      throw rpcErrors.internal('Account upgraded to unsupported contract');
+    }
 
-  if (!isSupported && delegationAddress) {
-    log('Account upgraded to unsupported contract', from, delegationAddress);
-    throw rpcErrors.internal('Account upgraded to unsupported contract');
+    requiresUpgrade = !isSupported;
   }
 
   const nestedTransactions = await Promise.all(
@@ -339,7 +353,7 @@ async function addTransactionBatchWith7702(
     ...batchParams,
   };
 
-  if (!isSupported) {
+  if (requiresUpgrade) {
     const upgradeContractAddress = getEIP7702UpgradeContractAddress(
       chainId,
       messenger,
@@ -409,6 +423,7 @@ async function addTransactionBatchWith7702(
     origin,
     requireApproval,
     securityAlertResponse,
+    skipInitialGasEstimate,
     type: TransactionType.batch,
   });
 

packages/transaction-controller/src/utils/first-time-interaction.test.ts

@@ -106,6 +106,7 @@ describe('updateFirstTimeInteraction', () => {
         const transactionMetaWithData = {
           ...mockTransactionMeta,
           txParams: { ...mockTransactionMeta.txParams, data: '0xabcdef' },
+          type: TransactionType.tokenMethodTransfer,
         };
 
         mockDecodeTransactionData.mockReturnValue({
@@ -136,6 +137,7 @@ describe('updateFirstTimeInteraction', () => {
         const transactionMetaWithData = {
           ...mockTransactionMeta,
           txParams: { ...mockTransactionMeta.txParams, data: '0xabcdef' },
+          type: TransactionType.tokenMethodTransfer,
         };
 
         mockDecodeTransactionData.mockReturnValue({
@@ -165,6 +167,7 @@ describe('updateFirstTimeInteraction', () => {
         const transactionMetaWithData = {
           ...mockTransactionMeta,
           txParams: { ...mockTransactionMeta.txParams, data: '0xabcdef' },
+          type: TransactionType.tokenMethodTransferFrom,
         };
 
         mockDecodeTransactionData.mockReturnValue({

packages/transaction-controller/src/utils/first-time-interaction.ts

@@ -9,7 +9,7 @@ import {
   type GetAccountAddressRelationshipRequest,
 } from '../api/accounts-api';
 import { projectLogger as log } from '../logger';
-import type { TransactionMeta } from '../types';
+import { TransactionType, type TransactionMeta } from '../types';
 
 type UpdateFirstTimeInteractionRequest = {
   existingTransactions: TransactionMeta[];
@@ -57,10 +57,17 @@ export async function updateFirstTimeInteraction({
     chainId,
     id: transactionId,
     txParams: { data, from, to },
+    type,
   } = transactionMeta;
 
   let recipient;
-  if (data) {
+  if (
+    data &&
+    [
+      TransactionType.tokenMethodTransfer,
+      TransactionType.tokenMethodTransferFrom,
+    ].includes(type as TransactionType)
+  ) {
     const parsedData = decodeTransactionData(data) as TransactionDescription;
     // _to is for ERC20, ERC721 and USDC
     // to is for ERC1155