Merge branch 'mikesposito/messenger/approval-controller' into mikesposito/messenger/polling-controllers

mikesposito · mikesposito · commit 466e1679011a · 2025-10-24T14:56:38.000+02:00
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -24,4 +24,5 @@ npmMinimalAgeGate: 4320 # 3 days (in minutes)
 # regardless of their publish age.
 npmPreapprovedPackages:
   - "@metamask/*"
+  - "@metamask-previews/*"
   - "@lavamoat/*"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "638.0.0",
+  "version": "639.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### 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))
diff --git a/packages/accounts-controller/src/AccountsController.test.ts b/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([
       {
diff --git a/packages/accounts-controller/src/AccountsController.ts b/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),
diff --git a/packages/accounts-controller/src/index.ts b/packages/accounts-controller/src/index.ts
@@ -13,6 +13,7 @@ export type {
   AccountsControllerGetAccountByAddressAction,
   AccountsControllerGetNextAvailableAccountNameAction,
   AccountsControllerGetAccountAction,
+  AccountsControllerGetAccountsAction,
   AccountsControllerUpdateAccountMetadataAction,
   AllowedActions,
   AccountsControllerActions,
diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [83.1.0]
+
+### Added
+
+- Add `Monad Mainnet` into `SUPPORTED_NETWORKS_ACCOUNTS_API_V4`
+
+### Fixed
+
+- Fix incorrect balance scan contract address for `Monad Mainnet`
+  - Remove `Monad Mainnet` in `SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID` ([#6929](https://github.com/MetaMask/core/pull/6929))
+
 ## [83.0.0]
 
 ### Changed
@@ -2168,7 +2179,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@83.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@83.1.0...HEAD
+[83.1.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@83.0.0...@metamask/assets-controllers@83.1.0
 [83.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@82.0.0...@metamask/assets-controllers@83.0.0
 [82.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@81.0.1...@metamask/assets-controllers@82.0.0
 [81.0.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@81.0.0...@metamask/assets-controllers@81.0.1
diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "83.0.0",
+  "version": "83.1.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",
diff --git a/packages/assets-controllers/src/AssetsContractController.ts b/packages/assets-controllers/src/AssetsContractController.ts
@@ -71,8 +71,6 @@ export const SINGLE_CALL_BALANCES_ADDRESS_BY_CHAINID = {
     '0x6aa75276052d96696134252587894ef5ffa520af',
   [SupportedTokenDetectionNetworks.moonriver]:
     '0x6aa75276052d96696134252587894ef5ffa520af',
-  [SupportedTokenDetectionNetworks.monad_mainnet]:
-    '0xC856736BFe4DcB217F6678Ff2C4D7A7939B29A88',
 } as const satisfies Record<Hex, string>;
 
 export const STAKING_CONTRACT_ADDRESS_BY_CHAINID = {
diff --git a/packages/assets-controllers/src/constants.ts b/packages/assets-controllers/src/constants.ts
@@ -15,4 +15,5 @@ export const SUPPORTED_NETWORKS_ACCOUNTS_API_V4 = [
   '0xa4b1', // 42161
   '0x82750', // 534352
   '0x531', // 1329
+  '0x8f', // 143
 ];
diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^33.1.1",
-    "@metamask/assets-controllers": "^83.0.0",
+    "@metamask/assets-controllers": "^83.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/network-controller": "^24.3.0",
diff --git a/packages/keyring-controller/CHANGELOG.md b/packages/keyring-controller/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add actions for `createNewVaultAndKeychain` and `createNewVaultAndRestore` ([#6928](https://github.com/MetaMask/core/pull/6928))
+  - These actions are meant to to be consumed by the `MultichainAccountService` in its `createMultichainAccountWallet` method.
+
 ### Changed
 
 - Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -184,6 +184,16 @@ export type KeyringControllerWithKeyringAction = {
   handler: KeyringController['withKeyring'];
 };
 
+export type KeyringControllerCreateNewVaultAndKeychainAction = {
+  type: `${typeof name}:createNewVaultAndKeychain`;
+  handler: KeyringController['createNewVaultAndKeychain'];
+};
+
+export type KeyringControllerCreateNewVaultAndRestoreAction = {
+  type: `${typeof name}:createNewVaultAndRestore`;
+  handler: KeyringController['createNewVaultAndRestore'];
+};
+
 export type KeyringControllerAddNewKeyringAction = {
   type: `${typeof name}:addNewKeyring`;
   handler: KeyringController['addNewKeyring'];
@@ -226,7 +236,9 @@ export type KeyringControllerActions =
   | KeyringControllerSignUserOperationAction
   | KeyringControllerAddNewAccountAction
   | KeyringControllerWithKeyringAction
-  | KeyringControllerAddNewKeyringAction;
+  | KeyringControllerAddNewKeyringAction
+  | KeyringControllerCreateNewVaultAndKeychainAction
+  | KeyringControllerCreateNewVaultAndRestoreAction;
 
 export type KeyringControllerEvents =
   | KeyringControllerStateChangeEvent
@@ -1780,6 +1792,16 @@ export class KeyringController extends BaseController<
       `${name}:addNewKeyring`,
       this.addNewKeyring.bind(this),
     );
+
+    this.messagingSystem.registerActionHandler(
+      `${name}:createNewVaultAndKeychain`,
+      this.createNewVaultAndKeychain.bind(this),
+    );
+
+    this.messagingSystem.registerActionHandler(
+      `${name}:createNewVaultAndRestore`,
+      this.createNewVaultAndRestore.bind(this),
+    );
   }
 
   /**
diff --git a/packages/subscription-controller/CHANGELOG.md b/packages/subscription-controller/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6444](https://github.com/MetaMask/core/pull/6444))
   - Previously, `SubscriptionController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
+- Make `getCryptoApproveTransactionParams` synchronous ([#6930](https://github.com/MetaMask/core/pull/6930))
 - Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
 
 ## [2.0.0]
diff --git a/packages/subscription-controller/src/SubscriptionController.test.ts b/packages/subscription-controller/src/SubscriptionController.test.ts
@@ -979,7 +979,7 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          const result = await controller.getCryptoApproveTransactionParams({
+          const result = controller.getCryptoApproveTransactionParams({
             chainId: '0x1',
             paymentTokenAddress: '0xtoken',
             productType: PRODUCT_TYPES.SHIELD,
@@ -998,14 +998,14 @@ describe('SubscriptionController', () => {
 
     it('throws when pricing not found', async () => {
       await withController(async ({ controller }) => {
-        await expect(
+        expect(() =>
           controller.getCryptoApproveTransactionParams({
             chainId: '0x1',
             paymentTokenAddress: '0xtoken',
             productType: PRODUCT_TYPES.SHIELD,
             interval: RECURRING_INTERVALS.month,
           }),
-        ).rejects.toThrow('Subscription pricing not found');
+        ).toThrow('Subscription pricing not found');
       });
     });
 
@@ -1020,14 +1020,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Product price not found');
+          ).toThrow('Product price not found');
         },
       );
     });
@@ -1057,14 +1057,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Price not found');
+          ).toThrow('Price not found');
         },
       );
     });
@@ -1084,14 +1084,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Chains payment info not found');
+          ).toThrow('Chains payment info not found');
         },
       );
     });
@@ -1118,14 +1118,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Invalid chain id');
+          ).toThrow('Invalid chain id');
         },
       );
     });
@@ -1138,14 +1138,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken-invalid',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Invalid token address');
+          ).toThrow('Invalid token address');
         },
       );
     });
@@ -1179,14 +1179,14 @@ describe('SubscriptionController', () => {
           },
         },
         async ({ controller }) => {
-          await expect(
+          expect(() =>
             controller.getCryptoApproveTransactionParams({
               chainId: '0x1',
               paymentTokenAddress: '0xtoken',
               productType: PRODUCT_TYPES.SHIELD,
               interval: RECURRING_INTERVALS.month,
             }),
-          ).rejects.toThrow('Conversion rate not found');
+          ).toThrow('Conversion rate not found');
         },
       );
     });
diff --git a/packages/subscription-controller/src/SubscriptionController.ts b/packages/subscription-controller/src/SubscriptionController.ts
@@ -419,9 +419,9 @@ export class SubscriptionController extends StaticIntervalPollingController()<
    * @param request.interval - The interval
    * @returns The crypto approve transaction params
    */
-  async getCryptoApproveTransactionParams(
+  getCryptoApproveTransactionParams(
     request: GetCryptoApproveTransactionRequest,
-  ): Promise<GetCryptoApproveTransactionResponse> {
+  ): GetCryptoApproveTransactionResponse {
     const { pricing } = this.state;
     if (!pricing) {
       throw new Error('Subscription pricing not found');
diff --git a/yarn.lock b/yarn.lock
@@ -2738,7 +2738,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/assets-controllers@npm:^83.0.0, @metamask/assets-controllers@workspace:packages/assets-controllers":
+"@metamask/assets-controllers@npm:^83.1.0, @metamask/assets-controllers@workspace:packages/assets-controllers":
   version: 0.0.0-use.local
   resolution: "@metamask/assets-controllers@workspace:packages/assets-controllers"
   dependencies:
@@ -2900,7 +2900,7 @@ __metadata:
     "@ethersproject/contracts": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/accounts-controller": "npm:^33.1.1"
-    "@metamask/assets-controllers": "npm:^83.0.0"
+    "@metamask/assets-controllers": "npm:^83.1.0"
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/base-controller": "npm:^8.4.2"
     "@metamask/controller-utils": "npm:^11.14.1"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@metamask/core-monorepo",`
`3`		`- "version": "638.0.0",`
	`3`	`+ "version": "639.0.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Monorepo for packages shared between MetaMask clients",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@metamask/assets-controllers",`
`3`		`- "version": "83.0.0",`
	`3`	`+ "version": "83.1.0",`
`4`	`4`	`"description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"MetaMask",`