diff --git a/Cargo.lock b/Cargo.lock index be12484..1cab7a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "bitkitcore" -version = "0.1.56" +version = "0.1.57" dependencies = [ "android_logger", "async-trait", @@ -4688,9 +4688,9 @@ dependencies = [ [[package]] name = "trezor-connect-rs" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e263b71e1f5da38ed1efd02e96ef5e274ecd14411e86f30c02e746ff9362dac0" +checksum = "8b1d7bbb66e791e3bf063373b40c6a7911c4130f4fb14298ecb5bfae5040ed84" dependencies = [ "aes-gcm", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 7507210..8019578 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bitkitcore" -version = "0.1.56" +version = "0.1.57" edition = "2021" [lib] @@ -46,11 +46,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.2.5", features = ["psbt"] } +trezor-connect-rs = { version = "0.2.8", 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.2.5", default-features = false, features = ["bluetooth", "psbt"] } +trezor-connect-rs = { version = "0.2.8", default-features = false, features = ["bluetooth", "psbt"] } # JNI for Android (must match btleplug's jni version) [target.'cfg(target_os = "android")'.dependencies] diff --git a/Package.swift b/Package.swift index e3e0808..fcae1cd 100644 --- a/Package.swift +++ b/Package.swift @@ -3,8 +3,8 @@ import PackageDescription -let tag = "v0.1.56" -let checksum = "6b3b2e2138f80bde3a3cbbf21f11bb194fef7299a8eebff5175c10632fc80eff" +let tag = "v0.1.57" +let checksum = "fe0b5fa50a9bad4330fc6fb74bcec335459188fdcf543a6b971af3356161bb85" let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip" let package = Package( diff --git a/bindings/android/gradle.properties b/bindings/android/gradle.properties index 37cce97..876e8ca 100644 --- a/bindings/android/gradle.properties +++ b/bindings/android/gradle.properties @@ -3,4 +3,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official group=com.synonym -version=0.1.56 +version=0.1.57 diff --git a/bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so b/bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so index 77a6803..251bc2f 100755 Binary files a/bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so and b/bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so differ diff --git a/bindings/android/lib/src/main/jniLibs/arm64-v8a/libpubky_app_specs-90a3a8b6be1a7a22.so b/bindings/android/lib/src/main/jniLibs/arm64-v8a/libpubky_app_specs-90a3a8b6be1a7a22.so deleted file mode 100755 index 2856ba2..0000000 Binary files a/bindings/android/lib/src/main/jniLibs/arm64-v8a/libpubky_app_specs-90a3a8b6be1a7a22.so and /dev/null differ diff --git a/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so b/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so index c2c10b6..4bf93e9 100755 Binary files a/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so and b/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so differ diff --git a/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libpubky_app_specs-a5b33175be180155.so b/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libpubky_app_specs-a5b33175be180155.so deleted file mode 100755 index 9df27c8..0000000 Binary files a/bindings/android/lib/src/main/jniLibs/armeabi-v7a/libpubky_app_specs-a5b33175be180155.so and /dev/null differ diff --git a/bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so b/bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so index 693ebe3..24a338c 100755 Binary files a/bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so and b/bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so differ diff --git a/bindings/android/lib/src/main/jniLibs/x86/libpubky_app_specs-6691cf4f97b9d92f.so b/bindings/android/lib/src/main/jniLibs/x86/libpubky_app_specs-6691cf4f97b9d92f.so deleted file mode 100755 index d08e98c..0000000 Binary files a/bindings/android/lib/src/main/jniLibs/x86/libpubky_app_specs-6691cf4f97b9d92f.so and /dev/null differ diff --git a/bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so b/bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so index 9c9bd9f..98f9f1d 100755 Binary files a/bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so and b/bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so differ diff --git a/bindings/android/lib/src/main/jniLibs/x86_64/libpubky_app_specs-4ad86c877f377f40.so b/bindings/android/lib/src/main/jniLibs/x86_64/libpubky_app_specs-4ad86c877f377f40.so deleted file mode 100755 index 8f8f793..0000000 Binary files a/bindings/android/lib/src/main/jniLibs/x86_64/libpubky_app_specs-4ad86c877f377f40.so and /dev/null differ diff --git a/bindings/ios/BitkitCore.xcframework.zip b/bindings/ios/BitkitCore.xcframework.zip index 5377165..cef58eb 100644 Binary files a/bindings/ios/BitkitCore.xcframework.zip and b/bindings/ios/BitkitCore.xcframework.zip differ diff --git a/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a b/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a index 31b558a..210e991 100644 Binary files a/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a and b/bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a differ diff --git a/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a b/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a index f9b2cae..901de65 100644 Binary files a/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a and b/bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a differ diff --git a/bindings/python/bitkitcore/libbitkitcore.dylib b/bindings/python/bitkitcore/libbitkitcore.dylib index ad6108a..9a0cd92 100755 Binary files a/bindings/python/bitkitcore/libbitkitcore.dylib and b/bindings/python/bitkitcore/libbitkitcore.dylib differ diff --git a/src/modules/trezor/implementation.rs b/src/modules/trezor/implementation.rs index b07d637..e078d0f 100644 --- a/src/modules/trezor/implementation.rs +++ b/src/modules/trezor/implementation.rs @@ -602,9 +602,20 @@ impl TrezorManager { is_bootloader: false, }; + // Check if the transport negotiated THP during acquire (BLE always, + // USB for newer devices like Safe 7). + let uses_thp = transport.has_thp(&device.path).await; + // Create connected device and initialize it let mut connected = ConnectedDevice::new(device_info, Box::new(transport), session); + // When THP was negotiated, initialize() must use GetFeatures instead + // of Initialize (the THP session was already created during acquire + // via ThpCreateNewSession). + if uses_thp { + connected.set_uses_thp(true); + } + // Wire UI callback if set if let Some(ui_cb) = crate::modules::trezor::get_ui_callback() { let adapter = Arc::new(UiCallbackAdapter {