Feat/add keystone

remote-wallet/Cargo.toml

@@ -36,6 +36,10 @@ solana-signature = { workspace = true, features = ["std"] }
 solana-signer = { workspace = true }
 thiserror = { workspace = true }
 uriparse = { workspace = true }
+serde_json = { workspace = true }
+hex = { workspace = true }
+ur-registry = { git = "https://github.com/KeystoneHQ/keystone-sdk-rust.git", tag = "0.0.50", default-features = false, features = ["std"] }
+ur-parse-lib = { git = "https://github.com/KeystoneHQ/keystone-sdk-rust.git", tag = "0.0.50" }
 
 [dev-dependencies]
 assert_matches = { workspace = true }

remote-wallet/src/errors.rs

@@ -1,4 +1,5 @@
 use crate::locator::LocatorError;
+use crate::wallet::keystone::error::KeystoneError;
 use crate::wallet::ledger::error::LedgerError;
 use solana_derivation_path::DerivationPathError;
 use solana_signer::SignerError;
@@ -28,6 +29,9 @@ pub enum RemoteWalletError {
     #[error(transparent)]
     LedgerError(#[from] LedgerError),
 
+    #[error(transparent)]
+    KeystoneError(#[from] KeystoneError),
+
     #[error("no device found")]
     NoDeviceFound,
 
@@ -59,6 +63,7 @@ impl From<RemoteWalletError> for SignerError {
             RemoteWalletError::InvalidDevice => SignerError::Connection(err.to_string()),
             RemoteWalletError::InvalidInput(input) => SignerError::InvalidInput(input),
             RemoteWalletError::LedgerError(e) => SignerError::Protocol(e.to_string()),
+            RemoteWalletError::KeystoneError(e) => SignerError::Protocol(e.to_string()),
             RemoteWalletError::NoDeviceFound => SignerError::NoDeviceFound,
             RemoteWalletError::Protocol(e) => SignerError::Protocol(e.to_string()),
             RemoteWalletError::UserCancel => {

remote-wallet/src/locator.rs

@@ -12,6 +12,7 @@ use {
 pub enum Manufacturer {
     Unknown,
     Ledger,
+    Keystone,
 }
 
 impl Default for Manufacturer {
@@ -22,6 +23,7 @@ impl Default for Manufacturer {
 
 const MANUFACTURER_UNKNOWN: &str = "unknown";
 const MANUFACTURER_LEDGER: &str = "ledger";
+const MANUFACTURER_KEYSTONE: &str = "keystone";
 
 #[derive(Clone, Debug, Error, PartialEq, Eq)]
 #[error("not a manufacturer")]
@@ -39,6 +41,7 @@ impl FromStr for Manufacturer {
         let s = s.to_ascii_lowercase();
         match s.as_str() {
             MANUFACTURER_LEDGER => Ok(Self::Ledger),
+            MANUFACTURER_KEYSTONE => Ok(Self::Keystone),
             _ => Err(ManufacturerError),
         }
     }
@@ -56,6 +59,7 @@ impl AsRef<str> for Manufacturer {
         match self {
             Self::Unknown => MANUFACTURER_UNKNOWN,
             Self::Ledger => MANUFACTURER_LEDGER,
+            Self::Keystone => MANUFACTURER_KEYSTONE,
         }
     }
 }

remote-wallet/src/remote_keypair.rs

@@ -3,7 +3,10 @@ use {
         errors::RemoteWalletError,
         locator::{Locator, Manufacturer},
         remote_wallet::{RemoteWallet, RemoteWalletInfo, RemoteWalletManager},
-        wallet::{ledger::ledger::get_ledger_from_info, types::RemoteWalletType},
+        wallet::{
+            keystone::keystone::get_keystone_from_info, ledger::ledger::get_ledger_from_info,
+            types::RemoteWalletType,
+        },
     },
     solana_derivation_path::DerivationPath,
     solana_pubkey::Pubkey,
@@ -27,6 +30,9 @@ impl RemoteKeypair {
     ) -> Result<Self, RemoteWalletError> {
         let pubkey = match &wallet_type {
             RemoteWalletType::Ledger(wallet) => wallet.get_pubkey(&derivation_path, confirm_key)?,
+            RemoteWalletType::Keystone(wallet) => {
+                wallet.get_pubkey(&derivation_path, confirm_key)?
+            }
         };
 
         Ok(Self {
@@ -48,6 +54,9 @@ impl Signer for RemoteKeypair {
             RemoteWalletType::Ledger(wallet) => wallet
                 .sign_message(&self.derivation_path, message)
                 .map_err(|e| e.into()),
+            RemoteWalletType::Keystone(wallet) => wallet
+                .sign_message(&self.derivation_path, message)
+                .map_err(|e| e.into()),
         }
     }
 
@@ -73,6 +82,15 @@ pub fn generate_remote_keypair(
             confirm_key,
             path,
         )?)
+    } else if remote_wallet_info.manufacturer == Manufacturer::Keystone {
+        let keystone = get_keystone_from_info(remote_wallet_info, keypair_name, wallet_manager)?;
+        let path = format!("{}{}", keystone.pretty_path, derivation_path.get_query());
+        Ok(RemoteKeypair::new(
+            RemoteWalletType::Keystone(keystone),
+            derivation_path,
+            confirm_key,
+            path,
+        )?)
     } else {
         Err(RemoteWalletError::DeviceTypeMismatch)
     }