diff --git a/Cargo.lock b/Cargo.lock index cadf234..5136e66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,7 +349,7 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90dbd31c98227229239363921e60fcf5e558e43ec69094d46fc4996f08d1d5bc" dependencies = [ - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.14.1", "rand 0.8.5", "rand_core 0.6.4", "serde", @@ -1347,7 +1347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2553,7 +2553,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3640,7 +3640,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3865,7 +3865,7 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ - "bitcoin_hashes 0.12.0", + "bitcoin_hashes 0.14.1", "rand 0.8.5", "secp256k1-sys 0.10.1", "serde", @@ -4189,7 +4189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4316,10 +4316,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4689,9 +4689,9 @@ dependencies = [ [[package]] name = "trezor-connect-rs" -version = "0.3.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a31fec2e974785094e9da67dabe34e9dd0d9212b9eb902a95c1aa49928990" +checksum = "d2c59a49eaa8a70bc09a6e7b3177eda0115ff20a4247244fd38bd484e832fd44" dependencies = [ "aes-gcm", "async-trait", @@ -5181,7 +5181,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index df85a6f..2f579e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,11 +47,11 @@ btleplug = "0.11" # Trezor connect library - non-iOS platforms get USB + Bluetooth [target.'cfg(not(target_os = "ios"))'.dependencies] -trezor-connect-rs = { version = "0.3.4", features = ["psbt"] } +trezor-connect-rs = { version = "0.4.0", features = ["psbt"] } # iOS: Bluetooth only (libusb has no iOS backend, so no USB support) [target.'cfg(target_os = "ios")'.dependencies] -trezor-connect-rs = { version = "0.3.4", default-features = false, features = ["bluetooth", "psbt"] } +trezor-connect-rs = { version = "0.4.0", default-features = false, features = ["bluetooth", "psbt"] } # JNI for Android (must match btleplug's jni version) [target.'cfg(target_os = "android")'.dependencies] diff --git a/src/modules/trezor/tests.rs b/src/modules/trezor/tests.rs index ad1e17d..4685d68 100644 --- a/src/modules/trezor/tests.rs +++ b/src/modules/trezor/tests.rs @@ -528,6 +528,7 @@ mod tests { signatures: vec!["sig1".to_string(), "sig2".to_string()], serialized_tx: "rawtx".to_string(), txid: None, + witnesses: None, }; let result: TrezorSignedTx = response.into(); diff --git a/src/modules/trezor/types.rs b/src/modules/trezor/types.rs index f26ab89..40e2630 100644 --- a/src/modules/trezor/types.rs +++ b/src/modules/trezor/types.rs @@ -258,6 +258,7 @@ impl From for trezor_connect_rs::GetAddressParams { show_on_trezor: p.show_on_trezor, script_type: p.script_type.map(|s| s.into()), multisig: None, + ..Default::default() } } } @@ -353,6 +354,7 @@ impl From for trezor_connect_rs::SignMessageParams { message: p.message, coin: p.coin.map(|c| c.into()), no_script_type: false, + ..Default::default() } } } @@ -395,6 +397,7 @@ impl From for trezor_connect_rs::VerifyMessageParams signature: p.signature, message: p.message, coin: p.coin.map(|c| c.into()), + ..Default::default() } } } @@ -583,12 +586,12 @@ impl From for trezor_connect_rs::SignTxParams { lock_time: params.lock_time, version: params.version, prev_txs: params.prev_txs.into_iter().map(|t| t.into()).collect(), - push: None, amount_unit: None, serialize: None, chunkify: None, unlock_path: None, payment_requests: vec![], + ..Default::default() } } }