aboutsummaryrefslogtreecommitdiffstats
path: root/src/features
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2026-08-29 07:05:47 -0700
committerAdam Soltys <[email protected]>2026-08-29 07:05:47 -0700
commitdd011c2c98033637829d83fc320ab4fdce4ede8c (patch)
tree67be07e6e8480354bfd60589ca68dbcaeac0c409 /src/features
parentc4b566651d6afac2c48c88611094cfa71c16289b (diff)
downloadcoinosv3-dd011c2c98033637829d83fc320ab4fdce4ede8c.tar.gz
coinosv3-dd011c2c98033637829d83fc320ab4fdce4ede8c.zip
A round's output can no longer strand: every refresh asks the server to drop its unlock hash in the mailbox, and any device that finds such a breadcrumb with no matching action adopts the claim itself (input ids now read from the status response — the rescue needs no operator). History learns to tell the whole truth and nothing more: coins the server saw spent elsewhere get a folded row (skipping coins a known renewal consumed), renewals fold across devices on their unlock hash and appear only when they cost something, and a rescue records the fee the round actually took. The account page keeps its header icons when reached from an open wallet; the messages page folds the control/guestbook replay once per burst instead of painting every intermediate state — no more blinking messages from superseded ban lists or member counts crawling to their total, which now paints from last session's settled figure
Co-Authored-By: Claude Fable 5 <[email protected]> Claude-Session: https://claude.ai/code/session_019WboeoetMF3MTmgT7Ew8yi
Diffstat (limited to 'src/features')
-rw-r--r--src/features/ark.js53
-rw-r--r--src/features/messages.js32
2 files changed, 74 insertions, 11 deletions
diff --git a/src/features/ark.js b/src/features/ark.js
index 291ae92..6d122a0 100644
--- a/src/features/ark.js
+++ b/src/features/ark.js
@@ -873,6 +873,19 @@ export function arkFeature(ctx) {
: m.type === 'ln-send' ? t('arkLnPaidHistory') : m.type === 'ln-receive' ? t('arkLnReceivedHistory')
: m.type === 'offboard' ? t('arkOffboarded') : m.type === 'exit' ? t('arkExited')
: m.type === 'refresh' ? t('arkRenewedHistory') : t('sent');
+ // coins the server saw spent outside this device's story (another
+ // device, a swept expiry, an adopted renewal) — the row that keeps the
+ // history summing to the balance. Folded per reconcile pass upstream.
+ if (m.type === 'reconcile') {
+ return h('div', { class: 'item' },
+ h('div', { class: 'ico out', html: ARK_MARK(15) }),
+ h('div', { class: 'grow' },
+ h('div', {}, t('arkSpentElsewhere')),
+ h('div', { class: 'small faint' },
+ timeAgo(m.ts / 1000) + (m.count > 1 ? ` · ${t('arkSpentElsewhereN', { n: m.count })}` : ''))),
+ h('div', { style: 'text-align:right' },
+ h('div', { class: 'amount-neg' }, '-' + fmtAmount(m.amountSat))));
+ }
// a renewal moves nothing anywhere — its history amount is what it COST
if (m.type === 'refresh') {
return h('div', { class: 'item', style: 'cursor:pointer', onClick: () => { ui.arkMoveDetail = m.id; render(); } },
@@ -2589,18 +2602,46 @@ export function arkFeature(ctx) {
// Same-payment duplicates (the old settle race, or a snapshot adopted
// whole before the merge learned to dedupe) fold at display time too —
// the earliest telling wins, everywhere, however the state got here.
+ // Renewals fold on their unlock hash (two devices can adopt the same
+ // participation), and only ones that COST something get a row — a free
+ // renewal is net zero, invisible money movement, noise.
const seenPay = new Set();
- return exits.concat((s.movements || [])
- .filter((m) => ['receive', 'send', 'board', 'offboard', 'exit', 'ln-send', 'ln-receive', 'refresh'].includes(m.type) && m.status === 'complete')
+ const moves = (s.movements || [])
+ .filter((m) => ['receive', 'send', 'board', 'offboard', 'exit', 'ln-send', 'ln-receive', 'refresh', 'reconcile'].includes(m.type) && m.status === 'complete')
+ .filter((m) => m.type !== 'refresh' || m.feeSat > 0)
.sort((m, n) => (m.ts || 0) - (n.ts || 0))
.filter((m) => {
- if (!m.type.startsWith('ln-')) return true;
- const key = m.type + ':' + (m.paymentHash || m.preimage || m.invoice || m.id);
+ if (!m.type.startsWith('ln-') && !(m.type === 'refresh' && m.unlockHash)) return true;
+ const key = m.type + ':' + (m.unlockHash || m.paymentHash || m.preimage || m.invoice || m.id);
if (seenPay.has(key)) return false;
seenPay.add(key);
return true;
- })
- .map((m) => ({ time: m.ts, render: () => arkHistoryItem(m) })));
+ });
+ // Coins the server reported spent elsewhere: without a row for them the
+ // history stops summing to the balance (cooney's looked 29k sats rich).
+ // One reconcile pass marks many coins in the same instant — fold each
+ // pass (and re-imported duplicates, deduped by coin) into one row.
+ // Coins a renewal is known to have consumed are excluded outright: the
+ // reconcile that noticed them gone was pre-empting the claim, and the
+ // renewed coin already balances the books invisibly.
+ const renewed = new Set();
+ for (const a of s.actions || []) if (a.type === 'refresh') for (const id of a.inputIds || []) renewed.add(id);
+ for (const m of s.movements || []) if (m.type === 'refresh') for (const id of m.inputIds || []) renewed.add(id);
+ const out = [];
+ const seenCoin = new Set();
+ for (const m of moves) {
+ if (m.type !== 'reconcile') { out.push(m); continue; }
+ if (m.vtxoId && (seenCoin.has(m.vtxoId) || renewed.has(m.vtxoId))) continue;
+ if (m.vtxoId) seenCoin.add(m.vtxoId);
+ const last = out[out.length - 1];
+ if (last && last.type === 'reconcile' && last.ts === m.ts) {
+ last.amountSat += m.amountSat;
+ last.count += 1;
+ } else {
+ out.push({ ...m, count: 1 });
+ }
+ }
+ return exits.concat(out.map((m) => ({ time: m.ts, render: () => arkHistoryItem(m) })));
},
historyDetail() {
if (ui.arkExitDetail) {
diff --git a/src/features/messages.js b/src/features/messages.js
index eea4fbf..d5c0441 100644
--- a/src/features/messages.js
+++ b/src/features/messages.js
@@ -263,6 +263,27 @@ export function messagesFeature(ctx) {
if (tms) observeAuthor(room.members, author, tms);
}
};
+ // The replay of stored wraps arrives one event at a time, and folding
+ // after every wrap paints each intermediate state: a superseded ban-list
+ // version blinks members' messages out until the newest version lands,
+ // and the member count creeps upward as joins stream in. Fold once per
+ // burst instead — a short quiet gap ends the burst — so the page goes
+ // from cache straight to the settled state.
+ let foldTimer = 0;
+ const scheduleFold = () => {
+ clearTimeout(foldTimer);
+ foldTimer = setTimeout(() => {
+ refold();
+ refoldGuestbook();
+ // remember the settled count — next session's list paints it
+ // immediately instead of "encrypted" flipping to a number
+ const s = st();
+ (s.memberCounts ||= {})[jm.community_id] =
+ [...room.members.values()].filter((m) => m.state === 'join').length;
+ save(s);
+ scheduleRepaint();
+ }, 250);
+ };
allUnsubs.push(
subscribeOn(room.relays, { kinds: [1059], authors: [room.control.pk], limit: 500 }, (wrap) => {
@@ -271,8 +292,7 @@ export function messagesFeature(ctx) {
const opened = openWrap(wrap, room.control);
if (!opened || opened.rumor.kind !== 3308) return;
room.controlEntries.push(opened);
- refold();
- scheduleRepaint();
+ scheduleFold();
}),
subscribeOn(room.relays, { kinds: [1059], authors: [room.guestbook.pk], limit: 500 }, (wrap) => {
if (seenWraps.has(wrap.id)) return;
@@ -280,8 +300,7 @@ export function messagesFeature(ctx) {
const opened = openWrap(wrap, room.guestbook);
if (!opened) return;
room.guestEntries.push(opened);
- refoldGuestbook();
- scheduleRepaint();
+ scheduleFold();
})
);
for (const c of jm.channels || []) subChannel(room, c.id);
@@ -2128,7 +2147,10 @@ export function messagesFeature(ctx) {
kids.push(h('div', { class: 'list' }, communities().map((jm) => {
const room = rooms.get(jm.community_id);
const name = room?.folded?.metadata?.name || jm.name;
- const memberCount = room ? [...room.members.values()].filter((m) => m.state === 'join').length : 0;
+ // until the guestbook fold lands, last session's settled count beats
+ // a placeholder that flips a moment later
+ const live = room ? [...room.members.values()].filter((m) => m.state === 'join').length : 0;
+ const memberCount = live || (st().memberCounts || {})[jm.community_id] || 0;
const unread = room ? roomUnread(room) : false;
return h('div', {
class: 'item chat-thread-row' + (unread ? ' unread' : ''),