Skip to content

fix: prioritize explicit contact linking #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben-kaufman merged 8 commits into from
Oct 9, 2026
Merged

fix: prioritize explicit contact linking #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5c0e55
fix: prioritize explicit contact linking
ben-kaufman Oct 8, 2026
de2bbdb
fix: retain endpoint publication until queued
ben-kaufman Oct 8, 2026
2261767
perf: batch private retry scheduling reads
ben-kaufman Oct 8, 2026
a34eaa0
chore: adopt paykit rc72
ben-kaufman Oct 9, 2026
98a2f05
fix: preserve contacts during stale sync
ben-kaufman Oct 9, 2026
57a370e
fix: keep sharing enabled across contact changes
ben-kaufman Oct 9, 2026
1c8f938
fix: bound unavailable contact retries
ben-kaufman Oct 9, 2026
f9fa0b5
fix: stop empty retries for missing peers
ben-kaufman Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions app/src/main/java/to/bitkit/repositories/ContactPaymentSettingsRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class ContactPaymentSettingsRepo @Inject constructor(
}

private suspend fun enable(contacts: List<String>): Result<Unit> {
val signIn = pubkyRepo.currentSignIn()
val previous = settingsStore.data.first()
val canUsePrivateContactPayments = runSuspendCatching {
privatePaykitRepo.hasPrivatePaymentAccess()
Expand All @@ -92,16 +93,23 @@ class ContactPaymentSettingsRepo @Inject constructor(
publicPaykitRepo.syncPublishedEndpoints(publish = true).getOrThrow()

if (canUsePrivateContactPayments) {
privatePaykitRepo.enableSharingAndPrepareSavedContacts(
publicKeys = contacts,
).getOrThrow()
prepareCurrentSavedContacts(signIn).getOrThrow()
}
}.onFailure { rollbackEnabled(previous, contacts, it) }
}.onFailure { rollbackEnabled(previous, contacts, signIn, it) }
}

private suspend fun prepareCurrentSavedContacts(signIn: PubkySignIn?): Result<Unit> {
if (signIn == null || !pubkyRepo.isCurrent(signIn)) return Result.success(Unit)
return privatePaykitRepo.enableSharingAndPrepareSavedContacts(
savedPublicKeys = { pubkyRepo.contacts.value.map { it.publicKey }.toSet() },
isStillCurrent = { pubkyRepo.isCurrent(signIn) },
)
}

private suspend fun rollbackEnabled(
previous: SettingsData,
contacts: List<String>,
signIn: PubkySignIn?,
error: Throwable,
) {
runSuspendCatching {
Expand All @@ -128,9 +136,7 @@ class ContactPaymentSettingsRepo @Inject constructor(
markPublicPaykitRetry(error)
}
if (previous.sharesPrivatePaykitEndpoints) {
privatePaykitRepo.enableSharingAndPrepareSavedContacts(
publicKeys = contacts,
).onFailure(error::addSuppressed)
prepareCurrentSavedContacts(signIn).onFailure(error::addSuppressed)
}
}

Expand Down
12 changes: 10 additions & 2 deletions app/src/main/java/to/bitkit/repositories/PrivatePaykitAddressReservationRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,13 @@ class PrivatePaykitAddressReservationRepo @Inject constructor(
return lightningRepo.getAddressBalance(address).getOrDefault(0u) > 0u
}

suspend fun clearContactAssignments(excludingPublicKeys: Collection<String>) = withContext(ioDispatcher) {
suspend fun clearContactAssignments(
excludingPublicKeys: Collection<String>,
isStillCurrent: (() -> Boolean)? = null,
) = withContext(ioDispatcher) {
val savedKeys = excludingPublicKeys.mapNotNull { normalizedPublicKeyOrNull(it) }.toSet()
locked { current ->
if (isStillCurrent?.invoke() == false) return@locked
val next = current.copy(
contactAssignments = current.contactAssignments.filterKeys {
it in savedKeys
Expand All @@ -217,9 +221,13 @@ class PrivatePaykitAddressReservationRepo @Inject constructor(
}
}

suspend fun removeContactAssignments(publicKeys: Collection<String>) = withContext(ioDispatcher) {
suspend fun removeContactAssignments(
publicKeys: Collection<String>,
isStillCurrent: (() -> Boolean)? = null,
) = withContext(ioDispatcher) {
val removedKeys = publicKeys.mapNotNull { normalizedPublicKeyOrNull(it) }.toSet()
locked { current ->
if (isStillCurrent?.invoke() == false) return@locked
val next = current.copy(
contactAssignments = current.contactAssignments.filterKeys { it !in removedKeys },
contactAssignmentHistory = current.contactAssignmentHistory.filterKeys { it !in removedKeys },
Expand Down
Loading
Loading