chore: bump multichain accounts deps #6560

ccharly · 2025-09-11T09:32:05Z

Explanation

Bumping accounts dependencies and adapting new account-api and keyring-api breaking changes.

References

N/A

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed, highlighting breaking changes as necessary
I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

socket-security · 2025-09-11T09:35:40Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	@metamask/keyring-internal-api@9.0.0
	@metamask/account-api@0.12.0
	@metamask/keyring-api@21.0.0
	@metamask/eth-snap-keyring@17.1.0

View full report

ccharly · 2025-09-11T09:53:13Z

packages/multichain-account-service/src/MultichainAccountWallet.ts

+    await this.alignAccounts();

-    return discoveredAccounts;
+    return providerContexts.flatMap((context) => context.accounts);


We now only return discovered accounts. If we need to extract metrics from this, we can still rely on the account.type to know if it's a Solana/Bitcoin/EVM accounts that got discovered.

ccharly · 2025-09-11T09:54:26Z

packages/multichain-account-service/src/MultichainAccountWallet.ts

   * Align all multichain account groups.
   */
-  async alignGroups(): Promise<void> {
+  async alignAccounts(): Promise<void> {


Renamed to follow the <operation>Accounts pattern. Also, this function does re-align accounts (create missing one if needed)

But it WILL NOT create missing groups if there's any.

Thus, it's more accounts related.

ccharly · 2025-09-11T09:55:02Z

packages/multichain-account-service/src/MultichainAccountWallet.ts

   * @returns The discovered accounts for each provider.
   */
-  async discoverAndCreateAccounts(): Promise<AccountDiscoveryMetrics> {
+  async discoverAccounts(): Promise<Account[]> {


Same here. Just following the <operation>Accounts pattern.

Also the return type got changed, see this for more details.

ccharly · 2025-09-11T09:55:47Z

...ges/assets-controllers/src/MultichainBalancesController/MultichainBalancesController.test.ts

  },
  scopes: [BtcScope.Testnet],
  options: {},
-  methods: [BtcMethod.SendBitcoin],


This method no longer exists. So we just use all methods from the enum now.

montelaidev

LGTM. Note: this should be breaking for the btc snap because of the keyring-api change.

packages/multichain-account-service/src/MultichainAccountWallet.ts

packages/multichain-account-service/src/providers/SolAccountProvider.test.ts

This reverts commit aa81a4b.

ccharly · 2025-09-11T12:10:22Z

LGTM. Note: this should be breaking for the btc snap because of the keyring-api change.

@montelaidev actually, I believe it's not breaking for the controller themselves. Most of them only depends on KeyringAccount or InternalAccount which have generic shapes.

However, we strongly-enforce account shapes at runtime in the Snap keyring:

https://github.com/MetaMask/accounts/blob/v73.0.0/packages/keyring-snap-bridge/src/account.ts#L30-L105

And since the enum is only used for tests and not part of any public methods/types, none of this should be considered breaking IMO.

cryptodev-2s · 2025-09-11T12:36:37Z

packages/multichain-account-service/package.json

  },
  "peerDependencies": {
-    "@metamask/account-api": "^0.9.0",
+    "@metamask/account-api": "^0.12.0",


Nit: could we add a changelog for this peer dependency bump ?

cryptodev-2s · 2025-09-11T12:38:34Z

packages/multichain-account-service/CHANGELOG.md


+### Changed
+
+- **BREAKING:** Rename `MultichainAccountWallet.discoverAndCreateAccounts` to `MultichainAccountWallet.discoverAccounts` ([#6560](https://github.com/MetaMask/core/pull/6560))


Nit: as AccountProviderWrapper, BaseBip44AccountProvider and SnapAccountProvider are also exported at the index level. Should we add a changelog entry for the same renaming ?

That makes total sense too yes! I'll add those too. Thanks!

cryptodev-2s

LGTM!

…utex for concurrent mutable operations (#6527) ## Explanation Wallet operations are not behind a mutex. This ensure that only one mutable operation can be executed at a time. Also publish new event, so we know in which state a wallet is. > [!NOTE] > A follow-up PR will be using those events to add a new status in the `account-tree-controller`. Depends on this PR to be merged first: - [ ] #6560 ## References N/A ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs), highlighting breaking changes as necessary - [ ] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

## Explanation Release for `@metamask/profile-sync-controller` & `@metamask/multichain-account-service`. ```md ## [25.1.0] ### Changed - Use deferred promises for encryption/decryption KDF operations ([#6736](#6736)) - That will prevent duplicate KDF operations from being computed if one with the same options is already in progress. - For operations that already completed, we use the already existing cache. - Bump `@metamask/utils` from `^11.8.0` to `^11.8.1` ([#6708](#6708)) - Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](#6560)) - Bump `@metamask/keyring-internal-api` from `^8.1.0` to `^9.0.0` ([#6560](#6560)) - Strip `srpSessionData.token.accessToken` from state logs ([#6553](#6553)) - We haven't started using the `includeInStateLogs` metadata yet in clients, so this will have no functional impact. This change brings this metadata into alignment with the hard-coded state log generation performed by clients.today. - Add dependency on `@metamask/utils` ([#6553](#6553)) - Bump `@metamask/base-controller` from `^8.3.0` to `^8.4.0` ([#6632](#6632)) ``` ## References  ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs), highlighting breaking changes as necessary - [ ] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes  --- > [!NOTE] > Releases core 589.0.0, publishing @metamask/profile-sync-controller 25.1.0 and @metamask/multichain-account-service 1.3.0, and bumps dependent packages and changelogs. > > - **Release**: `@metamask/core-monorepo` to `589.0.0`. > - **Packages**: > - `@metamask/profile-sync-controller@25.1.0` > - Use deferred promises for KDF operations; update deps and strip `srpSessionData.token.accessToken` from state logs. > - `@metamask/multichain-account-service@1.3.0` > - Add `{Btc, Trx}AccountProvider`; update compare links. > - **Deps Bumped**: > - Update references to `@metamask/profile-sync-controller` to `^25.1.0` in `account-tree-controller`, `notification-services-controller`, `subscription-controller`, and lockfile. > - Update references to `@metamask/multichain-account-service` to `^1.3.0` in `assets-controllers`, `account-tree-controller`, and lockfile. > - **Changelogs**: > - Add Unreleased note for `assets-controllers` reflecting `multichain-account-service` bump. > - Add `1.3.0` section and links in `multichain-account-service`. > - Add `25.1.0` section and links in `profile-sync-controller`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 88351ca. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup>  --------- Co-authored-by: Antonio Regadas <antonio.regadas@consensys.net>

ccharly added 2 commits September 11, 2025 11:34

chore: bump accounts deps

2125c98

fix: fix breaking changes

2b0b3fc

ccharly force-pushed the chore/bump-multichain-accounts-deps branch from 088c08b to 2b0b3fc Compare September 11, 2025 09:34

chore: update changelogs

ffbf1d2

ccharly marked this pull request as ready for review September 11, 2025 09:52

ccharly requested review from a team as code owners September 11, 2025 09:52

ccharly commented Sep 11, 2025

View reviewed changes

Merge branch 'main' into chore/bump-multichain-accounts-deps

4180c3f

ccharly mentioned this pull request Sep 11, 2025

feat(multichain-account-service): add :walletStatusChange event + mutex for concurrent mutable operations #6527

Merged

5 tasks

montelaidev previously approved these changes Sep 11, 2025

View reviewed changes

mathieuartu reviewed Sep 11, 2025

View reviewed changes

packages/multichain-account-service/src/MultichainAccountWallet.ts Outdated Show resolved Hide resolved

packages/multichain-account-service/src/providers/SolAccountProvider.test.ts Outdated Show resolved Hide resolved

ccharly added 2 commits September 11, 2025 13:57

chore: update accounts-controller changelog

aa81a4b

chore: pr feedback

0cc7269

ccharly dismissed montelaidev’s stale review via 0cc7269 September 11, 2025 11:57

Revert "chore: update accounts-controller changelog"

b9d57e1

This reverts commit aa81a4b.

mathieuartu previously approved these changes Sep 11, 2025

View reviewed changes

fabiobozzo previously approved these changes Sep 11, 2025

View reviewed changes

montelaidev previously approved these changes Sep 11, 2025

View reviewed changes

ccharly enabled auto-merge (squash) September 11, 2025 12:22

chore: fix missing entries in changelog

aefd4c2

ccharly dismissed stale reviews from montelaidev, fabiobozzo, and mathieuartu via aefd4c2 September 11, 2025 12:28

montelaidev previously approved these changes Sep 11, 2025

View reviewed changes

cryptodev-2s reviewed Sep 11, 2025

View reviewed changes

chore: fix missing entries in changelog

1c3e586

ccharly dismissed montelaidev’s stale review via 1c3e586 September 11, 2025 12:47

cryptodev-2s approved these changes Sep 11, 2025

View reviewed changes

Merge branch 'main' into chore/bump-multichain-accounts-deps

f090bbd

mathieuartu approved these changes Sep 11, 2025

View reviewed changes

Prithpal-Sooriya approved these changes Sep 11, 2025

View reviewed changes

ccharly merged commit 63d5826 into main Sep 11, 2025
239 checks passed

ccharly deleted the chore/bump-multichain-accounts-deps branch September 11, 2025 13:06


		### Changed

		- BREAKING: Rename `MultichainAccountWallet.discoverAndCreateAccounts` to `MultichainAccountWallet.discoverAccounts` ([#6560](https://github.com/MetaMask/core/pull/6560))

Uh oh!

chore: bump multichain accounts deps #6560

chore: bump multichain accounts deps #6560

Uh oh!

Conversation

ccharly commented Sep 11, 2025

Explanation

References

Checklist

Uh oh!

socket-security bot commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ccharly Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

ccharly Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

ccharly Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

ccharly Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

montelaidev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ccharly commented Sep 11, 2025

Uh oh!

cryptodev-2s Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

cryptodev-2s Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

ccharly Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

cryptodev-2s left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

socket-security bot commented Sep 11, 2025 •

edited

Loading