From 376fd49142ca78d36421f4875576452e7f874831 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 11:34:20 +0200 Subject: [PATCH 01/13] chore: bump accounts deps --- packages/account-tree-controller/package.json | 4 +- packages/account-tree-controller/src/group.ts | 2 + packages/accounts-controller/package.json | 6 +- packages/assets-controller/package.json | 6 +- packages/assets-controllers/package.json | 8 +- packages/bridge-controller/package.json | 2 +- .../chain-agnostic-permission/package.json | 2 +- .../src/scope/types.ts | 12 +- packages/earn-controller/package.json | 2 +- packages/keyring-controller/package.json | 8 +- .../src/KeyringController.ts | 10 +- .../money-account-controller/package.json | 4 +- .../multichain-account-service/package.json | 14 +- .../src/providers/AccountProviderWrapper.ts | 4 +- .../src/providers/BaseBip44AccountProvider.ts | 4 +- .../src/providers/BtcAccountProvider.ts | 4 +- .../src/providers/EvmAccountProvider.ts | 4 +- .../src/providers/SolAccountProvider.ts | 4 +- .../src/providers/TrxAccountProvider.ts | 4 +- .../src/tests/providers.ts | 4 +- .../package.json | 4 +- .../package.json | 6 +- .../package.json | 2 +- packages/perps-controller/package.json | 2 +- .../profile-metrics-controller/package.json | 2 +- packages/profile-sync-controller/package.json | 4 +- yarn.lock | 364 +++++++++--------- 27 files changed, 250 insertions(+), 242 deletions(-) diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index 43f41a3752e..91bed2de499 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -55,7 +55,7 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "@metamask/multichain-account-service": "^8.0.1", @@ -69,7 +69,7 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@metamask/account-api": "^1.0.0", + "@metamask/account-api": "^1.0.2", "@metamask/auto-changelog": "^6.0.0", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", diff --git a/packages/account-tree-controller/src/group.ts b/packages/account-tree-controller/src/group.ts index 118dd0e5530..5e53cbc5a08 100644 --- a/packages/account-tree-controller/src/group.ts +++ b/packages/account-tree-controller/src/group.ts @@ -10,6 +10,7 @@ import { EthAccountType, SolAccountType, TrxAccountType, + XlmAccountType, } from '@metamask/keyring-api'; import type { KeyringAccountType } from '@metamask/keyring-api'; @@ -45,6 +46,7 @@ export const ACCOUNT_TYPE_TO_SORT_ORDER: Record = { [BtcAccountType.P2wpkh]: 5, [BtcAccountType.P2tr]: 6, [TrxAccountType.Eoa]: 7, + [XlmAccountType.Account]: 8, [AnyAccountType.Account]: MAX_SORT_ORDER, }; diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 2ae5138b172..1f31ce2d47e 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -55,10 +55,10 @@ "dependencies": { "@ethereumjs/util": "^9.1.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-snap-keyring": "^19.0.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/eth-snap-keyring": "^21.0.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@metamask/keyring-utils": "^3.1.0", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index b7d87b20ca4..beda6f5b674 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -62,10 +62,10 @@ "@metamask/client-controller": "^1.0.1", "@metamask/controller-utils": "^11.20.0", "@metamask/core-backend": "^6.2.1", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.0.0", - "@metamask/keyring-snap-client": "^8.2.0", + "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-snap-client": "^9.0.0", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/network-enablement-controller": "^5.0.2", diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 14f97fb4fe2..e547bff8f0e 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -68,7 +68,7 @@ "@metamask/controller-utils": "^11.20.0", "@metamask/core-backend": "^6.2.1", "@metamask/eth-query": "^4.0.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "@metamask/metamask-eth-abis": "^3.1.1", @@ -101,11 +101,11 @@ }, "devDependencies": { "@babel/runtime": "^7.23.9", - "@metamask/account-api": "^1.0.0", + "@metamask/account-api": "^1.0.2", "@metamask/auto-changelog": "^6.0.0", "@metamask/ethjs-provider-http": "^0.3.0", - "@metamask/keyring-internal-api": "^10.0.0", - "@metamask/keyring-snap-client": "^8.2.0", + "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-snap-client": "^9.0.0", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index aa8bfa9de66..8634bac9ea9 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -63,7 +63,7 @@ "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", "@metamask/gas-fee-controller": "^26.1.1", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/messenger": "^1.1.1", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/multichain-network-controller": "^3.0.6", diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index eb376040fd4..e7d421d1963 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", "deepmerge": "^4.2.2", diff --git a/packages/chain-agnostic-permission/src/scope/types.ts b/packages/chain-agnostic-permission/src/scope/types.ts index af01e6f8dd5..24c2c036c27 100644 --- a/packages/chain-agnostic-permission/src/scope/types.ts +++ b/packages/chain-agnostic-permission/src/scope/types.ts @@ -116,10 +116,14 @@ export const parseScopeString = ( /** * CAIP namespaces excluding "wallet" currently supported by/known to the wallet. */ -export type NonWalletKnownCaipNamespace = Exclude< - KnownCaipNamespace, - KnownCaipNamespace.Wallet ->; +export type NonWalletKnownCaipNamespace = + // NOTE: Using explicit enum values to avoid having breaking change when + // `KnownCaipNamespace` is updated with new namespaces that we don't yet + // support. + | KnownCaipNamespace.Eip155 + | KnownCaipNamespace.Bip122 + | KnownCaipNamespace.Solana + | KnownCaipNamespace.Tron; /** * Checks if a scope string is either a 'wallet' scope or a 'wallet:*' scope. diff --git a/packages/earn-controller/package.json b/packages/earn-controller/package.json index a5658947b0b..cb26d8a44d8 100644 --- a/packages/earn-controller/package.json +++ b/packages/earn-controller/package.json @@ -58,7 +58,7 @@ "@metamask/account-tree-controller": "^7.0.0", "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/stake-sdk": "^3.2.1", diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 29e13e25d1a..5da9820bc7b 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -56,11 +56,11 @@ "@ethereumjs/util": "^9.1.0", "@metamask/base-controller": "^9.1.0", "@metamask/browser-passworder": "^6.0.0", - "@metamask/eth-hd-keyring": "^13.1.1", + "@metamask/eth-hd-keyring": "^14.0.0", "@metamask/eth-sig-util": "^8.2.0", - "@metamask/eth-simple-keyring": "^11.1.2", - "@metamask/keyring-api": "^21.6.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/eth-simple-keyring": "^12.0.0", + "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@metamask/messenger": "^1.1.1", "@metamask/utils": "^11.9.0", "async-mutex": "^0.5.0", diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index d3d7def12b7..da3b836bba4 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -2,18 +2,22 @@ import type { TypedTransaction, TypedTxData } from '@ethereumjs/tx'; import { isValidPrivate, getBinarySize } from '@ethereumjs/util'; import { BaseController } from '@metamask/base-controller'; import type * as encryptorUtils from '@metamask/browser-passworder'; -import { HdKeyring, HdKeyringV2 } from '@metamask/eth-hd-keyring'; +import { HdKeyring } from '@metamask/eth-hd-keyring'; +import { HdKeyring as HdKeyringV2 } from '@metamask/eth-hd-keyring/v2'; import { normalize as ethNormalize } from '@metamask/eth-sig-util'; -import SimpleKeyring, { SimpleKeyringV2 } from '@metamask/eth-simple-keyring'; +import SimpleKeyring from '@metamask/eth-simple-keyring'; +import { SimpleKeyring as SimpleKeyringV2 } from '@metamask/eth-simple-keyring/v2'; import type { KeyringExecutionContext, EthBaseTransaction, EthBaseUserOperation, EthUserOperation, EthUserOperationPatch, - KeyringV2, KeyringAccount, } from '@metamask/keyring-api'; +import type { + Keyring as KeyringV2, +} from '@metamask/keyring-api/v2'; import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Keyring, KeyringClass } from '@metamask/keyring-utils'; import type { Messenger } from '@metamask/messenger'; diff --git a/packages/money-account-controller/package.json b/packages/money-account-controller/package.json index 8b35012178d..9e83eb01c75 100644 --- a/packages/money-account-controller/package.json +++ b/packages/money-account-controller/package.json @@ -55,8 +55,8 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-money-keyring": "^2.0.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/eth-money-keyring": "^2.0.1", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "async-mutex": "^0.5.0" diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 25b625deeb6..6b6186736cf 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -56,12 +56,12 @@ "@ethereumjs/util": "^9.1.0", "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-snap-keyring": "^19.0.0", + "@metamask/eth-snap-keyring": "^21.0.0", "@metamask/key-tree": "^10.1.1", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.0.0", - "@metamask/keyring-snap-client": "^8.2.0", + "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-snap-client": "^9.0.0", "@metamask/keyring-utils": "^3.1.0", "@metamask/messenger": "^1.1.1", "@metamask/snaps-controllers": "^19.0.0", @@ -73,10 +73,10 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@metamask/account-api": "^1.0.0", + "@metamask/account-api": "^1.0.2", "@metamask/auto-changelog": "^6.0.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/eth-hd-keyring": "^13.1.1", + "@metamask/eth-hd-keyring": "^14.0.0", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", @@ -92,7 +92,7 @@ "webextension-polyfill": "^0.12.0" }, "peerDependencies": { - "@metamask/account-api": "^1.0.0", + "@metamask/account-api": "^1.0.2", "@metamask/providers": "^22.0.0", "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" }, diff --git a/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts b/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts index 40b1c8aba95..61e98b981b1 100644 --- a/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts +++ b/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts @@ -3,8 +3,10 @@ import type { CreateAccountOptions, EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { MultichainAccountServiceMessenger } from '../types'; diff --git a/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts b/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts index 969ea506de3..e38b2b54024 100644 --- a/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts +++ b/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts @@ -4,8 +4,10 @@ import type { CreateAccountOptions, EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import type { KeyringMetadata, KeyringSelector, diff --git a/packages/multichain-account-service/src/providers/BtcAccountProvider.ts b/packages/multichain-account-service/src/providers/BtcAccountProvider.ts index 9f48a506849..bcbbde63a8d 100644 --- a/packages/multichain-account-service/src/providers/BtcAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/BtcAccountProvider.ts @@ -3,8 +3,10 @@ import type { TraceCallback } from '@metamask/controller-utils'; import type { EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import { AccountCreationType, BtcAccountType, diff --git a/packages/multichain-account-service/src/providers/EvmAccountProvider.ts b/packages/multichain-account-service/src/providers/EvmAccountProvider.ts index aa0e1eb97d9..8b3ed4df290 100644 --- a/packages/multichain-account-service/src/providers/EvmAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/EvmAccountProvider.ts @@ -7,8 +7,10 @@ import type { CreateAccountOptions, EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import { AccountCreationType, assertCreateAccountOptionIsSupported, diff --git a/packages/multichain-account-service/src/providers/SolAccountProvider.ts b/packages/multichain-account-service/src/providers/SolAccountProvider.ts index 7d29880e710..17d3cfba7f6 100644 --- a/packages/multichain-account-service/src/providers/SolAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/SolAccountProvider.ts @@ -4,8 +4,10 @@ import type { TraceCallback } from '@metamask/controller-utils'; import type { EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import { AccountCreationType, KeyringAccountEntropyTypeOption, diff --git a/packages/multichain-account-service/src/providers/TrxAccountProvider.ts b/packages/multichain-account-service/src/providers/TrxAccountProvider.ts index 451907ea6b8..578b521ead9 100644 --- a/packages/multichain-account-service/src/providers/TrxAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/TrxAccountProvider.ts @@ -3,8 +3,10 @@ import type { TraceCallback } from '@metamask/controller-utils'; import type { EntropySourceId, KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import { AccountCreationType, TrxAccountType, diff --git a/packages/multichain-account-service/src/tests/providers.ts b/packages/multichain-account-service/src/tests/providers.ts index 9544c9f9780..45d127b6ffd 100644 --- a/packages/multichain-account-service/src/tests/providers.ts +++ b/packages/multichain-account-service/src/tests/providers.ts @@ -2,8 +2,10 @@ import type { Bip44Account } from '@metamask/account-api'; import { BtcScope, EthScope, SolScope, TrxScope } from '@metamask/keyring-api'; import type { KeyringAccount, - KeyringCapabilities, } from '@metamask/keyring-api'; +import type { + KeyringCapabilities, +} from '@metamask/keyring-api/v2'; import { AccountProviderWrapper, EvmAccountProvider } from '../providers'; import { GroupIndexRange } from '../utils'; diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index e42f71d96f2..0649b76d333 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -56,8 +56,8 @@ "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^21.6.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/superstruct": "^3.1.0", diff --git a/packages/multichain-transactions-controller/package.json b/packages/multichain-transactions-controller/package.json index d37a6310c94..6c130944452 100644 --- a/packages/multichain-transactions-controller/package.json +++ b/packages/multichain-transactions-controller/package.json @@ -55,9 +55,9 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/keyring-api": "^21.6.0", - "@metamask/keyring-internal-api": "^10.0.0", - "@metamask/keyring-snap-client": "^8.2.0", + "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-snap-client": "^9.0.0", "@metamask/messenger": "^1.1.1", "@metamask/polling-controller": "^16.0.4", "@metamask/snaps-controllers": "^19.0.0", diff --git a/packages/network-enablement-controller/package.json b/packages/network-enablement-controller/package.json index a10eea7acb0..ec0da62531c 100644 --- a/packages/network-enablement-controller/package.json +++ b/packages/network-enablement-controller/package.json @@ -55,7 +55,7 @@ "dependencies": { "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^21.6.0", + "@metamask/keyring-api": "^23.0.0", "@metamask/messenger": "^1.1.1", "@metamask/multichain-network-controller": "^3.0.6", "@metamask/network-controller": "^30.0.1", diff --git a/packages/perps-controller/package.json b/packages/perps-controller/package.json index 95e5e12dbfd..d93e364160c 100644 --- a/packages/perps-controller/package.json +++ b/packages/perps-controller/package.json @@ -71,7 +71,7 @@ "@metamask/auto-changelog": "^6.0.0", "@metamask/geolocation-controller": "^0.1.2", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@metamask/network-controller": "^30.0.1", "@metamask/profile-sync-controller": "^28.0.2", "@metamask/remote-feature-flag-controller": "^4.2.0", diff --git a/packages/profile-metrics-controller/package.json b/packages/profile-metrics-controller/package.json index 4d763f172e9..5cea97d5479 100644 --- a/packages/profile-metrics-controller/package.json +++ b/packages/profile-metrics-controller/package.json @@ -66,7 +66,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", "deepmerge": "^4.2.2", diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index 0c5f0c7c8ca..75adfac4a00 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -124,8 +124,8 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-api": "^21.6.0", - "@metamask/keyring-internal-api": "^10.0.0", + "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-internal-api": "^10.1.0", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", diff --git a/yarn.lock b/yarn.lock index 8ddcdc06186..7c55d1411c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2512,14 +2512,14 @@ __metadata: languageName: node linkType: hard -"@metamask/account-api@npm:^1.0.0": - version: 1.0.0 - resolution: "@metamask/account-api@npm:1.0.0" +"@metamask/account-api@npm:^1.0.2": + version: 1.0.2 + resolution: "@metamask/account-api@npm:1.0.2" dependencies: - "@metamask/keyring-api": "npm:^21.4.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-utils": "npm:^3.2.0" uuid: "npm:^9.0.1" - checksum: 10/221fe044b9fb2e1cf79edea22834cfcd4e2658e26a649375b77ac7436ed6bb2f90b76168d449aef52cdd608a8908ca84570387b200f39fcd8f1127134671e7ce + checksum: 10/6efee14be4334ad31df689d21bc3d16a1d27d01529cbbfd75a5f255e97ce7fdc95dccb2f2cfeb50466aa65f9781d58c89768764e61a44530cfeb7dc9137756f8 languageName: node linkType: hard @@ -2527,11 +2527,11 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/account-tree-controller@workspace:packages/account-tree-controller" dependencies: - "@metamask/account-api": "npm:^1.0.0" + "@metamask/account-api": "npm:^1.0.2" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/multichain-account-service": "npm:^8.0.1" @@ -2568,10 +2568,10 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/eth-snap-keyring": "npm:^19.0.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/eth-snap-keyring": "npm:^21.0.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" @@ -2741,7 +2741,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/approval-controller@npm:^9.0.0, @metamask/approval-controller@npm:^9.0.1, @metamask/approval-controller@workspace:packages/approval-controller": +"@metamask/approval-controller@npm:^9.0.1, @metamask/approval-controller@workspace:packages/approval-controller": version: 0.0.0-use.local resolution: "@metamask/approval-controller@workspace:packages/approval-controller" dependencies: @@ -2777,10 +2777,10 @@ __metadata: "@metamask/client-controller": "npm:^1.0.1" "@metamask/controller-utils": "npm:^11.20.0" "@metamask/core-backend": "npm:^6.2.1" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-snap-client": "npm:^8.2.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-snap-client": "npm:^9.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/network-enablement-controller": "npm:^5.0.2" @@ -2821,7 +2821,7 @@ __metadata: "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" "@metamask/abi-utils": "npm:^2.0.3" - "@metamask/account-api": "npm:^1.0.0" + "@metamask/account-api": "npm:^1.0.2" "@metamask/account-tree-controller": "npm:^7.0.0" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/approval-controller": "npm:^9.0.1" @@ -2832,10 +2832,10 @@ __metadata: "@metamask/core-backend": "npm:^6.2.1" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-snap-client": "npm:^8.2.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-snap-client": "npm:^9.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/multichain-account-service": "npm:^8.0.1" @@ -2952,7 +2952,7 @@ __metadata: languageName: node linkType: hard -"@metamask/base-controller@npm:^9.0.0, @metamask/base-controller@npm:^9.1.0, @metamask/base-controller@workspace:packages/base-controller": +"@metamask/base-controller@npm:^9.0.1, @metamask/base-controller@npm:^9.1.0, @metamask/base-controller@workspace:packages/base-controller": version: 0.0.0-use.local resolution: "@metamask/base-controller@workspace:packages/base-controller" dependencies: @@ -3012,7 +3012,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.20.0" "@metamask/eth-json-rpc-provider": "npm:^6.0.1" "@metamask/gas-fee-controller": "npm:^26.1.1" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/multichain-network-controller": "npm:^3.0.6" @@ -3112,7 +3112,7 @@ __metadata: "@metamask/api-specs": "npm:^0.14.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/permission-controller": "npm:^12.3.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.9.0" @@ -3459,7 +3459,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/stake-sdk": "npm:^3.2.1" @@ -3654,22 +3654,22 @@ __metadata: languageName: unknown linkType: soft -"@metamask/eth-hd-keyring@npm:^13.1.0, @metamask/eth-hd-keyring@npm:^13.1.1": - version: 13.1.1 - resolution: "@metamask/eth-hd-keyring@npm:13.1.1" +"@metamask/eth-hd-keyring@npm:^14.0.0": + version: 14.0.0 + resolution: "@metamask/eth-hd-keyring@npm:14.0.0" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@ethereumjs/util": "npm:^9.1.0" "@metamask/eth-sig-util": "npm:^8.2.0" "@metamask/key-tree": "npm:^10.0.2" - "@metamask/keyring-api": "npm:^22.0.0" - "@metamask/keyring-sdk": "npm:^1.2.0" + "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-sdk": "npm:^2.0.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.10.0" - ethereum-cryptography: "npm:^2.1.2" - checksum: 10/780b51c8f78eb729970d2d7dbe20149f91ae5925f47f0b2768269cbc782ac85610a08da7267de7ca87eff08365b39d4f0a51aff6c3feaa65b087a9fa853e8a7e + "@metamask/utils": "npm:^11.11.0" + ethereum-cryptography: "npm:^2.2.1" + checksum: 10/c9e1caa54430a6f080cf20fc044047210a9109417f85deb510ccc8e50ae7db831655887adcafae0e55f163860b5535097a7074ece6dea9222bb98050e7144047 languageName: node linkType: hard @@ -3765,16 +3765,16 @@ __metadata: languageName: unknown linkType: soft -"@metamask/eth-money-keyring@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/eth-money-keyring@npm:2.0.0" +"@metamask/eth-money-keyring@npm:^2.0.1": + version: 2.0.1 + resolution: "@metamask/eth-money-keyring@npm:2.0.1" dependencies: - "@metamask/eth-hd-keyring": "npm:^13.1.0" - "@metamask/keyring-api": "npm:^22.0.0" + "@metamask/eth-hd-keyring": "npm:^14.0.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" async-mutex: "npm:^0.5.0" - checksum: 10/d94926d6100d9b3f177e7f3754505803df024eff4eeca4e593f6dfb1ddecf70cdcdc84e0389a68a234089ed28c797a81c2ac4cbfe691d29c4b2883eb62f3657a + checksum: 10/5b8915c133a1005b23ade53bd7891cc18c59e4cf270e7483b5c1dd05d719fd75bd070939b4452672914ace80520bdb8b885b814e76fe88299b4ea30eb2136617 languageName: node linkType: hard @@ -3803,41 +3803,44 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-simple-keyring@npm:^11.1.2": - version: 11.1.2 - resolution: "@metamask/eth-simple-keyring@npm:11.1.2" +"@metamask/eth-simple-keyring@npm:^12.0.0": + version: 12.0.0 + resolution: "@metamask/eth-simple-keyring@npm:12.0.0" dependencies: "@ethereumjs/util": "npm:^9.1.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-api": "npm:^22.0.0" - "@metamask/keyring-sdk": "npm:^1.2.0" - "@metamask/utils": "npm:^11.10.0" - ethereum-cryptography: "npm:^2.1.2" + "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-sdk": "npm:^2.0.0" + "@metamask/utils": "npm:^11.11.0" + ethereum-cryptography: "npm:^2.2.1" randombytes: "npm:^2.1.0" - checksum: 10/edf916c1a419a31c2dfa2d9048124fb7fc87120f16a6adb6e2525b4ec63eac3cb470897a7345cc468980ea7a8951080772fc7e69c2819d0bfba3bafa74ae3d61 + checksum: 10/a85db462ac293ffe88e46139e0c7252b03f5c400d73c8c9ca0d8fdfb78bfd74dbd87cb95bb8330346becba85e1b2423c8522d06fa7dc60555d6a24cf92220c55 languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^19.0.0": - version: 19.0.0 - resolution: "@metamask/eth-snap-keyring@npm:19.0.0" +"@metamask/eth-snap-keyring@npm:^21.0.0": + version: 21.0.0 + resolution: "@metamask/eth-snap-keyring@npm:21.0.0" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-api": "npm:^21.4.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-internal-snap-client": "npm:^9.0.0" - "@metamask/keyring-snap-sdk": "npm:^7.2.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-snap-client": "npm:^10.0.0" + "@metamask/keyring-sdk": "npm:^2.0.0" + "@metamask/keyring-snap-sdk": "npm:^9.0.0" "@metamask/keyring-utils": "npm:^3.2.0" - "@metamask/messenger": "npm:^0.3.0" + "@metamask/messenger": "npm:^1.1.1" + "@metamask/snaps-controllers": "npm:^19.0.1" + "@metamask/snaps-sdk": "npm:^11.0.0" + "@metamask/snaps-utils": "npm:^12.1.3" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.1.0" + "@metamask/utils": "npm:^11.11.0" "@types/uuid": "npm:^9.0.8" async-mutex: "npm:^0.5.0" uuid: "npm:^9.0.1" peerDependencies: - "@metamask/keyring-api": ^21.4.0 - checksum: 10/6e307295cb15ab44aba4ff89fb1886ad8c0ea6636748e5d84c87250fbaff9d5a3c316e63b614d7b472e4027aad0a7912109b36981e978e978bf31deea7980726 + "@metamask/keyring-api": ^23.0.0 + checksum: 10/c65582b4791f6a121871df7c9fc7fc16c588b78324a1eb18a237e9e66d0b88ff63f91a6f8b6fdbc9050bd0ecbc7f6097aefc5d3e3690fbf69a6d0ef1aa292b07 languageName: node linkType: hard @@ -4099,7 +4102,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.3, @metamask/json-rpc-engine@npm:^10.2.4, @metamask/json-rpc-engine@workspace:packages/json-rpc-engine": +"@metamask/json-rpc-engine@npm:^10.0.0, @metamask/json-rpc-engine@npm:^10.0.2, @metamask/json-rpc-engine@npm:^10.1.0, @metamask/json-rpc-engine@npm:^10.1.1, @metamask/json-rpc-engine@npm:^10.2.4, @metamask/json-rpc-engine@workspace:packages/json-rpc-engine": version: 0.0.0-use.local resolution: "@metamask/json-rpc-engine@workspace:packages/json-rpc-engine" dependencies: @@ -4160,32 +4163,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^21.4.0, @metamask/keyring-api@npm:^21.6.0": - version: 21.6.0 - resolution: "@metamask/keyring-api@npm:21.6.0" +"@metamask/keyring-api@npm:^23.0.0": + version: 23.0.0 + resolution: "@metamask/keyring-api@npm:23.0.0" dependencies: - "@ethereumjs/tx": "npm:^5.4.0" - "@metamask/eth-sig-util": "npm:^8.2.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.1.0" - "@types/uuid": "npm:^9.0.8" - async-mutex: "npm:^0.5.0" + "@metamask/utils": "npm:^11.11.0" bitcoin-address-validation: "npm:^2.2.3" - uuid: "npm:^9.0.1" - checksum: 10/ecd482ec83fbdb16da5f0c548db29931edd4718c57550547aed9f3532c8e60ec39a6894571c96a819e5f205e53ec149e6b52710194ac0610960aa51834f15dd8 - languageName: node - linkType: hard - -"@metamask/keyring-api@npm:^22.0.0": - version: 22.0.0 - resolution: "@metamask/keyring-api@npm:22.0.0" - dependencies: - "@metamask/keyring-utils": "npm:^3.2.0" - "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.1.0" - bitcoin-address-validation: "npm:^2.2.3" - checksum: 10/ff1e9537c7219fb906b61d6755de28890239ec44f634732bd8571801c662e8b801671e98961a1c5047e079cef314353297499a52f7091a2b5391325d575ec4f9 + checksum: 10/1d56e275070bc995fe1a71ffbf9d4abed9c725c965aa2ce229034de0215a23f1c6e0e835427bcc49450171620c144e197471293879eb9f7bf414c299f864b0f1 languageName: node linkType: hard @@ -4201,11 +4187,11 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/browser-passworder": "npm:^6.0.0" - "@metamask/eth-hd-keyring": "npm:^13.1.1" + "@metamask/eth-hd-keyring": "npm:^14.0.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/eth-simple-keyring": "npm:^11.1.2" - "@metamask/keyring-api": "npm:^21.6.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/eth-simple-keyring": "npm:^12.0.0" + "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/scure-bip39": "npm:^2.1.1" @@ -4229,53 +4215,53 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:^10.0.0": - version: 10.0.0 - resolution: "@metamask/keyring-internal-api@npm:10.0.0" +"@metamask/keyring-internal-api@npm:^10.1.0": + version: 10.1.0 + resolution: "@metamask/keyring-internal-api@npm:10.1.0" dependencies: - "@metamask/keyring-api": "npm:^21.4.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" - checksum: 10/f49499572418128b03ed0d1e5d028082530b0b84f5d4554d24216b1caf0a196fe23b6038f719fc32af6c262e33de4dbd346b593b98236ad40b3ca67026f1a998 + checksum: 10/7cb71d940ff2415b7dab5228fc7bfcf932eea7a0fa260e8580cf4a34eb85166f5057e494b87041737e581c9459b0f1a9fd0d57c7dbbf253cf2aac38dfe657c6d languageName: node linkType: hard -"@metamask/keyring-internal-snap-client@npm:^9.0.0": - version: 9.0.0 - resolution: "@metamask/keyring-internal-snap-client@npm:9.0.0" +"@metamask/keyring-internal-snap-client@npm:^10.0.0": + version: 10.0.0 + resolution: "@metamask/keyring-internal-snap-client@npm:10.0.0" dependencies: - "@metamask/keyring-api": "npm:^21.4.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-snap-client": "npm:^8.2.0" + "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-snap-client": "npm:^9.0.0" "@metamask/keyring-utils": "npm:^3.2.0" - "@metamask/messenger": "npm:^0.3.0" - checksum: 10/d3a63d0a1aff343af013c5bc872f782eec80d048a76b169a17034fd004c61a42fe07d703c8227a1341569b62fb1fe091f66494c4658419a3e2827d864487e608 + "@metamask/messenger": "npm:^1.1.1" + checksum: 10/71eb7bd0132a1efe4d4e6ca7d88854149c921d5ac7dc3c45b6c9ffc0c10c308aee8187c9fded75bdfb7815feea740f7db341a9696b022868d9dcfef32fa420ee languageName: node linkType: hard -"@metamask/keyring-sdk@npm:^1.2.0": - version: 1.2.0 - resolution: "@metamask/keyring-sdk@npm:1.2.0" +"@metamask/keyring-sdk@npm:^2.0.0": + version: 2.0.0 + resolution: "@metamask/keyring-sdk@npm:2.0.0" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-api": "npm:^22.0.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.10.0" + "@metamask/utils": "npm:^11.11.0" async-mutex: "npm:^0.5.0" - ethereum-cryptography: "npm:^2.1.2" + ethereum-cryptography: "npm:^2.2.1" uuid: "npm:^9.0.1" - checksum: 10/ea5a406005a59ab453a2768a6787ec8070be3b2b2cc99970f5af975dc65728823725ad5139dc0deee7e91aed74ef9821388f4a295116190ec95ff547ad15a379 + checksum: 10/78250570448e791b3729cae9dff6df13222d91738c86bc821e5899e8661fc7d271943e93c6ea16e66175261c4da26d1f0276362215f03d6eb1ff4f396cf0fe4c languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:^8.2.0": - version: 8.2.0 - resolution: "@metamask/keyring-snap-client@npm:8.2.0" +"@metamask/keyring-snap-client@npm:^9.0.0": + version: 9.0.0 + resolution: "@metamask/keyring-snap-client@npm:9.0.0" dependencies: - "@metamask/keyring-api": "npm:^21.4.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" "@types/uuid": "npm:^9.0.8" @@ -4283,23 +4269,23 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^19.0.0 - checksum: 10/a64dafdc718061c55da3522d1598def5d7934b60d6141af64eccc9f8a0fecf72154d6ffc202913c2dd48fff8aa3266557bb914cd09901e00dccc3849dc932868 + checksum: 10/677fbe0a5c7262fad0310627b3e5767095fccc4982af0cfc6c7848a3f129306490c7d1a61c60caafc7f55dced80836d06b321a0123b26197af609cfb30042ea5 languageName: node linkType: hard -"@metamask/keyring-snap-sdk@npm:^7.2.0": - version: 7.2.0 - resolution: "@metamask/keyring-snap-sdk@npm:7.2.0" +"@metamask/keyring-snap-sdk@npm:^9.0.0": + version: 9.0.0 + resolution: "@metamask/keyring-snap-sdk@npm:9.0.0" dependencies: "@metamask/keyring-utils": "npm:^3.2.0" - "@metamask/snaps-sdk": "npm:^10.4.0" + "@metamask/snaps-sdk": "npm:^11.0.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^11.1.0" + "@metamask/utils": "npm:^11.11.0" webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/keyring-api": ^21.4.0 + "@metamask/keyring-api": ^23.0.0 "@metamask/providers": ^19.0.0 - checksum: 10/e805566d60bef72efb7298e9ee05d23acbd6e77e2cc17d47b6e9d09854f1a029b5873754d3ab0a5631a468267c0f21607de1c2cb37f57522a62cabca34b99b4d + checksum: 10/e39dbcd49a695b4533a224951d20c25330ebad797975ab04e6c36669dd1dda45c72a769064157eecd7d0d51b892a5f62a7e51c8720ad9bb1d2b03c3714b71d8f languageName: node linkType: hard @@ -4387,14 +4373,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/messenger@npm:^0.3.0": - version: 0.3.0 - resolution: "@metamask/messenger@npm:0.3.0" - checksum: 10/84e9f4193646d749c7260a4958b13974b3c8738cc2e414116279ed31734e1edba687ff56ddbfdb75033bce30aaa9eeb7c391bccb87a66dbc99a902882271f673 - languageName: node - linkType: hard - -"@metamask/messenger@npm:^1.1.1, @metamask/messenger@workspace:packages/messenger": +"@metamask/messenger@npm:^1.1.0, @metamask/messenger@npm:^1.1.1, @metamask/messenger@workspace:packages/messenger": version: 0.0.0-use.local resolution: "@metamask/messenger@workspace:packages/messenger" dependencies: @@ -4461,8 +4440,8 @@ __metadata: "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/eth-money-keyring": "npm:^2.0.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/eth-money-keyring": "npm:^2.0.1" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" @@ -4485,18 +4464,18 @@ __metadata: resolution: "@metamask/multichain-account-service@workspace:packages/multichain-account-service" dependencies: "@ethereumjs/util": "npm:^9.1.0" - "@metamask/account-api": "npm:^1.0.0" + "@metamask/account-api": "npm:^1.0.2" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/eth-hd-keyring": "npm:^13.1.1" - "@metamask/eth-snap-keyring": "npm:^19.0.0" + "@metamask/eth-hd-keyring": "npm:^14.0.0" + "@metamask/eth-snap-keyring": "npm:^21.0.0" "@metamask/key-tree": "npm:^10.1.1" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-snap-client": "npm:^8.2.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-snap-client": "npm:^9.0.0" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/providers": "npm:^22.1.0" @@ -4520,7 +4499,7 @@ __metadata: uuid: "npm:^8.3.2" webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/account-api": ^1.0.0 + "@metamask/account-api": ^1.0.2 "@metamask/providers": ^22.0.0 webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 languageName: unknown @@ -4564,9 +4543,9 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/superstruct": "npm:^3.1.0" @@ -4596,10 +4575,10 @@ __metadata: "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" - "@metamask/keyring-snap-client": "npm:^8.2.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-snap-client": "npm:^9.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/polling-controller": "npm:^16.0.4" "@metamask/snaps-controllers": "npm:^19.0.0" @@ -4699,7 +4678,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/multichain-network-controller": "npm:^3.0.6" "@metamask/network-controller": "npm:^30.0.1" @@ -4789,7 +4768,7 @@ __metadata: languageName: node linkType: hard -"@metamask/permission-controller@npm:^12.2.1, @metamask/permission-controller@npm:^12.3.0, @metamask/permission-controller@workspace:packages/permission-controller": +"@metamask/permission-controller@npm:^12.3.0, @metamask/permission-controller@workspace:packages/permission-controller": version: 0.0.0-use.local resolution: "@metamask/permission-controller@workspace:packages/permission-controller" dependencies: @@ -4852,7 +4831,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.20.0" "@metamask/geolocation-controller": "npm:^0.1.2" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/profile-sync-controller": "npm:^28.0.2" @@ -4970,7 +4949,7 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/polling-controller": "npm:^16.0.4" "@metamask/profile-sync-controller": "npm:^28.0.2" @@ -4999,9 +4978,9 @@ __metadata: "@metamask/address-book-controller": "npm:^7.1.1" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^21.6.0" + "@metamask/keyring-api": "npm:^23.0.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/providers": "npm:^22.1.0" "@metamask/snaps-controllers": "npm:^19.0.0" @@ -5324,25 +5303,25 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-controllers@npm:^19.0.0": - version: 19.0.0 - resolution: "@metamask/snaps-controllers@npm:19.0.0" +"@metamask/snaps-controllers@npm:^19.0.0, @metamask/snaps-controllers@npm:^19.0.1": + version: 19.0.1 + resolution: "@metamask/snaps-controllers@npm:19.0.1" dependencies: - "@metamask/approval-controller": "npm:^9.0.0" - "@metamask/base-controller": "npm:^9.0.0" - "@metamask/json-rpc-engine": "npm:^10.2.3" + "@metamask/approval-controller": "npm:^9.0.1" + "@metamask/base-controller": "npm:^9.0.1" + "@metamask/json-rpc-engine": "npm:^10.2.4" "@metamask/json-rpc-middleware-stream": "npm:^8.0.8" "@metamask/key-tree": "npm:^10.1.1" - "@metamask/messenger": "npm:^0.3.0" + "@metamask/messenger": "npm:^1.1.0" "@metamask/object-multiplex": "npm:^2.1.0" - "@metamask/permission-controller": "npm:^12.2.1" + "@metamask/permission-controller": "npm:^12.3.0" "@metamask/post-message-stream": "npm:^10.0.0" "@metamask/rpc-errors": "npm:^7.0.3" "@metamask/snaps-registry": "npm:^4.0.0" - "@metamask/snaps-rpc-methods": "npm:^15.0.1" + "@metamask/snaps-rpc-methods": "npm:^15.0.2" "@metamask/snaps-sdk": "npm:^11.0.0" - "@metamask/snaps-utils": "npm:^12.1.2" - "@metamask/storage-service": "npm:^1.0.0" + "@metamask/snaps-utils": "npm:^12.1.3" + "@metamask/storage-service": "npm:^1.0.1" "@metamask/superstruct": "npm:^3.2.1" "@metamask/utils": "npm:^11.10.0" "@xstate/fsm": "npm:^2.0.0" @@ -5363,7 +5342,7 @@ __metadata: peerDependenciesMeta: "@metamask/snaps-execution-environments": optional: true - checksum: 10/95d4522877aee8d320ace7de396255a827efab6b63ee81a4dfa34d595d65c3e429d586f6895aa70e170201b907b6bf3c7fb33f5bd683768873f92f58817792d3 + checksum: 10/e7cee816b1af1e2c4cbd25a81afff779427e6d738c1fe283a1ca9b23f67c62b5a983d6ed35e91acf0b15016e6825074557f3376d322a518c1acfc36728d36509 languageName: node linkType: hard @@ -5379,66 +5358,52 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-rpc-methods@npm:^15.0.1": - version: 15.0.1 - resolution: "@metamask/snaps-rpc-methods@npm:15.0.1" +"@metamask/snaps-rpc-methods@npm:^15.0.2": + version: 15.1.1 + resolution: "@metamask/snaps-rpc-methods@npm:15.1.1" dependencies: "@metamask/key-tree": "npm:^10.1.1" - "@metamask/permission-controller": "npm:^12.2.1" + "@metamask/permission-controller": "npm:^12.3.0" "@metamask/rpc-errors": "npm:^7.0.3" - "@metamask/snaps-sdk": "npm:^11.0.0" - "@metamask/snaps-utils": "npm:^12.1.2" + "@metamask/snaps-sdk": "npm:^11.1.0" + "@metamask/snaps-utils": "npm:^12.2.0" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.10.0" + "@metamask/utils": "npm:^11.11.0" "@noble/hashes": "npm:^1.7.1" async-mutex: "npm:^0.5.0" - checksum: 10/40353ead6a12def2cb301fd4fc35c8dfb6783fc4d8ebc52ad2b9d6453d64f1c0f69a619d1e3c240250542c44cfea7f2fd0461ff73907c3327588fc1c409b942e - languageName: node - linkType: hard - -"@metamask/snaps-sdk@npm:^10.4.0": - version: 10.4.0 - resolution: "@metamask/snaps-sdk@npm:10.4.0" - dependencies: - "@metamask/key-tree": "npm:^10.1.1" - "@metamask/providers": "npm:^22.1.1" - "@metamask/rpc-errors": "npm:^7.0.3" - "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.9.0" - luxon: "npm:^3.5.0" - checksum: 10/215a73f41f5043ca9767241da83308bb25b3faae96521ed71a63a9d29078461bcf278a01799e014bb20b49e34d96a05ea1822648c9bcf81e92f22e8c9b6c0f94 + checksum: 10/906eafa8a2d4944e50d73b8aa4d32a7070c33367ad3d58843e892e62b3bd8facb0a02e1d88a9245c18a281637435d97266212b7706ef67ee6a68db85a5991ea3 languageName: node linkType: hard -"@metamask/snaps-sdk@npm:^11.0.0": - version: 11.0.0 - resolution: "@metamask/snaps-sdk@npm:11.0.0" +"@metamask/snaps-sdk@npm:^11.0.0, @metamask/snaps-sdk@npm:^11.1.0": + version: 11.1.0 + resolution: "@metamask/snaps-sdk@npm:11.1.0" dependencies: "@metamask/key-tree": "npm:^10.1.1" "@metamask/providers": "npm:^22.1.1" "@metamask/rpc-errors": "npm:^7.0.3" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.10.0" + "@metamask/utils": "npm:^11.11.0" luxon: "npm:^3.5.0" - checksum: 10/83dc24c9c583ca257874498ed2b124160c559afd56f043a6e0f617fc3edc4fcbd4b1ef15efb4a197a71a8a6dd2ab20b6da87463b4261928311d39eb29f64668a + checksum: 10/138c616584d537b9976ae48123090ab5731848d79d5d1f4e979c797dfdfe061329cbf18a5e84d8bd068fe36d5b9d169337f6d74efab0736f30c31ddf4088f70b languageName: node linkType: hard -"@metamask/snaps-utils@npm:^12.1.2": - version: 12.1.2 - resolution: "@metamask/snaps-utils@npm:12.1.2" +"@metamask/snaps-utils@npm:^12.1.2, @metamask/snaps-utils@npm:^12.1.3, @metamask/snaps-utils@npm:^12.2.0": + version: 12.2.0 + resolution: "@metamask/snaps-utils@npm:12.2.0" dependencies: "@babel/core": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" "@metamask/key-tree": "npm:^10.1.1" - "@metamask/messenger": "npm:^0.3.0" - "@metamask/permission-controller": "npm:^12.2.1" + "@metamask/messenger": "npm:^1.1.1" + "@metamask/permission-controller": "npm:^12.3.0" "@metamask/rpc-errors": "npm:^7.0.3" "@metamask/slip44": "npm:^4.4.0" "@metamask/snaps-registry": "npm:^4.0.0" - "@metamask/snaps-sdk": "npm:^11.0.0" + "@metamask/snaps-sdk": "npm:^11.1.0" "@metamask/superstruct": "npm:^3.2.1" - "@metamask/utils": "npm:^11.10.0" + "@metamask/utils": "npm:^11.11.0" "@scure/base": "npm:^1.1.1" chalk: "npm:^4.1.2" cron-parser: "npm:^4.5.0" @@ -5451,7 +5416,7 @@ __metadata: semver: "npm:^7.5.4" ses: "npm:^1.15.0" validate-npm-package-name: "npm:^5.0.0" - checksum: 10/cf36670f9946e2ab737d7fd1fd5be5c0e915c66b57e76d5f4bfc509061420f79b442b353c52a94c5f953fceba75f910ebd512592956a62e831f4eb43d0b0a40f + checksum: 10/0e7cb5a4deebad3dc98404486b7767be049e9f86173195e9b1ae577f197e67cdd392f1e05ebb146a199ffc3cd52013636637a4d1ac7f9fec164f3189be97df55 languageName: node linkType: hard @@ -5484,7 +5449,7 @@ __metadata: languageName: node linkType: hard -"@metamask/storage-service@npm:^1.0.0, @metamask/storage-service@npm:^1.0.1, @metamask/storage-service@workspace:packages/storage-service": +"@metamask/storage-service@npm:^1.0.1, @metamask/storage-service@workspace:packages/storage-service": version: 0.0.0-use.local resolution: "@metamask/storage-service@workspace:packages/storage-service" dependencies: @@ -5711,6 +5676,25 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^11.11.0": + version: 11.11.0 + resolution: "@metamask/utils@npm:11.11.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + "@types/lodash": "npm:^4.17.20" + debug: "npm:^4.3.4" + lodash: "npm:^4.17.21" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/c4381b9e451a9616bde84ac659bc0d1848ef06b6e605f877bfa065b78c8ed5015706683ea88a3387de5eaeb3a50d1af9af0994f04f9e06258d992598fe2be3bf + languageName: node + linkType: hard + "@metamask/utils@npm:^9.0.0": version: 9.3.0 resolution: "@metamask/utils@npm:9.3.0" From 51fb952275e2dbf5681e7df207cb3c50f4e1b841 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 11:48:45 +0200 Subject: [PATCH 02/13] chore: dedupe --- yarn.lock | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7c55d1411c9..b27bbcacfdd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5657,26 +5657,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.10.0, @metamask/utils@npm:^11.4.0, @metamask/utils@npm:^11.4.2, @metamask/utils@npm:^11.8.1, @metamask/utils@npm:^11.9.0": - version: 11.10.0 - resolution: "@metamask/utils@npm:11.10.0" - dependencies: - "@ethereumjs/tx": "npm:^4.2.0" - "@metamask/superstruct": "npm:^3.1.0" - "@noble/hashes": "npm:^1.3.1" - "@scure/base": "npm:^1.1.3" - "@types/debug": "npm:^4.1.7" - "@types/lodash": "npm:^4.17.20" - debug: "npm:^4.3.4" - lodash: "npm:^4.17.21" - pony-cause: "npm:^2.1.10" - semver: "npm:^7.5.4" - uuid: "npm:^9.0.1" - checksum: 10/691a268af66593b60e9807a069127993cea3cdc941f99d5d7ca4664868754f08945821f1787b2f3e99e4497df63ceb0af37a2419ad494da29a1fddffe94f5797 - languageName: node - linkType: hard - -"@metamask/utils@npm:^11.11.0": +"@metamask/utils@npm:^11.0.1, @metamask/utils@npm:^11.1.0, @metamask/utils@npm:^11.10.0, @metamask/utils@npm:^11.11.0, @metamask/utils@npm:^11.4.0, @metamask/utils@npm:^11.4.2, @metamask/utils@npm:^11.8.1, @metamask/utils@npm:^11.9.0": version: 11.11.0 resolution: "@metamask/utils@npm:11.11.0" dependencies: From f0eb47e35230237b17c71da81bb8bd6b3518fe5a Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 12:15:09 +0200 Subject: [PATCH 03/13] test: fix keyring-controller test --- packages/keyring-controller/src/KeyringController.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts index e52a9fcacd5..57cd39afe3f 100644 --- a/packages/keyring-controller/src/KeyringController.test.ts +++ b/packages/keyring-controller/src/KeyringController.test.ts @@ -12,7 +12,7 @@ import { recoverEIP7702Authorization, } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring'; -import { KeyringType } from '@metamask/keyring-api'; +import { KeyringType } from '@metamask/keyring-api/v2'; import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { KeyringClass } from '@metamask/keyring-utils'; import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger'; From 1e05a39c0ceaf90d2a6659c99f52df819653ed2b Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 12:15:32 +0200 Subject: [PATCH 04/13] test: fix module name mapping for keyring API /v2 exports --- jest.config.packages.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jest.config.packages.js b/jest.config.packages.js index 07d249241ce..9aea04d497b 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.js @@ -83,6 +83,16 @@ module.exports = { '^@metamask/json-rpc-engine/v2$': [ '/../json-rpc-engine/src/v2/index.ts', ], + // Required for the keyring API v2 transition until `/v2` is merged with the top-level: { + '^@metamask/eth-hd-keyring/v2$': require.resolve( + '@metamask/eth-hd-keyring/v2', + ), + '^@metamask/eth-simple-keyring/v2$': require.resolve( + '@metamask/eth-simple-keyring/v2', + ), + '^@metamask/keyring-api/v2$': require.resolve('@metamask/keyring-api/v2'), + '^@metamask/keyring-sdk/v2$': require.resolve('@metamask/keyring-sdk/v2'), + // } '^@metamask/utils/node$': require.resolve('@metamask/utils/node'), '^@metamask/(.+)$': [ '/../$1/src', From 2b40d63bef01cf61190dd020b3533850a28c22bc Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 13:16:55 +0200 Subject: [PATCH 05/13] build: exclude jest.config.packages.js from depcheck entirely --- .depcheckrc.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.depcheckrc.yml b/.depcheckrc.yml index 92c7012b7ea..b0d8f568d54 100644 --- a/.depcheckrc.yml +++ b/.depcheckrc.yml @@ -30,3 +30,6 @@ ignores: - 'eslint-import-resolver-typescript' # Ignore dependencies which plug into the NPM lifecycle - '@lavamoat/preinstall-always-fail' +ignore-patterns: + # Ignore local mapping resolutions (e.g for keyring API v2 with the new `/v2` exports) + - 'jest.config.packages.js' From d2b5653b62fb994a4ead265d9f3646143e5aabab Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 13:20:04 +0200 Subject: [PATCH 06/13] chore: lint --- jest.config.packages.js | 10 ++++------ packages/keyring-controller/src/KeyringController.ts | 4 +--- .../src/providers/AccountProviderWrapper.ts | 4 +--- .../src/providers/BaseBip44AccountProvider.ts | 4 +--- .../src/providers/BtcAccountProvider.ts | 9 ++------- .../src/providers/EvmAccountProvider.ts | 4 +--- .../src/providers/SolAccountProvider.ts | 9 ++------- .../src/providers/TrxAccountProvider.ts | 9 ++------- .../multichain-account-service/src/tests/providers.ts | 8 ++------ 9 files changed, 16 insertions(+), 45 deletions(-) diff --git a/jest.config.packages.js b/jest.config.packages.js index 9aea04d497b..ff7ccd62dba 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.js @@ -84,12 +84,10 @@ module.exports = { '/../json-rpc-engine/src/v2/index.ts', ], // Required for the keyring API v2 transition until `/v2` is merged with the top-level: { - '^@metamask/eth-hd-keyring/v2$': require.resolve( - '@metamask/eth-hd-keyring/v2', - ), - '^@metamask/eth-simple-keyring/v2$': require.resolve( - '@metamask/eth-simple-keyring/v2', - ), + '^@metamask/eth-hd-keyring/v2$': + require.resolve('@metamask/eth-hd-keyring/v2'), + '^@metamask/eth-simple-keyring/v2$': + require.resolve('@metamask/eth-simple-keyring/v2'), '^@metamask/keyring-api/v2$': require.resolve('@metamask/keyring-api/v2'), '^@metamask/keyring-sdk/v2$': require.resolve('@metamask/keyring-sdk/v2'), // } diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index da3b836bba4..415a912b9d6 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -15,9 +15,7 @@ import type { EthUserOperationPatch, KeyringAccount, } from '@metamask/keyring-api'; -import type { - Keyring as KeyringV2, -} from '@metamask/keyring-api/v2'; +import type { Keyring as KeyringV2 } from '@metamask/keyring-api/v2'; import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Keyring, KeyringClass } from '@metamask/keyring-utils'; import type { Messenger } from '@metamask/messenger'; diff --git a/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts b/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts index 61e98b981b1..951143a9f31 100644 --- a/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts +++ b/packages/multichain-account-service/src/providers/AccountProviderWrapper.ts @@ -4,9 +4,7 @@ import type { EntropySourceId, KeyringAccount, } from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { MultichainAccountServiceMessenger } from '../types'; diff --git a/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts b/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts index e38b2b54024..9f27f2fc72a 100644 --- a/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts +++ b/packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts @@ -5,9 +5,7 @@ import type { EntropySourceId, KeyringAccount, } from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import type { KeyringMetadata, KeyringSelector, diff --git a/packages/multichain-account-service/src/providers/BtcAccountProvider.ts b/packages/multichain-account-service/src/providers/BtcAccountProvider.ts index bcbbde63a8d..5661dbaa30d 100644 --- a/packages/multichain-account-service/src/providers/BtcAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/BtcAccountProvider.ts @@ -1,17 +1,12 @@ import type { Bip44Account } from '@metamask/account-api'; import type { TraceCallback } from '@metamask/controller-utils'; -import type { - EntropySourceId, - KeyringAccount, -} from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api'; import { AccountCreationType, BtcAccountType, BtcScope, } from '@metamask/keyring-api'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapId } from '@metamask/snaps-sdk'; diff --git a/packages/multichain-account-service/src/providers/EvmAccountProvider.ts b/packages/multichain-account-service/src/providers/EvmAccountProvider.ts index 8b3ed4df290..147fe6a768e 100644 --- a/packages/multichain-account-service/src/providers/EvmAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/EvmAccountProvider.ts @@ -8,15 +8,13 @@ import type { EntropySourceId, KeyringAccount, } from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; import { AccountCreationType, assertCreateAccountOptionIsSupported, EthAccountType, EthScope, } from '@metamask/keyring-api'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { EthKeyring, diff --git a/packages/multichain-account-service/src/providers/SolAccountProvider.ts b/packages/multichain-account-service/src/providers/SolAccountProvider.ts index 17d3cfba7f6..c5f1af5977d 100644 --- a/packages/multichain-account-service/src/providers/SolAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/SolAccountProvider.ts @@ -1,19 +1,14 @@ import { assertIsBip44Account } from '@metamask/account-api'; import type { Bip44Account } from '@metamask/account-api'; import type { TraceCallback } from '@metamask/controller-utils'; -import type { - EntropySourceId, - KeyringAccount, -} from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api'; import { AccountCreationType, KeyringAccountEntropyTypeOption, SolAccountType, SolScope, } from '@metamask/keyring-api'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapId } from '@metamask/snaps-sdk'; diff --git a/packages/multichain-account-service/src/providers/TrxAccountProvider.ts b/packages/multichain-account-service/src/providers/TrxAccountProvider.ts index 578b521ead9..9c3ac48be52 100644 --- a/packages/multichain-account-service/src/providers/TrxAccountProvider.ts +++ b/packages/multichain-account-service/src/providers/TrxAccountProvider.ts @@ -1,17 +1,12 @@ import type { Bip44Account } from '@metamask/account-api'; import type { TraceCallback } from '@metamask/controller-utils'; -import type { - EntropySourceId, - KeyringAccount, -} from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { EntropySourceId, KeyringAccount } from '@metamask/keyring-api'; import { AccountCreationType, TrxAccountType, TrxScope, } from '@metamask/keyring-api'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import { KeyringTypes } from '@metamask/keyring-controller'; import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapId } from '@metamask/snaps-sdk'; diff --git a/packages/multichain-account-service/src/tests/providers.ts b/packages/multichain-account-service/src/tests/providers.ts index 45d127b6ffd..2c92fca4bac 100644 --- a/packages/multichain-account-service/src/tests/providers.ts +++ b/packages/multichain-account-service/src/tests/providers.ts @@ -1,11 +1,7 @@ import type { Bip44Account } from '@metamask/account-api'; import { BtcScope, EthScope, SolScope, TrxScope } from '@metamask/keyring-api'; -import type { - KeyringAccount, -} from '@metamask/keyring-api'; -import type { - KeyringCapabilities, -} from '@metamask/keyring-api/v2'; +import type { KeyringAccount } from '@metamask/keyring-api'; +import type { KeyringCapabilities } from '@metamask/keyring-api/v2'; import { AccountProviderWrapper, EvmAccountProvider } from '../providers'; import { GroupIndexRange } from '../utils'; From e1f1895bcdadb8cb2dbf223fb92afb57b1e75ca5 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 13:47:45 +0200 Subject: [PATCH 07/13] chore: changelogs --- packages/account-tree-controller/CHANGELOG.md | 2 ++ packages/accounts-controller/CHANGELOG.md | 3 +++ packages/assets-controller/CHANGELOG.md | 3 +++ packages/assets-controllers/CHANGELOG.md | 1 + packages/bridge-controller/CHANGELOG.md | 1 + packages/earn-controller/CHANGELOG.md | 1 + packages/keyring-controller/CHANGELOG.md | 4 ++++ packages/money-account-controller/CHANGELOG.md | 2 ++ packages/multichain-account-service/CHANGELOG.md | 5 +++++ packages/multichain-network-controller/CHANGELOG.md | 2 ++ packages/multichain-transactions-controller/CHANGELOG.md | 3 +++ packages/network-enablement-controller/CHANGELOG.md | 1 + 12 files changed, 28 insertions(+) diff --git a/packages/account-tree-controller/CHANGELOG.md b/packages/account-tree-controller/CHANGELOG.md index eafc26f62f8..8a9a7adf181 100644 --- a/packages/account-tree-controller/CHANGELOG.md +++ b/packages/account-tree-controller/CHANGELOG.md @@ -15,10 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The tree is not persisted and can be used before `init` is called. - This allow consumers (like the assets controllers) to rely on the selected group's accounts right away. - Remove dynamic identifiers (wallet IDs, group IDs) from backup and sync thrown error messages to improve Sentry error grouping ([#8349](https://github.com/MetaMask/core/pull/8349)) +- Add Stellar sort-order support ([#8464](https://github.com/MetaMask/core/pull/8464)) - Bump `@metamask/accounts-controller` from `^37.1.1` to `^37.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [7.0.0] diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md index 17323ef3234..ee58d3facb2 100644 --- a/packages/accounts-controller/CHANGELOG.md +++ b/packages/accounts-controller/CHANGELOG.md @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [37.2.0] diff --git a/packages/assets-controller/CHANGELOG.md b/packages/assets-controller/CHANGELOG.md index 7d933548a6e..22d9eed3927 100644 --- a/packages/assets-controller/CHANGELOG.md +++ b/packages/assets-controller/CHANGELOG.md @@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ### Fixed diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md index b1fed9259c5..6120b79d4c0 100644 --- a/packages/assets-controllers/CHANGELOG.md +++ b/packages/assets-controllers/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ### Fixed diff --git a/packages/bridge-controller/CHANGELOG.md b/packages/bridge-controller/CHANGELOG.md index d4f722f6fef..68e2548824c 100644 --- a/packages/bridge-controller/CHANGELOG.md +++ b/packages/bridge-controller/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ### Deprecated diff --git a/packages/earn-controller/CHANGELOG.md b/packages/earn-controller/CHANGELOG.md index f1e10a9743d..6cc9ece8951 100644 --- a/packages/earn-controller/CHANGELOG.md +++ b/packages/earn-controller/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [12.0.0] diff --git a/packages/keyring-controller/CHANGELOG.md b/packages/keyring-controller/CHANGELOG.md index b8c092d1429..c6dad52923f 100644 --- a/packages/keyring-controller/CHANGELOG.md +++ b/packages/keyring-controller/CHANGELOG.md @@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/eth-hd-keyring` from `^13.1.1` to `^14.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-simple-keyring` from `^11.1.2` to `^12.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [25.2.0] diff --git a/packages/money-account-controller/CHANGELOG.md b/packages/money-account-controller/CHANGELOG.md index 885322da5e0..b1b14978232 100644 --- a/packages/money-account-controller/CHANGELOG.md +++ b/packages/money-account-controller/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.1.0` to `^1.1.1` ([#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/eth-money-keyring` from `^2.0.0` to `^2.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [0.1.0] diff --git a/packages/multichain-account-service/CHANGELOG.md b/packages/multichain-account-service/CHANGELOG.md index 2f44a658ee7..1ab8e24f518 100644 --- a/packages/multichain-account-service/CHANGELOG.md +++ b/packages/multichain-account-service/CHANGELOG.md @@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/account-api` from `^1.0.0` to `^1.0.2` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [8.0.1] diff --git a/packages/multichain-network-controller/CHANGELOG.md b/packages/multichain-network-controller/CHANGELOG.md index ed21c8e4e8b..309a1d746e2 100644 --- a/packages/multichain-network-controller/CHANGELOG.md +++ b/packages/multichain-network-controller/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/controller-utils` from `^11.19.0` to `^11.20.0` ([#8344](https://github.com/MetaMask/core/pull/8344)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [3.0.6] diff --git a/packages/multichain-transactions-controller/CHANGELOG.md b/packages/multichain-transactions-controller/CHANGELOG.md index 3ac4f7b6667..12785afa747 100644 --- a/packages/multichain-transactions-controller/CHANGELOG.md +++ b/packages/multichain-transactions-controller/CHANGELOG.md @@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/accounts-controller` from `^37.1.1` to `^37.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [7.0.4] diff --git a/packages/network-enablement-controller/CHANGELOG.md b/packages/network-enablement-controller/CHANGELOG.md index 07ccbdf59db..b478943c8c5 100644 --- a/packages/network-enablement-controller/CHANGELOG.md +++ b/packages/network-enablement-controller/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [5.0.2] From f8c35a101060b19f71fb2c4aee41b2b657b051d7 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 14:05:22 +0200 Subject: [PATCH 08/13] build: re-fix module name mapping with local file paths --- .depcheckrc.yml | 3 --- jest.config.packages.js | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.depcheckrc.yml b/.depcheckrc.yml index b0d8f568d54..92c7012b7ea 100644 --- a/.depcheckrc.yml +++ b/.depcheckrc.yml @@ -30,6 +30,3 @@ ignores: - 'eslint-import-resolver-typescript' # Ignore dependencies which plug into the NPM lifecycle - '@lavamoat/preinstall-always-fail' -ignore-patterns: - # Ignore local mapping resolutions (e.g for keyring API v2 with the new `/v2` exports) - - 'jest.config.packages.js' diff --git a/jest.config.packages.js b/jest.config.packages.js index ff7ccd62dba..260a518afb4 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.js @@ -85,11 +85,13 @@ module.exports = { ], // Required for the keyring API v2 transition until `/v2` is merged with the top-level: { '^@metamask/eth-hd-keyring/v2$': - require.resolve('@metamask/eth-hd-keyring/v2'), + '/../../node_modules/@metamask/eth-hd-keyring/dist/v2/index.cjs', '^@metamask/eth-simple-keyring/v2$': - require.resolve('@metamask/eth-simple-keyring/v2'), - '^@metamask/keyring-api/v2$': require.resolve('@metamask/keyring-api/v2'), - '^@metamask/keyring-sdk/v2$': require.resolve('@metamask/keyring-sdk/v2'), + '/../../node_modules/@metamask/eth-simple-keyring/dist/v2/index.cjs', + '^@metamask/keyring-api/v2$': + '/../../node_modules/@metamask/keyring-api/dist/v2/index.cjs', + '^@metamask/keyring-sdk/v2$': + '/../../node_modules/@metamask/keyring-sdk/dist/v2/index.cjs', // } '^@metamask/utils/node$': require.resolve('@metamask/utils/node'), '^@metamask/(.+)$': [ From 531556e30f30e96394470c3e1b7a8359aa46e0e1 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Wed, 15 Apr 2026 14:16:36 +0200 Subject: [PATCH 09/13] chore: changelogs --- packages/assets-controller/CHANGELOG.md | 9 ++++++--- packages/assets-controllers/CHANGELOG.md | 5 ++++- packages/bridge-controller/CHANGELOG.md | 5 ++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/assets-controller/CHANGELOG.md b/packages/assets-controller/CHANGELOG.md index acdcb51f35a..652cea84679 100644 --- a/packages/assets-controller/CHANGELOG.md +++ b/packages/assets-controller/CHANGELOG.md @@ -7,15 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) + ## [5.0.1] ### Changed - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) - Bump `@metamask/assets-controllers` from `^103.1.1` to `^104.0.0` ([#8466](https://github.com/MetaMask/core/pull/8466)) ### Fixed diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md index 4566cffa477..3fa2b26fb31 100644 --- a/packages/assets-controllers/CHANGELOG.md +++ b/packages/assets-controllers/CHANGELOG.md @@ -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 `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) + ## [104.0.0] ### Changed @@ -23,7 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) ### Fixed diff --git a/packages/bridge-controller/CHANGELOG.md b/packages/bridge-controller/CHANGELOG.md index 0c1a0e4a66c..15c0ff1f90a 100644 --- a/packages/bridge-controller/CHANGELOG.md +++ b/packages/bridge-controller/CHANGELOG.md @@ -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 `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) + ## [70.1.0] ### Added @@ -28,7 +32,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) - Bump `@metamask/assets-controllers` from `^103.1.1` to `^104.0.0` ([#8466](https://github.com/MetaMask/core/pull/8466)) ### Deprecated From d15bf4b88e830b3f315d5a783d2f562c9a2c20c7 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 16 Apr 2026 17:03:19 +0200 Subject: [PATCH 10/13] chore: re-bump everything --- packages/account-tree-controller/CHANGELOG.md | 2 +- packages/account-tree-controller/package.json | 4 +- packages/accounts-controller/CHANGELOG.md | 6 +- packages/accounts-controller/package.json | 6 +- packages/assets-controller/CHANGELOG.md | 6 +- packages/assets-controller/package.json | 6 +- packages/assets-controllers/CHANGELOG.md | 2 +- packages/assets-controllers/package.json | 8 +- packages/bridge-controller/CHANGELOG.md | 2 +- packages/bridge-controller/package.json | 2 +- .../chain-agnostic-permission/package.json | 2 +- packages/earn-controller/CHANGELOG.md | 2 +- packages/earn-controller/package.json | 2 +- packages/keyring-controller/CHANGELOG.md | 8 +- packages/keyring-controller/package.json | 8 +- .../money-account-controller/CHANGELOG.md | 4 +- .../money-account-controller/package.json | 4 +- .../multichain-account-service/CHANGELOG.md | 10 +- .../multichain-account-service/package.json | 14 +- .../CHANGELOG.md | 4 +- .../package.json | 4 +- .../CHANGELOG.md | 6 +- .../package.json | 6 +- .../CHANGELOG.md | 2 +- .../package.json | 2 +- packages/perps-controller/package.json | 2 +- .../profile-metrics-controller/package.json | 2 +- packages/profile-sync-controller/package.json | 4 +- yarn.lock | 198 +++++++++--------- 29 files changed, 164 insertions(+), 164 deletions(-) diff --git a/packages/account-tree-controller/CHANGELOG.md b/packages/account-tree-controller/CHANGELOG.md index 8a9a7adf181..a223d0494c5 100644 --- a/packages/account-tree-controller/CHANGELOG.md +++ b/packages/account-tree-controller/CHANGELOG.md @@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [7.0.0] diff --git a/packages/account-tree-controller/package.json b/packages/account-tree-controller/package.json index 91bed2de499..f4a071d1573 100644 --- a/packages/account-tree-controller/package.json +++ b/packages/account-tree-controller/package.json @@ -55,7 +55,7 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "@metamask/multichain-account-service": "^8.0.1", @@ -69,7 +69,7 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@metamask/account-api": "^1.0.2", + "@metamask/account-api": "^1.0.3", "@metamask/auto-changelog": "^6.0.0", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md index ee58d3facb2..6fa47deddbe 100644 --- a/packages/accounts-controller/CHANGELOG.md +++ b/packages/accounts-controller/CHANGELOG.md @@ -11,9 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [37.2.0] diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 1f31ce2d47e..18b6196cc6a 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -55,10 +55,10 @@ "dependencies": { "@ethereumjs/util": "^9.1.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-snap-keyring": "^21.0.0", - "@metamask/keyring-api": "^23.0.0", + "@metamask/eth-snap-keyring": "^21.0.1", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-internal-api": "^10.1.1", "@metamask/keyring-utils": "^3.1.0", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", diff --git a/packages/assets-controller/CHANGELOG.md b/packages/assets-controller/CHANGELOG.md index 652cea84679..84dc9be9237 100644 --- a/packages/assets-controller/CHANGELOG.md +++ b/packages/assets-controller/CHANGELOG.md @@ -9,9 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [5.0.1] diff --git a/packages/assets-controller/package.json b/packages/assets-controller/package.json index e5f34c23f76..eca8b474e23 100644 --- a/packages/assets-controller/package.json +++ b/packages/assets-controller/package.json @@ -62,10 +62,10 @@ "@metamask/client-controller": "^1.0.1", "@metamask/controller-utils": "^11.20.0", "@metamask/core-backend": "^6.2.1", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.1.0", - "@metamask/keyring-snap-client": "^9.0.0", + "@metamask/keyring-internal-api": "^10.1.1", + "@metamask/keyring-snap-client": "^9.0.1", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/network-enablement-controller": "^5.0.2", diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md index 3fa2b26fb31..047e45b2094 100644 --- a/packages/assets-controllers/CHANGELOG.md +++ b/packages/assets-controllers/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [104.0.0] diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index c40b7add612..6b4b8db61d3 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -68,7 +68,7 @@ "@metamask/controller-utils": "^11.20.0", "@metamask/core-backend": "^6.2.1", "@metamask/eth-query": "^4.0.0", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "@metamask/metamask-eth-abis": "^3.1.1", @@ -101,11 +101,11 @@ }, "devDependencies": { "@babel/runtime": "^7.23.9", - "@metamask/account-api": "^1.0.2", + "@metamask/account-api": "^1.0.3", "@metamask/auto-changelog": "^6.0.0", "@metamask/ethjs-provider-http": "^0.3.0", - "@metamask/keyring-internal-api": "^10.1.0", - "@metamask/keyring-snap-client": "^9.0.0", + "@metamask/keyring-internal-api": "^10.1.1", + "@metamask/keyring-snap-client": "^9.0.1", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", diff --git a/packages/bridge-controller/CHANGELOG.md b/packages/bridge-controller/CHANGELOG.md index 15c0ff1f90a..90a8c267fdd 100644 --- a/packages/bridge-controller/CHANGELOG.md +++ b/packages/bridge-controller/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [70.1.0] diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json index 9dc7b4c9992..7cd2ee8c97e 100644 --- a/packages/bridge-controller/package.json +++ b/packages/bridge-controller/package.json @@ -63,7 +63,7 @@ "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", "@metamask/gas-fee-controller": "^26.1.1", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/messenger": "^1.1.1", "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/multichain-network-controller": "^3.0.6", diff --git a/packages/chain-agnostic-permission/package.json b/packages/chain-agnostic-permission/package.json index e7d421d1963..c81c42278e8 100644 --- a/packages/chain-agnostic-permission/package.json +++ b/packages/chain-agnostic-permission/package.json @@ -60,7 +60,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-internal-api": "^10.1.1", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", "deepmerge": "^4.2.2", diff --git a/packages/earn-controller/CHANGELOG.md b/packages/earn-controller/CHANGELOG.md index 6cc9ece8951..99dd3c350f5 100644 --- a/packages/earn-controller/CHANGELOG.md +++ b/packages/earn-controller/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [12.0.0] diff --git a/packages/earn-controller/package.json b/packages/earn-controller/package.json index cb26d8a44d8..4bc9b20be91 100644 --- a/packages/earn-controller/package.json +++ b/packages/earn-controller/package.json @@ -58,7 +58,7 @@ "@metamask/account-tree-controller": "^7.0.0", "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/stake-sdk": "^3.2.1", diff --git a/packages/keyring-controller/CHANGELOG.md b/packages/keyring-controller/CHANGELOG.md index c6dad52923f..c557950760b 100644 --- a/packages/keyring-controller/CHANGELOG.md +++ b/packages/keyring-controller/CHANGELOG.md @@ -27,10 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/eth-hd-keyring` from `^13.1.1` to `^14.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/eth-simple-keyring` from `^11.1.2` to `^12.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-hd-keyring` from `^13.1.1` to `^14.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-simple-keyring` from `^11.1.2` to `^12.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [25.2.0] diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 5da9820bc7b..fb0fcfe16b4 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -56,11 +56,11 @@ "@ethereumjs/util": "^9.1.0", "@metamask/base-controller": "^9.1.0", "@metamask/browser-passworder": "^6.0.0", - "@metamask/eth-hd-keyring": "^14.0.0", + "@metamask/eth-hd-keyring": "^14.0.1", "@metamask/eth-sig-util": "^8.2.0", - "@metamask/eth-simple-keyring": "^12.0.0", - "@metamask/keyring-api": "^23.0.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/eth-simple-keyring": "^12.0.1", + "@metamask/keyring-api": "^23.0.1", + "@metamask/keyring-internal-api": "^10.1.1", "@metamask/messenger": "^1.1.1", "@metamask/utils": "^11.9.0", "async-mutex": "^0.5.0", diff --git a/packages/money-account-controller/CHANGELOG.md b/packages/money-account-controller/CHANGELOG.md index b1b14978232..5db283c5445 100644 --- a/packages/money-account-controller/CHANGELOG.md +++ b/packages/money-account-controller/CHANGELOG.md @@ -11,8 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.1.0` to `^1.1.1` ([#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/eth-money-keyring` from `^2.0.0` to `^2.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-money-keyring` from `^2.0.0` to `^2.0.2` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [0.1.0] diff --git a/packages/money-account-controller/package.json b/packages/money-account-controller/package.json index 9e83eb01c75..3554e74fffc 100644 --- a/packages/money-account-controller/package.json +++ b/packages/money-account-controller/package.json @@ -55,8 +55,8 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-money-keyring": "^2.0.1", - "@metamask/keyring-api": "^23.0.0", + "@metamask/eth-money-keyring": "^2.0.2", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", "@metamask/messenger": "^1.1.1", "async-mutex": "^0.5.0" diff --git a/packages/multichain-account-service/CHANGELOG.md b/packages/multichain-account-service/CHANGELOG.md index 1ab8e24f518..428e0be92f7 100644 --- a/packages/multichain-account-service/CHANGELOG.md +++ b/packages/multichain-account-service/CHANGELOG.md @@ -13,11 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/keyring-controller` from `^25.1.1` to `^25.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/account-api` from `^1.0.0` to `^1.0.2` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/account-api` from `^1.0.0` to `^1.0.3` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/eth-snap-keyring` from `^19.0.0` to `^21.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [8.0.1] diff --git a/packages/multichain-account-service/package.json b/packages/multichain-account-service/package.json index 6b6186736cf..032c1309768 100644 --- a/packages/multichain-account-service/package.json +++ b/packages/multichain-account-service/package.json @@ -56,12 +56,12 @@ "@ethereumjs/util": "^9.1.0", "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/eth-snap-keyring": "^21.0.0", + "@metamask/eth-snap-keyring": "^21.0.1", "@metamask/key-tree": "^10.1.1", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.1.0", - "@metamask/keyring-snap-client": "^9.0.0", + "@metamask/keyring-internal-api": "^10.1.1", + "@metamask/keyring-snap-client": "^9.0.1", "@metamask/keyring-utils": "^3.1.0", "@metamask/messenger": "^1.1.1", "@metamask/snaps-controllers": "^19.0.0", @@ -73,10 +73,10 @@ "lodash": "^4.17.21" }, "devDependencies": { - "@metamask/account-api": "^1.0.2", + "@metamask/account-api": "^1.0.3", "@metamask/auto-changelog": "^6.0.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/eth-hd-keyring": "^14.0.0", + "@metamask/eth-hd-keyring": "^14.0.1", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", @@ -92,7 +92,7 @@ "webextension-polyfill": "^0.12.0" }, "peerDependencies": { - "@metamask/account-api": "^1.0.2", + "@metamask/account-api": "^1.0.3", "@metamask/providers": "^22.0.0", "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" }, diff --git a/packages/multichain-network-controller/CHANGELOG.md b/packages/multichain-network-controller/CHANGELOG.md index 309a1d746e2..2e50c985eb6 100644 --- a/packages/multichain-network-controller/CHANGELOG.md +++ b/packages/multichain-network-controller/CHANGELOG.md @@ -17,8 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/controller-utils` from `^11.19.0` to `^11.20.0` ([#8344](https://github.com/MetaMask/core/pull/8344)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [3.0.6] diff --git a/packages/multichain-network-controller/package.json b/packages/multichain-network-controller/package.json index 0649b76d333..72944f810b7 100644 --- a/packages/multichain-network-controller/package.json +++ b/packages/multichain-network-controller/package.json @@ -56,8 +56,8 @@ "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^23.0.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-api": "^23.0.1", + "@metamask/keyring-internal-api": "^10.1.1", "@metamask/messenger": "^1.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/superstruct": "^3.1.0", diff --git a/packages/multichain-transactions-controller/CHANGELOG.md b/packages/multichain-transactions-controller/CHANGELOG.md index 12785afa747..b6d39b8c528 100644 --- a/packages/multichain-transactions-controller/CHANGELOG.md +++ b/packages/multichain-transactions-controller/CHANGELOG.md @@ -19,9 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/accounts-controller` from `^37.1.1` to `^37.2.0` ([#8363](https://github.com/MetaMask/core/pull/8363)) - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) -- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-internal-api` from `^10.0.0` to `^10.1.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-snap-client` from `^8.2.0` to `^9.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [7.0.4] diff --git a/packages/multichain-transactions-controller/package.json b/packages/multichain-transactions-controller/package.json index 6c130944452..f33524cdf03 100644 --- a/packages/multichain-transactions-controller/package.json +++ b/packages/multichain-transactions-controller/package.json @@ -55,9 +55,9 @@ "dependencies": { "@metamask/accounts-controller": "^37.2.0", "@metamask/base-controller": "^9.1.0", - "@metamask/keyring-api": "^23.0.0", - "@metamask/keyring-internal-api": "^10.1.0", - "@metamask/keyring-snap-client": "^9.0.0", + "@metamask/keyring-api": "^23.0.1", + "@metamask/keyring-internal-api": "^10.1.1", + "@metamask/keyring-snap-client": "^9.0.1", "@metamask/messenger": "^1.1.1", "@metamask/polling-controller": "^16.0.4", "@metamask/snaps-controllers": "^19.0.0", diff --git a/packages/network-enablement-controller/CHANGELOG.md b/packages/network-enablement-controller/CHANGELOG.md index b478943c8c5..b2dd543a573 100644 --- a/packages/network-enablement-controller/CHANGELOG.md +++ b/packages/network-enablement-controller/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/messenger` from `^1.0.0` to `^1.1.1` ([#8364](https://github.com/MetaMask/core/pull/8364), [#8373](https://github.com/MetaMask/core/pull/8373)) - Bump `@metamask/transaction-controller` from `^64.0.0` to `^64.2.0` ([#8432](https://github.com/MetaMask/core/pull/8432), [#8447](https://github.com/MetaMask/core/pull/8447)) - Bump `@metamask/base-controller` from `^9.0.1` to `^9.1.0` ([#8457](https://github.com/MetaMask/core/pull/8457)) -- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.0` ([#8464](https://github.com/MetaMask/core/pull/8464)) +- Bump `@metamask/keyring-api` from `^21.6.0` to `^23.0.1` ([#8464](https://github.com/MetaMask/core/pull/8464)) ## [5.0.2] diff --git a/packages/network-enablement-controller/package.json b/packages/network-enablement-controller/package.json index ec0da62531c..abbcead2d56 100644 --- a/packages/network-enablement-controller/package.json +++ b/packages/network-enablement-controller/package.json @@ -55,7 +55,7 @@ "dependencies": { "@metamask/base-controller": "^9.1.0", "@metamask/controller-utils": "^11.20.0", - "@metamask/keyring-api": "^23.0.0", + "@metamask/keyring-api": "^23.0.1", "@metamask/messenger": "^1.1.1", "@metamask/multichain-network-controller": "^3.0.6", "@metamask/network-controller": "^30.0.1", diff --git a/packages/perps-controller/package.json b/packages/perps-controller/package.json index 357a5aded76..a01904598d0 100644 --- a/packages/perps-controller/package.json +++ b/packages/perps-controller/package.json @@ -71,7 +71,7 @@ "@metamask/auto-changelog": "^6.0.0", "@metamask/geolocation-controller": "^0.1.2", "@metamask/keyring-controller": "^25.2.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-internal-api": "^10.1.1", "@metamask/network-controller": "^30.0.1", "@metamask/profile-sync-controller": "^28.0.2", "@metamask/remote-feature-flag-controller": "^4.2.0", diff --git a/packages/profile-metrics-controller/package.json b/packages/profile-metrics-controller/package.json index 5cea97d5479..2611ea65ff5 100644 --- a/packages/profile-metrics-controller/package.json +++ b/packages/profile-metrics-controller/package.json @@ -66,7 +66,7 @@ }, "devDependencies": { "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-internal-api": "^10.1.1", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", "deepmerge": "^4.2.2", diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index 75adfac4a00..d70b02d808b 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -124,8 +124,8 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^6.0.0", - "@metamask/keyring-api": "^23.0.0", - "@metamask/keyring-internal-api": "^10.1.0", + "@metamask/keyring-api": "^23.0.1", + "@metamask/keyring-internal-api": "^10.1.1", "@metamask/providers": "^22.1.0", "@ts-bridge/cli": "^0.6.4", "@types/jest": "^29.5.14", diff --git a/yarn.lock b/yarn.lock index 7c0e66296e6..3cd7d3012e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2512,14 +2512,14 @@ __metadata: languageName: node linkType: hard -"@metamask/account-api@npm:^1.0.2": - version: 1.0.2 - resolution: "@metamask/account-api@npm:1.0.2" +"@metamask/account-api@npm:^1.0.3": + version: 1.0.3 + resolution: "@metamask/account-api@npm:1.0.3" dependencies: - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-utils": "npm:^3.2.0" uuid: "npm:^9.0.1" - checksum: 10/6efee14be4334ad31df689d21bc3d16a1d27d01529cbbfd75a5f255e97ce7fdc95dccb2f2cfeb50466aa65f9781d58c89768764e61a44530cfeb7dc9137756f8 + checksum: 10/297e75336fc9bed1197135328a80a184f03f97797f50d36b6dc84866c2de5e4e5b64eb882c43e267b46da5ea17b6888484ff5f3f9f6b80957198b92c70927b36 languageName: node linkType: hard @@ -2527,11 +2527,11 @@ __metadata: version: 0.0.0-use.local resolution: "@metamask/account-tree-controller@workspace:packages/account-tree-controller" dependencies: - "@metamask/account-api": "npm:^1.0.2" + "@metamask/account-api": "npm:^1.0.3" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/multichain-account-service": "npm:^8.0.1" @@ -2568,10 +2568,10 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/eth-snap-keyring": "npm:^21.0.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/eth-snap-keyring": "npm:^21.0.1" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" @@ -2777,10 +2777,10 @@ __metadata: "@metamask/client-controller": "npm:^1.0.1" "@metamask/controller-utils": "npm:^11.20.0" "@metamask/core-backend": "npm:^6.2.1" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-snap-client": "npm:^9.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-snap-client": "npm:^9.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/network-enablement-controller": "npm:^5.0.2" @@ -2821,7 +2821,7 @@ __metadata: "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" "@metamask/abi-utils": "npm:^2.0.3" - "@metamask/account-api": "npm:^1.0.2" + "@metamask/account-api": "npm:^1.0.3" "@metamask/account-tree-controller": "npm:^7.0.0" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/approval-controller": "npm:^9.0.1" @@ -2832,10 +2832,10 @@ __metadata: "@metamask/core-backend": "npm:^6.2.1" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-snap-client": "npm:^9.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-snap-client": "npm:^9.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/multichain-account-service": "npm:^8.0.1" @@ -3012,7 +3012,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.20.0" "@metamask/eth-json-rpc-provider": "npm:^6.0.1" "@metamask/gas-fee-controller": "npm:^26.1.1" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/multichain-network-controller": "npm:^3.0.6" @@ -3112,7 +3112,7 @@ __metadata: "@metamask/api-specs": "npm:^0.14.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/permission-controller": "npm:^12.3.0" "@metamask/rpc-errors": "npm:^7.0.2" "@metamask/utils": "npm:^11.9.0" @@ -3459,7 +3459,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/stake-sdk": "npm:^3.2.1" @@ -3654,22 +3654,22 @@ __metadata: languageName: unknown linkType: soft -"@metamask/eth-hd-keyring@npm:^14.0.0": - version: 14.0.0 - resolution: "@metamask/eth-hd-keyring@npm:14.0.0" +"@metamask/eth-hd-keyring@npm:^14.0.1": + version: 14.0.1 + resolution: "@metamask/eth-hd-keyring@npm:14.0.1" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@ethereumjs/util": "npm:^9.1.0" "@metamask/eth-sig-util": "npm:^8.2.0" "@metamask/key-tree": "npm:^10.0.2" - "@metamask/keyring-api": "npm:^23.0.0" - "@metamask/keyring-sdk": "npm:^2.0.0" + "@metamask/keyring-api": "npm:^23.0.1" + "@metamask/keyring-sdk": "npm:^2.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^11.11.0" ethereum-cryptography: "npm:^2.2.1" - checksum: 10/c9e1caa54430a6f080cf20fc044047210a9109417f85deb510ccc8e50ae7db831655887adcafae0e55f163860b5535097a7074ece6dea9222bb98050e7144047 + checksum: 10/e3666247f2bcb15c28af388a89f0e5e1fc19a9efdf7b17e41f9f1ae0c3f8dad81be2a0ebca79691dea92dc2dc5d30ccfe26fc1853b008b1b8955d95becff1114 languageName: node linkType: hard @@ -3765,16 +3765,16 @@ __metadata: languageName: unknown linkType: soft -"@metamask/eth-money-keyring@npm:^2.0.1": - version: 2.0.1 - resolution: "@metamask/eth-money-keyring@npm:2.0.1" +"@metamask/eth-money-keyring@npm:^2.0.2": + version: 2.0.2 + resolution: "@metamask/eth-money-keyring@npm:2.0.2" dependencies: - "@metamask/eth-hd-keyring": "npm:^14.0.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/eth-hd-keyring": "npm:^14.0.1" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" async-mutex: "npm:^0.5.0" - checksum: 10/5b8915c133a1005b23ade53bd7891cc18c59e4cf270e7483b5c1dd05d719fd75bd070939b4452672914ace80520bdb8b885b814e76fe88299b4ea30eb2136617 + checksum: 10/cd8f52b88836b874e9e3a67c045714dd6c2e83be21a72ada4f45e4ca6884e01e496e414db6c358ef9d2f1c99229d90bc1f1760c4de48bb3919928820c9a09123 languageName: node linkType: hard @@ -3803,31 +3803,31 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-simple-keyring@npm:^12.0.0": - version: 12.0.0 - resolution: "@metamask/eth-simple-keyring@npm:12.0.0" +"@metamask/eth-simple-keyring@npm:^12.0.1": + version: 12.0.1 + resolution: "@metamask/eth-simple-keyring@npm:12.0.1" dependencies: "@ethereumjs/util": "npm:^9.1.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-api": "npm:^23.0.0" - "@metamask/keyring-sdk": "npm:^2.0.0" + "@metamask/keyring-api": "npm:^23.0.1" + "@metamask/keyring-sdk": "npm:^2.0.1" "@metamask/utils": "npm:^11.11.0" ethereum-cryptography: "npm:^2.2.1" randombytes: "npm:^2.1.0" - checksum: 10/a85db462ac293ffe88e46139e0c7252b03f5c400d73c8c9ca0d8fdfb78bfd74dbd87cb95bb8330346becba85e1b2423c8522d06fa7dc60555d6a24cf92220c55 + checksum: 10/7bedb102e89a3dd3ade935a9c8b02dc6237778bab276e7a2144d4a0f5c2a1fe0c6dd85756c1014fe0b4cd0936fdcc60d53fd00c3d35fa880e49b2aaf840f2521 languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^21.0.0": - version: 21.0.0 - resolution: "@metamask/eth-snap-keyring@npm:21.0.0" +"@metamask/eth-snap-keyring@npm:^21.0.1": + version: 21.0.1 + resolution: "@metamask/eth-snap-keyring@npm:21.0.1" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-internal-snap-client": "npm:^10.0.0" - "@metamask/keyring-sdk": "npm:^2.0.0" - "@metamask/keyring-snap-sdk": "npm:^9.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-internal-snap-client": "npm:^10.0.1" + "@metamask/keyring-sdk": "npm:^2.0.1" + "@metamask/keyring-snap-sdk": "npm:^9.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/snaps-controllers": "npm:^19.0.1" @@ -3840,7 +3840,7 @@ __metadata: uuid: "npm:^9.0.1" peerDependencies: "@metamask/keyring-api": ^23.0.0 - checksum: 10/c65582b4791f6a121871df7c9fc7fc16c588b78324a1eb18a237e9e66d0b88ff63f91a6f8b6fdbc9050bd0ecbc7f6097aefc5d3e3690fbf69a6d0ef1aa292b07 + checksum: 10/331c6481d6ff174a7f3f13e6f4a0a91ad5c135f494dd3690e043951b77beb9faf4fd9e55bfddd16b504f4ec2f8fe789236a53a67071b0a9a3e30a87e27e1e24a languageName: node linkType: hard @@ -4163,15 +4163,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^23.0.0": - version: 23.0.0 - resolution: "@metamask/keyring-api@npm:23.0.0" +"@metamask/keyring-api@npm:^23.0.1": + version: 23.0.1 + resolution: "@metamask/keyring-api@npm:23.0.1" dependencies: "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^11.11.0" bitcoin-address-validation: "npm:^2.2.3" - checksum: 10/1d56e275070bc995fe1a71ffbf9d4abed9c725c965aa2ce229034de0215a23f1c6e0e835427bcc49450171620c144e197471293879eb9f7bf414c299f864b0f1 + checksum: 10/a74f302edda5035f999b714f16ee4934f757695bfd47414932efc34ba14d5e10d37c6632c49ee0cf19cb83729bf453bddb1367ccf1affeb7b92400b2bd6ca105 languageName: node linkType: hard @@ -4187,11 +4187,11 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/browser-passworder": "npm:^6.0.0" - "@metamask/eth-hd-keyring": "npm:^14.0.0" + "@metamask/eth-hd-keyring": "npm:^14.0.1" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/eth-simple-keyring": "npm:^12.0.0" - "@metamask/keyring-api": "npm:^23.0.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/eth-simple-keyring": "npm:^12.0.1" + "@metamask/keyring-api": "npm:^23.0.1" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/scure-bip39": "npm:^2.1.1" @@ -4215,37 +4215,37 @@ __metadata: languageName: unknown linkType: soft -"@metamask/keyring-internal-api@npm:^10.1.0": - version: 10.1.0 - resolution: "@metamask/keyring-internal-api@npm:10.1.0" +"@metamask/keyring-internal-api@npm:^10.1.1": + version: 10.1.1 + resolution: "@metamask/keyring-internal-api@npm:10.1.1" dependencies: - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" - checksum: 10/7cb71d940ff2415b7dab5228fc7bfcf932eea7a0fa260e8580cf4a34eb85166f5057e494b87041737e581c9459b0f1a9fd0d57c7dbbf253cf2aac38dfe657c6d + checksum: 10/056f1e957e07e0622a0d61abfb567f2020e94fb2bc68d3db599b2ec74fa222c874642a6eaef6ccfd1923619e1353ba819fdad729c989b9dc0df6c3127cc14a59 languageName: node linkType: hard -"@metamask/keyring-internal-snap-client@npm:^10.0.0": - version: 10.0.0 - resolution: "@metamask/keyring-internal-snap-client@npm:10.0.0" +"@metamask/keyring-internal-snap-client@npm:^10.0.1": + version: 10.0.1 + resolution: "@metamask/keyring-internal-snap-client@npm:10.0.1" dependencies: - "@metamask/keyring-api": "npm:^23.0.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-snap-client": "npm:^9.0.0" + "@metamask/keyring-api": "npm:^23.0.1" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-snap-client": "npm:^9.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/messenger": "npm:^1.1.1" - checksum: 10/71eb7bd0132a1efe4d4e6ca7d88854149c921d5ac7dc3c45b6c9ffc0c10c308aee8187c9fded75bdfb7815feea740f7db341a9696b022868d9dcfef32fa420ee + checksum: 10/50d18ed88fc55d0587def111c62803344d28364263c4c64adbb8879c1beb6c7e24dc213d2ab27d8aaa265b874e0b507caec8755427bbdd0aa56578c997708973 languageName: node linkType: hard -"@metamask/keyring-sdk@npm:^2.0.0": - version: 2.0.0 - resolution: "@metamask/keyring-sdk@npm:2.0.0" +"@metamask/keyring-sdk@npm:^2.0.1": + version: 2.0.1 + resolution: "@metamask/keyring-sdk@npm:2.0.1" dependencies: "@ethereumjs/tx": "npm:^5.4.0" "@metamask/eth-sig-util": "npm:^8.2.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/superstruct": "npm:^3.1.0" @@ -4253,15 +4253,15 @@ __metadata: async-mutex: "npm:^0.5.0" ethereum-cryptography: "npm:^2.2.1" uuid: "npm:^9.0.1" - checksum: 10/78250570448e791b3729cae9dff6df13222d91738c86bc821e5899e8661fc7d271943e93c6ea16e66175261c4da26d1f0276362215f03d6eb1ff4f396cf0fe4c + checksum: 10/c6dfe7b0e45799703fea873c41724f2f45a33b748177a22e300419d2da802073e2fc9c4fa608d6b27a206e94d1fed7b3dd2a738b8e47cbc406e8ae3116d61912 languageName: node linkType: hard -"@metamask/keyring-snap-client@npm:^9.0.0": - version: 9.0.0 - resolution: "@metamask/keyring-snap-client@npm:9.0.0" +"@metamask/keyring-snap-client@npm:^9.0.1": + version: 9.0.1 + resolution: "@metamask/keyring-snap-client@npm:9.0.1" dependencies: - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/superstruct": "npm:^3.1.0" "@types/uuid": "npm:^9.0.8" @@ -4269,13 +4269,13 @@ __metadata: webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^19.0.0 - checksum: 10/677fbe0a5c7262fad0310627b3e5767095fccc4982af0cfc6c7848a3f129306490c7d1a61c60caafc7f55dced80836d06b321a0123b26197af609cfb30042ea5 + checksum: 10/1f6594bee7c3b49c41bb9597a1ddb25c941fe0182381cd03dd28af5da328a48ec15569e6421e961026eb7189161e63af174061a86ffbe6034ed6c7b24c7b0e1d languageName: node linkType: hard -"@metamask/keyring-snap-sdk@npm:^9.0.0": - version: 9.0.0 - resolution: "@metamask/keyring-snap-sdk@npm:9.0.0" +"@metamask/keyring-snap-sdk@npm:^9.0.1": + version: 9.0.1 + resolution: "@metamask/keyring-snap-sdk@npm:9.0.1" dependencies: "@metamask/keyring-utils": "npm:^3.2.0" "@metamask/snaps-sdk": "npm:^11.0.0" @@ -4285,7 +4285,7 @@ __metadata: peerDependencies: "@metamask/keyring-api": ^23.0.0 "@metamask/providers": ^19.0.0 - checksum: 10/e39dbcd49a695b4533a224951d20c25330ebad797975ab04e6c36669dd1dda45c72a769064157eecd7d0d51b892a5f62a7e51c8720ad9bb1d2b03c3714b71d8f + checksum: 10/02e33662cb82562a86b1ac1d0f5c36b94be3cd17ff31fd8aa6358ee5880a6b8f4fa84e02ea50971395d56a4aaa6be2c573c9862d8fafaf06266db200c14c9497 languageName: node linkType: hard @@ -4440,8 +4440,8 @@ __metadata: "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/eth-money-keyring": "npm:^2.0.1" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/eth-money-keyring": "npm:^2.0.2" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" @@ -4464,18 +4464,18 @@ __metadata: resolution: "@metamask/multichain-account-service@workspace:packages/multichain-account-service" dependencies: "@ethereumjs/util": "npm:^9.1.0" - "@metamask/account-api": "npm:^1.0.2" + "@metamask/account-api": "npm:^1.0.3" "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/eth-hd-keyring": "npm:^14.0.0" - "@metamask/eth-snap-keyring": "npm:^21.0.0" + "@metamask/eth-hd-keyring": "npm:^14.0.1" + "@metamask/eth-snap-keyring": "npm:^21.0.1" "@metamask/key-tree": "npm:^10.1.1" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-snap-client": "npm:^9.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-snap-client": "npm:^9.0.1" "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/messenger": "npm:^1.1.1" "@metamask/providers": "npm:^22.1.0" @@ -4499,7 +4499,7 @@ __metadata: uuid: "npm:^8.3.2" webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/account-api": ^1.0.2 + "@metamask/account-api": ^1.0.3 "@metamask/providers": ^22.0.0 webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 languageName: unknown @@ -4543,9 +4543,9 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/superstruct": "npm:^3.1.0" @@ -4575,10 +4575,10 @@ __metadata: "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" - "@metamask/keyring-snap-client": "npm:^9.0.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" + "@metamask/keyring-snap-client": "npm:^9.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/polling-controller": "npm:^16.0.4" "@metamask/snaps-controllers": "npm:^19.0.0" @@ -4678,7 +4678,7 @@ __metadata: "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/multichain-network-controller": "npm:^3.0.6" "@metamask/network-controller": "npm:^30.0.1" @@ -4831,7 +4831,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.20.0" "@metamask/geolocation-controller": "npm:^0.1.2" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/network-controller": "npm:^30.0.1" "@metamask/profile-sync-controller": "npm:^28.0.2" @@ -4949,7 +4949,7 @@ __metadata: "@metamask/base-controller": "npm:^9.1.0" "@metamask/controller-utils": "npm:^11.20.0" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/polling-controller": "npm:^16.0.4" "@metamask/profile-sync-controller": "npm:^28.0.2" @@ -4978,9 +4978,9 @@ __metadata: "@metamask/address-book-controller": "npm:^7.1.1" "@metamask/auto-changelog": "npm:^6.0.0" "@metamask/base-controller": "npm:^9.1.0" - "@metamask/keyring-api": "npm:^23.0.0" + "@metamask/keyring-api": "npm:^23.0.1" "@metamask/keyring-controller": "npm:^25.2.0" - "@metamask/keyring-internal-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^10.1.1" "@metamask/messenger": "npm:^1.1.1" "@metamask/providers": "npm:^22.1.0" "@metamask/snaps-controllers": "npm:^19.0.0" From ee3d50d722f9793058c0cc1284e8071d62f5b922 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 16 Apr 2026 17:09:22 +0200 Subject: [PATCH 11/13] chore: yarn.lock --- yarn.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 50baa495df2..1d508428983 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2822,13 +2822,8 @@ __metadata: "@ethersproject/contracts": "npm:^5.7.0" "@ethersproject/providers": "npm:^5.7.0" "@metamask/abi-utils": "npm:^2.0.3" -<<<<<<< HEAD "@metamask/account-api": "npm:^1.0.3" - "@metamask/account-tree-controller": "npm:^7.0.0" -======= - "@metamask/account-api": "npm:^1.0.0" "@metamask/account-tree-controller": "npm:^7.1.0" ->>>>>>> main "@metamask/accounts-controller": "npm:^37.2.0" "@metamask/approval-controller": "npm:^9.0.1" "@metamask/auto-changelog": "npm:^6.1.0" From 20c515dddacf7621b975f9fcd6d4db138940e9da Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 16 Apr 2026 17:12:22 +0200 Subject: [PATCH 12/13] chore: cleanup jest.config.packages.js --- jest.config.packages.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/jest.config.packages.js b/jest.config.packages.js index 260a518afb4..07d249241ce 100644 --- a/jest.config.packages.js +++ b/jest.config.packages.js @@ -83,16 +83,6 @@ module.exports = { '^@metamask/json-rpc-engine/v2$': [ '/../json-rpc-engine/src/v2/index.ts', ], - // Required for the keyring API v2 transition until `/v2` is merged with the top-level: { - '^@metamask/eth-hd-keyring/v2$': - '/../../node_modules/@metamask/eth-hd-keyring/dist/v2/index.cjs', - '^@metamask/eth-simple-keyring/v2$': - '/../../node_modules/@metamask/eth-simple-keyring/dist/v2/index.cjs', - '^@metamask/keyring-api/v2$': - '/../../node_modules/@metamask/keyring-api/dist/v2/index.cjs', - '^@metamask/keyring-sdk/v2$': - '/../../node_modules/@metamask/keyring-sdk/dist/v2/index.cjs', - // } '^@metamask/utils/node$': require.resolve('@metamask/utils/node'), '^@metamask/(.+)$': [ '/../$1/src', From dc56540fa11144059de1d3f4bb2bf92bd6a87725 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Thu, 16 Apr 2026 17:16:59 +0200 Subject: [PATCH 13/13] ci: trigger