Skip to content

Fix/coldcard signing issue ms #84

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
ben-kaufman merged 2 commits into from
Apr 29, 2025
+22 −81
Merged

Fix/coldcard signing issue ms #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8aba2
Update bitcoin and async-hwi versions
ben-kaufman Apr 29, 2025
51fecc2
Fix coldcard signing
ben-kaufman Apr 29, 2025
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
92 changes: 15 additions & 77 deletions src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ hex = "0.4.3"
log = "0.4"
thiserror = "1.0"
env_logger = "0.10"
bitcoin = { version = "0.31", features = ["serde", "base64"] }
async-hwi = "0.0.25"
bitcoin = { version = "0.32", features = ["serde", "base64"] }
async-hwi = "0.0.27"
x25519-dalek = "2.0.1"

[features]
Expand Down
7 changes: 5 additions & 2 deletions src-tauri/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ async fn hwi_sign_tx(
)
.await?;

let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;

if hwi_state.device_type != HWIDeviceType::Coldcard {
let is_registered = device
.is_wallet_registered(&wallet_name.clone().unwrap_or_default(), &policy)
Expand Down Expand Up @@ -274,10 +276,11 @@ async fn hwi_sign_tx(
.await?;
}
}
} else {
// Coldcard change verification gives an error when xpubs are included for Miniscript scheme
psbt_obj.xpub.clear();
}

let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;

device
.sign_tx(&mut psbt_obj)
.await
Expand Down