Skip to content

Update Keystone error handling and documentation #2

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

Merged
ww3512687 merged 1 commit into from
Aug 28, 2025
Merged

Update Keystone error handling and documentation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion remote-wallet/src/wallet/keystone/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl FromStr for KeystoneError {
"previous request is not finished" | "previous request not finished" => {
Ok(KeystoneError::PreviousRequestNotFinished)
}
"solana app not open on ledger device" | "no app response" => {
"solana app not open on keystone device" | "no app response" => {
Ok(KeystoneError::NoAppResponse)
}
"invalid json response" | "invalid json" => Ok(KeystoneError::InvalidJson),
Expand Down
10 changes: 5 additions & 5 deletions remote-wallet/src/wallet/keystone/keystone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const HID_TAG: u8 = 0xAA;
const KEYSTONE_VID: u16 = 0x1209;
/// Keystone product IDs
const KEYSTONE_PID: u16 = 0x3001;
const LEDGER_TRANSPORT_HEADER_LEN: usize = 5;
const KEYSTONE_TRANSPORT_HEADER_LEN: usize = 5;

const HID_PACKET_SIZE: usize = 64 + HID_PREFIX_ZERO;

Expand Down Expand Up @@ -106,7 +106,7 @@ impl CommandType {
}
}

/// Ledger Wallet device
/// Keystone Wallet device
pub struct KeystoneWallet {
pub transport: Box<dyn Transport>,
pub pretty_path: String,
Expand Down Expand Up @@ -200,7 +200,7 @@ impl KeystoneWallet {

chunk[header..header + size].copy_from_slice(&data[offset..offset + size]);
}
trace!("Ledger write {:?}", &hid_chunk[..]);
trace!("Keystone write {:?}", &hid_chunk[..]);
let n = self.transport.write(&hid_chunk[..])?;
if n < size + header {
return Err(RemoteWalletError::Protocol("Write data size mismatch"));
Expand Down Expand Up @@ -234,7 +234,7 @@ impl KeystoneWallet {
loop {
// Read HID packet
let chunk = self.transport.read()?;
if chunk.len() < LEDGER_TRANSPORT_HEADER_LEN {
if chunk.len() < KEYSTONE_TRANSPORT_HEADER_LEN {
return Err(RemoteWalletError::Protocol("Invalid HID packet size"));
}

Expand Down Expand Up @@ -651,7 +651,7 @@ fn extend_and_serialize_multiple(derivation_paths: &[&DerivationPath]) -> Vec<u8
concat_derivation
}

/// Choose a Ledger wallet based on matching info fields
/// Choose a Keystone wallet based on matching info fields
pub fn get_keystone_from_info(
info: RemoteWalletInfo,
keypair_name: &str,
Expand Down