nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Show on-chain zappers in expanded reactions gallery

Browse Source 
- Add OnchainZappedIcon and PendingClockBadge
- move PendingClockBadge to TopStart to avoid follow-dot clash
This commit is contained in:
davotoula
2026-05-18 23:52:30 +02:00
parent d41cf6d75b
commit 91ded74636
8 changed files with 359 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/Note.kt
+21 -11
View File
@@ -158,11 +158,13 @@ open class Note(
/**
* NIP-BC verified onchain zaps targeting this note.
* Key: Bitcoin txid (lowercase 64-char hex). Value: verified satoshis paid to the recipient
* (NOT the sender-claimed amount). Confirmed and pending entries live here together;
* `updateZapTotal` only counts confirmed amounts.
* Key: Bitcoin txid (lowercase 64-char hex). Value: verified entry with the source
* OnchainZapEvent note (so `source.author` identifies the sender), the verified
* satoshis paid to the recipient (NOT the sender-claimed amount), and a confirmed
* flag. Confirmed and pending entries live here together; `updateZapTotal` only
* counts confirmed amounts.
*/
var onchainZaps = mapOf<String, OnchainZapAmount>()
var onchainZaps = mapOf<String, OnchainZapEntry>()
private set
var zapPayments = mapOf<Note, Note?>()
@@ -430,27 +432,35 @@ open class Note(
@Synchronized
private fun innerAddOnchainZap(
txid: String,
amount: OnchainZapAmount,
entry: OnchainZapEntry,
): Boolean {
val existing = onchainZaps[txid]
// Allow upgrading pending → confirmed but never reduce already-stored confirmations.
if (existing != null && existing.confirmed && !amount.confirmed) return false
if (existing == amount) return false
onchainZaps = onchainZaps + Pair(txid, amount)
if (existing == null) {
onchainZaps = onchainZaps + Pair(txid, entry)
return true
}
// Same-state duplicate: keep the first source and amount we got.
if (existing.confirmed == entry.confirmed) return false
// Downgrade confirmed → pending: never accept.
if (existing.confirmed && !entry.confirmed) return false
// Upgrade pending → confirmed: replace, so the upgrading event's source wins.
onchainZaps = onchainZaps + Pair(txid, entry)
return true
}
/**
* Register a NIP-BC verified onchain zap targeting this note. `verifiedSats` MUST come
* from on-chain verification (sum of outputs paying the recipient's derived Taproot
* address), not the sender-claimed `amount` tag.
* address), not the sender-claimed `amount` tag. `source` is the OnchainZapEvent's own
* note — `source.author` is the sender shown in the reactions gallery.
*/
fun addOnchainZap(
source: Note,
txid: String,
verifiedSats: Long,
confirmed: Boolean,
) {
val inserted = innerAddOnchainZap(txid, OnchainZapAmount(verifiedSats, confirmed))
val inserted = innerAddOnchainZap(txid, OnchainZapEntry(source, verifiedSats, confirmed))
if (inserted) {
updateZapTotal()
flowSet?.zaps?.invalidateData()
commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/OnchainZapAmount.kt → commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/OnchainZapEntry.kt
+7 -3
View File
@@ -20,11 +20,14 @@
*/
package com.vitorpamplona.amethyst.commons.model
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
/**
* Per-(note, txid) verified NIP-BC onchain zap state.
*
* @property source The OnchainZapEvent note that contributed this entry. `source.author` is the
* sender shown in the reactions gallery. When pending → confirmed upgrades
* happen, the upgrading event's note replaces the existing `source`.
* @property verifiedSats Satoshis verified to have paid the recipient's derived Taproot
* address on chain. NEVER the sender-claimed `amount` tag.
* @property confirmed True when the transaction has at least one confirmation. Unconfirmed
@@ -33,8 +36,9 @@ import androidx.compose.runtime.Immutable
* SHOULD either exclude them from aggregate totals or clearly label
* them as pending").
*/
@Immutable
data class OnchainZapAmount(
@Stable
data class OnchainZapEntry(
val source: Note,
val verifiedSats: Long,
val confirmed: Boolean,
)
commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/model/NoteOnchainZapTest.kt
+114
View File
@@ -0,0 +1,114 @@
/*
* Copyright (c) 2025 Vitor Pamplona
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
* Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package com.vitorpamplona.amethyst.commons.model
import java.math.BigDecimal
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertSame
import kotlin.test.assertTrue
class NoteOnchainZapTest {
private fun freshNote(idHex: String = "a".repeat(64)) = Note(idHex)
private fun sourceNote(idHex: String) = Note(idHex)
@Test
fun pendingEntryIsStoredWithSourceAndDoesNotAffectTotal() {
val target = freshNote()
val src = sourceNote("b".repeat(64))
target.addOnchainZap(source = src, txid = "tx1", verifiedSats = 1000L, confirmed = false)
val entry = target.onchainZaps["tx1"]
assertEquals(1, target.onchainZaps.size)
assertSame(src, entry?.source)
assertEquals(1000L, entry?.verifiedSats)
assertEquals(false, entry?.confirmed)
assertEquals(BigDecimal.ZERO, target.zapsAmount)
}
@Test
fun confirmedEntryIsStoredAndAddsToTotal() {
val target = freshNote()
val src = sourceNote("c".repeat(64))
target.addOnchainZap(source = src, txid = "tx1", verifiedSats = 5000L, confirmed = true)
assertEquals(true, target.onchainZaps["tx1"]?.confirmed)
assertEquals(BigDecimal.valueOf(5000L), target.zapsAmount)
}
@Test
fun pendingThenConfirmedReplacesSourceAndUpdatesTotal() {
val target = freshNote()
val firstSrc = sourceNote("d".repeat(64))
val secondSrc = sourceNote("e".repeat(64))
target.addOnchainZap(firstSrc, "tx1", 2500L, confirmed = false)
target.addOnchainZap(secondSrc, "tx1", 2500L, confirmed = true)
val entry = target.onchainZaps["tx1"]
assertSame(secondSrc, entry?.source)
assertEquals(true, entry?.confirmed)
assertEquals(BigDecimal.valueOf(2500L), target.zapsAmount)
}
@Test
fun confirmedThenPendingIsIgnored() {
val target = freshNote()
val firstSrc = sourceNote("f".repeat(64))
val secondSrc = sourceNote("0".repeat(64))
target.addOnchainZap(firstSrc, "tx1", 7500L, confirmed = true)
target.addOnchainZap(secondSrc, "tx1", 7500L, confirmed = false)
val entry = target.onchainZaps["tx1"]
assertSame(firstSrc, entry?.source)
assertEquals(true, entry?.confirmed)
assertEquals(BigDecimal.valueOf(7500L), target.zapsAmount)
}
@Test
fun sameStateDuplicateIsIgnored() {
val target = freshNote()
val firstSrc = sourceNote("1".repeat(64))
val secondSrc = sourceNote("2".repeat(64))
target.addOnchainZap(firstSrc, "tx1", 100L, confirmed = true)
target.addOnchainZap(secondSrc, "tx1", 100L, confirmed = true)
assertSame(firstSrc, target.onchainZaps["tx1"]?.source)
assertEquals(BigDecimal.valueOf(100L), target.zapsAmount)
}
@Test
fun updateZapTotalSumsConfirmedAcrossMultipleTxids() {
val target = freshNote()
target.addOnchainZap(sourceNote("3".repeat(64)), "tx1", 1000L, confirmed = true)
target.addOnchainZap(sourceNote("4".repeat(64)), "tx2", 2000L, confirmed = true)
target.addOnchainZap(sourceNote("5".repeat(64)), "tx3", 9999L, confirmed = false)
assertEquals(BigDecimal.valueOf(3000L), target.zapsAmount)
assertEquals(3, target.onchainZaps.size)
assertTrue(target.onchainZaps.containsKey("tx3"))
}
}