Merge pull request #52 from bithyve/fix-accounts

Fix getting accounts from device
bithyve · Nov 26, 2024 · 576c1b9 · 576c1b9
2 parents a9ec053 + 6836cac
commit 576c1b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src-tauri/src/device.rs b/src-tauri/src/device.rs
@@ -10,7 +10,10 @@ pub enum ScriptType {
     P2TR,
 }
 
-pub fn get_xpubs(hwi_state: &HWIClientState, account: u32) -> Result<serde_json::Value, HWIError> {
+pub fn get_xpubs(
+    hwi_state: &HWIClientState,
+    account: usize,
+) -> Result<serde_json::Value, HWIError> {
     let ss_path = get_derivation_path(ScriptType::P2WPKH, hwi_state.network, account);
     let ms_path = get_derivation_path(ScriptType::P2WSH, hwi_state.network, account);
     let tr_path = get_derivation_path(ScriptType::P2TR, hwi_state.network, account);
@@ -37,14 +40,18 @@ pub fn get_xpubs(hwi_state: &HWIClientState, account: u32) -> Result<serde_json:
     }))
 }
 
-fn get_derivation_path(script_type: ScriptType, network: Network, account: u32) -> DerivationPath {
+fn get_derivation_path(
+    script_type: ScriptType,
+    network: Network,
+    account: usize,
+) -> DerivationPath {
     let network_num = match network {
         Network::Bitcoin => 0,
         Network::Testnet | Network::Signet | Network::Regtest => 1,
         _ => panic!("Unsupported Network"),
     };
     match script_type {
-        ScriptType::P2WPKH => format!("m/84'/{}'/{}'/", network_num, account)
+        ScriptType::P2WPKH => format!("m/84'/{}'/{}'", network_num, account)
             .parse()
             .unwrap(),
         ScriptType::P2WSH => format!("m/48'/{}'/{}'/2'", network_num, account)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -138,7 +138,7 @@ fn set_hwi_client(
 }
 
 #[tauri::command]
-async fn hwi_get_xpubs(state: State<'_, AppState>, account: u32) -> Result<Value, String> {
+async fn hwi_get_xpubs(state: State<'_, AppState>, account: usize) -> Result<Value, String> {
     let state = state.lock().await;
     let hwi_state = state.hwi.as_ref().ok_or("HWI client not initialized")?;
     let xpub_data = get_xpubs(hwi_state, account).map_err(|e| e.to_string())?;
@@ -155,7 +155,7 @@ async fn hwi_get_xpubs(state: State<'_, AppState>, account: u32) -> Result<Value
 }
 
 #[tauri::command]
-async fn hwi_healthcheck(state: State<'_, AppState>, account: u32) -> Result<Value, String> {
+async fn hwi_healthcheck(state: State<'_, AppState>, account: usize) -> Result<Value, String> {
     let state = state.lock().await;
     let hwi_state = state.hwi.as_ref().ok_or("HWI client not initialized")?;
     let xpub_data = get_xpubs(hwi_state, account).map_err(|e| e.to_string())?;