diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 108f60b10a..6f224b7150 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -49,8 +49,9 @@ "dependencies": { "@ethereumjs/util": "^8.1.0", "@metamask/base-controller": "^7.0.2", - "@metamask/eth-snap-keyring": "^5.0.1", - "@metamask/keyring-api": "^10.1.0", + "@metamask/eth-snap-keyring": "^7.0.0", + "@metamask/keyring-api": "^12.0.0", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", "@metamask/utils": "^10.0.0", diff --git a/packages/accounts-controller/src/AccountsController.test.ts b/packages/accounts-controller/src/AccountsController.test.ts index 4905119e45..e082ea1c38 100644 --- a/packages/accounts-controller/src/AccountsController.test.ts +++ b/packages/accounts-controller/src/AccountsController.test.ts @@ -1,15 +1,15 @@ import { ControllerMessenger } from '@metamask/base-controller'; -import type { - InternalAccount, - InternalAccountType, -} from '@metamask/keyring-api'; import { BtcAccountType, - BtcMethod, EthAccountType, + BtcMethod, EthMethod, } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; +import type { + InternalAccount, + InternalAccountType, +} from '@metamask/keyring-internal-api'; import type { SnapControllerState } from '@metamask/snaps-controllers'; import { SnapStatus } from '@metamask/snaps-utils'; import type { CaipChainId } from '@metamask/utils'; diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index 54f2d01614..234d454472 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -5,7 +5,6 @@ import type { } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import { SnapKeyring } from '@metamask/eth-snap-keyring'; -import type { InternalAccount } from '@metamask/keyring-api'; import { EthAccountType, EthMethod, @@ -19,6 +18,7 @@ import type { KeyringControllerGetAccountsAction, KeyringControllerStateChangeEvent, } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapControllerState, SnapStateChange, diff --git a/packages/accounts-controller/src/tests/mocks.ts b/packages/accounts-controller/src/tests/mocks.ts index b41388fb2f..c5224ab0be 100644 --- a/packages/accounts-controller/src/tests/mocks.ts +++ b/packages/accounts-controller/src/tests/mocks.ts @@ -1,14 +1,14 @@ -import type { - InternalAccount, - InternalAccountType, -} from '@metamask/keyring-api'; import { BtcAccountType, - BtcMethod, EthAccountType, + BtcMethod, EthMethod, } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; +import type { + InternalAccount, + InternalAccountType, +} from '@metamask/keyring-internal-api'; import { v4 } from 'uuid'; export const createMockInternalAccount = ({ diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index cffcd780ad..21425f95ad 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -79,11 +79,10 @@ "@metamask/approval-controller": "^7.1.1", "@metamask/auto-changelog": "^3.4.4", "@metamask/ethjs-provider-http": "^0.3.0", - "@metamask/keyring-api": "^10.1.0", "@metamask/keyring-controller": "^19.0.1", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/network-controller": "^22.1.1", "@metamask/preferences-controller": "^15.0.1", - "@metamask/providers": "^18.1.1", "@types/jest": "^27.4.1", "@types/lodash": "^4.14.191", "@types/node": "^16.18.54", @@ -104,7 +103,6 @@ "@metamask/keyring-controller": "^19.0.0", "@metamask/network-controller": "^22.0.0", "@metamask/preferences-controller": "^15.0.0", - "@metamask/providers": "^18.1.0", "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" }, "engines": { diff --git a/packages/assets-controllers/src/AccountTrackerController.test.ts b/packages/assets-controllers/src/AccountTrackerController.test.ts index bd27eecb87..8b82b7b4c6 100644 --- a/packages/assets-controllers/src/AccountTrackerController.test.ts +++ b/packages/assets-controllers/src/AccountTrackerController.test.ts @@ -1,6 +1,6 @@ import { ControllerMessenger } from '@metamask/base-controller'; import { query, toChecksumHexAddress } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { type NetworkClientId, type NetworkClientConfiguration, diff --git a/packages/assets-controllers/src/NftController.test.ts b/packages/assets-controllers/src/NftController.test.ts index 2fd003dac4..dc9c9a4a8f 100644 --- a/packages/assets-controllers/src/NftController.test.ts +++ b/packages/assets-controllers/src/NftController.test.ts @@ -20,7 +20,7 @@ import { NFT_API_BASE_URL, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/NftController.ts b/packages/assets-controllers/src/NftController.ts index 63c60b53aa..df159b91a9 100644 --- a/packages/assets-controllers/src/NftController.ts +++ b/packages/assets-controllers/src/NftController.ts @@ -26,7 +26,7 @@ import { NFT_API_BASE_URL, NFT_API_VERSION, } from '@metamask/controller-utils'; -import { type InternalAccount } from '@metamask/keyring-api'; +import { type InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientId, NetworkControllerGetNetworkClientByIdAction, diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts index 6a1a69e5ea..a084b5a0ac 100644 --- a/packages/assets-controllers/src/TokenDetectionController.test.ts +++ b/packages/assets-controllers/src/TokenDetectionController.test.ts @@ -6,8 +6,8 @@ import { convertHexToDecimal, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; import type { KeyringControllerState } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { getDefaultNetworkControllerState, RpcEndpointType, diff --git a/packages/assets-controllers/src/TokenRatesController.test.ts b/packages/assets-controllers/src/TokenRatesController.test.ts index 4648151769..db41deddd4 100644 --- a/packages/assets-controllers/src/TokenRatesController.test.ts +++ b/packages/assets-controllers/src/TokenRatesController.test.ts @@ -7,7 +7,7 @@ import { toChecksumHexAddress, toHex, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/TokenRatesController.ts b/packages/assets-controllers/src/TokenRatesController.ts index 50ffd583c9..f25702bbf8 100644 --- a/packages/assets-controllers/src/TokenRatesController.ts +++ b/packages/assets-controllers/src/TokenRatesController.ts @@ -14,7 +14,7 @@ import { FALL_BACK_VS_CURRENCY, toHex, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkControllerGetNetworkClientByIdAction, NetworkControllerGetStateAction, diff --git a/packages/assets-controllers/src/TokensController.test.ts b/packages/assets-controllers/src/TokensController.test.ts index 1f3aa57ea1..250382cd5c 100644 --- a/packages/assets-controllers/src/TokensController.test.ts +++ b/packages/assets-controllers/src/TokensController.test.ts @@ -13,7 +13,7 @@ import { convertHexToDecimal, InfuraNetworkType, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkClientConfiguration, NetworkClientId, diff --git a/packages/assets-controllers/src/TokensController.ts b/packages/assets-controllers/src/TokensController.ts index feb5293d8c..be24f364b5 100644 --- a/packages/assets-controllers/src/TokensController.ts +++ b/packages/assets-controllers/src/TokensController.ts @@ -24,7 +24,7 @@ import { isValidHexAddress, safelyExecute, } from '@metamask/controller-utils'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { abiERC721 } from '@metamask/metamask-eth-abis'; import type { NetworkClientId, diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index 4e5b1a59dd..3e238e9aa0 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -49,7 +49,8 @@ "dependencies": { "@metamask/base-controller": "^7.0.2", "@metamask/chain-api": "^0.1.0", - "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-internal-api": "^1.0.0", + "@metamask/keyring-utils": "^1.0.0", "@metamask/snaps-controllers": "^9.10.0", "@metamask/snaps-sdk": "^6.7.0", "@metamask/snaps-utils": "^8.3.0", diff --git a/packages/chain-controller/src/ChainController.test.ts b/packages/chain-controller/src/ChainController.test.ts index 734a82a231..8fe506561f 100644 --- a/packages/chain-controller/src/ChainController.test.ts +++ b/packages/chain-controller/src/ChainController.test.ts @@ -1,5 +1,5 @@ import { ControllerMessenger } from '@metamask/base-controller'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { SnapId } from '@metamask/snaps-sdk'; import type { AllowedActions, ChainControllerActions } from './ChainController'; diff --git a/packages/chain-controller/src/ChainController.ts b/packages/chain-controller/src/ChainController.ts index 86d32636a9..4e262bd053 100644 --- a/packages/chain-controller/src/ChainController.ts +++ b/packages/chain-controller/src/ChainController.ts @@ -5,7 +5,7 @@ import type { } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import type { CaipAssetType, BalancesResult, Chain } from '@metamask/chain-api'; -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { HandleSnapRequest as SnapControllerHandleSnapRequestAction } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import type { CaipChainId } from '@metamask/utils'; diff --git a/packages/chain-controller/src/SnapHandlerClient.ts b/packages/chain-controller/src/SnapHandlerClient.ts index fa03a16407..d89d529a69 100644 --- a/packages/chain-controller/src/SnapHandlerClient.ts +++ b/packages/chain-controller/src/SnapHandlerClient.ts @@ -1,4 +1,4 @@ -import type { JsonRpcRequest } from '@metamask/keyring-api/dist/JsonRpcRequest'; +import type { JsonRpcRequest } from '@metamask/keyring-utils'; import type { SnapController } from '@metamask/snaps-controllers'; import type { SnapId } from '@metamask/snaps-sdk'; import { HandlerType } from '@metamask/snaps-utils'; @@ -78,7 +78,7 @@ export class SnapHandlerClient { */ constructor({ handler, - // Follow same pattern than for @metamask/keyring-api + // Follow same pattern than for @metamask/keyring-snap-client snapId, origin = 'metamask', }: { diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 73a80303ba..48050fdaeb 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -54,7 +54,8 @@ "@metamask/eth-hd-keyring": "^7.0.4", "@metamask/eth-sig-util": "^8.0.0", "@metamask/eth-simple-keyring": "^6.0.5", - "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-api": "^12.0.0", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/message-manager": "^11.0.3", "@metamask/utils": "^10.0.0", "async-mutex": "^0.5.0", @@ -68,7 +69,6 @@ "@lavamoat/allow-scripts": "^3.0.4", "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/auto-changelog": "^3.4.4", - "@metamask/providers": "^18.1.1", "@metamask/scure-bip39": "^2.1.1", "@types/jest": "^27.4.1", "deepmerge": "^4.2.2", @@ -79,12 +79,7 @@ "typedoc": "^0.24.8", "typedoc-plugin-missing-exports": "^2.0.0", "typescript": "~5.2.2", - "uuid": "^8.3.2", - "webextension-polyfill": "^0.12.0" - }, - "peerDependencies": { - "@metamask/providers": "^18.1.0", - "webextension-polyfill": "^0.10.0 || ^0.11.0 || ^0.12.0" + "uuid": "^8.3.2" }, "engines": { "node": "^18.18 || >=20" diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts index d8e6218725..18a0c2319d 100644 --- a/packages/keyring-controller/src/KeyringController.test.ts +++ b/packages/keyring-controller/src/KeyringController.test.ts @@ -12,7 +12,7 @@ import { encrypt, } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring/dist/simple-keyring'; -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import { wordlist } from '@metamask/scure-bip39/dist/wordlists/english'; import type { KeyringClass } from '@metamask/utils'; import { diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 375397fd60..06ed76bca3 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -11,13 +11,13 @@ import HDKeyring from '@metamask/eth-hd-keyring'; import { normalize as ethNormalize } from '@metamask/eth-sig-util'; import SimpleKeyring from '@metamask/eth-simple-keyring'; import type { + KeyringExecutionContext, EthBaseTransaction, EthBaseUserOperation, - EthKeyring, EthUserOperation, EthUserOperationPatch, - KeyringExecutionContext, } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { PersonalMessageParams, TypedMessageParams, diff --git a/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts b/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts index 2838ea0b55..6d3f0d3e68 100644 --- a/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts +++ b/packages/keyring-controller/tests/mocks/mockErc4337Keyring.ts @@ -1,4 +1,4 @@ -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Hex, Json } from '@metamask/utils'; export class MockErc4337Keyring implements EthKeyring { diff --git a/packages/keyring-controller/tests/mocks/mockKeyring.ts b/packages/keyring-controller/tests/mocks/mockKeyring.ts index 9ce4b50caf..38770fbcbd 100644 --- a/packages/keyring-controller/tests/mocks/mockKeyring.ts +++ b/packages/keyring-controller/tests/mocks/mockKeyring.ts @@ -1,4 +1,4 @@ -import type { EthKeyring } from '@metamask/keyring-api'; +import type { EthKeyring } from '@metamask/keyring-internal-api'; import type { Json, Hex } from '@metamask/utils'; export class MockKeyring implements EthKeyring { diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index f55fda8da6..051f755b61 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -101,7 +101,7 @@ }, "dependencies": { "@metamask/base-controller": "^7.0.2", - "@metamask/keyring-api": "^10.1.0", + "@metamask/keyring-api": "^12.0.0", "@metamask/keyring-controller": "^19.0.1", "@metamask/network-controller": "^22.1.1", "@metamask/snaps-sdk": "^6.7.0", @@ -117,6 +117,7 @@ "@lavamoat/preinstall-always-fail": "^2.1.0", "@metamask/accounts-controller": "^20.0.1", "@metamask/auto-changelog": "^3.4.4", + "@metamask/keyring-internal-api": "^1.0.0", "@metamask/providers": "^18.1.1", "@metamask/snaps-controllers": "^9.10.0", "@types/jest": "^27.4.1", diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts index feb2c8d1d3..300d0e04d4 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts @@ -1,4 +1,4 @@ -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type nock from 'nock'; import encryption, { createSHA256Hash } from '../../shared/encryption'; diff --git a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts index c698b101bc..74a3eab880 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.ts @@ -11,7 +11,7 @@ import type { StateMetadata, } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; -import { type InternalAccount, isEvmAccountType } from '@metamask/keyring-api'; +import { isEvmAccountType } from '@metamask/keyring-api'; import { type KeyringControllerGetStateAction, type KeyringControllerLockEvent, @@ -19,6 +19,7 @@ import { type KeyringControllerAddNewAccountAction, KeyringTypes, } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import type { NetworkControllerAddNetworkAction, NetworkControllerGetStateAction, diff --git a/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts b/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts index 5103853d44..8664fcd6cc 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/__fixtures__/mockAccounts.ts @@ -1,5 +1,6 @@ -import { EthAccountType, type InternalAccount } from '@metamask/keyring-api'; +import { EthAccountType } from '@metamask/keyring-api'; import { KeyringTypes } from '@metamask/keyring-controller'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { LOCALIZED_DEFAULT_ACCOUNT_NAMES } from '../accounts/constants'; import { mapInternalAccountToUserStorageAccount } from '../accounts/user-storage'; diff --git a/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts b/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts index c02ef96fad..374063a20f 100644 --- a/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts +++ b/packages/profile-sync-controller/src/controllers/user-storage/accounts/user-storage.ts @@ -1,4 +1,4 @@ -import type { InternalAccount } from '@metamask/keyring-api'; +import type { InternalAccount } from '@metamask/keyring-internal-api'; import { USER_STORAGE_VERSION_KEY, diff --git a/yarn.lock b/yarn.lock index 11e7522926..808c2159ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2041,9 +2041,10 @@ __metadata: "@ethereumjs/util": "npm:^8.1.0" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/eth-snap-keyring": "npm:^5.0.1" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/eth-snap-keyring": "npm:^7.0.0" + "@metamask/keyring-api": "npm:^12.0.0" "@metamask/keyring-controller": "npm:^19.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2161,13 +2162,12 @@ __metadata: "@metamask/controller-utils": "npm:^11.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-provider-http": "npm:^0.3.0" - "@metamask/keyring-api": "npm:^10.1.0" "@metamask/keyring-controller": "npm:^19.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/network-controller": "npm:^22.1.1" "@metamask/polling-controller": "npm:^12.0.2" "@metamask/preferences-controller": "npm:^15.0.1" - "@metamask/providers": "npm:^18.1.1" "@metamask/rpc-errors": "npm:^7.0.1" "@metamask/utils": "npm:^10.0.0" "@types/bn.js": "npm:^5.1.5" @@ -2199,7 +2199,6 @@ __metadata: "@metamask/keyring-controller": ^19.0.0 "@metamask/network-controller": ^22.0.0 "@metamask/preferences-controller": ^15.0.0 - "@metamask/providers": ^18.1.0 webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 languageName: unknown linkType: soft @@ -2298,7 +2297,8 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" "@metamask/chain-api": "npm:^0.1.0" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-internal-api": "npm:^1.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" @@ -2671,22 +2671,27 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-snap-keyring@npm:^5.0.1": - version: 5.0.1 - resolution: "@metamask/eth-snap-keyring@npm:5.0.1" +"@metamask/eth-snap-keyring@npm:^7.0.0": + version: 7.0.0 + resolution: "@metamask/eth-snap-keyring@npm:7.0.0" dependencies: "@ethereumjs/tx": "npm:^4.2.0" "@metamask/eth-sig-util": "npm:^8.0.0" + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-internal-api": "npm:^1.0.0" + "@metamask/keyring-internal-snap-client": "npm:^1.0.0" "@metamask/snaps-controllers": "npm:^9.10.0" "@metamask/snaps-sdk": "npm:^6.7.0" "@metamask/snaps-utils": "npm:^8.3.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" + "@metamask/utils": "npm:^9.3.0" "@types/uuid": "npm:^9.0.8" uuid: "npm:^9.0.1" + webextension-polyfill: "npm:^0.12.0" peerDependencies: - "@metamask/keyring-api": ^10.1.0 - checksum: 10/4d9d700b7c2ecc1b17e92f716f7aeb04bbd03836601b5d37f639bed7fba4d5f00bafadf5359d2416c319cdf18eb2f9417c7353654737af87a6e8579d5e5bab79 + "@metamask/keyring-api": ^12.0.0 + "@metamask/providers": ^18.1.0 + checksum: 10/7a82cd2c19204776d31e29716844ac6f304ce4b136b36728be8e7b19ac2be6b46d0c72cc9707c48669a7a342994ce401aafbfe3f0b47769748ab86ae2169cbbd languageName: node linkType: hard @@ -2943,20 +2948,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^10.1.0": - version: 10.1.0 - resolution: "@metamask/keyring-api@npm:10.1.0" +"@metamask/keyring-api@npm:^12.0.0": + version: 12.0.0 + resolution: "@metamask/keyring-api@npm:12.0.0" dependencies: - "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/keyring-utils": "npm:^1.0.0" "@metamask/superstruct": "npm:^3.1.0" - "@metamask/utils": "npm:^9.2.1" - "@types/uuid": "npm:^9.0.8" + "@metamask/utils": "npm:^9.3.0" bech32: "npm:^2.0.0" - uuid: "npm:^9.0.1" - webextension-polyfill: "npm:^0.12.0" - peerDependencies: - "@metamask/providers": ^18.1.0 - checksum: 10/de22b9f5f3aecc290210fa78161e157aa8358f8dad421a093c9f6dbe35c4755067472a732f10d1ddbfba789e871c64edd8ea1c4c7316a392b214a187efd46ebe + checksum: 10/ba8b75c55d3fcb9f8b52c58ff141cba81f7c416c3fa684e089965717ea129d50e8df7a73e7ab1c96eaf59d70b6e2dd8a618434939b75ef0d3402b547b5196877 languageName: node linkType: hard @@ -2977,9 +2977,9 @@ __metadata: "@metamask/eth-hd-keyring": "npm:^7.0.4" "@metamask/eth-sig-util": "npm:^8.0.0" "@metamask/eth-simple-keyring": "npm:^6.0.5" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/message-manager": "npm:^11.0.3" - "@metamask/providers": "npm:^18.1.1" "@metamask/scure-bip39": "npm:^2.1.1" "@metamask/utils": "npm:^10.0.0" "@types/jest": "npm:^27.4.1" @@ -2995,12 +2995,63 @@ __metadata: typedoc-plugin-missing-exports: "npm:^2.0.0" typescript: "npm:~5.2.2" uuid: "npm:^8.3.2" + languageName: unknown + linkType: soft + +"@metamask/keyring-internal-api@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-internal-api@npm:1.0.0" + dependencies: + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.3.0" + checksum: 10/dd0fff93ddfdce008f1db82d404bd040d09840413723c831819d3a7f4c2819a4303657e4acd7578cfd22bd05ad9c7aa563fc88f13f2f06999e2325ada71b824c + languageName: node + linkType: hard + +"@metamask/keyring-internal-snap-client@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-internal-snap-client@npm:1.0.0" + dependencies: + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-snap-client": "npm:^1.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" + "@metamask/snaps-controllers": "npm:^9.10.0" + "@metamask/snaps-sdk": "npm:^6.7.0" + "@metamask/snaps-utils": "npm:^8.3.0" webextension-polyfill: "npm:^0.12.0" peerDependencies: "@metamask/providers": ^18.1.0 - webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 - languageName: unknown - linkType: soft + checksum: 10/4c02429235bf5b3609fe2d728f0f976fc87cc276483c092d155b181eeb1f167953a96226c4f6b64f6700084f8a66e5b02944ba0accf201e3514e83df205389e1 + languageName: node + linkType: hard + +"@metamask/keyring-snap-client@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-snap-client@npm:1.0.0" + dependencies: + "@metamask/keyring-api": "npm:^12.0.0" + "@metamask/keyring-utils": "npm:^1.0.0" + "@metamask/superstruct": "npm:^3.1.0" + "@types/uuid": "npm:^9.0.8" + uuid: "npm:^9.0.1" + webextension-polyfill: "npm:^0.12.0" + peerDependencies: + "@metamask/providers": ^18.1.0 + checksum: 10/7b3ee4ab6b39f8e06d55dee2c29f778eeb2eeb8bb311eccaab07d1f8a855fa920bf52e78bd2be0f3ddcb66dc475282d740de0cc7337ccd99e956302a706d76a0 + languageName: node + linkType: hard + +"@metamask/keyring-utils@npm:^1.0.0": + version: 1.0.0 + resolution: "@metamask/keyring-utils@npm:1.0.0" + dependencies: + "@metamask/superstruct": "npm:^3.1.0" + "@metamask/utils": "npm:^9.3.0" + checksum: 10/f74f7343a7154b029e0fa4c25735c589eba4dc25a9e323d43b7c733ce5dbb23ce603a4f02aac455163993649ceeaf714b8b843985ba7a9cb00b926b3b8dc6b51 + languageName: node + linkType: hard "@metamask/logging-controller@npm:^6.0.3, @metamask/logging-controller@workspace:packages/logging-controller": version: 0.0.0-use.local @@ -3347,8 +3398,9 @@ __metadata: "@metamask/accounts-controller": "npm:^20.0.1" "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^7.0.2" - "@metamask/keyring-api": "npm:^10.1.0" + "@metamask/keyring-api": "npm:^12.0.0" "@metamask/keyring-controller": "npm:^19.0.1" + "@metamask/keyring-internal-api": "npm:^1.0.0" "@metamask/network-controller": "npm:^22.1.1" "@metamask/providers": "npm:^18.1.1" "@metamask/snaps-controllers": "npm:^9.10.0" @@ -3814,7 +3866,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1": +"@metamask/utils@npm:^9.0.0, @metamask/utils@npm:^9.1.0, @metamask/utils@npm:^9.2.1, @metamask/utils@npm:^9.3.0": version: 9.3.0 resolution: "@metamask/utils@npm:9.3.0" dependencies: