Merge branch 'main' into chore/move-monad-testnet

Author: stanleyyconsensys

eslint-warning-thresholds.json

@@ -82,9 +82,11 @@ const config = createConfig([
     rules: {
       // TODO: These rules created more errors after the upgrade to ESLint 9.
       // Re-enable these rules and address any lint violations.
-      'jest/no-conditional-in-test': 'warn',
       'jest/prefer-lowercase-title': 'warn',
       'jest/prefer-strict-equal': 'warn',
+
+      // TODO: Re-enable this rule
+      'jest/unbound-method': 'off',
     },
     settings: {
       node: {
@@ -160,7 +162,6 @@ const config = createConfig([
       '@typescript-eslint/no-base-to-string': 'warn',
       '@typescript-eslint/no-duplicate-enum-values': 'warn',
       '@typescript-eslint/no-misused-promises': 'warn',
-      '@typescript-eslint/no-unsafe-enum-comparison': 'warn',
       '@typescript-eslint/no-unused-vars': 'warn',
       '@typescript-eslint/only-throw-error': 'warn',
       '@typescript-eslint/prefer-promise-reject-errors': 'warn',
@@ -250,6 +251,17 @@ const config = createConfig([
       'n/no-deprecated-api': 'off',
     },
   },
+  {
+    files: [
+      'packages/notification-services-controller/src/NotificationServicesPushController/services/push/*-web.ts',
+      'packages/notification-services-controller/src/NotificationServicesPushController/web/**/*.ts',
+    ],
+    rules: {
+      // These files use `self` because they're written for a service worker context.
+      // TODO: Move these files to the extension repository, `core` is just for platform-agnostic code.
+      'consistent-this': 'off',
+    },
+  },
 ]);
 
 export default config;

eslint.config.mjs

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "666.0.0",
+  "version": "667.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -56,10 +56,10 @@
     "@lavamoat/allow-scripts": "^3.0.4",
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/create-release-branch": "^4.1.3",
-    "@metamask/eslint-config": "^14.0.0",
-    "@metamask/eslint-config-jest": "^14.0.0",
+    "@metamask/eslint-config": "^14.1.0",
+    "@metamask/eslint-config-jest": "^14.1.0",
     "@metamask/eslint-config-nodejs": "^14.0.0",
-    "@metamask/eslint-config-typescript": "^14.0.0",
+    "@metamask/eslint-config-typescript": "^14.1.0",
     "@metamask/eth-block-tracker": "^14.0.0",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/json-rpc-engine": "^10.1.1",
@@ -76,7 +76,7 @@
     "babel-jest": "^29.7.0",
     "chalk": "^4.1.2",
     "depcheck": "^1.4.7",
-    "eslint": "^9.11.0",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.3",
     "eslint-plugin-import-x": "^4.3.0",

package.json

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/multichain-account-service` from `^2.0.0` to `^3.0.0` ([#7100](https://github.com/MetaMask/core/pull/7100))
+
 ## [2.0.0]
 
 ### Changed
@@ -393,7 +399,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
   - Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[3.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [2.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [1.6.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [1.5.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/account-tree-controller/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/account-tree-controller",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Controller to group account together based on some pre-defined rules",
   "keywords": [
     "MetaMask",
@@ -63,7 +63,7 @@
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "^21.0.0",
     "@metamask/keyring-controller": "^24.0.0",
-    "@metamask/multichain-account-service": "^2.1.0",
+    "@metamask/multichain-account-service": "^3.0.0",
     "@metamask/profile-sync-controller": "^26.0.0",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
@@ -81,7 +81,7 @@
     "@metamask/account-api": "^0.12.0",
     "@metamask/accounts-controller": "^34.0.0",
     "@metamask/keyring-controller": "^24.0.0",
-    "@metamask/multichain-account-service": "^2.0.0",
+    "@metamask/multichain-account-service": "^3.0.0",
     "@metamask/profile-sync-controller": "^26.0.0",
     "@metamask/providers": "^22.0.0",
     "@metamask/snaps-controllers": "^14.0.0",

packages/account-tree-controller/package.json

@@ -11,7 +11,6 @@ import {
 import { errorCodes, JsonRpcError } from '@metamask/rpc-errors';
 import { nanoid } from 'nanoid';
 
-import { flushPromises } from '../../../tests/helpers';
 import type {
   AddApprovalOptions,
   ApprovalControllerActions,
@@ -33,6 +32,7 @@ import {
   MissingApprovalFlowError,
   NoApprovalFlowsError,
 } from './errors';
+import { flushPromises } from '../../../tests/helpers';
 
 jest.mock('nanoid');
 

packages/approval-controller/src/ApprovalController.test.ts

@@ -369,13 +369,13 @@ export class ApprovalController extends BaseController<
   ApprovalControllerState,
   ApprovalControllerMessenger
 > {
-  #approvals: Map<string, ApprovalCallbacks>;
+  readonly #approvals: Map<string, ApprovalCallbacks>;
 
-  #origins: Map<string, Map<string, number>>;
+  readonly #origins: Map<string, Map<string, number>>;
 
-  #showApprovalRequest: () => void;
+  readonly #showApprovalRequest: () => void;
 
-  #typesExcludedFromRateLimiting: string[];
+  readonly #typesExcludedFromRateLimiting: string[];
 
   /**
    * Construct an Approval controller.
@@ -615,8 +615,6 @@ export class ApprovalController extends BaseController<
     if (origin) {
       return Array.from(
         (this.#origins.get(origin) || new Map()).values(),
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
       ).reduce((total, value) => total + value, 0);
     }
 

packages/approval-controller/src/ApprovalController.ts

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [88.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/account-tree-controller` from `^2.0.0` to `^3.0.0` ([#7100](https://github.com/MetaMask/core/pull/7100))
+- **BREAKING:** Bump `@metamask/multichain-account-service` from `^2.0.0` to `^3.0.0` ([#7100](https://github.com/MetaMask/core/pull/7100))
+
 ## [87.1.1]
 
 ### Changed
@@ -2256,7 +2263,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[88.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [87.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [87.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [87.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

packages/assets-controllers/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "87.1.1",
+  "version": "88.0.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
@@ -82,7 +82,7 @@
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
     "@metamask/account-api": "^0.12.0",
-    "@metamask/account-tree-controller": "^2.0.0",
+    "@metamask/account-tree-controller": "^3.0.0",
     "@metamask/accounts-controller": "^34.0.0",
     "@metamask/approval-controller": "^8.0.0",
     "@metamask/auto-changelog": "^3.4.4",
@@ -91,7 +91,7 @@
     "@metamask/keyring-controller": "^24.0.0",
     "@metamask/keyring-internal-api": "^9.0.0",
     "@metamask/keyring-snap-client": "^8.0.0",
-    "@metamask/multichain-account-service": "^2.1.0",
+    "@metamask/multichain-account-service": "^3.0.0",
     "@metamask/network-controller": "^25.0.0",
     "@metamask/permission-controller": "^12.1.0",
     "@metamask/phishing-controller": "^15.0.0",
@@ -115,7 +115,7 @@
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {
-    "@metamask/account-tree-controller": "^2.0.0",
+    "@metamask/account-tree-controller": "^3.0.0",
     "@metamask/accounts-controller": "^34.0.0",
     "@metamask/approval-controller": "^8.0.0",
     "@metamask/core-backend": "^4.0.0",

packages/assets-controllers/package.json

@@ -583,8 +583,6 @@ describe('NftController', () => {
         'mainnet',
       );
       await expect(erc721Result).rejects.toThrow(
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `Suggested NFT of type ${ERC721} does not match received type ${ERC1155}`,
       );
     });
@@ -2485,12 +2483,8 @@ describe('NftController', () => {
         .reply(200, {
           name: 'name (directly from tokenURI)',
           description: 'description (directly from tokenURI)',
-          // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-          // eslint-disable-next-line @typescript-eslint/naming-convention
           external_link: null,
           image: 'image (directly from tokenURI)',
-          // TODO: Either fix this lint violation or explain why it's necessary to ignore.
-          // eslint-disable-next-line @typescript-eslint/naming-convention
           animation_url: null,
         });