Merge remote-tracking branch 'origin/main' into cryptodev-2s/messenger/multichain-account-service

Author: cryptodev-2s

.github/CODEOWNERS

@@ -11,6 +11,7 @@
 /packages/multichain-transactions-controller @MetaMask/accounts-engineers
 /packages/multichain-account-service         @MetaMask/accounts-engineers
 /packages/account-tree-controller            @MetaMask/accounts-engineers
+/packages/profile-sync-controller            @MetaMask/accounts-engineers
 
 ## Assets Team
 /packages/assets-controllers         @MetaMask/metamask-assets
@@ -39,9 +40,6 @@
 ## Product Safety Team
 /packages/phishing-controller              @MetaMask/product-safety
 
-## Snaps Team
-/packages/rate-limit-controller            @MetaMask/snaps-devs
-
 ## Swaps-Bridge Team
 /packages/bridge-controller                @MetaMask/swaps-engineers
 /packages/bridge-status-controller        @MetaMask/swaps-engineers
@@ -57,11 +55,11 @@
 /packages/delegation-controller           @MetaMask/vault
 
 ## Wallet API Platform Team
-/packages/chain-agnostic-permission        @MetaMask/wallet-api-platform-engineers
-/packages/eip1193-permission-middleware    @MetaMask/wallet-api-platform-engineers
-/packages/multichain-api-middleware        @MetaMask/wallet-api-platform-engineers
-/packages/selected-network-controller      @MetaMask/wallet-api-platform-engineers
-/packages/eip-5792-middleware              @MetaMask/wallet-api-platform-engineers
+/packages/chain-agnostic-permission        @MetaMask/wallet-integrations
+/packages/eip1193-permission-middleware    @MetaMask/wallet-integrations
+/packages/multichain-api-middleware        @MetaMask/wallet-integrations
+/packages/selected-network-controller      @MetaMask/wallet-integrations
+/packages/eip-5792-middleware              @MetaMask/wallet-integrations
 
 ## Core Platform Team
 /packages/base-controller              @MetaMask/core-platform
@@ -73,25 +71,25 @@
 /packages/sample-controllers           @MetaMask/core-platform
 /packages/polling-controller           @MetaMask/core-platform
 /packages/preferences-controller       @MetaMask/core-platform
+/packages/rate-limit-controller        @MetaMask/core-platform
 
 ## Wallet UX Team
-/packages/announcement-controller      @MetaMask/wallet-ux
+/packages/announcement-controller      @MetaMask/core-extension-ux @MetaMask/mobile-core-ux
 
 ## Web3Auth Team
 /packages/seedless-onboarding-controller @MetaMask/web3auth
 /packages/shield-controller              @MetaMask/web3auth
 /packages/subscription-controller        @MetaMask/web3auth
 
 ## Joint team ownership
-/packages/eth-json-rpc-provider        @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/json-rpc-engine              @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/json-rpc-middleware-stream   @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
+/packages/eth-json-rpc-provider        @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/json-rpc-engine              @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/json-rpc-middleware-stream   @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/keyring-controller           @MetaMask/accounts-engineers @MetaMask/core-platform
 /packages/multichain-network-controller  @MetaMask/core-platform @MetaMask/accounts-engineers @MetaMask/metamask-assets
 /packages/network-controller           @MetaMask/core-platform @MetaMask/metamask-assets
-/packages/permission-controller        @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform @MetaMask/snaps-devs
-/packages/permission-log-controller    @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/profile-sync-controller      @MetaMask/identity
+/packages/permission-controller        @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/permission-log-controller    @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/remote-feature-flag-controller @MetaMask/extension-platform @MetaMask/mobile-platform
 /packages/foundryup                    @MetaMask/mobile-platform @MetaMask/extension-platform
 
@@ -102,22 +100,22 @@
 /packages/accounts-controller/CHANGELOG.md        @MetaMask/accounts-engineers @MetaMask/core-platform
 /packages/address-book-controller/package.json    @MetaMask/confirmations @MetaMask/core-platform
 /packages/address-book-controller/CHANGELOG.md    @MetaMask/confirmations @MetaMask/core-platform
-/packages/announcement-controller/package.json    @MetaMask/wallet-ux @MetaMask/core-platform
-/packages/announcement-controller/CHANGELOG.md    @MetaMask/wallet-ux @MetaMask/core-platform
+/packages/announcement-controller/package.json    @MetaMask/core-extension-ux @MetaMask/mobile-core-ux @MetaMask/core-platform
+/packages/announcement-controller/CHANGELOG.md    @MetaMask/core-extension-ux @MetaMask/mobile-core-ux @MetaMask/core-platform
 /packages/approval-controller/package.json        @MetaMask/confirmations @MetaMask/core-platform
 /packages/approval-controller/CHANGELOG.md        @MetaMask/confirmations @MetaMask/core-platform
 /packages/assets-controllers/package.json         @MetaMask/metamask-assets @MetaMask/core-platform
 /packages/assets-controllers/CHANGELOG.md         @MetaMask/metamask-assets @MetaMask/core-platform
-/packages/chain-agnostic-permission/package.json  @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/chain-agnostic-permission/CHANGELOG.md  @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
+/packages/chain-agnostic-permission/package.json  @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/chain-agnostic-permission/CHANGELOG.md  @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/delegation-controller/package.json      @MetaMask/vault @MetaMask/core-platform
 /packages/delegation-controller/CHANGELOG.md      @MetaMask/vault @MetaMask/core-platform
 /packages/earn-controller/package.json            @MetaMask/earn @MetaMask/core-platform
 /packages/earn-controller/CHANGELOG.md            @MetaMask/earn @MetaMask/core-platform
-/packages/eip-5792-middleware/package.json        @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/eip-5792-middleware/CHANGELOG.md        @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/eip1193-permission-middleware/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/eip1193-permission-middleware/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
+/packages/eip-5792-middleware/package.json        @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/eip-5792-middleware/CHANGELOG.md        @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/eip1193-permission-middleware/package.json @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/eip1193-permission-middleware/CHANGELOG.md @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/ens-controller/package.json             @MetaMask/confirmations @MetaMask/core-platform
 /packages/ens-controller/CHANGELOG.md             @MetaMask/confirmations @MetaMask/core-platform
 /packages/gas-fee-controller/package.json         @MetaMask/confirmations @MetaMask/core-platform
@@ -132,22 +130,20 @@
 /packages/message-manager/CHANGELOG.md            @MetaMask/confirmations @MetaMask/core-platform
 /packages/multichain-account-service/package.json @MetaMask/accounts-engineers @MetaMask/core-platform
 /packages/multichain-account-service/CHANGELOG.md @MetaMask/accounts-engineers @MetaMask/core-platform
-/packages/multichain-api-middleware/package.json  @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/multichain-api-middleware/CHANGELOG.md  @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
+/packages/multichain-api-middleware/package.json  @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/multichain-api-middleware/CHANGELOG.md  @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/name-controller/package.json            @MetaMask/confirmations @MetaMask/core-platform
 /packages/name-controller/CHANGELOG.md            @MetaMask/confirmations @MetaMask/core-platform
 /packages/notification-services-controller/package.json @MetaMask/notifications @MetaMask/core-platform
 /packages/notification-services-controller/CHANGELOG.md @MetaMask/notifications @MetaMask/core-platform
 /packages/phishing-controller/package.json    @MetaMask/product-safety @MetaMask/core-platform
 /packages/phishing-controller/CHANGELOG.md    @MetaMask/product-safety @MetaMask/core-platform
-/packages/profile-sync-controller/package.json    @MetaMask/identity @MetaMask/core-platform
-/packages/profile-sync-controller/CHANGELOG.md    @MetaMask/identity @MetaMask/core-platform
-/packages/selected-network-controller/package.json @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
-/packages/selected-network-controller/CHANGELOG.md @MetaMask/wallet-api-platform-engineers @MetaMask/core-platform
+/packages/profile-sync-controller/package.json    @MetaMask/accounts-engineers @MetaMask/core-platform
+/packages/profile-sync-controller/CHANGELOG.md    @MetaMask/accounts-engineers @MetaMask/core-platform
+/packages/selected-network-controller/package.json @MetaMask/wallet-integrations @MetaMask/core-platform
+/packages/selected-network-controller/CHANGELOG.md @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/signature-controller/package.json       @MetaMask/confirmations @MetaMask/core-platform
 /packages/signature-controller/CHANGELOG.md       @MetaMask/confirmations @MetaMask/core-platform
-/packages/rate-limit-controller/package.json      @MetaMask/snaps-devs @MetaMask/core-platform
-/packages/rate-limit-controller/CHANGELOG.md      @MetaMask/snaps-devs @MetaMask/core-platform
 /packages/transaction-controller/package.json     @MetaMask/confirmations @MetaMask/core-platform
 /packages/transaction-controller/CHANGELOG.md     @MetaMask/confirmations @MetaMask/core-platform
 /packages/user-operation-controller/package.json  @MetaMask/confirmations @MetaMask/core-platform

README.md

@@ -100,7 +100,7 @@ linkStyle default opacity:0.5
   controller_utils(["@metamask/controller-utils"]);
   delegation_controller(["@metamask/delegation-controller"]);
   earn_controller(["@metamask/earn-controller"]);
-  eip-5792-middleware(["@metamask/eip-5792-middleware"])
+  eip_5792_middleware(["@metamask/eip-5792-middleware"]);
   eip1193_permission_middleware(["@metamask/eip1193-permission-middleware"]);
   ens_controller(["@metamask/ens-controller"]);
   error_reporting_service(["@metamask/error-reporting-service"]);
@@ -142,6 +142,8 @@ linkStyle default opacity:0.5
   account_tree_controller --> base_controller;
   account_tree_controller --> accounts_controller;
   account_tree_controller --> keyring_controller;
+  account_tree_controller --> multichain_account_service;
+  account_tree_controller --> profile_sync_controller;
   accounts_controller --> base_controller;
   accounts_controller --> controller_utils;
   accounts_controller --> keyring_controller;
@@ -154,14 +156,17 @@ linkStyle default opacity:0.5
   assets_controllers --> base_controller;
   assets_controllers --> controller_utils;
   assets_controllers --> polling_controller;
+  assets_controllers --> account_tree_controller;
   assets_controllers --> accounts_controller;
   assets_controllers --> approval_controller;
   assets_controllers --> keyring_controller;
+  assets_controllers --> multichain_account_service;
   assets_controllers --> network_controller;
   assets_controllers --> permission_controller;
   assets_controllers --> phishing_controller;
   assets_controllers --> preferences_controller;
   assets_controllers --> transaction_controller;
+  base_controller --> messenger;
   base_controller --> json_rpc_engine;
   bridge_controller --> base_controller;
   bridge_controller --> controller_utils;
@@ -192,9 +197,11 @@ linkStyle default opacity:0.5
   delegation_controller --> keyring_controller;
   earn_controller --> base_controller;
   earn_controller --> controller_utils;
-  earn_controller --> accounts_controller;
+  earn_controller --> account_tree_controller;
   earn_controller --> network_controller;
   earn_controller --> transaction_controller;
+  eip_5792_middleware --> transaction_controller;
+  eip_5792_middleware --> keyring_controller;
   eip1193_permission_middleware --> chain_agnostic_permission;
   eip1193_permission_middleware --> controller_utils;
   eip1193_permission_middleware --> json_rpc_engine;
@@ -244,6 +251,7 @@ linkStyle default opacity:0.5
   network_enablement_controller --> controller_utils;
   network_enablement_controller --> multichain_network_controller;
   network_enablement_controller --> network_controller;
+  network_enablement_controller --> transaction_controller;
   notification_services_controller --> base_controller;
   notification_services_controller --> controller_utils;
   notification_services_controller --> keyring_controller;
@@ -263,7 +271,7 @@ linkStyle default opacity:0.5
   preferences_controller --> controller_utils;
   preferences_controller --> keyring_controller;
   profile_sync_controller --> base_controller;
-  profile_sync_controller --> accounts_controller;
+  profile_sync_controller --> address_book_controller;
   profile_sync_controller --> keyring_controller;
   rate_limit_controller --> base_controller;
   remote_feature_flag_controller --> base_controller;
@@ -277,13 +285,19 @@ linkStyle default opacity:0.5
   selected_network_controller --> json_rpc_engine;
   selected_network_controller --> network_controller;
   selected_network_controller --> permission_controller;
+  shield_controller --> base_controller;
+  shield_controller --> signature_controller;
+  shield_controller --> transaction_controller;
   signature_controller --> base_controller;
   signature_controller --> controller_utils;
   signature_controller --> accounts_controller;
   signature_controller --> approval_controller;
   signature_controller --> keyring_controller;
   signature_controller --> logging_controller;
   signature_controller --> network_controller;
+  subscription_controller --> base_controller;
+  subscription_controller --> controller_utils;
+  subscription_controller --> profile_sync_controller;
   token_search_discovery_controller --> base_controller;
   transaction_controller --> base_controller;
   transaction_controller --> controller_utils;

docs/controller-guidelines.md

@@ -116,19 +116,27 @@ A variable named `${controllerName}Metadata` should be defined (there is no need
 ```typescript
 const keyringControllerMetadata = {
   vault: {
+    // We don't want to include this in state logs because it contains sensitive key material.
+    includeInStateLogs: false,
     // We want to persist this property so it's restored automatically, as we
     // cannot reconstruct it otherwise.
     persist: true,
     // This property can be used to identify a user, so we want to make sure we
     // do not include it in Sentry.
     anonymous: false,
+    // This property is only used in the controller, not in the UI.
+    usedInUi: false,
   },
   isUnlocked: {
+    // This value is not sensitive, and is useful for diagnosing errors reported through support.
+    includeInStateLogs: true
     // We do not need to persist this property in state, as we want to
     // initialize state with the wallet unlocked.
     persist: false,
     // This property has no PII, so it is safe to send to Sentry.
     anonymous: true,
+    // This is used in the UI
+    usedInUi: true,
   },
 };
 

eslint-warning-thresholds.json

@@ -25,10 +25,6 @@
     "import-x/namespace": 9,
     "jest/no-conditional-in-test": 6
   },
-  "packages/assets-controllers/src/NftController.ts": {
-    "@typescript-eslint/prefer-readonly": 1,
-    "jsdoc/check-tag-names": 46
-  },
   "packages/assets-controllers/src/NftDetectionController.test.ts": {
     "import-x/namespace": 6,
     "import-x/order": 4
@@ -107,10 +103,10 @@
     "jsdoc/tag-lines": 2
   },
   "packages/base-controller/src/BaseController.test.ts": {
-    "import-x/namespace": 18
+    "import-x/namespace": 15
   },
   "packages/base-controller/src/next/BaseController.test.ts": {
-    "import-x/namespace": 18
+    "import-x/namespace": 13
   },
   "packages/build-utils/src/transforms/remove-fenced-code.test.ts": {
     "import-x/order": 1
@@ -187,7 +183,6 @@
     "n/no-unsupported-features/node-builtins": 1
   },
   "packages/keyring-controller/src/KeyringController.test.ts": {
-    "import-x/namespace": 5,
     "jest/no-conditional-in-test": 2
   },
   "packages/keyring-controller/src/KeyringController.ts": {
@@ -286,9 +281,6 @@
   "packages/permission-controller/src/PermissionController.test.ts": {
     "jest/no-conditional-in-test": 4
   },
-  "packages/permission-controller/src/PermissionController.ts": {
-    "prettier/prettier": 12
-  },
   "packages/permission-controller/src/rpc-methods/getPermissions.test.ts": {
     "import-x/order": 1
   },
@@ -301,23 +293,13 @@
     "jsdoc/tag-lines": 1
   },
   "packages/phishing-controller/src/PhishingController.ts": {
-    "jsdoc/check-tag-names": 38,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/phishing-controller/src/PhishingDetector.ts": {
-    "@typescript-eslint/no-unused-vars": 1,
-    "@typescript-eslint/prefer-readonly": 2,
-    "jsdoc/tag-lines": 2
-  },
-  "packages/phishing-controller/src/tests/utils.ts": {
-    "@typescript-eslint/no-unused-vars": 1
+    "jsdoc/check-tag-names": 32
   },
   "packages/phishing-controller/src/utils.test.ts": {
     "import-x/namespace": 5
   },
   "packages/phishing-controller/src/utils.ts": {
-    "@typescript-eslint/no-unsafe-enum-comparison": 1,
-    "@typescript-eslint/no-unused-vars": 1
+    "@typescript-eslint/no-unsafe-enum-comparison": 1
   },
   "packages/polling-controller/src/AbstractPollingController.ts": {
     "@typescript-eslint/prefer-readonly": 1
@@ -338,8 +320,7 @@
   },
   "packages/remote-feature-flag-controller/src/remote-feature-flag-controller.ts": {
     "@typescript-eslint/prefer-readonly": 1,
-    "jsdoc/check-tag-names": 2,
-    "prettier/prettier": 1
+    "jsdoc/check-tag-names": 2
   },
   "packages/remote-feature-flag-controller/src/utils/user-segmentation-utils.ts": {
     "jsdoc/tag-lines": 2
@@ -350,29 +331,14 @@
   "packages/seedless-onboarding-controller/src/errors.ts": {
     "@typescript-eslint/no-unsafe-enum-comparison": 1
   },
-  "packages/selected-network-controller/src/SelectedNetworkController.ts": {
-    "@typescript-eslint/prefer-readonly": 1,
-    "prettier/prettier": 6
-  },
   "packages/selected-network-controller/tests/SelectedNetworkController.test.ts": {
     "jest/no-conditional-in-test": 1
   },
   "packages/signature-controller/src/SignatureController.ts": {
-    "@typescript-eslint/no-unsafe-enum-comparison": 4
-  },
-  "packages/signature-controller/src/utils/decoding-api.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/signature-controller/src/utils/decoding-api.ts": {
-    "import-x/order": 1
-  },
-  "packages/signature-controller/src/utils/normalize.test.ts": {
-    "import-x/order": 1
+    "@typescript-eslint/no-unsafe-enum-comparison": 3
   },
   "packages/signature-controller/src/utils/normalize.ts": {
-    "@typescript-eslint/no-unused-vars": 1,
-    "jsdoc/tag-lines": 2
+    "@typescript-eslint/no-unused-vars": 1
   },
   "packages/signature-controller/src/utils/validation.ts": {
     "@typescript-eslint/no-base-to-string": 1,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "539.0.0",
+  "version": "603.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -61,9 +61,9 @@
     "@metamask/eslint-config-nodejs": "^14.0.0",
     "@metamask/eslint-config-typescript": "^14.0.0",
     "@metamask/eth-block-tracker": "^12.0.1",
-    "@metamask/eth-json-rpc-provider": "^4.1.8",
-    "@metamask/json-rpc-engine": "^10.0.3",
-    "@metamask/utils": "^11.4.2",
+    "@metamask/eth-json-rpc-provider": "^5.0.0",
+    "@metamask/json-rpc-engine": "^10.1.0",
+    "@metamask/utils": "^11.8.1",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^27.4.1",
     "@types/lodash": "^4.14.191",