Merge branch 'main' into defi-controller-changes

Author: bergarces

.github/workflows/changelog-check.yml

@@ -3,9 +3,11 @@ 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/ensure-blocking-pr-labels-absent.yml

@@ -6,9 +6,11 @@ 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/main.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

README.md

@@ -154,16 +154,22 @@ linkStyle default opacity:0.5
   account_tree_controller --> multichain_account_service;
   account_tree_controller --> profile_sync_controller;
   accounts_controller --> base_controller;
+  accounts_controller --> messenger;
   accounts_controller --> controller_utils;
   accounts_controller --> keyring_controller;
   accounts_controller --> network_controller;
   address_book_controller --> base_controller;
   address_book_controller --> controller_utils;
+  address_book_controller --> messenger;
   announcement_controller --> base_controller;
+  announcement_controller --> messenger;
   app_metadata_controller --> base_controller;
+  app_metadata_controller --> messenger;
   approval_controller --> base_controller;
+  approval_controller --> messenger;
   assets_controllers --> base_controller;
   assets_controllers --> controller_utils;
+  assets_controllers --> messenger;
   assets_controllers --> polling_controller;
   assets_controllers --> account_tree_controller;
   assets_controllers --> accounts_controller;
@@ -201,17 +207,20 @@ linkStyle default opacity:0.5
   chain_agnostic_permission --> network_controller;
   chain_agnostic_permission --> permission_controller;
   composable_controller --> base_controller;
+  composable_controller --> messenger;
   composable_controller --> json_rpc_engine;
   core_backend --> base_controller;
   core_backend --> controller_utils;
   core_backend --> profile_sync_controller;
   core_backend --> accounts_controller;
   core_backend --> keyring_controller;
   delegation_controller --> base_controller;
+  delegation_controller --> messenger;
   delegation_controller --> accounts_controller;
   delegation_controller --> keyring_controller;
   earn_controller --> base_controller;
   earn_controller --> controller_utils;
+  earn_controller --> messenger;
   earn_controller --> account_tree_controller;
   earn_controller --> network_controller;
   earn_controller --> transaction_controller;
@@ -224,8 +233,10 @@ linkStyle default opacity:0.5
   eip1193_permission_middleware --> permission_controller;
   ens_controller --> base_controller;
   ens_controller --> controller_utils;
+  ens_controller --> messenger;
   ens_controller --> network_controller;
   error_reporting_service --> base_controller;
+  error_reporting_service --> messenger;
   eth_block_tracker --> eth_json_rpc_provider;
   eth_block_tracker --> json_rpc_engine;
   eth_json_rpc_middleware --> eth_block_tracker;
@@ -239,12 +250,16 @@ linkStyle default opacity:0.5
   gas_fee_controller --> polling_controller;
   gas_fee_controller --> network_controller;
   gator_permissions_controller --> base_controller;
+  gator_permissions_controller --> messenger;
   json_rpc_middleware_stream --> json_rpc_engine;
   keyring_controller --> base_controller;
+  keyring_controller --> messenger;
   logging_controller --> base_controller;
   logging_controller --> controller_utils;
+  logging_controller --> messenger;
   message_manager --> base_controller;
   message_manager --> controller_utils;
+  message_manager --> messenger;
   multichain_account_service --> base_controller;
   multichain_account_service --> accounts_controller;
   multichain_account_service --> keyring_controller;
@@ -271,6 +286,7 @@ linkStyle default opacity:0.5
   network_controller --> eth_json_rpc_middleware;
   network_controller --> eth_json_rpc_provider;
   network_controller --> json_rpc_engine;
+  network_controller --> messenger;
   network_controller --> error_reporting_service;
   network_enablement_controller --> base_controller;
   network_enablement_controller --> controller_utils;
@@ -329,6 +345,7 @@ linkStyle default opacity:0.5
   token_search_discovery_controller --> base_controller;
   transaction_controller --> base_controller;
   transaction_controller --> controller_utils;
+  transaction_controller --> messenger;
   transaction_controller --> accounts_controller;
   transaction_controller --> approval_controller;
   transaction_controller --> eth_block_tracker;

eslint-warning-thresholds.json

@@ -68,7 +68,7 @@
   },
   "packages/assets-controllers/src/TokensController.test.ts": {
     "import-x/namespace": 1,
-    "import-x/order": 4,
+    "import-x/order": 3,
     "jest/no-conditional-in-test": 2
   },
   "packages/assets-controllers/src/TokensController.ts": {
@@ -107,9 +107,6 @@
   "packages/composable-controller/src/ComposableController.test.ts": {
     "import-x/namespace": 3
   },
-  "packages/composable-controller/src/ComposableController.ts": {
-    "@typescript-eslint/no-unused-vars": 1
-  },
   "packages/controller-utils/jest.environment.js": {
     "n/prefer-global/text-encoder": 1,
     "n/prefer-global/text-decoder": 1,
@@ -137,7 +134,7 @@
     "@typescript-eslint/no-misused-promises": 1
   },
   "packages/ens-controller/src/EnsController.test.ts": {
-    "import-x/order": 2
+    "import-x/order": 1
   },
   "packages/ens-controller/src/EnsController.ts": {
     "jsdoc/check-tag-names": 6

packages/accounts-controller/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6426](https://github.com/MetaMask/core/pull/6426))
+  - Previously, `AccountsController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
+
 ## [33.2.0]
 
 ### Added

packages/accounts-controller/package.json

@@ -53,6 +53,7 @@
     "@metamask/keyring-api": "^21.0.0",
     "@metamask/keyring-internal-api": "^9.0.0",
     "@metamask/keyring-utils": "^3.1.0",
+    "@metamask/messenger": "^0.3.0",
     "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/snaps-utils": "^11.0.0",
     "@metamask/superstruct": "^3.1.0",