Skip to content

chore: bump multichain accounts deps #6560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccharly merged 10 commits into from
Sep 11, 2025
Merged

chore: bump multichain accounts deps #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2125c98
chore: bump accounts deps
ccharly Sep 10, 2025
2b0b3fc
fix: fix breaking changes
ccharly Sep 11, 2025
ffbf1d2
chore: update changelogs
ccharly Sep 11, 2025
4180c3f
Merge branch 'main' into chore/bump-multichain-accounts-deps
ccharly Sep 11, 2025
aa81a4b
chore: update accounts-controller changelog
ccharly Sep 11, 2025
0cc7269
chore: pr feedback
ccharly Sep 11, 2025
b9d57e1
Revert "chore: update accounts-controller changelog"
ccharly Sep 11, 2025
aefd4c2
chore: fix missing entries in changelog
ccharly Sep 11, 2025
1c3e586
chore: fix missing entries in changelog
ccharly Sep 11, 2025
f090bbd
Merge branch 'main' into chore/bump-multichain-accounts-deps
ccharly Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/account-tree-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- **BREAKING:** Bump peer dependency `@metamask/account-api` from `^0.9.0` to `^0.12.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [0.14.0]

### Added
Expand Down
6 changes: 3 additions & 3 deletions packages/account-tree-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@metamask/account-api": "^0.9.0",
"@metamask/account-api": "^0.12.0",
"@metamask/accounts-controller": "^33.0.0",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/keyring-controller": "^23.0.0",
"@metamask/multichain-account-service": "^0.7.0",
"@metamask/profile-sync-controller": "^25.0.0",
Expand All @@ -75,7 +75,7 @@
"webextension-polyfill": "^0.12.0"
},
"peerDependencies": {
"@metamask/account-api": "^0.9.0",
"@metamask/account-api": "^0.12.0",
"@metamask/accounts-controller": "^33.0.0",
"@metamask/keyring-controller": "^23.0.0",
"@metamask/multichain-account-service": "^0.7.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/accounts-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Bump `@metamask/base-controller` from `^8.1.0` to `^8.3.0` ([#6355](https://github.com/MetaMask/core/pull/6355), [#6465](https://github.com/MetaMask/core/pull/6465))
- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/keyring-internal-api` from `^8.1.0` to `^9.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/eth-snap-keyring` from `^16.1.0` to `^17.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [33.0.0]

Expand Down
6 changes: 3 additions & 3 deletions packages/accounts-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"dependencies": {
"@ethereumjs/util": "^9.1.0",
"@metamask/base-controller": "^8.3.0",
"@metamask/eth-snap-keyring": "^16.1.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-internal-api": "^8.1.0",
"@metamask/eth-snap-keyring": "^17.0.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/keyring-internal-api": "^9.0.0",
"@metamask/keyring-utils": "^3.1.0",
"@metamask/snaps-sdk": "^9.0.0",
"@metamask/snaps-utils": "^11.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/assets-controllers/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- **BREAKING:** Replace `useAccountAPI` boolean with `accountsApiChainIds` array in `TokenBalancesController` for granular per-chain Accounts API configuration ([#6487](https://github.com/MetaMask/core/pull/6487))
- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [74.3.3]

Expand Down
8 changes: 4 additions & 4 deletions packages/assets-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@metamask/contract-metadata": "^2.4.0",
"@metamask/controller-utils": "^11.12.0",
"@metamask/eth-query": "^4.0.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/metamask-eth-abis": "^3.1.1",
"@metamask/polling-controller": "^14.0.0",
"@metamask/rpc-errors": "^7.0.2",
Expand All @@ -79,15 +79,15 @@
},
"devDependencies": {
"@babel/runtime": "^7.23.9",
"@metamask/account-api": "^0.9.0",
"@metamask/account-api": "^0.12.0",
"@metamask/account-tree-controller": "^0.14.0",
"@metamask/accounts-controller": "^33.0.0",
"@metamask/approval-controller": "^7.1.3",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/ethjs-provider-http": "^0.3.0",
"@metamask/keyring-controller": "^23.0.0",
"@metamask/keyring-internal-api": "^8.1.0",
"@metamask/keyring-snap-client": "^7.0.0",
"@metamask/keyring-internal-api": "^9.0.0",
"@metamask/keyring-snap-client": "^8.0.0",
"@metamask/multichain-account-service": "^0.7.0",
"@metamask/network-controller": "^24.1.0",
"@metamask/permission-controller": "^11.0.6",
Expand Down
2 changes: 1 addition & 1 deletion .../assets-controllers/src/MultichainBalancesController/MultichainBalancesController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const mockBtcAccount = {
},
scopes: [BtcScope.Testnet],
options: {},
methods: [BtcMethod.SendBitcoin],
Copy link
Contributor Author

@ccharly ccharly Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

methods: Object.values(BtcMethod),
type: BtcAccountType.P2wpkh,
};

Expand Down
4 changes: 4 additions & 0 deletions packages/bridge-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [42.0.0]

### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@metamask/base-controller": "^8.3.0",
"@metamask/controller-utils": "^11.12.0",
"@metamask/gas-fee-controller": "^24.0.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/metamask-eth-abis": "^3.1.1",
"@metamask/multichain-network-controller": "^0.12.0",
"@metamask/polling-controller": "^14.0.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/bridge-status-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [42.0.0]

### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-status-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"dependencies": {
"@metamask/base-controller": "^8.3.0",
"@metamask/controller-utils": "^11.12.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/polling-controller": "^14.0.0",
"@metamask/superstruct": "^3.1.0",
"@metamask/utils": "^11.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/chain-agnostic-permission/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"devDependencies": {
"@metamask/auto-changelog": "^3.4.4",
"@metamask/keyring-internal-api": "^8.1.0",
"@metamask/keyring-internal-api": "^9.0.0",
"@types/jest": "^27.4.1",
"deepmerge": "^4.2.2",
"jest": "^27.5.1",
Expand Down
1 change: 1 addition & 0 deletions packages/earn-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Bump `@metamask/base-controller` from `^8.2.0` to `^8.3.0` ([#6465](https://github.com/MetaMask/core/pull/6465))
- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [7.0.0]

Expand Down
2 changes: 1 addition & 1 deletion packages/earn-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@ethersproject/providers": "^5.7.0",
"@metamask/base-controller": "^8.3.0",
"@metamask/controller-utils": "^11.12.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/stake-sdk": "^3.2.1",
"reselect": "^5.1.1"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/keyring-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Bump `@metamask/base-controller` from `^8.1.0` to `^8.3.0` ([#6355](https://github.com/MetaMask/core/pull/6355), [#6465](https://github.com/MetaMask/core/pull/6465))
- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/keyring-internal-api` from `^8.1.0` to `^9.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [23.0.0]

Expand Down
4 changes: 2 additions & 2 deletions packages/keyring-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@metamask/eth-hd-keyring": "^12.0.0",
"@metamask/eth-sig-util": "^8.2.0",
"@metamask/eth-simple-keyring": "^10.0.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-internal-api": "^8.1.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/keyring-internal-api": "^9.0.0",
"@metamask/utils": "^11.4.2",
"async-mutex": "^0.5.0",
"ethereumjs-wallet": "^1.0.1",
Expand Down
10 changes: 10 additions & 0 deletions packages/multichain-account-service/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add `multichainAccountGroupCreated` event emitted from wallet level when new groups are created.
- Add `multichainAccountGroupUpdated` event emitted from wallet level when groups are synchronized.

### Changed

- **BREAKING:** Bump peer dependency `@metamask/account-api` from `^0.9.0` to `^0.12.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- **BREAKING:** Rename `alignGroups` to `alignAccounts` for `MultichainAccountWallet` ([#6560](https://github.com/MetaMask/core/pull/6560))
- **BREAKING:** Rename `MultichainAccountWallet.discoverAndCreateAccounts` to `discoverAccounts` for `MultichainAccountWallet` and `*Provider*` types ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/keyring-api` from `^20.1.0` to `^21.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/keyring-internal-api` from `^8.1.0` to `^9.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/keyring-snap-client` from `^7.0.0` to `^8.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))
- Bump `@metamask/eth-snap-keyring` from `^16.1.0` to `^17.0.0` ([#6560](https://github.com/MetaMask/core/pull/6560))

## [0.7.0]

### Added
Expand Down
12 changes: 6 additions & 6 deletions packages/multichain-account-service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,18 @@
},
"dependencies": {
"@metamask/base-controller": "^8.3.0",
"@metamask/eth-snap-keyring": "^16.1.0",
"@metamask/keyring-api": "^20.1.0",
"@metamask/keyring-internal-api": "^8.1.0",
"@metamask/keyring-snap-client": "^7.0.0",
"@metamask/eth-snap-keyring": "^17.0.0",
"@metamask/keyring-api": "^21.0.0",
"@metamask/keyring-internal-api": "^9.0.0",
"@metamask/keyring-snap-client": "^8.0.0",
"@metamask/keyring-utils": "^3.1.0",
"@metamask/snaps-sdk": "^9.0.0",
"@metamask/snaps-utils": "^11.0.0",
"@metamask/superstruct": "^3.1.0",
"@metamask/utils": "^11.4.2"
},
"devDependencies": {
"@metamask/account-api": "^0.9.0",
"@metamask/account-api": "^0.12.0",
"@metamask/accounts-controller": "^33.0.0",
"@metamask/auto-changelog": "^3.4.4",
"@metamask/keyring-controller": "^23.0.0",
Expand All @@ -77,7 +77,7 @@
"webextension-polyfill": "^0.12.0"
},
"peerDependencies": {
"@metamask/account-api": "^0.9.0",
"@metamask/account-api": "^0.12.0",
Copy link
Contributor

@cryptodev-2s cryptodev-2s Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

"@metamask/accounts-controller": "^33.0.0",
"@metamask/keyring-controller": "^23.0.0",
"@metamask/providers": "^22.0.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/multichain-account-service/src/MultichainAccountService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ describe('MultichainAccountService', () => {
jest.spyOn(solProvider, 'getAccounts');
jest.spyOn(solProvider, 'getAccount');
jest.spyOn(solProvider, 'createAccounts');
jest.spyOn(solProvider, 'discoverAndCreateAccounts');
jest.spyOn(solProvider, 'discoverAccounts');
jest.spyOn(solProvider, 'isAccountCompatible');

wrapper = new AccountProviderWrapper(
Expand Down Expand Up @@ -985,24 +985,24 @@ describe('MultichainAccountService', () => {
expect(result).toStrictEqual([]);
});

it('returns empty array when discoverAndCreateAccounts() is disabled', async () => {
it('returns empty array when discoverAccounts() is disabled', async () => {
const options = {
entropySource: MOCK_HD_ACCOUNT_1.options.entropy.id,
groupIndex: 0,
};

// Enable first - should work normally
(solProvider.discoverAndCreateAccounts as jest.Mock).mockResolvedValue([
(solProvider.discoverAccounts as jest.Mock).mockResolvedValue([
MOCK_HD_ACCOUNT_1,
]);
expect(await wrapper.discoverAndCreateAccounts(options)).toStrictEqual([
expect(await wrapper.discoverAccounts(options)).toStrictEqual([
MOCK_HD_ACCOUNT_1,
]);

// Disable - should return empty array
wrapper.setEnabled(false);

const result = await wrapper.discoverAndCreateAccounts(options);
const result = await wrapper.discoverAccounts(options);
expect(result).toStrictEqual([]);
});

Expand Down
4 changes: 2 additions & 2 deletions packages/multichain-account-service/src/MultichainAccountService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ export class MultichainAccountService {
*/
async alignWallets(): Promise<void> {
const wallets = this.getMultichainAccountWallets();
await Promise.all(wallets.map((w) => w.alignGroups()));
await Promise.all(wallets.map((w) => w.alignAccounts()));
}

/**
Expand All @@ -423,6 +423,6 @@ export class MultichainAccountService {
*/
async alignWallet(entropySource: EntropySourceId): Promise<void> {
const wallet = this.getMultichainAccountWallet({ entropySource });
await wallet.alignGroups();
await wallet.alignAccounts();
}
}
Loading
Loading