Merge branch 'main' into feat/jwt-auth-accounts-api-integration

Author: salimtb

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "688.0.0",
+  "version": "689.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/assets-controllers/package.json

@@ -94,7 +94,7 @@
     "@metamask/multichain-account-service": "^4.0.0",
     "@metamask/network-controller": "^26.0.0",
     "@metamask/permission-controller": "^12.1.1",
-    "@metamask/phishing-controller": "^16.0.0",
+    "@metamask/phishing-controller": "^16.1.0",
     "@metamask/preferences-controller": "^22.0.0",
     "@metamask/profile-sync-controller": "^27.0.0",
     "@metamask/providers": "^22.1.0",

packages/phishing-controller/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [16.1.0]
+
+### Added
+
+- Export `TokenScanCacheData` and `TokenScanResultType` to allow consumers to have a type to reference if grabbing values directly from the controller's state ([#7208](https://github.com/MetaMask/core/pull/7208))
+
 ## [16.0.0]
 
 ### Added
@@ -487,7 +493,8 @@ 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/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[16.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [16.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [15.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [15.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/phishing-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/phishing-controller",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "description": "Maintains a periodically updated list of approved and unapproved website origins",
   "keywords": [
     "MetaMask",

packages/phishing-controller/src/index.ts

@@ -8,6 +8,7 @@ export type {
 } from './PhishingDetector';
 export { PhishingDetector } from './PhishingDetector';
 export type { PhishingDetectionScanResult, AddressScanResult } from './types';
+export type { TokenScanCacheData, TokenScanResultType } from './types';
 export {
   PhishingDetectorResultType,
   RecommendedAction,

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. */