Skip to content

feat: support keystone usb keyring #7440

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
Qkin-Keystone wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −0
Open

feat: support keystone usb keyring #7440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9db0c33
feat: support keystone usb keyring
soralit Jun 30, 2025
2ad28b9
feat: add KeyringTypes case for keystone
Dec 11, 2025
e3bc5cc
feat: update account-tree-controller changeLog
Qkin-Keystone Jan 15, 2026
File filter

Filter by extension

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

## [Unreleased]

### Added

- Add support for Keystone USB Keyring([#7440](https://github.com/MetaMask/core/pull/7440))
Copy link
Member

@gantunesr gantunesr Jan 15, 2026

Choose a reason for hiding this comment

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

nit

Suggested change
- Add support for Keystone USB Keyring([#7440](https://github.com/MetaMask/core/pull/7440))
- Add support for Keystone USB Keyring ([#7440](https://github.com/MetaMask/core/pull/7440))


### Changed

- Bump `@metamask/snaps-sdk` from `^9.0.0` to `^10.3.0` ([#7550](https://github.com/MetaMask/core/pull/7550))
Expand Down
6 changes: 6 additions & 0 deletions packages/account-tree-controller/src/rules/keyring.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export function getAccountWalletNameFromKeyringType(type: KeyringTypes) {
case KeyringTypes.qr: {
return 'QR';
}
case KeyringTypes.keystone: {
return 'Keystone';
}
// Those keyrings should never really be used in such context since they
// should be used by other grouping rules.
case KeyringTypes.hd: {
Expand Down Expand Up @@ -76,6 +79,9 @@ export function getAccountGroupPrefixFromKeyringType(type: KeyringTypes) {
case KeyringTypes.qr: {
return 'QR Account';
}
case KeyringTypes.keystone: {
return 'Keystone Account';
}
// Those keyrings should never really be used in such context since they
// should be used by other grouping rules.
case KeyringTypes.hd: {
Expand Down
3 changes: 3 additions & 0 deletions packages/accounts-controller/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ export function keyringTypeToName(keyringType: string): string {
case KeyringTypes.lattice: {
return 'Lattice';
}
case KeyringTypes.keystone: {
return 'Keystone';
}
case KeyringTypes.qr: {
return 'QR';
}
Expand Down
1 change: 1 addition & 0 deletions packages/keyring-controller/src/KeyringController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export enum KeyringTypes {
oneKey = 'OneKey Hardware',
ledger = 'Ledger Hardware',
lattice = 'Lattice Hardware',
keystone = 'Keystone Hardware',
snap = 'Snap Keyring',
/* eslint-enable @typescript-eslint/naming-convention */
}
Expand Down
Loading