Merge branch 'main' into refactor/update-allowance-logic

Author: micaelae

.github/CODEOWNERS

@@ -3,11 +3,9 @@ name: Check Changelog
 on:
   pull_request:
     types: [opened, synchronize, labeled, unlabeled]
-  merge_group:
 
 jobs:
   check_changelog:
-    if: github.event_name != 'merge_group'
     uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
     with:
       action-sha: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7

.github/workflows/changelog-check.yml

@@ -6,11 +6,9 @@ on:
       - synchronize
       - labeled
       - unlabeled
-  merge_group:
 
 jobs:
   ensure-blocking-pr-labels-absent:
-    if: github.event_name != 'merge_group'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read

.github/workflows/ensure-blocking-pr-labels-absent.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main]
   pull_request:
-  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -24,17 +23,17 @@ jobs:
         run: ${{ steps.download-actionlint.outputs.executable }} -color
         shell: bash
 
-  # analyse-code:
-  #  name: Code scanner
-  #  needs: check-workflows
-  #  uses: ./.github/workflows/security-code-scanner.yml
-  #  permissions:
-  #    actions: read
-  #    contents: read
-  #    security-events: write
-  #  secrets:
-  #    SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
-  #    APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
+  analyse-code:
+    name: Code scanner
+    needs: check-workflows
+    uses: ./.github/workflows/security-code-scanner.yml
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    secrets:
+      SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
+      APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
 
   lint-build-test:
     name: Lint, build, and test
@@ -77,7 +76,7 @@ jobs:
     name: All jobs complete
     runs-on: ubuntu-latest
     needs:
-      # - analyse-code
+      - analyse-code
       - lint-build-test
     outputs:
       passed: ${{ steps.set-output.outputs.passed }}

.github/workflows/main.yml

@@ -1 +1 @@
-v24.7.0
+lts/*

.nvmrc

@@ -15,12 +15,8 @@
     "no-shadow": 2
   },
   "packages/assets-controllers/src/CurrencyRateController.test.ts": {
-    "import-x/order": 1,
     "jest/no-conditional-in-test": 1
   },
-  "packages/assets-controllers/src/CurrencyRateController.ts": {
-    "jsdoc/check-tag-names": 6
-  },
   "packages/assets-controllers/src/NftController.test.ts": {
     "import-x/namespace": 9,
     "jest/no-conditional-in-test": 6
@@ -59,9 +55,6 @@
     "import-x/order": 2,
     "jest/no-conditional-in-test": 2
   },
-  "packages/assets-controllers/src/TokenRatesController.test.ts": {
-    "import-x/order": 3
-  },
   "packages/assets-controllers/src/TokenRatesController.ts": {
     "@typescript-eslint/prefer-readonly": 1,
     "jsdoc/check-tag-names": 11
@@ -86,16 +79,10 @@
   "packages/assets-controllers/src/multicall.test.ts": {
     "@typescript-eslint/prefer-promise-reject-errors": 2
   },
-  "packages/assets-controllers/src/token-prices-service/codefi-v2.test.ts": {
-    "jsdoc/require-returns": 1
-  },
   "packages/assets-controllers/src/token-prices-service/codefi-v2.ts": {
     "jsdoc/tag-lines": 2
   },
   "packages/base-controller/src/BaseController.test.ts": {
-    "import-x/namespace": 15
-  },
-  "packages/base-controller/src/next/BaseController.test.ts": {
     "import-x/namespace": 13
   },
   "packages/build-utils/src/transforms/remove-fenced-code.test.ts": {

eslint-warning-thresholds.json

@@ -80,9 +80,6 @@ module.exports = {
   // Here we ensure that Jest resolves `@metamask/*` imports to the uncompiled source code for packages that live in this repo.
   // NOTE: This must be synchronized with the `paths` option in `tsconfig.packages.json`.
   moduleNameMapper: {
-    '^@metamask/base-controller/next': [
-      '<rootDir>/../base-controller/src/next',
-    ],
     '^@metamask/(.+)$': [
       '<rootDir>/../$1/src',
       // Some @metamask/* packages we are referencing aren't in this monorepo,

jest.config.packages.js

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

package.json

@@ -7,10 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0]
+
 ### Changed
 
 - **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6380](https://github.com/MetaMask/core/pull/6380))
   - Previously, `AccountTreeController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
+- **BREAKING:** Bump `@metamask/accounts-controller` from `^33.0.0` to `^34.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/keyring-controller` from `^23.0.0` to `^24.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/multichain-account-service` from `^1.0.0` to `^2.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- **BREAKING:** Bump `@metamask/profile-sync-controller` from `^25.0.0` to `^26.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
+- Bump `@metamask/base-controller` from `^8.4.2` to `^9.0.0` ([#6962](https://github.com/MetaMask/core/pull/6962))
 
 ## [1.6.0]
 
@@ -386,7 +393,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/account-tree-controller@1.6.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@2.0.0...HEAD
+[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.6.0...@metamask/account-tree-controller@2.0.0
 [1.6.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.5.0...@metamask/account-tree-controller@1.6.0
 [1.5.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.2...@metamask/account-tree-controller@1.5.0
 [1.4.2]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.1...@metamask/account-tree-controller@1.4.2

packages/account-tree-controller/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/account-tree-controller",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "Controller to group account together based on some pre-defined rules",
   "keywords": [
     "MetaMask",
@@ -47,7 +47,7 @@
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
-    "@metamask/base-controller": "^8.4.2",
+    "@metamask/base-controller": "^9.0.0",
     "@metamask/messenger": "^0.3.0",
     "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/snaps-utils": "^11.0.0",
@@ -58,12 +58,12 @@
   },
   "devDependencies": {
     "@metamask/account-api": "^0.12.0",
-    "@metamask/accounts-controller": "^33.2.0",
+    "@metamask/accounts-controller": "^34.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "^21.0.0",
-    "@metamask/keyring-controller": "^23.2.0",
-    "@metamask/multichain-account-service": "^1.6.2",
-    "@metamask/profile-sync-controller": "^25.1.2",
+    "@metamask/keyring-controller": "^24.0.0",
+    "@metamask/multichain-account-service": "^2.0.0",
+    "@metamask/profile-sync-controller": "^26.0.0",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@types/jest": "^27.4.1",
@@ -77,10 +77,10 @@
   },
   "peerDependencies": {
     "@metamask/account-api": "^0.12.0",
-    "@metamask/accounts-controller": "^33.0.0",
-    "@metamask/keyring-controller": "^23.0.0",
-    "@metamask/multichain-account-service": "^1.0.0",
-    "@metamask/profile-sync-controller": "^25.0.0",
+    "@metamask/accounts-controller": "^34.0.0",
+    "@metamask/keyring-controller": "^24.0.0",
+    "@metamask/multichain-account-service": "^2.0.0",
+    "@metamask/profile-sync-controller": "^26.0.0",
     "@metamask/providers": "^22.0.0",
     "@metamask/snaps-controllers": "^14.0.0",
     "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"