Merge branch 'main' into wip/intent-swap-architecture-refactory

Author: oscarwroche

.github/CODEOWNERS

@@ -16,6 +16,7 @@
 ## Assets Team
 /packages/assets-controllers         @MetaMask/metamask-assets
 /packages/network-enablement-controller @MetaMask/metamask-assets
+/packages/token-search-discovery-controller @MetaMask/metamask-assets
 
 ## Confirmations Team
 /packages/address-book-controller           @MetaMask/confirmations
@@ -55,9 +56,6 @@
 /packages/app-metadata-controller @MetaMask/mobile-platform
 /packages/analytics-controller    @MetaMask/mobile-platform @MetaMask/extension-platform
 
-## Portfolio Team
-/packages/token-search-discovery-controller      @MetaMask/portfolio
-
 ## Wallet Integrations Team
 /packages/chain-agnostic-permission        @MetaMask/wallet-integrations
 /packages/eip1193-permission-middleware    @MetaMask/wallet-integrations
@@ -166,8 +164,8 @@
 /packages/user-operation-controller/CHANGELOG.md  @MetaMask/confirmations @MetaMask/core-platform
 /packages/multichain-transactions-controller/package.json @MetaMask/accounts-engineers @MetaMask/core-platform
 /packages/multichain-transactions-controller/CHANGELOG.md @MetaMask/accounts-engineers @MetaMask/core-platform
-/packages/token-search-discovery-controller/package.json      @MetaMask/portfolio @MetaMask/core-platform
-/packages/token-search-discovery-controller/CHANGELOG.md      @MetaMask/portfolio @MetaMask/core-platform
+/packages/token-search-discovery-controller/package.json      @MetaMask/metamask-assets @MetaMask/core-platform
+/packages/token-search-discovery-controller/CHANGELOG.md      @MetaMask/metamask-assets @MetaMask/core-platform
 /packages/bridge-controller/package.json                 @MetaMask/swaps-engineers @MetaMask/core-platform
 /packages/bridge-controller/CHANGELOG.md                 @MetaMask/swaps-engineers @MetaMask/core-platform
 /packages/remote-feature-flag-controller/package.json @MetaMask/extension-platform @MetaMask/mobile-platform @MetaMask/core-platform

.github/workflows/main.yml

@@ -11,8 +11,25 @@ concurrency:
   cancel-in-progress: ${{ !contains(github.ref, 'refs/heads/main') }}
 
 jobs:
+  check-skip-merge-queue:
+    name: Check if pull request can skip merge queue
+    runs-on: ubuntu-latest
+    outputs:
+      skip-merge-queue: ${{ steps.check-skip-merge-queue.outputs.up-to-date }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        if: github.event_name == 'merge_group'
+      - name: Check pull request merge queue status
+        id: check-skip-merge-queue
+        if: github.event_name == 'merge_group'
+        uses: MetaMask/github-tools/.github/actions/check-skip-merge-queue@v1
+
   check-workflows:
     name: Check workflows
+    needs:
+      - check-skip-merge-queue
+    if: github.event_name != 'merge_group' || needs.check-skip-merge-queue.outputs.skip-merge-queue != 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
@@ -127,11 +144,14 @@ jobs:
     name: All jobs pass
     if: ${{ always() }}
     runs-on: ubuntu-latest
-    needs: all-jobs-complete
+    needs:
+      - all-jobs-complete
+      - check-skip-merge-queue
+    env:
+      PASSED: ${{ needs.all-jobs-complete.outputs.passed == 'true' || needs.check-skip-merge-queue.outputs.skip-merge-queue == 'true' }}
     steps:
       - name: Check that all jobs have passed
         run: |
-          passed="${{ needs.all-jobs-complete.outputs.passed }}"
-          if [[ $passed != "true" ]]; then
+          if [[ "$PASSED" != "true" ]]; then
             exit 1
           fi

eslint-suppressions.json

@@ -926,9 +926,6 @@
     "@typescript-eslint/explicit-function-return-type": {
       "count": 9
     },
-    "@typescript-eslint/naming-convention": {
-      "count": 1
-    },
     "id-length": {
       "count": 2
     },
@@ -938,7 +935,7 @@
   },
   "packages/earn-controller/src/selectors.ts": {
     "@typescript-eslint/explicit-function-return-type": {
-      "count": 6
+      "count": 3
     }
   },
   "packages/eip-5792-middleware/src/constants.ts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "724.0.0",
+  "version": "732.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -63,7 +63,7 @@
     "@metamask/eth-block-tracker": "^15.0.0",
     "@metamask/eth-json-rpc-provider": "^6.0.0",
     "@metamask/json-rpc-engine": "^10.2.0",
-    "@metamask/network-controller": "^27.0.0",
+    "@metamask/network-controller": "^27.1.0",
     "@metamask/utils": "^11.8.1",
     "@ts-bridge/cli": "^0.6.4",
     "@types/jest": "^27.4.1",

packages/account-tree-controller/CHANGELOG.md

@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - In clients, it is now possible for multiple versions of these packages to exist in the dependency tree.
     - For example, this scenario would be valid: a client relies on `@metamask/controller-a` 1.0.0 and `@metamask/controller-b` 1.0.0, and `@metamask/controller-b` depends on `@metamask/controller-a` 1.1.0.
   - Note, however, that the versions specified in the client's `package.json` always "win", and you are expected to keep them up to date so as not to break controller and service intercommunication.
-- Bump `@metamask/multichain-account-service` from `^4.0.0` to `^4.0.1` ([#7437](https://github.com/MetaMask/core/pull/7437)
+- Bump `@metamask/multichain-account-service` from `^4.0.0` to `^4.1.0` ([#7437](https://github.com/MetaMask/core/pull/7437), ([#7515](https://github.com/MetaMask/core/pull/7515)
 
 ## [4.0.0]
 

packages/account-tree-controller/package.json

@@ -52,7 +52,7 @@
     "@metamask/base-controller": "^9.0.0",
     "@metamask/keyring-controller": "^25.0.0",
     "@metamask/messenger": "^0.3.0",
-    "@metamask/multichain-account-service": "^4.0.1",
+    "@metamask/multichain-account-service": "^4.1.0",
     "@metamask/profile-sync-controller": "^27.0.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@metamask/snaps-sdk": "^9.0.0",

packages/accounts-controller/CHANGELOG.md

@@ -9,10 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Move peer dependencies for controller and service packages to direct dependencies ([#7209](https://github.com/MetaMask/core/pull/7209), [#7258](https://github.com/MetaMask/core/pull/7258))
+- Move peer dependencies for controller and service packages to direct dependencies ([#7209](https://github.com/MetaMask/core/pull/7209), [#7258](https://github.com/MetaMask/core/pull/7258), [#7534](https://github.com/MetaMask/core/pull/7534))
   - The dependencies moved are:
     - `@metamask/keyring-controller` (^25.0.0)
-    - `@metamask/network-controller` (^27.0.0)
+    - `@metamask/network-controller` (^27.1.0)
     - `@metamask/snaps-controllers` (^14.0.1)
   - In clients, it is now possible for multiple versions of these packages to exist in the dependency tree.
     - For example, this scenario would be valid: a client relies on `@metamask/controller-a` 1.0.0 and `@metamask/controller-b` 1.0.0, and `@metamask/controller-b` depends on `@metamask/controller-a` 1.1.0.

packages/accounts-controller/package.json

@@ -56,7 +56,7 @@
     "@metamask/keyring-internal-api": "^9.0.0",
     "@metamask/keyring-utils": "^3.1.0",
     "@metamask/messenger": "^0.3.0",
-    "@metamask/network-controller": "^27.0.0",
+    "@metamask/network-controller": "^27.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/snaps-utils": "^11.0.0",
@@ -70,7 +70,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/controller-utils": "^11.16.0",
+    "@metamask/controller-utils": "^11.17.0",
     "@metamask/providers": "^22.1.0",
     "@ts-bridge/cli": "^0.6.4",
     "@types/jest": "^27.4.1",

packages/address-book-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump `@metamask/controller-utils` from `^11.16.0` to `^11.17.0` ([#7534](https://github.com/MetaMask/core/pull/7534))
+
 ## [7.0.1]
 
 ### Changed

packages/address-book-controller/package.json

@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^9.0.0",
-    "@metamask/controller-utils": "^11.16.0",
+    "@metamask/controller-utils": "^11.17.0",
     "@metamask/messenger": "^0.3.0",
     "@metamask/utils": "^11.8.1"
   },