Skip to content

lib: bump coldcard dep & uses Coldcard::sign_psbt_miniscript() #119

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

lib: bump coldcard dep & uses Coldcard::sign_psbt_miniscript() #119

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
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
bitbox-api = { version = "0.9.0", default-features = false, features = ["usb", "tokio", "multithreaded"], optional = true }

# coldcard
coldcard = { version = "0.12.2", optional = true }
# coldcard = { version = "0.12.2", optional = true }
coldcard = { git = "https://github.com/pythcoiner/rust-coldcard.git", rev = "5f6a6a6",optional = true }

# ledger
ledger_bitcoin_client = { version = "0.5.0", optional = true }
Expand Down
12 changes: 11 additions & 1 deletion src/coldcard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use bitcoin::{
bip32::{DerivationPath, Fingerprint, Xpub},
psbt::Psbt,
};
use coldcard::protocol::DescriptorName;

use crate::{parse_version, AddressScript, DeviceKind, Error as HWIError, Version, HWI};
pub use coldcard as api;
Expand Down Expand Up @@ -120,7 +121,16 @@ impl HWI for Coldcard {
async fn sign_tx(&self, psbt: &mut Psbt) -> Result<(), HWIError> {
let mut cc = self.device()?;

let _ = cc.sign_psbt(&psbt.serialize(), api::SignMode::Signed)?;
let wallet_name = if let Some(name) = self.wallet_name.clone() {
Some(
DescriptorName::new(name)
.map_err(|_| HWIError::Unexpected("Coldcard: Invalid wallet name"))?,
)
} else {
None
};

let _ = cc.sign_psbt_miniscript(&psbt.serialize(), api::SignMode::Signed, wallet_name)?;

let tx = loop {
if let Some(tx) = cc.get_signed_tx()? {
Expand Down
Loading