feat: bump core to 0.3.9 and hw reliability

app/src/main/java/to/bitkit/ext/Activities.kt

@@ -5,6 +5,7 @@ import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
+import to.bitkit.models.WalletScope
 
 fun Activity.rawId(): String = when (this) {
     is Activity.Lightning -> v1.id
@@ -94,6 +95,7 @@ enum class BoostType { RBF, CPFP }
 
 @Suppress("LongParameterList")
 fun LightningActivity.Companion.create(
+    walletId: String = WalletScope.default,
     id: String,
     txType: PaymentType,
     status: PaymentState,
@@ -108,6 +110,7 @@ fun LightningActivity.Companion.create(
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
 ) = LightningActivity(
+    walletId = walletId,
     id = id,
     txType = txType,
     status = status,
@@ -125,6 +128,7 @@ fun LightningActivity.Companion.create(
 
 @Suppress("LongParameterList")
 fun OnchainActivity.Companion.create(
+    walletId: String = WalletScope.default,
     id: String,
     txType: PaymentType,
     txId: String,
@@ -146,6 +150,7 @@ fun OnchainActivity.Companion.create(
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
 ) = OnchainActivity(
+    walletId = walletId,
     id = id,
     txType = txType,
     txId = txId,

app/src/main/java/to/bitkit/ext/BackupRestoreCompat.kt

@@ -0,0 +1,47 @@
+package to.bitkit.ext
+
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.jsonArray
+import kotlinx.serialization.json.jsonObject
+import to.bitkit.di.json
+import to.bitkit.models.ActivityBackupV1
+import to.bitkit.models.MetadataBackupV1
+import to.bitkit.models.WalletScope
+
+fun String.decodeActivityBackupV1Compat(): ActivityBackupV1 =
+    json.decodeFromString(normalizeLegacyWalletIdsInBackupJson(this))
+
+fun String.decodeMetadataBackupV1Compat(): MetadataBackupV1 =
+    json.decodeFromString(normalizeLegacyWalletIdsInBackupJson(this))
+
+private fun normalizeLegacyWalletIdsInBackupJson(
+    raw: String,
+    walletId: String = WalletScope.default,
+): String {
+    val normalized = json.parseToJsonElement(raw).normalizeLegacyWalletIds(walletId)
+    return json.encodeToString(normalized)
+}
+
+private fun JsonElement.normalizeLegacyWalletIds(walletId: String): JsonElement = when (this) {
+    is JsonObject -> {
+        val patched = if (needsLegacyWalletId() && "walletId" !in this) {
+            this + ("walletId" to JsonPrimitive(walletId))
+        } else {
+            this
+        }
+        JsonObject(patched.mapValues { (_, value) -> value.normalizeLegacyWalletIds(walletId) })
+    }
+    is JsonArray -> JsonArray(map { it.normalizeLegacyWalletIds(walletId) })
+    else -> this
+}
+
+private fun JsonObject.needsLegacyWalletId(): Boolean = when {
+    "paymentId" in this && "tags" in this && "isReceive" in this -> true
+    "activityId" in this && "tags" in this && "paymentId" !in this -> true
+    "txId" in this && "txType" in this && "value" in this -> true
+    "invoice" in this && "status" in this && "txType" in this -> true
+    else -> false
+}

app/src/main/java/to/bitkit/ext/TrezorExceptionExt.kt

@@ -0,0 +1,17 @@
+package to.bitkit.ext
+
+import com.synonym.bitkitcore.TrezorException
+
+fun Throwable.isTrezorUserCancellation(): Boolean {
+    var current: Throwable? = this
+    while (current != null) {
+        when (current) {
+            is TrezorException.UserCancelled,
+            is TrezorException.PinCancelled,
+            is TrezorException.PassphraseCancelled,
+            -> return true
+        }
+        current = current.cause
+    }
+    return false
+}

app/src/main/java/to/bitkit/models/HwWalletId.kt

@@ -0,0 +1,10 @@
+package to.bitkit.models
+
+import com.synonym.bitkitcore.deriveWalletId
+
+object HwWalletId {
+    fun derive(xpubs: Map<String, String>, deviceType: String = "trezor"): String {
+        require(xpubs.isNotEmpty()) { "xpubs must not be empty" }
+        return deriveWalletId(deviceType = deviceType, xpubs = xpubs.values.toList())
+    }
+}

app/src/main/java/to/bitkit/models/WalletScope.kt

@@ -0,0 +1,14 @@
+package to.bitkit.models
+
+import androidx.annotation.VisibleForTesting
+import com.synonym.bitkitcore.getDefaultWalletId
+
+object WalletScope {
+    @VisibleForTesting
+    internal var testOverride: String? = null
+
+    val default: String
+        get() = testOverride ?: lazyDefault
+
+    private val lazyDefault: String by lazy { getDefaultWalletId() }
+}

app/src/main/java/to/bitkit/repositories/ActivityRepo.kt

@@ -36,6 +36,7 @@ import to.bitkit.di.BgDispatcher
 import to.bitkit.di.IoDispatcher
 import to.bitkit.ext.amountOnClose
 import to.bitkit.ext.contact
+import to.bitkit.ext.create
 import to.bitkit.ext.isReplacedSentTransaction
 import to.bitkit.ext.matchesPaymentId
 import to.bitkit.ext.nowMillis
@@ -653,7 +654,7 @@ class ActivityRepo @Inject constructor(
             val now = nowTimestamp().epochSecond.toULong()
             insertActivity(
                 Activity.Lightning(
-                    LightningActivity(
+                    LightningActivity.create(
                         id = id,
                         txType = PaymentType.RECEIVED,
                         status = PaymentState.SUCCEEDED,

app/src/main/java/to/bitkit/repositories/BackupRepo.kt

@@ -35,6 +35,8 @@ import to.bitkit.data.backup.VssBackupClientLdk
 import to.bitkit.data.resetPin
 import to.bitkit.di.IoDispatcher
 import to.bitkit.di.json
+import to.bitkit.ext.decodeActivityBackupV1Compat
+import to.bitkit.ext.decodeMetadataBackupV1Compat
 import to.bitkit.ext.formatPlural
 import to.bitkit.ext.nowMillis
 import to.bitkit.models.ActivityBackupV1
@@ -581,7 +583,7 @@ class BackupRepo @Inject constructor(
 
         val result = runCatching {
             performRestore(BackupCategory.METADATA) { dataBytes ->
-                val parsed = json.decodeFromString<MetadataBackupV1>(String(dataBytes))
+                val parsed = String(dataBytes).decodeMetadataBackupV1Compat()
                 val cleanCache = parsed.cache.resetBip21() // Force address rotation
                 cacheStore.update { cleanCache }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
@@ -613,7 +615,7 @@ class BackupRepo @Inject constructor(
                 parsed.createdAt
             }
             performRestore(BackupCategory.ACTIVITY) { dataBytes ->
-                val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
+                val parsed = String(dataBytes).decodeActivityBackupV1Compat()
                 activityRepo.restoreFromBackup(parsed)
                 parsed.createdAt
             }