Merge branch 'main' into per-package-lint-autofix

.github/CODEOWNERS

@@ -37,12 +37,16 @@
 ## Snaps Team
 /packages/rate-limit-controller            @MetaMask/snaps-devs
 
+## Swaps-Bridge Team
+/packages/bridge-controller                @MetaMask/swaps-engineers
+
 ## Portfolio Team
 /packages/token-search-discovery-controller      @MetaMask/portfolio
 
 ## Wallet API Platform Team
 /packages/multichain                       @MetaMask/wallet-api-platform-engineers
 /packages/queued-request-controller        @MetaMask/wallet-api-platform-engineers
+/packages/selected-network-controller      @MetaMask/wallet-api-platform-engineers
 
 ## Wallet Framework Team
 /packages/base-controller              @MetaMask/wallet-framework-engineers
@@ -62,7 +66,6 @@
 /packages/network-controller           @MetaMask/wallet-framework-engineers @MetaMask/metamask-assets
 /packages/permission-controller        @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers @MetaMask/snaps-devs
 /packages/permission-log-controller    @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
-/packages/selected-network-controller  @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers @MetaMask/metamask-assets
 /packages/profile-sync-controller      @MetaMask/notifications @MetaMask/identity
 
 ## Package Release related
@@ -112,4 +115,5 @@
 /packages/multichain-transactions-controller/CHANGELOG.md @MetaMask/accounts-engineers @MetaMask/wallet-framework-engineers
 /packages/token-search-discovery-controller/package.json      @MetaMask/portfolio @MetaMask/wallet-framework-engineers
 /packages/token-search-discovery-controller/CHANGELOG.md      @MetaMask/portfolio @MetaMask/wallet-framework-engineers
-
+/packages/bridge-controller/package.json                 @MetaMask/swaps-engineers @MetaMask/wallet-framework-engineers
+/packages/bridge-controller/CHANGELOG.md                 @MetaMask/swaps-engineers @MetaMask/wallet-framework-engineers

.gitignore

@@ -34,4 +34,4 @@ scripts/coverage
 !.yarn/versions
 
 # typescript
-packages/*/*.tsbuildinfo
+packages/*/*.tsbuildinfo

README.md

@@ -26,6 +26,7 @@ Each package in this repository has its own README where you can find installati
 - [`@metamask/approval-controller`](packages/approval-controller)
 - [`@metamask/assets-controllers`](packages/assets-controllers)
 - [`@metamask/base-controller`](packages/base-controller)
+- [`@metamask/bridge-controller`](packages/bridge-controller)
 - [`@metamask/build-utils`](packages/build-utils)
 - [`@metamask/composable-controller`](packages/composable-controller)
 - [`@metamask/controller-utils`](packages/controller-utils)
@@ -39,6 +40,7 @@ Each package in this repository has its own README where you can find installati
 - [`@metamask/logging-controller`](packages/logging-controller)
 - [`@metamask/message-manager`](packages/message-manager)
 - [`@metamask/multichain`](packages/multichain)
+- [`@metamask/multichain-network-controller`](packages/multichain-network-controller)
 - [`@metamask/multichain-transactions-controller`](packages/multichain-transactions-controller)
 - [`@metamask/name-controller`](packages/name-controller)
 - [`@metamask/network-controller`](packages/network-controller)
@@ -85,6 +87,7 @@ linkStyle default opacity:0.5
   logging_controller(["@metamask/logging-controller"]);
   message_manager(["@metamask/message-manager"]);
   multichain(["@metamask/multichain"]);
+  multichain_network_controller(["@metamask/multichain-network-controller"]);
   multichain_transactions_controller(["@metamask/multichain-transactions-controller"]);
   name_controller(["@metamask/name-controller"]);
   network_controller(["@metamask/network-controller"]);
@@ -105,6 +108,7 @@ linkStyle default opacity:0.5
   user_operation_controller(["@metamask/user-operation-controller"]);
   accounts_controller --> base_controller;
   accounts_controller --> keyring_controller;
+  accounts_controller --> network_controller;
   address_book_controller --> base_controller;
   address_book_controller --> controller_utils;
   announcement_controller --> base_controller;
@@ -116,10 +120,15 @@ linkStyle default opacity:0.5
   assets_controllers --> approval_controller;
   assets_controllers --> keyring_controller;
   assets_controllers --> network_controller;
+  assets_controllers --> permission_controller;
   assets_controllers --> preferences_controller;
   base_controller --> json_rpc_engine;
   composable_controller --> base_controller;
   composable_controller --> json_rpc_engine;
+  earn_controller --> base_controller;
+  earn_controller --> controller_utils;
+  earn_controller --> accounts_controller;
+  earn_controller --> network_controller;
   ens_controller --> base_controller;
   ens_controller --> controller_utils;
   ens_controller --> network_controller;
@@ -136,8 +145,15 @@ linkStyle default opacity:0.5
   message_manager --> base_controller;
   message_manager --> controller_utils;
   multichain --> controller_utils;
+  multichain --> json_rpc_engine;
   multichain --> network_controller;
   multichain --> permission_controller;
+  multichain_network_controller --> base_controller;
+  multichain_network_controller --> keyring_controller;
+  multichain_transactions_controller --> base_controller;
+  multichain_transactions_controller --> polling_controller;
+  multichain_transactions_controller --> accounts_controller;
+  multichain_transactions_controller --> keyring_controller;
   name_controller --> base_controller;
   name_controller --> controller_utils;
   network_controller --> base_controller;
@@ -184,6 +200,7 @@ linkStyle default opacity:0.5
   signature_controller --> keyring_controller;
   signature_controller --> logging_controller;
   signature_controller --> network_controller;
+  token_search_discovery_controller --> base_controller;
   transaction_controller --> base_controller;
   transaction_controller --> controller_utils;
   transaction_controller --> accounts_controller;

eslint-warning-thresholds.json

@@ -16,9 +16,6 @@
   "packages/accounts-controller/src/AccountsController.test.ts": {
     "import-x/namespace": 1
   },
-  "packages/accounts-controller/src/utils.ts": {
-    "jsdoc/tag-lines": 3
-  },
   "packages/address-book-controller/src/AddressBookController.ts": {
     "jsdoc/check-tag-names": 13
   },
@@ -35,8 +32,7 @@
     "no-shadow": 2
   },
   "packages/assets-controllers/src/AccountTrackerController.test.ts": {
-    "import-x/namespace": 2,
-    "import-x/order": 2
+    "import-x/namespace": 2
   },
   "packages/assets-controllers/src/AccountTrackerController.ts": {
     "jsdoc/check-tag-names": 5,
@@ -420,33 +416,20 @@
     "jsdoc/tag-lines": 1,
     "prettier/prettier": 1
   },
-  "packages/network-controller/src/create-auto-managed-network-client.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/network-controller/src/create-network-client.ts": {
-    "@typescript-eslint/no-unsafe-enum-comparison": 1
-  },
   "packages/network-controller/tests/NetworkController.test.ts": {
     "@typescript-eslint/no-unused-vars": 1,
     "@typescript-eslint/prefer-promise-reject-errors": 1,
-    "import-x/order": 1,
-    "jest/no-conditional-in-test": 4
+    "import-x/order": 1
   },
   "packages/network-controller/tests/create-network-client.test.ts": {
     "import-x/order": 1
   },
-  "packages/network-controller/tests/provider-api-tests/block-param.ts": {
-    "jest/no-conditional-in-test": 1
-  },
   "packages/network-controller/tests/provider-api-tests/helpers.ts": {
     "@typescript-eslint/prefer-promise-reject-errors": 1,
     "import-x/namespace": 1,
     "import-x/no-named-as-default-member": 1,
     "promise/catch-or-return": 1
   },
-  "packages/network-controller/tests/provider-api-tests/no-block-param.ts": {
-    "jest/no-conditional-in-test": 2
-  },
   "packages/permission-controller/src/Permission.ts": {
     "prettier/prettier": 11
   },
@@ -568,7 +551,6 @@
     "jsdoc/tag-lines": 4
   },
   "packages/transaction-controller/src/TransactionController.test.ts": {
-    "@typescript-eslint/no-unused-vars": 1,
     "import-x/namespace": 1,
     "import-x/order": 4,
     "jsdoc/tag-lines": 1,
@@ -704,13 +686,6 @@
   "packages/transaction-controller/src/utils/nonce.test.ts": {
     "import-x/order": 1
   },
-  "packages/transaction-controller/src/utils/resimulate.test.ts": {
-    "import-x/order": 2
-  },
-  "packages/transaction-controller/src/utils/resimulate.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 7
-  },
   "packages/transaction-controller/src/utils/retry.test.ts": {
     "import-x/order": 1
   },

jest.config.packages.js

@@ -100,6 +100,10 @@ module.exports = {
   // A preset that is used as a base for Jest's configuration
   preset: 'ts-jest',
 
+  // The path to the Prettier executable used to format snapshots
+  // Jest doesn't support Prettier 3 yet, so we use Prettier 2
+  prettierPath: require.resolve('prettier-2'),
+
   // Run tests from one or more projects
   // projects: undefined
 

jest.config.scripts.js

@@ -50,6 +50,10 @@ module.exports = {
   // // A preset that is used as a base for Jest's configuration
   // preset: 'ts-jest',
 
+  // The path to the Prettier executable used to format snapshots
+  // Jest doesn't support Prettier 3 yet, so we use Prettier 2
+  prettierPath: require.resolve('prettier-2'),
+
   // "resetMocks" resets all mocks, including mocked modules, to jest.fn(),
   // between each test case.
   resetMocks: true,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "297.0.0",
+  "version": "299.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -93,6 +93,7 @@
     "lodash": "^4.17.21",
     "nock": "^13.3.1",
     "prettier": "^3.3.3",
+    "prettier-2": "npm:prettier@^2.8.8",
     "prettier-plugin-packagejson": "^2.4.5",
     "rimraf": "^5.0.5",
     "semver": "^7.6.3",

packages/accounts-controller/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [24.0.0]
+
+### Added
+
+- **BREAKING:** Now requires `MultichainNetworkController:didNetworkChange` event to be registered on the messenger ([#5215](https://github.com/MetaMask/core/pull/5215))
+  - This will be used to keep accounts in sync with EVM and non-EVM network changes.
+
+### Changed
+
+- **BREAKING:** Add `@metamask/network-controller@^22.0.0` peer dependency ([#5215](https://github.com/MetaMask/core/pull/5215)), ([#5327](https://github.com/MetaMask/core/pull/5327))
+
+## [23.1.0]
+
+### Added
+
+- Add new keyring type for OneKey ([#5216](https://github.com/MetaMask/core/pull/5216))
+
 ## [23.0.1]
 
 ### Changed
@@ -438,7 +455,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@24.0.0...HEAD
+[24.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.1.0...@metamask/accounts-controller@24.0.0
+[23.1.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.0.1...@metamask/accounts-controller@23.1.0
 [23.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.0.0...@metamask/accounts-controller@23.0.1
 [23.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@22.0.0...@metamask/accounts-controller@23.0.0
 [22.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@21.0.2...@metamask/accounts-controller@22.0.0

packages/accounts-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/accounts-controller",
-  "version": "23.0.1",
+  "version": "24.0.0",
   "description": "Manages internal accounts",
   "keywords": [
     "MetaMask",
@@ -52,6 +52,7 @@
     "@metamask/eth-snap-keyring": "^10.0.0",
     "@metamask/keyring-api": "^17.0.0",
     "@metamask/keyring-internal-api": "^4.0.1",
+    "@metamask/network-controller": "^22.2.1",
     "@metamask/snaps-sdk": "^6.17.1",
     "@metamask/snaps-utils": "^8.10.0",
     "@metamask/utils": "^11.1.0",
@@ -62,7 +63,7 @@
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/keyring-controller": "^19.0.7",
+    "@metamask/keyring-controller": "^19.1.0",
     "@metamask/providers": "^18.1.1",
     "@metamask/snaps-controllers": "^9.19.0",
     "@types/jest": "^27.4.1",
@@ -76,6 +77,7 @@
   },
   "peerDependencies": {
     "@metamask/keyring-controller": "^19.0.0",
+    "@metamask/network-controller": "^22.0.0",
     "@metamask/providers": "^18.1.0",
     "@metamask/snaps-controllers": "^9.19.0",
     "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0"