Merge branch 'main' into cryptodev-2s/messenger/core-backend

Author: mikesposito

.yarnrc.yml

@@ -24,4 +24,5 @@ npmMinimalAgeGate: 4320 # 3 days (in minutes)
 # regardless of their publish age.
 npmPreapprovedPackages:
   - "@metamask/*"
+  - "@metamask-previews/*"
   - "@lavamoat/*"

README.md

@@ -201,8 +201,8 @@ linkStyle default opacity:0.5
   chain_agnostic_permission --> permission_controller;
   composable_controller --> base_controller;
   composable_controller --> json_rpc_engine;
-  core_backend --> base_controller;
   core_backend --> controller_utils;
+  core_backend --> messenger;
   core_backend --> profile_sync_controller;
   core_backend --> accounts_controller;
   core_backend --> keyring_controller;
@@ -216,6 +216,7 @@ linkStyle default opacity:0.5
   earn_controller --> transaction_controller;
   eip_5792_middleware --> transaction_controller;
   eip_5792_middleware --> keyring_controller;
+  eip_7702_internal_rpc_middleware --> controller_utils;
   eip1193_permission_middleware --> chain_agnostic_permission;
   eip1193_permission_middleware --> controller_utils;
   eip1193_permission_middleware --> json_rpc_engine;

eslint-warning-thresholds.json

@@ -287,12 +287,6 @@
   "packages/gas-fee-controller/src/determineGasFeeCalculations.ts": {
     "jsdoc/tag-lines": 4
   },
-  "packages/json-rpc-engine/src/JsonRpcEngine.test.ts": {
-    "jest/no-conditional-in-test": 2
-  },
-  "packages/json-rpc-engine/src/JsonRpcEngine.ts": {
-    "@typescript-eslint/prefer-promise-reject-errors": 2
-  },
   "packages/json-rpc-middleware-stream/src/index.test.ts": {
     "@typescript-eslint/prefer-promise-reject-errors": 3,
     "no-empty-function": 1

package.json

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

packages/account-tree-controller/package.json

@@ -57,12 +57,12 @@
   },
   "devDependencies": {
     "@metamask/account-api": "^0.12.0",
-    "@metamask/accounts-controller": "^33.1.1",
+    "@metamask/accounts-controller": "^33.2.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-api": "^21.0.0",
-    "@metamask/keyring-controller": "^23.1.1",
-    "@metamask/multichain-account-service": "^1.6.1",
-    "@metamask/profile-sync-controller": "^25.1.1",
+    "@metamask/keyring-controller": "^23.2.0",
+    "@metamask/multichain-account-service": "^1.6.2",
+    "@metamask/profile-sync-controller": "^25.1.2",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@types/jest": "^27.4.1",

packages/accounts-controller/CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [33.2.0]
+
+### Added
+
+- Add a `getAccounts` method (and its associated action) that is the plural version of `getAccount` ([#6927](https://github.com/MetaMask/core/pull/6927))
+  - This method is added to primarily be consumed in the `MultichainAccountService`.
+
 ### Changed
 
 - Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
@@ -631,7 +638,8 @@ 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@33.1.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.2.0...HEAD
+[33.2.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.1.1...@metamask/accounts-controller@33.2.0
 [33.1.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.1.0...@metamask/accounts-controller@33.1.1
 [33.1.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.0.0...@metamask/accounts-controller@33.1.0
 [33.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@32.0.2...@metamask/accounts-controller@33.0.0

packages/accounts-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/accounts-controller",
-  "version": "33.1.1",
+  "version": "33.2.0",
   "description": "Manages internal accounts",
   "keywords": [
     "MetaMask",
@@ -66,8 +66,8 @@
   "devDependencies": {
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/controller-utils": "^11.14.1",
-    "@metamask/keyring-controller": "^23.1.1",
-    "@metamask/network-controller": "^24.3.0",
+    "@metamask/keyring-controller": "^23.2.0",
+    "@metamask/network-controller": "^24.3.1",
     "@metamask/providers": "^22.1.0",
     "@metamask/snaps-controllers": "^14.0.1",
     "@types/jest": "^27.4.1",

packages/accounts-controller/src/AccountsController.test.ts

@@ -2777,6 +2777,30 @@ describe('AccountsController', () => {
     });
   });
 
+  describe('getAccounts', () => {
+    it('returns a list of accounts based on the given account IDs', () => {
+      const { accountsController } = setupAccountsController({
+        initialState: {
+          internalAccounts: {
+            accounts: {
+              [mockAccount.id]: mockAccount,
+              [mockAccount2.id]: mockAccount2,
+              [mockAccount3.id]: mockAccount3,
+            },
+            selectedAccount: mockAccount.id,
+          },
+        },
+      });
+
+      const result = accountsController.getAccounts([
+        mockAccount.id,
+        mockAccount3.id,
+      ]);
+
+      expect(result).toStrictEqual([mockAccount, mockAccount3]);
+    });
+  });
+
   describe('getSelectedAccount', () => {
     it.each([
       {

packages/accounts-controller/src/AccountsController.ts

@@ -124,6 +124,11 @@ export type AccountsControllerGetAccountAction = {
   handler: AccountsController['getAccount'];
 };
 
+export type AccountsControllerGetAccountsAction = {
+  type: `${typeof controllerName}:getAccounts`;
+  handler: AccountsController['getAccounts'];
+};
+
 export type AccountsControllerUpdateAccountMetadataAction = {
   type: `${typeof controllerName}:updateAccountMetadata`;
   handler: AccountsController['updateAccountMetadata'];
@@ -145,6 +150,7 @@ export type AccountsControllerActions =
   | AccountsControllerGetSelectedAccountAction
   | AccountsControllerGetNextAvailableAccountNameAction
   | AccountsControllerGetAccountAction
+  | AccountsControllerGetAccountsAction
   | AccountsControllerGetSelectedMultichainAccountAction
   | AccountsControllerUpdateAccountMetadataAction;
 
@@ -303,6 +309,16 @@ export class AccountsController extends BaseController<
     return this.state.internalAccounts.accounts[accountId];
   }
 
+  /**
+   * Returns the internal account objects for the given account IDs, if they exist.
+   *
+   * @param accountIds - The IDs of the accounts to retrieve.
+   * @returns The internal account objects, or undefined if the account(s) do not exist.
+   */
+  getAccounts(accountIds: string[]): (InternalAccount | undefined)[] {
+    return accountIds.map((accountId) => this.getAccount(accountId));
+  }
+
   /**
    * Returns an array of all evm internal accounts.
    *
@@ -1305,6 +1321,11 @@ export class AccountsController extends BaseController<
       this.getAccount.bind(this),
     );
 
+    this.messagingSystem.registerActionHandler(
+      `AccountsController:getAccounts`,
+      this.getAccounts.bind(this),
+    );
+
     this.messagingSystem.registerActionHandler(
       `AccountsController:updateAccountMetadata`,
       this.updateAccountMetadata.bind(this),

packages/accounts-controller/src/index.ts

@@ -13,6 +13,7 @@ export type {
   AccountsControllerGetAccountByAddressAction,
   AccountsControllerGetNextAvailableAccountNameAction,
   AccountsControllerGetAccountAction,
+  AccountsControllerGetAccountsAction,
   AccountsControllerUpdateAccountMetadataAction,
   AllowedActions,
   AccountsControllerActions,