synonymdev · ovitrif · May 6, 2026 · Apr 30, 2026 · Apr 30, 2026 · Apr 30, 2026
diff --git a/app/src/main/java/to/bitkit/data/SettingsStore.kt b/app/src/main/java/to/bitkit/data/SettingsStore.kt
@@ -100,6 +100,11 @@ data class SettingsData(
     val hasSeenShopIntro: Boolean = false,
     val hasSeenProfileIntro: Boolean = false,
     val hasSeenContactsIntro: Boolean = false,
+    val hasConfirmedPublicPaykitEndpoints: Boolean = false,
+    val sharesPublicPaykitEndpoints: Boolean = false,
+    val publicPaykitBolt11: String = "",
+    val publicPaykitBolt11PaymentHash: String = "",
+    val publicPaykitBolt11ExpiresAtMillis: Long = 0,
     val quickPayIntroSeen: Boolean = false,
     val bgPaymentsIntroSeen: Boolean = false,
     val isQuickPayEnabled: Boolean = false,

diff --git a/app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt b/app/src/main/java/to/bitkit/domain/commands/NotifyPaymentReceivedHandler.kt
@@ -17,8 +17,8 @@ import to.bitkit.models.NewTransactionSheetType
 import to.bitkit.models.NotificationDetails
 import to.bitkit.models.PrimaryDisplay
 import to.bitkit.models.formatToModernDisplay
-import to.bitkit.repositories.ActivityRepo
 import to.bitkit.models.msatCeilOf
+import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.CurrencyRepo
 import to.bitkit.utils.Logger
 import javax.inject.Inject

diff --git a/app/src/main/java/to/bitkit/env/Env.kt b/app/src/main/java/to/bitkit/env/Env.kt
@@ -169,7 +169,7 @@ internal object Env {
                 Network.BITCOIN -> ""
                 else -> "staging."
             }
-            return "/pub/$pubkyDomain/:rw,/pub/${prefix}pubky.app/:r,/pub/${prefix}paykit/v0/:rw"
+            return "/pub/$pubkyDomain/:rw,/pub/${prefix}pubky.app/:r,/pub/paykit/v0/:rw"
         }
 
     val homegateUrl: String
@@ -245,6 +245,9 @@ internal object Env {
 
 @Suppress("ConstPropertyName")
 object Defaults {
+    /** Default Bolt11 invoice expiry in seconds. */
+    const val bolt11InvoiceExpirySeconds = 3_600u
+
     /** Recommended transaction base fee in sats */
     const val recommendedBaseFee = 256u
 

diff --git a/app/src/main/java/to/bitkit/ext/Activities.kt b/app/src/main/java/to/bitkit/ext/Activities.kt
@@ -52,6 +52,11 @@ fun Activity.isSent() = when (this) {
     is Activity.Onchain -> v1.txType == PaymentType.SENT
 }
 
+fun Activity.contact(): String? = when (this) {
+    is Activity.Lightning -> v1.contact
+    is Activity.Onchain -> v1.contact
+}
+
 fun Activity.matchesPaymentId(paymentHashOrTxId: String): Boolean = when (this) {
     is Activity.Lightning -> paymentHashOrTxId == v1.id
     is Activity.Onchain -> paymentHashOrTxId == v1.txId
@@ -92,6 +97,7 @@ fun LightningActivity.Companion.create(
     fee: ULong = 0u,
     message: String = "",
     preimage: String? = null,
+    contact: String? = null,
     createdAt: ULong? = timestamp,
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
@@ -105,6 +111,7 @@ fun LightningActivity.Companion.create(
     message = message,
     timestamp = timestamp,
     preimage = preimage,
+    contact = contact,
     createdAt = createdAt,
     updatedAt = updatedAt,
     seenAt = seenAt,
@@ -128,6 +135,7 @@ fun OnchainActivity.Companion.create(
     confirmTimestamp: ULong? = null,
     channelId: String? = null,
     transferTxId: String? = null,
+    contact: String? = null,
     createdAt: ULong? = timestamp,
     updatedAt: ULong? = createdAt,
     seenAt: ULong? = null,
@@ -148,6 +156,7 @@ fun OnchainActivity.Companion.create(
     confirmTimestamp = confirmTimestamp,
     channelId = channelId,
     transferTxId = transferTxId,
+    contact = contact,
     createdAt = createdAt,
     updatedAt = updatedAt,
     seenAt = seenAt,

diff --git a/app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt b/app/src/main/java/to/bitkit/fcm/WakeNodeWorker.kt
@@ -26,7 +26,6 @@ import to.bitkit.ext.amountOnClose
 import to.bitkit.ext.toUserMessage
 import to.bitkit.models.BITCOIN_SYMBOL
 import to.bitkit.models.BlocktankNotificationType
-import to.bitkit.models.msatCeilOf
 import to.bitkit.models.BlocktankNotificationType.cjitPaymentArrived
 import to.bitkit.models.BlocktankNotificationType.incomingHtlc
 import to.bitkit.models.BlocktankNotificationType.mutualClose
@@ -36,6 +35,7 @@ import to.bitkit.models.NewTransactionSheetDetails
 import to.bitkit.models.NewTransactionSheetDirection
 import to.bitkit.models.NewTransactionSheetType
 import to.bitkit.models.NotificationDetails
+import to.bitkit.models.msatCeilOf
 import to.bitkit.repositories.ActivityRepo
 import to.bitkit.repositories.BlocktankRepo
 import to.bitkit.repositories.LightningRepo

diff --git a/app/src/main/java/to/bitkit/models/MSat.kt b/app/src/main/java/to/bitkit/models/MSat.kt
@@ -24,3 +24,7 @@ fun msatCeilOf(msat: ULong): ULong = MSat(msat).ceil()
 
 /** Truncate sub-sat remainder from [msat]. Use for fees and upper bounds. */
 fun msatFloorOf(msat: ULong): ULong = MSat(msat).floor()
+
+/** Convert [sats] to millisats with saturating overflow protection. */
+fun satsToMsat(sats: ULong): ULong =
+    if (sats <= ULong.MAX_VALUE / MSat.PER_SAT) sats * MSat.PER_SAT else ULong.MAX_VALUE
diff --git a/app/src/main/java/to/bitkit/models/PubkyPublicKeyFormat.kt b/app/src/main/java/to/bitkit/models/PubkyPublicKeyFormat.kt
@@ -1,10 +1,12 @@
 package to.bitkit.models
 
+import to.bitkit.ext.ellipsisMiddle
 import java.util.Locale
 
 object PubkyPublicKeyFormat {
     private const val pubkyPrefix = "pubky"
     private const val rawKeyLength = 52
+    private const val redactedLength = 16
     const val maximumInputLength = 57
 
     private val zBase32Regex = Regex("^[ybndrfg8ejkmcpqxot1uwisza345h769]+$")
@@ -32,4 +34,9 @@ object PubkyPublicKeyFormat {
         val normalizedRhs = rhs?.let(::normalized) ?: return false
         return normalizedLhs == normalizedRhs
     }
+
+    fun redacted(input: String): String {
+        val normalizedInput = normalized(input) ?: input.trim()
+        return normalizedInput.ellipsisMiddle(redactedLength)
+    }
 }
diff --git a/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt b/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
@@ -33,12 +33,15 @@ import org.lightningdevkit.ldknode.TransactionDetails
 import to.bitkit.data.CacheStore
 import to.bitkit.data.dto.PendingBoostActivity
 import to.bitkit.di.BgDispatcher
+import to.bitkit.di.IoDispatcher
 import to.bitkit.ext.amountOnClose
+import to.bitkit.ext.contact
 import to.bitkit.ext.matchesPaymentId
 import to.bitkit.ext.nowMillis
 import to.bitkit.ext.nowTimestamp
 import to.bitkit.ext.rawId
 import to.bitkit.models.ActivityBackupV1
+import to.bitkit.models.PubkyPublicKeyFormat
 import to.bitkit.services.CoreService
 import to.bitkit.utils.AppError
 import to.bitkit.utils.Logger
@@ -55,6 +58,7 @@ private const val MS_SYNC_TIMEOUT = 40_000L
 @Singleton
 class ActivityRepo @Inject constructor(
     @BgDispatcher private val bgDispatcher: CoroutineDispatcher,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     private val coreService: CoreService,
     private val lightningRepo: LightningRepo,
     private val blocktankRepo: BlocktankRepo,
@@ -338,6 +342,69 @@ class ActivityRepo @Inject constructor(
         }
     }
 
+    suspend fun contactActivities(publicKey: String): Result<List<Activity>> = withContext(ioDispatcher) {
+        runCatching {
+            val normalizedKey = PubkyPublicKeyFormat.normalized(publicKey) ?: publicKey
+            getActivities(
+                filter = ActivityFilter.ALL,
+                sortDirection = SortDirection.DESC,
+            ).getOrThrow().filter { PubkyPublicKeyFormat.matches(it.contact(), normalizedKey) }
+        }.onFailure {
+            Logger.error("Failed to load contact activities for '$publicKey'", it, context = TAG)
+        }
+    }
+
+    suspend fun setContact(
+        contactPublicKey: String,
+        forPaymentId: String,
+        syncLdkPayments: Boolean = true,
+    ): Result<Unit> = withContext(ioDispatcher) {
+        runCatching {
+            if (syncLdkPayments) {
+                lightningRepo.getPayments().onSuccess {
+                    syncLdkNodePayments(it).getOrThrow()
+                }.getOrThrow()
+            }
+
+            val normalizedKey = PubkyPublicKeyFormat.normalized(contactPublicKey) ?: contactPublicKey
+            val activity = findActivityForPaymentId(forPaymentId, syncLdkPayments)
+            if (activity == null) {
+                Logger.warn(
+                    "Skipped setting contact for payment '$forPaymentId' because activity was not found",
+                    context = TAG,
+                )
+                return@runCatching
+            }
+            if (PubkyPublicKeyFormat.matches(activity.contact(), normalizedKey)) {
+                return@runCatching
+            }
+
+            val updatedAt = nowTimestamp().epochSecond.toULong()
+            val updatedActivity = activity.withContact(normalizedKey, updatedAt)
+            updateActivity(updatedActivity.rawId(), updatedActivity).getOrThrow()
+        }.onFailure {
+            Logger.error("Failed to set contact for payment '$forPaymentId'", it, context = TAG)
+        }
+    }
+
+    private suspend fun findActivityForPaymentId(forPaymentId: String, syncLdkPayments: Boolean): Activity? {
+        val activity = getActivityByPaymentId(forPaymentId)
+        if (activity != null) return activity
+        if (!syncLdkPayments) return null
+
+        syncActivities().getOrThrow()
+        return getActivityByPaymentId(forPaymentId)
+    }
+
+    private suspend fun getActivityByPaymentId(forPaymentId: String): Activity? =
+        coreService.activity.getActivity(forPaymentId)
+            ?: getOnchainActivityByTxId(forPaymentId)?.let { Activity.Onchain(it) }
+
+    private fun Activity.withContact(normalizedKey: String, updatedAt: ULong): Activity = when (this) {
+        is Activity.Lightning -> Activity.Lightning(v1.copy(contact = normalizedKey, updatedAt = updatedAt))
+        is Activity.Onchain -> Activity.Onchain(v1.copy(contact = normalizedKey, updatedAt = updatedAt))
+    }
+
     suspend fun getClosedChannels(
         sortDirection: SortDirection = SortDirection.ASC,
     ): Result<List<ClosedChannelDetails>> = withContext(bgDispatcher) {
@@ -515,6 +582,7 @@ class ActivityRepo @Inject constructor(
                         message = "",
                         timestamp = now,
                         preimage = null,
+                        contact = null,
                         createdAt = now,
                         updatedAt = null,
                         seenAt = null,

diff --git a/app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt b/app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt
@@ -41,6 +41,7 @@ import org.lightningdevkit.ldknode.ChannelDetails
 import to.bitkit.async.ServiceQueue
 import to.bitkit.data.CacheStore
 import to.bitkit.di.BgDispatcher
+import to.bitkit.env.Defaults
 import to.bitkit.env.Env
 import to.bitkit.ext.calculateRemoteBalance
 import to.bitkit.ext.nowTimestamp
@@ -462,7 +463,7 @@ class BlocktankRepo @Inject constructor(
         val invoice = lightningRepo.createInvoice(
             amountSats = null,
             description = "blocktank-gift-code:$code",
-            expirySeconds = 3600u,
+            expirySeconds = Defaults.bolt11InvoiceExpirySeconds,
         ).getOrThrow()
 
         Logger.debug("Created invoice for gift code, requesting payment from LSP", context = TAG)

diff --git a/app/src/main/java/to/bitkit/repositories/LightningRepo.kt b/app/src/main/java/to/bitkit/repositories/LightningRepo.kt
@@ -64,12 +64,12 @@ import to.bitkit.ext.nowTimestamp
 import to.bitkit.ext.toPeerDetailsList
 import to.bitkit.models.ALL_ADDRESS_TYPE_STRINGS
 import to.bitkit.models.CoinSelectionPreference
-import to.bitkit.models.MSat
 import to.bitkit.models.NATIVE_WITNESS_TYPES
 import to.bitkit.models.NodeLifecycleState
 import to.bitkit.models.OpenChannelResult
 import to.bitkit.models.TransactionSpeed
 import to.bitkit.models.safe
+import to.bitkit.models.satsToMsat
 import to.bitkit.models.toAddressType
 import to.bitkit.models.toCoinSelectAlgorithm
 import to.bitkit.models.toCoreNetwork
@@ -1396,7 +1396,7 @@ class LightningRepo @Inject constructor(
                 context = TAG,
             )
             val result = if (amountSats != null) {
-                val amountMsat = amountSats.safe() * MSat.PER_SAT.safe()
+                val amountMsat = satsToMsat(amountSats)
                 lightningService.sendProbesUsingAmount(bolt11, amountMsat)
             } else {
                 lightningService.sendProbes(bolt11)
@@ -1411,7 +1411,7 @@ class LightningRepo @Inject constructor(
                 "Sending keysend probe to nodeId='$nodeId' amountSats='$amountSats'",
                 context = TAG,
             )
-            val amountMsat = amountSats.safe() * MSat.PER_SAT.safe()
+            val amountMsat = satsToMsat(amountSats)
             lightningService.sendKeysendProbe(nodeId, amountMsat).map {
                 ProbeDispatch(paymentIds = it)
             }