Merge remote-tracking branch 'origin/master' into fix/lnurl-pay

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	Package.swift
#	bindings/android/gradle.properties
#	bindings/android/lib/src/main/jniLibs/arm64-v8a/libbitkitcore.so
#	bindings/android/lib/src/main/jniLibs/armeabi-v7a/libbitkitcore.so
#	bindings/android/lib/src/main/jniLibs/x86/libbitkitcore.so
#	bindings/android/lib/src/main/jniLibs/x86_64/libbitkitcore.so
#	bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.android.kt
#	bindings/android/lib/src/main/kotlin/com/synonym/bitkitcore/bitkitcore.common.kt
#	bindings/ios/BitkitCore.xcframework.zip
#	bindings/ios/BitkitCore.xcframework/ios-arm64-simulator/libbitkitcore.a
#	bindings/ios/BitkitCore.xcframework/ios-arm64/libbitkitcore.a
#	bindings/python/bitkitcore/libbitkitcore.dylib

Author: ovitrif

.cargo/config.toml

@@ -0,0 +1,27 @@
+[target.armv7-linux-androideabi]
+rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "link-arg=-Wl,-z,max-page-size=16384,-z,common-page-size=16384",
+]
+
+[target.aarch64-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "link-arg=-Wl,-z,max-page-size=16384,-z,common-page-size=16384",
+]
+
+[target.i686-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "link-arg=-Wl,-z,max-page-size=16384,-z,common-page-size=16384",
+]
+
+[target.x86_64-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+    "-C", "link-arg=-Wl,-z,max-page-size=16384,-z,common-page-size=16384",
+]
+
+[env]
+OPENSSL_STATIC = "1"
+OPENSSL_NO_VENDOR = "0"

.github/workflows/gradle-publish.yml

@@ -16,7 +16,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
       packages: write
 
     steps:
@@ -34,6 +34,22 @@ jobs:
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
 
+    - name: Install native build dependencies
+      run: sudo apt-get update && sudo apt-get install -y libdbus-1-dev pkg-config protobuf-compiler
+
+    - name: Set up Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Set up Android NDK
+      id: setup-ndk
+      uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: r28c
+        add-to-path: true
+
+    - name: Export Android NDK root
+      run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> "$GITHUB_ENV"
+
     - name: Extract version from input or tag
       id: version
       shell: bash
@@ -42,12 +58,27 @@ jobs:
         if [[ -z "$VERSION" ]]; then
           VERSION="$GITHUB_REF_NAME"
         fi
-        echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
+        echo "version=${VERSION#v}" >> "$GITHUB_OUTPUT"
+
+    - name: Generate Android bindings
+      run: ./build_android.sh
 
     - name: Build with Gradle
       working-directory: bindings/android
       run: ./gradlew build -Pversion=${{ steps.version.outputs.version }}
 
+    - name: Upload native debug symbols artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: bitkit-core-native-debug-symbols-${{ steps.version.outputs.version }}
+        path: bindings/android/native-debug-symbols.zip
+
+    - name: Upload native debug symbols to release
+      if: github.event_name == 'release'
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: gh release upload "${{ github.event.release.tag_name }}" bindings/android/native-debug-symbols.zip --clobber
+
     # same credentials env vars used in the publishing section of build.gradle.kts
     - name: Publish to GitHub Packages
       working-directory: bindings/android

.gitignore

@@ -1,4 +1,5 @@
 target/
+bindings/android/native-debug-symbols.zip
 .idea/
 .DS_Store
 # AI

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+## 0.3.3 - 2026-06-22
+
+- Surface wrong/cancelled/expected Trezor PIN failures as typed `TrezorError` variants (`InvalidPin`, `PinCancelled`, `PinRequired`) instead of generic device errors, so mobile clients can clear the PIN spinner, prompt a deliberate retry, and avoid reconnecting while the device is mid-flow. Backed by `trezor-connect-rs` 0.3.3, which maps protocol `Failure` codes to typed errors; unknown failure codes remain generic `TrezorError::DeviceError`.
+
+## 0.3.2 - 2026-06-22
+
+- Expose Trezor lock state through `TrezorFeatures.unlocked` so mobile apps can distinguish PIN protection from the current locked/unlocked session state.
+- Add `trezor_refresh_features()` as an explicit one-shot refresh for fresh Trezor feature state without background polling.
+- Surface busy Trezor transport state as `TrezorError::DeviceBusy`, including structured native callback busy results, so mobile clients can back off while the device is busy or awaiting user action.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bitkitcore"
-version = "0.1.75"
+version = "0.3.5"
 edition = "2021"
 
 [lib]
@@ -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.2", features = ["psbt"] }
+trezor-connect-rs = { version = "0.3.3", 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.2", default-features = false, features = ["bluetooth", "psbt"] }
+trezor-connect-rs = { version = "0.3.3", default-features = false, features = ["bluetooth", "psbt"] }
 
 # JNI for Android (must match btleplug's jni version)
 [target.'cfg(target_os = "android")'.dependencies]
@@ -67,17 +67,6 @@ tempfile = "3.2"
 serial_test = "3.2.0"
 rust_decimal = "1.30"
 
-[target.armv7-linux-androideabi]
-rustflags = [
-    "-C", "link-arg=-Wl,--allow-multiple-definition",
-]
-
-[target.aarch64-linux-android]
-rustflags = [
-    "-C", "link-arg=-Wl,--allow-multiple-definition",
-]
-
-
 [[bin]]
 name = "example"
 path = "example/main.rs"

Cargo.toml

@@ -3,8 +3,8 @@
 
 import PackageDescription
 
-let tag = "v0.1.75"
-let checksum = "9e4c13246dee06e38491d4112029352b60032df54ac7ed885a64375186c6dc3b"
+let tag = "v0.3.5"
+let checksum = "bd1dcde687950d5dcaa5ea86d8fb8e3b8e68fd3cfdfca024e3bc4ee54746ea07"
 let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip"
 
 let package = Package(

Package.swift

@@ -118,50 +118,121 @@
     ```rust
     fn init_db(base_path: String) -> Result<String, DbError>
     ```
+  - [get_default_wallet_id](src/modules/activity/README.md#usage-examples): Get the default wallet ID for the built-in Bitkit wallet
+    ```rust
+    fn get_default_wallet_id() -> String
+    ```
   - [insert_activity](src/modules/activity/README.md#usage-examples): Insert an activity (onchain or lightning)
     ```rust
     fn insert_activity(activity: Activity) -> Result<(), ActivityError>
     ```
-  - [get_activities](src/modules/activity/README.md#usage-examples): Get activities with optional filtering, limit and sort direction
-    ```rust
-    fn get_activities(filter: ActivityFilter, limit: Option<u32>, sort_direction: Option<SortDirection>) -> Result<Vec<Activity>, ActivityError>
+  - [get_activities](src/modules/activity/README.md#usage-examples): Get activities with optional wallet scope, filtering, limit and sort direction
+    ```rust
+    fn get_activities(
+        wallet_id: Option<String>,
+        filter: Option<ActivityFilter>,
+        tx_type: Option<PaymentType>,
+        tags: Option<Vec<String>>,
+        search: Option<String>,
+        min_date: Option<u64>,
+        max_date: Option<u64>,
+        limit: Option<u32>,
+        sort_direction: Option<SortDirection>
+    ) -> Result<Vec<Activity>, ActivityError>
     ```  
-  - [get_activity_by_id](src/modules/activity/README.md#usage-examples): Look up any activity by its ID
+  - [get_activity_by_id](src/modules/activity/README.md#usage-examples): Look up any activity by wallet ID and activity ID
     ```rust
-    fn get_activity_by_id(activity_id: String) -> Result<Option<Activity>, ActivityError>
+    fn get_activity_by_id(wallet_id: String, activity_id: String) -> Result<Option<Activity>, ActivityError>
+    ```
+  - [get_activity_by_tx_id](src/modules/activity/README.md#usage-examples): Look up an onchain activity by wallet ID and transaction ID
+    ```rust
+    fn get_activity_by_tx_id(wallet_id: String, tx_id: String) -> Result<Option<OnchainActivity>, ActivityError>
     ```
   - [update_activity](src/modules/activity/README.md#usage-examples): Update an existing activity (onchain or lightning)
     ```rust
     fn update_activity(activity_id: String, activity: Activity) -> Result<(), ActivityError>
     ```
-  - [delete_activity_by_id](src/modules/activity/README.md#usage-examples): Delete any activity (onchain or lightning) by its ID. Returns true if activity was found and deleted, false if not found
+  - [delete_activity_by_id](src/modules/activity/README.md#usage-examples): Delete any activity by wallet ID and activity ID. Returns true if activity was found and deleted, false if not found
+    ```rust
+    fn delete_activity_by_id(wallet_id: String, activity_id: String) -> Result<bool, ActivityError>
+    ```
+  - [delete_activities_by_wallet_id](src/modules/activity/README.md#usage-examples): Delete all activities and scoped activity data for a wallet
     ```rust
-    fn delete_activity_by_id(activity_id: String) -> Result<bool, ActivityError>
+    fn delete_activities_by_wallet_id(wallet_id: String) -> Result<u32, ActivityError>
+    ```
+  - [mark_activity_as_seen](src/modules/activity/README.md#usage-examples): Mark an activity as seen by wallet ID and activity ID
+    ```rust
+    fn mark_activity_as_seen(wallet_id: String, activity_id: String, seen_at: u64) -> Result<(), ActivityError>
     ```
   - [add_tags](src/modules/activity/README.md#usage-examples): Add tags to an activity
     ```rust
-    fn add_tags(activity_id: String, tags: Vec<String>) -> Result<(), ActivityError>
+    fn add_tags(wallet_id: String, activity_id: String, tags: Vec<String>) -> Result<(), ActivityError>
     ```
   - [remove_tags](src/modules/activity/README.md#usage-examples): Remove tags from an activity
     ```rust
-    fn remove_tags(activity_id: String, tags: Vec<String>) -> Result<(), ActivityError>
+    fn remove_tags(wallet_id: String, activity_id: String, tags: Vec<String>) -> Result<(), ActivityError>
     ```
   - [get_tags](src/modules/activity/README.md#usage-examples): Get all tags for an activity
     ```rust
-    fn get_tags(activity_id: String) -> Result<Vec<String>, ActivityError>
+    fn get_tags(wallet_id: String, activity_id: String) -> Result<Vec<String>, ActivityError>
     ```
   - [get_all_unique_tags](src/modules/activity/README.md#usage-examples): Get all unique tags in the database sorted alphabetically
     ```rust
     fn get_all_unique_tags() -> Result<Vec<String>, ActivityError>
     ```
-  - [get_activities_by_tag](src/modules/activity/README.md#usage-examples): Get all activities with a specific tag
+  - [get_activities_by_tag](src/modules/activity/README.md#usage-examples): Get activities with a specific tag and optional wallet scope
     ```rust
-    fn get_activities_by_tag(tag: String, limit: Option<u32>, sort_direction: Option<SortDirection>) -> Result<Vec<Activity>, ActivityError>
+    fn get_activities_by_tag(
+        wallet_id: Option<String>,
+        tag: String,
+        limit: Option<u32>,
+        sort_direction: Option<SortDirection>
+    ) -> Result<Vec<Activity>, ActivityError>
     ```
   - [upsert_activity](src/modules/activity/README.md#usage-examples): Insert or update an activity
     ```rust
     fn upsert_activity(activity: Activity) -> Result<(), ActivityError>
     ```
+  - [add_pre_activity_metadata](src/modules/activity/README.md#usage-examples): Store pending metadata before an activity exists
+    ```rust
+    fn add_pre_activity_metadata(pre_activity_metadata: PreActivityMetadata) -> Result<(), ActivityError>
+    ```
+  - [get_pre_activity_metadata](src/modules/activity/README.md#usage-examples): Get pending metadata by wallet ID and payment ID or address
+    ```rust
+    fn get_pre_activity_metadata(
+        wallet_id: String,
+        search_key: String,
+        search_by_address: bool
+    ) -> Result<Option<PreActivityMetadata>, ActivityError>
+    ```
+  - [add_pre_activity_metadata_tags](src/modules/activity/README.md#usage-examples): Add tags to pending metadata
+    ```rust
+    fn add_pre_activity_metadata_tags(wallet_id: String, payment_id: String, tags: Vec<String>) -> Result<(), ActivityError>
+    ```
+  - [remove_pre_activity_metadata_tags](src/modules/activity/README.md#usage-examples): Remove tags from pending metadata
+    ```rust
+    fn remove_pre_activity_metadata_tags(wallet_id: String, payment_id: String, tags: Vec<String>) -> Result<(), ActivityError>
+    ```
+  - [reset_pre_activity_metadata_tags](src/modules/activity/README.md#usage-examples): Remove all tags from pending metadata
+    ```rust
+    fn reset_pre_activity_metadata_tags(wallet_id: String, payment_id: String) -> Result<(), ActivityError>
+    ```
+  - [delete_pre_activity_metadata](src/modules/activity/README.md#usage-examples): Delete pending metadata by wallet ID and payment ID
+    ```rust
+    fn delete_pre_activity_metadata(wallet_id: String, payment_id: String) -> Result<(), ActivityError>
+    ```
+  - [upsert_pre_activity_metadata](src/modules/activity/README.md#usage-examples): Insert or update pending metadata records
+    ```rust
+    fn upsert_pre_activity_metadata(pre_activity_metadata: Vec<PreActivityMetadata>) -> Result<(), ActivityError>
+    ```
+  - [get_transaction_details](src/modules/activity/README.md#usage-examples): Get transaction details by wallet ID and transaction ID
+    ```rust
+    fn get_transaction_details(wallet_id: String, tx_id: String) -> Result<Option<TransactionDetails>, ActivityError>
+    ```
+  - [delete_transaction_details](src/modules/activity/README.md#usage-examples): Delete transaction details by wallet ID and transaction ID
+    ```rust
+    fn delete_transaction_details(wallet_id: String, tx_id: String) -> Result<bool, ActivityError>
+    ```
 - Blocktank:
   - [init_db](src/modules/blocktank/README.md#usage-examples): Initialize database
     ```rust
@@ -510,4 +581,4 @@ cargo test modules::blocktank
 
 # Run tests for the Trezor module
 cargo test modules::trezor  
-```
+```

README.md

@@ -85,6 +85,9 @@ Create a GitHub Release with a new tag like `v0.1.0`. The workflow `gradle-publi
 ### Terminal
 
 ```sh
-cd bindings/android
+./build_android.sh
+cd ./bindings/android
 ./gradlew publish -Pversion=0.1.0
 ```
+
+Run `./build_android.sh` before any direct Gradle publish so `jniLibs` is regenerated as stripped release libraries with separate `native-debug-symbols.zip` metadata and 16 KB page-size alignment.

bindings/android/README.md

@@ -3,4 +3,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 group=com.synonym
-version=0.1.75
+version=0.3.5