Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions jest.config.packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ module.exports = {
'^@metamask/json-rpc-engine/v2$': [
'<rootDir>/../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$':
'<rootDir>/../../node_modules/@metamask/eth-hd-keyring/dist/v2/index.cjs',
'^@metamask/eth-simple-keyring/v2$':
'<rootDir>/../../node_modules/@metamask/eth-simple-keyring/dist/v2/index.cjs',
'^@metamask/keyring-api/v2$':
'<rootDir>/../../node_modules/@metamask/keyring-api/dist/v2/index.cjs',
'^@metamask/keyring-sdk/v2$':
'<rootDir>/../../node_modules/@metamask/keyring-sdk/dist/v2/index.cjs',
Comment on lines +87 to +94
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Somehow, jest is not able to resolve that without doing it explicitly 😅

// }
'^@metamask/utils/node$': require.resolve('@metamask/utils/node'),
'^@metamask/(.+)$': [
'<rootDir>/../$1/src',
Expand Down
2 changes: 2 additions & 0 deletions packages/account-tree-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
4 changes: 2 additions & 2 deletions packages/account-tree-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions packages/account-tree-controller/src/group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
EthAccountType,
SolAccountType,
TrxAccountType,
XlmAccountType,
} from '@metamask/keyring-api';
import type { KeyringAccountType } from '@metamask/keyring-api';

Expand Down Expand Up @@ -45,6 +46,7 @@ export const ACCOUNT_TYPE_TO_SORT_ORDER: Record<KeyringAccountType, number> = {
[BtcAccountType.P2wpkh]: 5,
[BtcAccountType.P2tr]: 6,
[TrxAccountType.Eoa]: 7,
[XlmAccountType.Account]: 8,
[AnyAccountType.Account]: MAX_SORT_ORDER,
};

Expand Down
3 changes: 3 additions & 0 deletions packages/accounts-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
6 changes: 3 additions & 3 deletions packages/accounts-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions packages/assets-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ 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
Expand Down
6 changes: 3 additions & 3 deletions packages/assets-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/assets-controllers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

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

## [104.0.0]

### Changed
Expand Down
8 changes: 4 additions & 4 deletions packages/assets-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/bridge-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

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

## [70.1.0]

### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/chain-agnostic-permission/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 8 additions & 4 deletions packages/chain-agnostic-permission/src/scope/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we need one for stellar?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Well, I wasn't sure if there was some more logic needed in the package (not my domain here 😅)

So I preferred to just use an explicit enumeration instead (to avoid having other breaking change in the future). But I'll let the wallet API team to guide me on this one.

But indeed, given the name, we could re-use the Exclude and declare the missing field for the type that relies on it (but that could be seen as a breaking change though..)

// 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.
Expand Down
1 change: 1 addition & 0 deletions packages/earn-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Bump `@metamask/base-controller` from `^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]

Expand Down
2 changes: 1 addition & 1 deletion packages/earn-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions packages/keyring-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
8 changes: 4 additions & 4 deletions packages/keyring-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
8 changes: 5 additions & 3 deletions packages/keyring-controller/src/KeyringController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ 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';
Expand Down
2 changes: 2 additions & 0 deletions packages/money-account-controller/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
4 changes: 2 additions & 2 deletions packages/money-account-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions packages/multichain-account-service/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
14 changes: 7 additions & 7 deletions packages/multichain-account-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import type {
CreateAccountOptions,
EntropySourceId,
KeyringAccount,
KeyringCapabilities,
} from '@metamask/keyring-api';
import type { KeyringCapabilities } from '@metamask/keyring-api/v2';
import type {
KeyringMetadata,
KeyringSelector,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import type { Bip44Account } from '@metamask/account-api';
import type { TraceCallback } from '@metamask/controller-utils';
import type {
EntropySourceId,
KeyringAccount,
KeyringCapabilities,
} from '@metamask/keyring-api';
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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import type {
CreateAccountOptions,
EntropySourceId,
KeyringAccount,
KeyringCapabilities,
} from '@metamask/keyring-api';
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,
Expand Down
Loading
Loading