From 9db0c33e3ab3f7964a68306b7343ee4db5c1d1a2 Mon Sep 17 00:00:00 2001 From: soralit Date: Mon, 30 Jun 2025 16:50:22 +0800 Subject: [PATCH 1/2] feat: support keystone usb keyring --- packages/accounts-controller/src/utils.ts | 3 +++ packages/keyring-controller/src/KeyringController.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/packages/accounts-controller/src/utils.ts b/packages/accounts-controller/src/utils.ts index e2bbcc93fbd..0a026c9b3fb 100644 --- a/packages/accounts-controller/src/utils.ts +++ b/packages/accounts-controller/src/utils.ts @@ -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'; } diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts index 1c9e8ac5cd7..da085b20ca1 100644 --- a/packages/keyring-controller/src/KeyringController.ts +++ b/packages/keyring-controller/src/KeyringController.ts @@ -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 */ } From 2ad28b954d8cefa4a35406753d7597ff40e8d24b Mon Sep 17 00:00:00 2001 From: qkin Date: Thu, 11 Dec 2025 10:20:37 +0800 Subject: [PATCH 2/2] feat: add KeyringTypes case for keystone --- packages/account-tree-controller/src/rules/keyring.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/account-tree-controller/src/rules/keyring.ts b/packages/account-tree-controller/src/rules/keyring.ts index 881e8d86d74..0354e8834d5 100644 --- a/packages/account-tree-controller/src/rules/keyring.ts +++ b/packages/account-tree-controller/src/rules/keyring.ts @@ -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: { @@ -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: {